From a9e3c903b6f74d181c76d1a2014a3af2babe6e41 Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Wed, 15 Feb 2017 10:22:29 +0100
Subject: Autogen: Rename variables read from info file

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

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 99f5ef7..002e95b 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -335,11 +335,11 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   // - Moc
   cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_MOC"),
                                     this->SkipMoc);
-  this->MocCompileDefinitionsStr =
+  this->MocInfoCompileDefinitions =
     GetConfigDefinition(makefile, "AM_MOC_COMPILE_DEFINITIONS", config);
-  this->MocIncludesStr =
+  this->MocInfoIncludes =
     GetConfigDefinition(makefile, "AM_MOC_INCLUDES", config);
-  this->MocOptionsStr = makefile->GetSafeDefinition("AM_MOC_OPTIONS");
+  this->MocInfoOptions = makefile->GetSafeDefinition("AM_MOC_OPTIONS");
 
   // - Uic
   cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_UIC"),
@@ -433,11 +433,11 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile,
   // Compose current settings strings
   if (this->MocEnabled()) {
     std::string& str = this->SettingsStringMoc;
-    str += this->MocCompileDefinitionsStr;
+    str += this->MocInfoCompileDefinitions;
     str += " ~~~ ";
-    str += this->MocIncludesStr;
+    str += this->MocInfoIncludes;
     str += " ~~~ ";
-    str += this->MocOptionsStr;
+    str += this->MocInfoOptions;
     str += " ~~~ ";
     str += this->IncludeProjectDirsBefore ? "TRUE" : "FALSE";
     str += " ~~~ ";
@@ -532,16 +532,16 @@ void cmQtAutoGenerators::Init()
                                 this->ProjectBinaryDir);
 
   std::vector<std::string> cdefList;
-  cmSystemTools::ExpandListArgument(this->MocCompileDefinitionsStr, cdefList);
+  cmSystemTools::ExpandListArgument(this->MocInfoCompileDefinitions, cdefList);
   for (std::vector<std::string>::const_iterator it = cdefList.begin();
        it != cdefList.end(); ++it) {
     this->MocDefinitions.push_back("-D" + (*it));
   }
 
-  cmSystemTools::ExpandListArgument(this->MocOptionsStr, this->MocOptions);
+  cmSystemTools::ExpandListArgument(this->MocInfoOptions, this->MocOptions);
 
   std::vector<std::string> incPaths;
-  cmSystemTools::ExpandListArgument(this->MocIncludesStr, incPaths);
+  cmSystemTools::ExpandListArgument(this->MocInfoIncludes, incPaths);
 
   std::set<std::string> frameworkPaths;
   for (std::vector<std::string>::const_iterator it = incPaths.begin();
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 78d0314..b9c372e 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -143,9 +143,9 @@ private:
   std::string SettingsStringRcc;
   // - Moc
   std::vector<std::string> SkipMoc;
-  std::string MocCompileDefinitionsStr;
-  std::string MocIncludesStr;
-  std::string MocOptionsStr;
+  std::string MocInfoCompileDefinitions;
+  std::string MocInfoIncludes;
+  std::string MocInfoOptions;
   std::string OutMocCppFilenameRel;
   std::string OutMocCppFilenameAbs;
   std::list<std::string> MocIncludes;
-- 
cgit v0.12