diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-01-12 22:54:20 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-01-12 23:00:45 (GMT) |
| commit | 3f86032bdab94e219d053c10b7e55eba9c06e562 (patch) | |
| tree | 7f3baceb16d5750160252bf3bd615f250a38fd37 | |
| parent | f24e1d37cef95145927d14d186e1615fca23a75b (diff) | |
| download | CMake-3f86032bdab94e219d053c10b7e55eba9c06e562.zip CMake-3f86032bdab94e219d053c10b7e55eba9c06e562.tar.gz CMake-3f86032bdab94e219d053c10b7e55eba9c06e562.tar.bz2 | |
Autogen: Generators: Rename requiresMocing method
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 8 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 06decf8..4979997 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -683,8 +683,8 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile) * @brief Tests if the C++ content requires moc processing * @return True if moc is required */ -bool cmQtAutoGenerators::requiresMocing(const std::string& text, - std::string& macroName) +bool cmQtAutoGenerators::MocRequired(const std::string& text, + std::string& macroName) { // Run a simple check before an expensive regular expression check if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) { @@ -812,7 +812,7 @@ bool cmQtAutoGenerators::ParseContentForMoc( cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename); std::string macroName; - const bool requiresMoc = this->requiresMocing(contentsString, macroName); + const bool requiresMoc = this->MocRequired(contentsString, macroName); bool ownDotMocIncluded = false; bool ownMocUnderscoreIncluded = false; std::string ownMocUnderscoreFile; @@ -1053,7 +1053,7 @@ void cmQtAutoGenerators::ParseHeaders( this->LogInfo(err.str()); } std::string macroName; - if (this->requiresMocing(contents, macroName)) { + if (this->MocRequired(contents, macroName)) { notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) + "/moc_" + cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) + diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 3720a00..7891eb9 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -39,7 +39,7 @@ private: bool RunAutogen(cmMakefile* makefile); // - Content analysis - bool requiresMocing(const std::string& text, std::string& macroName); + bool MocRequired(const std::string& text, std::string& macroName); bool MocSkipTest(const std::string& absFilename); bool UicSkipTest(const std::string& absFilename); |