diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-02-14 16:48:39 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-02-19 11:35:40 (GMT) |
| commit | 3ee2b1623ecbef3164c412bb6a1d826ba788002b (patch) | |
| tree | 778af809931412c9310508b7f6867e518d5525d9 | |
| parent | ec24dcdb36db7b460113b2ce3f7a954800d41e90 (diff) | |
| download | CMake-3ee2b1623ecbef3164c412bb6a1d826ba788002b.zip CMake-3ee2b1623ecbef3164c412bb6a1d826ba788002b.tar.gz CMake-3ee2b1623ecbef3164c412bb6a1d826ba788002b.tar.bz2 | |
Autogen: Rename settings file read/write methods
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 11 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 4a88201..2fd28c3 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -259,7 +259,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, return false; } // Read old settings - this->OldSettingsReadFile(mf.get(), targetDirectory); + this->SettingsFileRead(mf.get(), targetDirectory); // Init and run this->Init(); if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") { @@ -268,7 +268,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, } } // Write latest settings - if (!this->OldSettingsWriteFile(targetDirectory)) { + if (!this->SettingsFileWrite(targetDirectory)) { return false; } return true; @@ -445,8 +445,8 @@ std::string cmQtAutoGenerators::RccSettingsStringCompose() return res; } -void cmQtAutoGenerators::OldSettingsReadFile( - cmMakefile* makefile, const std::string& targetDirectory) +void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile, + const std::string& targetDirectory) { // Compose current settings strings this->MocSettingsString = this->MocSettingsStringCompose(); @@ -488,8 +488,7 @@ void cmQtAutoGenerators::OldSettingsReadFile( } } -bool cmQtAutoGenerators::OldSettingsWriteFile( - const std::string& targetDirectory) +bool cmQtAutoGenerators::SettingsFileWrite(const std::string& targetDirectory) { bool success = true; // Only write if any setting changed diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index d442ec3..953349b 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -30,9 +30,9 @@ private: std::string MocSettingsStringCompose(); std::string UicSettingsStringCompose(); std::string RccSettingsStringCompose(); - void OldSettingsReadFile(cmMakefile* makefile, - const std::string& targetDirectory); - bool OldSettingsWriteFile(const std::string& targetDirectory); + void SettingsFileRead(cmMakefile* makefile, + const std::string& targetDirectory); + bool SettingsFileWrite(const std::string& targetDirectory); // - Init and run void Init(); |