summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGenerators.cxx
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-06-27 20:44:16 (GMT)
committerBrad King <brad.king@kitware.com>2016-06-28 13:02:26 (GMT)
commit1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb (patch)
tree3c13e63f2529d877b865475b5269a96ef5e0a4cb /Source/cmQtAutoGenerators.cxx
parentb4b73f56a26c1e1d630e3f262d2d4bafee8231c4 (diff)
downloadCMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.zip
CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.gz
CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.bz2
use CM_NULLPTR
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
-rw-r--r--Source/cmQtAutoGenerators.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 6a6d72f..7ada431 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -34,8 +34,8 @@
static bool requiresMocing(const std::string& text, std::string& macroName)
{
// this simple check is much much faster than the regexp
- if (strstr(text.c_str(), "Q_OBJECT") == NULL &&
- strstr(text.c_str(), "Q_GADGET") == NULL) {
+ if (strstr(text.c_str(), "Q_OBJECT") == CM_NULLPTR &&
+ strstr(text.c_str(), "Q_GADGET") == CM_NULLPTR) {
return false;
}
@@ -88,7 +88,7 @@ static std::string extractSubDir(const std::string& absPath,
}
cmQtAutoGenerators::cmQtAutoGenerators()
- : Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != 0)
+ : Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != CM_NULLPTR)
, ColorOutput(true)
, RunMocFailed(false)
, RunUicFailed(false)
@@ -588,7 +588,7 @@ void cmQtAutoGenerators::ParseCppFile(
// first a simple string check for "moc" is *much* faster than the regexp,
// and if the string search already fails, we don't have to try the
// expensive regexp
- if ((strstr(contentsString.c_str(), "moc") != NULL) &&
+ if ((strstr(contentsString.c_str(), "moc") != CM_NULLPTR) &&
(mocIncludeRegExp.find(contentsString))) {
// for every moc include in the file
do {
@@ -765,7 +765,7 @@ void cmQtAutoGenerators::StrictParseCppFile(
// first a simple string check for "moc" is *much* faster than the regexp,
// and if the string search already fails, we don't have to try the
// expensive regexp
- if ((strstr(contentsString.c_str(), "moc") != NULL) &&
+ if ((strstr(contentsString.c_str(), "moc") != CM_NULLPTR) &&
(mocIncludeRegExp.find(contentsString))) {
// for every moc include in the file
do {
@@ -879,7 +879,7 @@ void cmQtAutoGenerators::ParseForUic(
const std::string realName = cmsys::SystemTools::GetRealPath(absFilename);
matchOffset = 0;
- if ((strstr(contentsString.c_str(), "ui_") != NULL) &&
+ if ((strstr(contentsString.c_str(), "ui_") != CM_NULLPTR) &&
(uiIncludeRegExp.find(contentsString))) {
do {
const std::string currentUi = uiIncludeRegExp.match(1);