From 52d5d4e9154644597630ed844a254dfb8de524dd Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Wed, 2 Oct 2013 13:39:50 +0200
Subject: Rename the cmQtAutoGenerator instances to reflect coming features.

---
 Source/cmGlobalGenerator.cxx | 12 ++++++------
 Source/cmcmd.cxx             |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f92fe60..386af6d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1209,8 +1209,8 @@ bool cmGlobalGenerator::CheckTargets()
 void cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 {
 #ifdef CMAKE_BUILD_WITH_CMAKE
-  typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > Automocs;
-  Automocs automocs;
+  typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > Autogens;
+  Autogens autogens;
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
     cmTargets& targets =
@@ -1227,16 +1227,16 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
         {
         if(target.GetPropertyAsBool("AUTOMOC") && !target.IsImported())
           {
-          cmQtAutoGenerators automoc;
-          if(automoc.InitializeMocSourceFile(&target))
+          cmQtAutoGenerators autogen;
+          if(autogen.InitializeMocSourceFile(&target))
             {
-            automocs.push_back(std::make_pair(automoc, &target));
+            autogens.push_back(std::make_pair(autogen, &target));
             }
           }
         }
       }
     }
-  for (Automocs::iterator it = automocs.begin(); it != automocs.end();
+  for (Autogens::iterator it = autogens.begin(); it != autogens.end();
        ++it)
     {
     it->first.SetupAutoGenerateTarget(it->second);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 2fba5dc..79a3969 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -634,10 +634,10 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       }
     else if (args[1] == "cmake_automoc")
       {
-        cmQtAutoGenerators automoc;
+        cmQtAutoGenerators autogen;
         const char *config = args[3].empty() ? 0 : args[3].c_str();
-        bool automocSuccess = automoc.Run(args[2].c_str(), config);
-        return automocSuccess ? 0 : 1;
+        bool autogenSuccess = autogen.Run(args[2].c_str(), config);
+        return autogenSuccess ? 0 : 1;
       }
 #endif
 
-- 
cgit v0.12