diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-22 21:42:36 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-24 21:39:47 (GMT) |
| commit | 5962db438939ef2754509b8578af1f845ec07dc8 (patch) | |
| tree | f6b0c0db2acc8dc889d2d5d46fdf75659daa17e7 /Source/cmQtAutoGeneratorCommon.cxx | |
| parent | fe19fda2aa2595622c463fccaa8b36a91e4521c4 (diff) | |
| download | CMake-5962db438939ef2754509b8578af1f845ec07dc8.zip CMake-5962db438939ef2754509b8578af1f845ec07dc8.tar.gz CMake-5962db438939ef2754509b8578af1f845ec07dc8.tar.bz2 | |
Use C++11 nullptr
Diffstat (limited to 'Source/cmQtAutoGeneratorCommon.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorCommon.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmQtAutoGeneratorCommon.cxx b/Source/cmQtAutoGeneratorCommon.cxx index 3e1b58c..a8e6b96 100644 --- a/Source/cmQtAutoGeneratorCommon.cxx +++ b/Source/cmQtAutoGeneratorCommon.cxx @@ -38,7 +38,7 @@ static bool RccListInputsQt4(const std::string& fileName, osst << ifs.rdbuf(); qrcContents = osst.str(); } else { - if (errorMessage != CM_NULLPTR) { + if (errorMessage != nullptr) { std::ostringstream ost; ost << "AutoRcc: Error: Rcc file not readable:\n" << cmQtAutoGeneratorCommon::Quoted(fileName) << "\n"; @@ -98,7 +98,7 @@ static bool RccListInputsQt5(const std::string& rccCommand, int retVal = 0; bool result = cmSystemTools::RunSingleCommand(command, &rccStdOut, &rccStdErr, &retVal, - CM_NULLPTR, cmSystemTools::OUTPUT_NONE); + nullptr, cmSystemTools::OUTPUT_NONE); if (result && retVal == 0 && rccStdOut.find("--list") != std::string::npos) { hasDashDashList = true; @@ -117,10 +117,10 @@ static bool RccListInputsQt5(const std::string& rccCommand, command.push_back(fileName); result = cmSystemTools::RunSingleCommand(command, &rccStdOut, &rccStdErr, &retVal, - CM_NULLPTR, cmSystemTools::OUTPUT_NONE); + nullptr, cmSystemTools::OUTPUT_NONE); } if (!result || retVal) { - if (errorMessage != CM_NULLPTR) { + if (errorMessage != nullptr) { std::ostringstream ost; ost << "AutoRcc: Error: Rcc list process for " << fileName << " failed:\n" @@ -153,7 +153,7 @@ static bool RccListInputsQt5(const std::string& rccCommand, std::string::size_type pos = eline.find(searchString); if (pos == std::string::npos) { - if (errorMessage != CM_NULLPTR) { + if (errorMessage != nullptr) { std::ostringstream ost; ost << "AutoRcc: Error: Rcc lists unparsable output:\n" << cmQtAutoGeneratorCommon::Quoted(eline) << "\n"; @@ -205,7 +205,7 @@ bool cmQtAutoGeneratorCommon::RccListInputs(const std::string& qtMajorVersion, allGood = RccListInputsQt5(rccCommand, fileName, files, errorMessage); } } else { - if (errorMessage != CM_NULLPTR) { + if (errorMessage != nullptr) { std::ostringstream ost; ost << "AutoRcc: Error: Rcc file does not exist:\n" << cmQtAutoGeneratorCommon::Quoted(fileName) << "\n"; |