From 25f0c2e14b0285d81ad0c6be401398e12e7ea89e Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Tue, 14 Feb 2017 18:00:21 +0100
Subject: Autogen: Rename settings key variables

---
 Source/cmQtAutoGenerators.cxx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 95873a2..ba5a39e 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -29,9 +29,9 @@
 
 // -- Static variables
 
-static const char* MocOldSettingsKey = "AM_MOC_OLD_SETTINGS";
-static const char* UicOldSettingsKey = "AM_UIC_OLD_SETTINGS";
-static const char* RccOldSettingsKey = "AM_RCC_OLD_SETTINGS";
+static const char* SettingsKeyMoc = "AM_MOC_OLD_SETTINGS";
+static const char* SettingsKeyUic = "AM_UIC_OLD_SETTINGS";
+static const char* SettingsKeyRcc = "AM_RCC_OLD_SETTINGS";
 
 // -- Static functions
 
@@ -457,19 +457,19 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile,
   const std::string filename = OldSettingsFile(targetDirectory);
   if (makefile->ReadListFile(filename.c_str())) {
     if (!this->MocExecutable.empty()) {
-      const std::string sol = makefile->GetSafeDefinition(MocOldSettingsKey);
+      const std::string sol = makefile->GetSafeDefinition(SettingsKeyMoc);
       if (sol != this->MocSettingsString) {
         this->GenerateAllMoc = true;
       }
     }
     if (!this->UicExecutable.empty()) {
-      const std::string sol = makefile->GetSafeDefinition(UicOldSettingsKey);
+      const std::string sol = makefile->GetSafeDefinition(SettingsKeyUic);
       if (sol != this->UicSettingsString) {
         this->GenerateAllUic = true;
       }
     }
     if (!this->RccExecutable.empty()) {
-      const std::string sol = makefile->GetSafeDefinition(RccOldSettingsKey);
+      const std::string sol = makefile->GetSafeDefinition(SettingsKeyRcc);
       if (sol != this->RccSettingsString) {
         this->GenerateAllRcc = true;
       }
@@ -498,17 +498,17 @@ bool cmQtAutoGenerators::SettingsFileWrite(const std::string& targetDirectory)
     outfile.open(filename.c_str(), std::ios::trunc);
     if (outfile) {
       if (!this->MocExecutable.empty()) {
-        outfile << "set(" << MocOldSettingsKey << " "
+        outfile << "set(" << SettingsKeyMoc << " "
                 << cmOutputConverter::EscapeForCMake(this->MocSettingsString)
                 << ")\n";
       }
       if (!this->UicExecutable.empty()) {
-        outfile << "set(" << UicOldSettingsKey << " "
+        outfile << "set(" << SettingsKeyUic << " "
                 << cmOutputConverter::EscapeForCMake(this->UicSettingsString)
                 << ")\n";
       }
       if (!this->RccExecutable.empty()) {
-        outfile << "set(" << RccOldSettingsKey << " "
+        outfile << "set(" << SettingsKeyRcc << " "
                 << cmOutputConverter::EscapeForCMake(this->RccSettingsString)
                 << ")\n";
       }
-- 
cgit v0.12