Browse Source

Autogen: Rename settings file read/write methods

Sebastian Holtermann 8 years ago
parent
commit
3ee2b1623e
2 changed files with 8 additions and 9 deletions
  1. 5 6
      Source/cmQtAutoGenerators.cxx
  2. 3 3
      Source/cmQtAutoGenerators.h

+ 5 - 6
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

+ 3 - 3
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();