From 739592c9256fb6f89ee15081c3944d42515ef8db Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Wed, 15 Feb 2017 10:15:05 +0100
Subject: Autogen: Rename settings string variables

---
 Source/cmQtAutoGenerators.cxx | 18 +++++++++---------
 Source/cmQtAutoGenerators.h   |  7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 9c9142e..d3fbd02 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -469,20 +469,20 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile,
                                           const std::string& targetDirectory)
 {
   // Compose current settings strings
-  this->MocSettingsString = this->SettingsStringGenMoc();
-  this->UicSettingsString = this->SettingsStringGenUic();
-  this->RccSettingsString = this->SettingsStringGenRcc();
+  this->SettingsStringMoc = this->SettingsStringGenMoc();
+  this->SettingsStringUic = this->SettingsStringGenUic();
+  this->SettingsStringRcc = this->SettingsStringGenRcc();
 
   // Read old settings
   const std::string filename = SettingsFile(targetDirectory);
   if (makefile->ReadListFile(filename.c_str())) {
-    if (!SettingsMatch(makefile, SettingsKeyMoc, this->MocSettingsString)) {
+    if (!SettingsMatch(makefile, SettingsKeyMoc, this->SettingsStringMoc)) {
       this->GenerateAllMoc = true;
     }
-    if (!SettingsMatch(makefile, SettingsKeyUic, this->UicSettingsString)) {
+    if (!SettingsMatch(makefile, SettingsKeyUic, this->SettingsStringUic)) {
       this->GenerateAllUic = true;
     }
-    if (!SettingsMatch(makefile, SettingsKeyRcc, this->RccSettingsString)) {
+    if (!SettingsMatch(makefile, SettingsKeyRcc, this->SettingsStringRcc)) {
       this->GenerateAllRcc = true;
     }
     // In case any setting changed remove the old settings file.
@@ -513,9 +513,9 @@ bool cmQtAutoGenerators::SettingsFileWrite(const std::string& targetDirectory)
     cmsys::ofstream outfile;
     outfile.open(filename.c_str(), std::ios::trunc);
     if (outfile) {
-      SettingWrite(outfile, SettingsKeyMoc, this->MocSettingsString);
-      SettingWrite(outfile, SettingsKeyUic, this->UicSettingsString);
-      SettingWrite(outfile, SettingsKeyRcc, this->RccSettingsString);
+      SettingWrite(outfile, SettingsKeyMoc, this->SettingsStringMoc);
+      SettingWrite(outfile, SettingsKeyUic, this->SettingsStringUic);
+      SettingWrite(outfile, SettingsKeyRcc, this->SettingsStringRcc);
       success = outfile.good();
       outfile.close();
     } else {
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 068ec1d..7383c99 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -140,6 +140,10 @@ private:
   // - File lists
   std::vector<std::string> Sources;
   std::vector<std::string> Headers;
+  // - Settings
+  std::string SettingsStringMoc;
+  std::string SettingsStringUic;
+  std::string SettingsStringRcc;
   // - Moc
   std::vector<std::string> SkipMoc;
   std::string MocCompileDefinitionsStr;
@@ -150,17 +154,14 @@ private:
   std::list<std::string> MocIncludes;
   std::list<std::string> MocDefinitions;
   std::vector<std::string> MocOptions;
-  std::string MocSettingsString;
   // - Uic
   std::vector<std::string> SkipUic;
   std::vector<std::string> UicTargetOptions;
   std::map<std::string, std::string> UicOptions;
-  std::string UicSettingsString;
   // - Rcc
   std::vector<std::string> RccSources;
   std::map<std::string, std::string> RccOptions;
   std::map<std::string, std::vector<std::string> > RccInputs;
-  std::string RccSettingsString;
   // - Utility
   cmFilePathChecksum fpathCheckSum;
   cmsys::RegularExpression RegExpQObject;
-- 
cgit v0.12