浏览代码

Autogen: Remove lowercase generator name from generator variables class

The lowercase `Auto*` generator name in `cmQtAutoGenInitializer::GenVarsT` is
never user.  Remove it from the class.
Sebastian Holtermann 6 年之前
父节点
当前提交
78eccc7836
共有 1 个文件被更改,包括 5 次插入11 次删除
  1. 5 11
      Source/cmQtAutoGenInitializer.h

+ 5 - 11
Source/cmQtAutoGenInitializer.h

@@ -62,7 +62,6 @@ public:
     bool Enabled = false;
     bool Enabled = false;
     // Generator type/name
     // Generator type/name
     GenT Gen;
     GenT Gen;
-    std::string const& GenName;
     std::string const& GenNameUpper;
     std::string const& GenNameUpper;
     // Executable
     // Executable
     std::string ExecutableTargetName;
     std::string ExecutableTargetName;
@@ -71,11 +70,9 @@ public:
     bool ExecutableExists = false;
     bool ExecutableExists = false;
 
 
     /// @brief Constructor
     /// @brief Constructor
-    GenVarsT(GenT gen, std::string const& genName,
-             std::string const& genNameUpper)
+    GenVarsT(GenT gen)
       : Gen(gen)
       : Gen(gen)
-      , GenName(genName)
-      , GenNameUpper(genNameUpper){};
+      , GenNameUpper(cmQtAutoGen::GeneratorNameUpper(gen)){};
   };
   };
 
 
   /// @brief Writes a CMake info file
   /// @brief Writes a CMake info file
@@ -213,8 +210,7 @@ private:
 
 
     /// @brief Constructor
     /// @brief Constructor
     MocT()
     MocT()
-      : GenVarsT(cmQtAutoGen::GenT::MOC, cmQtAutoGen::GenAutoMoc,
-                 cmQtAutoGen::GenAUTOMOC){};
+      : GenVarsT(GenT::MOC){};
   } Moc;
   } Moc;
 
 
   /// @brief Uic only variables
   /// @brief Uic only variables
@@ -229,8 +225,7 @@ private:
 
 
     /// @brief Constructor
     /// @brief Constructor
     UicT()
     UicT()
-      : GenVarsT(cmQtAutoGen::GenT::UIC, cmQtAutoGen::GenAutoUic,
-                 cmQtAutoGen::GenAUTOUIC){};
+      : GenVarsT(GenT::UIC){};
   } Uic;
   } Uic;
 
 
   /// @brief Rcc only variables
   /// @brief Rcc only variables
@@ -242,8 +237,7 @@ private:
 
 
     /// @brief Constructor
     /// @brief Constructor
     RccT()
     RccT()
-      : GenVarsT(cmQtAutoGen::GenT::RCC, cmQtAutoGen::GenAutoRcc,
-                 cmQtAutoGen::GenAUTORCC){};
+      : GenVarsT(GenT::RCC){};
   } Rcc;
   } Rcc;
 };
 };