mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 01:09:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

use CM_NULLPTR

Browse Source
This commit is contained in:
Daniel Pfeifer
2016-06-27 22:44:16 +02:00
committed by Brad King
parent b4b73f56a2
commit 1d6909a287
201 changed files with 1143 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmGlobalKdevelopGenerator.cxx
View File

@@ -111,13 +111,13 @@ bool cmGlobalKdevelopGenerator::CreateFilelistFile(
// make sure the file is part of this source tree
if ((tmp[0] != '/') &&
(strstr(tmp.c_str(), cmake::GetCMakeFilesDirectoryPostSlash()) ==
0)) {
CM_NULLPTR)) {
files.insert(tmp);
tmp = cmSystemTools::GetFilenameName(tmp);
// add all files which dont match the default
// */CMakeLists.txt;*cmake; to the file pattern
if ((tmp != "CMakeLists.txt") &&
(strstr(tmp.c_str(), ".cmake") == 0)) {
(strstr(tmp.c_str(), ".cmake") == CM_NULLPTR)) {
cmakeFilePattern += tmp + ";";
}
}
@@ -142,7 +142,7 @@ bool cmGlobalKdevelopGenerator::CreateFilelistFile(
if ((tmp[0] != '/') &&
(strstr(tmp.c_str(), cmake::GetCMakeFilesDirectoryPostSlash()) ==
0) &&
CM_NULLPTR) &&
(cmSystemTools::GetFilenameExtension(tmp) != ".moc")) {
files.insert(tmp);
@@ -166,7 +166,7 @@ bool cmGlobalKdevelopGenerator::CreateFilelistFile(
cmSystemTools::ReplaceString(tmp, projectDir.c_str(), "");
if ((tmp[0] != '/') &&
(strstr(tmp.c_str(), cmake::GetCMakeFilesDirectoryPostSlash()) ==
0)) {
CM_NULLPTR)) {
files.insert(tmp);
}
}
@@ -296,12 +296,12 @@ void cmGlobalKdevelopGenerator::MergeProjectFiles(
it != lines.end(); it++) {
const char* line = (*it).c_str();
// skip these tags as they are always replaced
if ((strstr(line, "<projectdirectory>") != 0) ||
(strstr(line, "<projectmanagement>") != 0) ||
(strstr(line, "<absoluteprojectpath>") != 0) ||
(strstr(line, "<filelistdirectory>") != 0) ||
(strstr(line, "<buildtool>") != 0) ||
(strstr(line, "<builddir>") != 0)) {
if ((strstr(line, "<projectdirectory>") != CM_NULLPTR) ||
(strstr(line, "<projectmanagement>") != CM_NULLPTR) ||
(strstr(line, "<absoluteprojectpath>") != CM_NULLPTR) ||
(strstr(line, "<filelistdirectory>") != CM_NULLPTR) ||
(strstr(line, "<buildtool>") != CM_NULLPTR) ||
(strstr(line, "<builddir>") != CM_NULLPTR)) {
continue;
}