diff options
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 24 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 56c09f8..6896ba4 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -340,7 +340,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( // - Moc cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_MOC"), - this->SkipMoc); + this->MocSkipList); cmSystemTools::ExpandListArgument( GetConfigDefinition(makefile, "AM_MOC_COMPILE_DEFINITIONS", config), this->MocDefinitions); @@ -351,7 +351,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( // - Uic cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_UIC"), - this->SkipUic); + this->UicSkipList); cmSystemTools::ExpandListArgument( GetConfigDefinition(makefile, "AM_UIC_TARGET_OPTIONS", config), this->UicTargetOptions); @@ -635,10 +635,10 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile) for (std::vector<std::string>::const_iterator it = this->Headers.begin(); it != this->Headers.end(); ++it) { const std::string& headerName = *it; - if (!this->MocSkipTest(headerName)) { + if (!this->MocSkip(headerName)) { headerFilesMoc.insert(headerName); } - if (!this->UicSkipTest(headerName)) { + if (!this->UicSkip(headerName)) { headerFilesUic.insert(headerName); } } @@ -686,12 +686,12 @@ bool cmQtAutoGenerators::MocRequired(const std::string& text, * @brief Tests if the file should be ignored for moc scanning * @return True if the file should be ignored */ -bool cmQtAutoGenerators::MocSkipTest(const std::string& absFilename) +bool cmQtAutoGenerators::MocSkip(const std::string& absFilename) { // Test if moc scanning is enabled if (this->MocEnabled()) { // Test if the file name is on the skip list - if (!ListContains(this->SkipMoc, absFilename)) { + if (!ListContains(this->MocSkipList, absFilename)) { return false; } } @@ -701,12 +701,12 @@ bool cmQtAutoGenerators::MocSkipTest(const std::string& absFilename) /** * @brief Tests if the file name is in the skip list */ -bool cmQtAutoGenerators::UicSkipTest(const std::string& absFilename) +bool cmQtAutoGenerators::UicSkip(const std::string& absFilename) { // Test if uic scanning is enabled if (this->UicEnabled()) { // Test if the file name is on the skip list - if (!ListContains(this->SkipUic, absFilename)) { + if (!ListContains(this->UicSkipList, absFilename)) { return false; } } @@ -731,12 +731,12 @@ bool cmQtAutoGenerators::ParseSourceFile( this->LogWarning(err.str()); } else { // Parse source contents for MOC - if (success && !this->MocSkipTest(absFilename)) { + if (success && !this->MocSkip(absFilename)) { success = this->ParseContentForMoc( absFilename, contentsString, headerExtensions, includedMocs, relaxed); } // Parse source contents for UIC - if (success && !this->UicSkipTest(absFilename)) { + if (success && !this->UicSkip(absFilename)) { this->ParseContentForUic(absFilename, contentsString, includedUis); } } @@ -986,11 +986,11 @@ void cmQtAutoGenerators::SearchHeadersForSourceFile( const std::string hname = (*bpit) + (*heit); if (cmsys::SystemTools::FileExists(hname.c_str())) { // Moc headers - if (!this->MocSkipTest(absFilename) && !this->MocSkipTest(hname)) { + if (!this->MocSkip(absFilename) && !this->MocSkip(hname)) { absHeadersMoc.insert(hname); } // Uic headers - if (!this->UicSkipTest(absFilename) && !this->UicSkipTest(hname)) { + if (!this->UicSkip(absFilename) && !this->UicSkip(hname)) { absHeadersUic.insert(hname); } break; diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index ec9afef..f14c7a7 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -38,8 +38,8 @@ private: // - Content analysis bool MocRequired(const std::string& text, std::string& macroName); - bool MocSkipTest(const std::string& absFilename); - bool UicSkipTest(const std::string& absFilename); + bool MocSkip(const std::string& absFilename); + bool UicSkip(const std::string& absFilename); bool ParseSourceFile( const std::string& absFilename, @@ -142,7 +142,7 @@ private: std::string SettingsStringUic; std::string SettingsStringRcc; // - Moc - std::vector<std::string> SkipMoc; + std::vector<std::string> MocSkipList; std::string MocInfoIncludes; std::string OutMocCppFilenameRel; std::string OutMocCppFilenameAbs; @@ -150,7 +150,7 @@ private: std::vector<std::string> MocDefinitions; std::vector<std::string> MocOptions; // - Uic - std::vector<std::string> SkipUic; + std::vector<std::string> UicSkipList; std::vector<std::string> UicTargetOptions; std::map<std::string, std::string> UicOptions; // - Rcc |