diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-02-14 23:04:49 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-02-19 11:35:42 (GMT) |
commit | ad1f21313f553ecc7064accf582986112dc678d1 (patch) | |
tree | 209d1cfbe73f610597bb7883fb8b8116eccdb4a4 /Source | |
parent | 2296a2e9ee04fc83a294d51421038dca40b3150f (diff) | |
download | CMake-ad1f21313f553ecc7064accf582986112dc678d1.zip CMake-ad1f21313f553ecc7064accf582986112dc678d1.tar.gz CMake-ad1f21313f553ecc7064accf582986112dc678d1.tar.bz2 |
Autogen: Make methods const
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmQtAutoGenerators.cxx | 10 | ||||
-rw-r--r-- | Source/cmQtAutoGenerators.h | 16 |
2 files changed, 14 insertions, 12 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 0a90c7e..9c9142e 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -427,7 +427,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( return true; } -std::string cmQtAutoGenerators::SettingsStringGenMoc() +std::string cmQtAutoGenerators::SettingsStringGenMoc() const { std::string res; if (this->MocEnabled()) { @@ -443,7 +443,7 @@ std::string cmQtAutoGenerators::SettingsStringGenMoc() return res; } -std::string cmQtAutoGenerators::SettingsStringGenUic() +std::string cmQtAutoGenerators::SettingsStringGenUic() const { std::string res; if (this->UicEnabled()) { @@ -455,7 +455,7 @@ std::string cmQtAutoGenerators::SettingsStringGenUic() return res; } -std::string cmQtAutoGenerators::SettingsStringGenRcc() +std::string cmQtAutoGenerators::SettingsStringGenRcc() const { std::string res; if (this->RccEnabled()) { @@ -1601,7 +1601,7 @@ void cmQtAutoGenerators::LogCommand(const std::vector<std::string>& command) */ bool cmQtAutoGenerators::NameCollisionTest( const std::map<std::string, std::string>& genFiles, - std::multimap<std::string, std::string>& collisions) + std::multimap<std::string, std::string>& collisions) const { typedef std::map<std::string, std::string>::const_iterator Iter; typedef std::map<std::string, std::string>::value_type VType; @@ -1631,7 +1631,7 @@ bool cmQtAutoGenerators::NameCollisionTest( */ std::string cmQtAutoGenerators::ChecksumedPath(const std::string& sourceFile, const char* basePrefix, - const char* baseSuffix) + const char* baseSuffix) const { std::string res = fpathCheckSum.getPart(sourceFile); res += "/"; diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index dcb3a4f..068ec1d 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -28,9 +28,9 @@ private: const std::string& config); // - Settings file - std::string SettingsStringGenMoc(); - std::string SettingsStringGenUic(); - std::string SettingsStringGenRcc(); + std::string SettingsStringGenMoc() const; + std::string SettingsStringGenUic() const; + std::string SettingsStringGenRcc() const; void SettingsFileRead(cmMakefile* makefile, const std::string& targetDirectory); bool SettingsFileWrite(const std::string& targetDirectory); @@ -105,17 +105,19 @@ private: void LogCommand(const std::vector<std::string>& command); // - Utility - bool NameCollisionTest(const std::map<std::string, std::string>& genFiles, - std::multimap<std::string, std::string>& collisions); + bool NameCollisionTest( + const std::map<std::string, std::string>& genFiles, + std::multimap<std::string, std::string>& collisions) const; std::string ChecksumedPath(const std::string& sourceFile, - const char* basePrefix, const char* baseSuffix); + const char* basePrefix, + const char* baseSuffix) const; bool MakeParentDirectory(const std::string& filename); bool MocEnabled() const { return !this->MocExecutable.empty(); } bool UicEnabled() const { return !this->UicExecutable.empty(); } bool RccEnabled() const { return !this->RccExecutable.empty(); } - bool GenerateAllAny() + bool GenerateAllAny() const { return (this->GenerateAllMoc || this->GenerateAllRcc || this->GenerateAllUic); |