فهرست منبع

strings: use `emplace_back` with `cmStrCat` arguments

Ben Boeckel 2 سال پیش
والد
کامیت
d4144b9c0a

+ 4 - 4
Source/CPack/cmCPackInnoSetupGenerator.cxx

@@ -106,7 +106,7 @@ int cmCPackInnoSetupGenerator::PackageFiles()
     const cmList extraScripts(GetOption("CPACK_INNOSETUP_EXTRA_SCRIPTS"));
 
     for (const std::string& i : extraScripts) {
-      includeDirectives.push_back(cmStrCat(
+      includeDirectives.emplace_back(cmStrCat(
         "#include ", QuotePath(cmSystemTools::CollapseFullPath(i, toplevel))));
     }
   }
@@ -142,7 +142,7 @@ int cmCPackInnoSetupGenerator::PackageFiles()
     const cmList codeFiles(GetOption("CPACK_INNOSETUP_CODE_FILES"));
 
     for (const std::string& i : codeFiles) {
-      codeIncludes.push_back(cmStrCat(
+      codeIncludes.emplace_back(cmStrCat(
         "#include ", QuotePath(cmSystemTools::CollapseFullPath(i, toplevel))));
     }
   }
@@ -781,7 +781,7 @@ bool cmCPackInnoSetupGenerator::ConfigureISScript()
   // Create internal variables
   std::vector<std::string> setupSection;
   for (const auto& i : setupDirectives) {
-    setupSection.push_back(cmStrCat(i.first, '=', TranslateBool(i.second)));
+    setupSection.emplace_back(cmStrCat(i.first, '=', TranslateBool(i.second)));
   }
 
   // Also create comments if the sections are empty
@@ -1082,7 +1082,7 @@ std::string cmCPackInnoSetupGenerator::ISKeyValueLine(
   std::vector<std::string> keys;
   for (const char* i : availableKeys) {
     if (params.count(i)) {
-      keys.push_back(cmStrCat(i, ": ", params.at(i)));
+      keys.emplace_back(cmStrCat(i, ": ", params.at(i)));
     }
   }
 

+ 2 - 2
Source/cmExportBuildFileGenerator.cxx

@@ -419,7 +419,7 @@ std::string cmExportBuildFileGenerator::GetFileSetDirectories(
         resultVector.push_back(
           cmStrCat("\"$<$<CONFIG:", config, ">:", dest, ">\""));
       } else {
-        resultVector.push_back(cmStrCat('"', dest, '"'));
+        resultVector.emplace_back(cmStrCat('"', dest, '"'));
         break;
       }
     }
@@ -478,7 +478,7 @@ std::string cmExportBuildFileGenerator::GetFileSetFiles(cmGeneratorTarget* gte,
           resultVector.push_back(
             cmStrCat("\"$<$<CONFIG:", config, ">:", escapedFile, ">\""));
         } else {
-          resultVector.push_back(cmStrCat('"', escapedFile, '"'));
+          resultVector.emplace_back(cmStrCat('"', escapedFile, '"'));
         }
       }
     }

+ 2 - 2
Source/cmExportInstallFileGenerator.cxx

@@ -616,7 +616,7 @@ std::string cmExportInstallFileGenerator::GetFileSetDirectories(
       resultVector.push_back(
         cmStrCat("\"$<$<CONFIG:", config, ">:", dest, ">\""));
     } else {
-      resultVector.push_back(cmStrCat('"', dest, '"'));
+      resultVector.emplace_back(cmStrCat('"', dest, '"'));
       break;
     }
   }
@@ -690,7 +690,7 @@ std::string cmExportInstallFileGenerator::GetFileSetFiles(
           resultVector.push_back(
             cmStrCat("\"$<$<CONFIG:", config, ">:", escapedFile, ">\""));
         } else {
-          resultVector.push_back(cmStrCat('"', escapedFile, '"'));
+          resultVector.emplace_back(cmStrCat('"', escapedFile, '"'));
         }
       }
     }

+ 1 - 1
Source/cmGlobalGhsMultiGenerator.cxx

@@ -670,7 +670,7 @@ bool cmGlobalGhsMultiGenerator::AddCheckTarget()
     }
 
     // Add the cache file.
-    listFiles.push_back(cmStrCat(
+    listFiles.emplace_back(cmStrCat(
       this->GetCMakeInstance()->GetHomeOutputDirectory(), "/CMakeCache.txt"));
 
     // Print not implemented warning.

+ 3 - 3
Source/cmGlobalVisualStudio10Generator.cxx

@@ -975,9 +975,9 @@ bool cmGlobalVisualStudio10Generator::FindVCTargetsPath(cmMakefile* mf)
   std::vector<std::string> cmd;
   cmd.push_back(this->GetMSBuildCommand());
   cmd.push_back(vcxproj);
-  cmd.push_back("/p:Configuration=Debug");
-  cmd.push_back(cmStrCat("/p:Platform=", this->GetPlatformName()));
-  cmd.push_back(cmStrCat("/p:VisualStudioVersion=", this->GetIDEVersion()));
+  cmd.emplace_back("/p:Configuration=Debug");
+  cmd.emplace_back(cmStrCat("/p:Platform=", this->GetPlatformName()));
+  cmd.emplace_back(cmStrCat("/p:VisualStudioVersion=", this->GetIDEVersion()));
   std::string out;
   int ret = 0;
   cmsys::RegularExpression regex("\n *VCTargetsPath=([^%\r\n]+)[\r\n]");

+ 2 - 2
Source/cmGlobalVisualStudio12Generator.cxx

@@ -80,8 +80,8 @@ public:
   std::vector<std::string> GetGeneratorNamesWithPlatform() const override
   {
     std::vector<std::string> names;
-    names.push_back(cmStrCat(vs12generatorName, " ARM"));
-    names.push_back(cmStrCat(vs12generatorName, " Win64"));
+    names.emplace_back(cmStrCat(vs12generatorName, " ARM"));
+    names.emplace_back(cmStrCat(vs12generatorName, " Win64"));
     return names;
   }
 

+ 2 - 2
Source/cmGlobalVisualStudio14Generator.cxx

@@ -82,8 +82,8 @@ public:
   std::vector<std::string> GetGeneratorNamesWithPlatform() const override
   {
     std::vector<std::string> names;
-    names.push_back(cmStrCat(vs14generatorName, " ARM"));
-    names.push_back(cmStrCat(vs14generatorName, " Win64"));
+    names.emplace_back(cmStrCat(vs14generatorName, " ARM"));
+    names.emplace_back(cmStrCat(vs14generatorName, " Win64"));
     return names;
   }
 

+ 4 - 4
Source/cmGlobalVisualStudio9Generator.cxx

@@ -72,21 +72,21 @@ public:
   std::vector<std::string> GetGeneratorNames() const override
   {
     std::vector<std::string> names;
-    names.push_back(vs9generatorName);
+    names.emplace_back(vs9generatorName);
     return names;
   }
 
   std::vector<std::string> GetGeneratorNamesWithPlatform() const override
   {
     std::vector<std::string> names;
-    names.push_back(cmStrCat(vs9generatorName, " Win64"));
-    names.push_back(cmStrCat(vs9generatorName, " IA64"));
+    names.emplace_back(cmStrCat(vs9generatorName, " Win64"));
+    names.emplace_back(cmStrCat(vs9generatorName, " IA64"));
     cmVisualStudioWCEPlatformParser parser;
     parser.ParseVersion("9.0");
     const std::vector<std::string>& availablePlatforms =
       parser.GetAvailablePlatforms();
     for (std::string const& i : availablePlatforms) {
-      names.push_back(cmStrCat("Visual Studio 9 2008 ", i));
+      names.emplace_back(cmStrCat("Visual Studio 9 2008 ", i));
     }
     return names;
   }

+ 2 - 2
Source/cmGlobalVisualStudioVersionedGenerator.cxx

@@ -265,8 +265,8 @@ public:
   std::vector<std::string> GetGeneratorNamesWithPlatform() const override
   {
     std::vector<std::string> names;
-    names.push_back(cmStrCat(vs15generatorName, " ARM"));
-    names.push_back(cmStrCat(vs15generatorName, " Win64"));
+    names.emplace_back(cmStrCat(vs15generatorName, " ARM"));
+    names.emplace_back(cmStrCat(vs15generatorName, " Win64"));
     return names;
   }
 

+ 2 - 1
Source/cmNinjaTargetGenerator.cxx

@@ -1052,7 +1052,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements(
 
     for (std::string const& l :
          this->GetLinkedTargetDirectories(language, config)) {
-      build.ImplicitDeps.push_back(cmStrCat(l, '/', language, "Modules.json"));
+      build.ImplicitDeps.emplace_back(
+        cmStrCat(l, '/', language, "Modules.json"));
     }
 
     this->GetGlobalGenerator()->WriteBuild(this->GetImplFileStream(fileConfig),

+ 1 - 1
Source/cmQtAutoMocUic.cxx

@@ -2116,7 +2116,7 @@ void cmQtAutoMocUicT::JobCompileMocT::MaybeWriteMocResponseFile(
     cmd.resize(1);
 
     // Specify response file
-    cmd.push_back(cmStrCat('@', responseFile));
+    cmd.emplace_back(cmStrCat('@', responseFile));
   }
 #else
   static_cast<void>(outputFile);

+ 1 - 1
Source/cmVisualStudio10TargetGenerator.cxx

@@ -4356,7 +4356,7 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
     // first just full path
     linkDirs.push_back(d);
     // next path with configuration type Debug, Release, etc
-    linkDirs.push_back(cmStrCat(d, "/$(Configuration)"));
+    linkDirs.emplace_back(cmStrCat(d, "/$(Configuration)"));
   }
   linkDirs.push_back("%(AdditionalLibraryDirectories)");
   linkOptions.AddFlag("AdditionalLibraryDirectories", linkDirs);