clang-tidy modernize-use-emplace fix

daniele77 · daniele77 · commit fdcc13a1421e · 2021-03-18T18:35:51.000+01:00
diff --git a/examples/pluginmanager.cpp b/examples/pluginmanager.cpp
@@ -69,7 +69,7 @@ class PluginRegistry
 {
 public:
     static PluginRegistry& Instance() { return instance; }
-    void Register(const string& name, Factory factory) { plugins.push_back(make_pair(name, factory)); }
+    void Register(const string& name, Factory factory) { plugins.emplace_back(name, factory); }
     void Print(ostream& out) const
     {
         for (auto& p: plugins)
@@ -140,7 +140,7 @@ class RegisteredPlugin : public Plugin
     RegisteredPlugin() : Plugin(NAME)
     {
         const Registration& dummy = registration;
-        do { (void)(dummy); } while (0); // silence unused variable warning
+        do { (void)(dummy); } while (false); // silence unused variable warning
     }
 private:
     static unique_ptr<Plugin> Create(Menu* menu) { return make_unique<T>(menu); }
diff --git a/include/cli/detail/split.h b/include/cli/detail/split.h
@@ -98,12 +98,12 @@ class Text
             // Should come back into the word state after this.
             prev_state = State::word;
             state = State::escape;
-            splitResult.push_back("");
+            splitResult.emplace_back("");
         }
         else
         {
             state = State::word;
-            splitResult.push_back(std::string(1, c));
+            splitResult.emplace_back(1, c);
         }
     }
 
@@ -167,7 +167,7 @@ class Text
     {
         state = State::sentence;
         sentence_type = ( c == '"' ? SentenceType::double_quote : SentenceType::quote);
-        splitResult.push_back("");
+        splitResult.emplace_back("");
     }
 
     void RemoveEmptyEntries()
diff --git a/test/test_split.cpp b/test/test_split.cpp
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE(SingleQuotedCases)
     BOOST_CHECK_EQUAL(strs[0], "first");
     BOOST_CHECK_EQUAL(strs[1], "foo \tbar");
 
-    split(strs, "first '\"second\" \"thirdh\"'"); // first '"second" "thirdh"'
+    split(strs, R"(first '"second" "thirdh"')"); // first '"second" "thirdh"'
     BOOST_CHECK_EQUAL(strs.size(), 2);
     BOOST_CHECK_EQUAL(strs[0], "first");
     BOOST_CHECK_EQUAL(strs[1], "\"second\" \"thirdh\"");

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class PluginRegistry`
`69`	`69`	`{`
`70`	`70`	`public:`
`71`	`71`	`static PluginRegistry& Instance() { return instance; }`
`72`		`- void Register(const string& name, Factory factory) { plugins.push_back(make_pair(name, factory)); }`
	`72`	`+ void Register(const string& name, Factory factory) { plugins.emplace_back(name, factory); }`
`73`	`73`	`void Print(ostream& out) const`
`74`	`74`	`{`
`75`	`75`	`for (auto& p: plugins)`
`@@ -140,7 +140,7 @@ class RegisteredPlugin : public Plugin`
`140`	`140`	`RegisteredPlugin() : Plugin(NAME)`
`141`	`141`	`{`
`142`	`142`	`const Registration& dummy = registration;`
`143`		`- do { (void)(dummy); } while (0); // silence unused variable warning`
	`143`	`+ do { (void)(dummy); } while (false); // silence unused variable warning`
`144`	`144`	`}`
`145`	`145`	`private:`
`146`	`146`	`static unique_ptr<Plugin> Create(Menu* menu) { return make_unique<T>(menu); }`
Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,12 @@ class Text`
`98`	`98`	`// Should come back into the word state after this.`
`99`	`99`	`prev_state = State::word;`
`100`	`100`	`state = State::escape;`
`101`		`- splitResult.push_back("");`
	`101`	`+ splitResult.emplace_back("");`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
`105`	`105`	`state = State::word;`
`106`		`- splitResult.push_back(std::string(1, c));`
	`106`	`+ splitResult.emplace_back(1, c);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`@@ -167,7 +167,7 @@ class Text`
`167`	`167`	`{`
`168`	`168`	`state = State::sentence;`
`169`	`169`	`sentence_type = ( c == '"' ? SentenceType::double_quote : SentenceType::quote);`
`170`		`- splitResult.push_back("");`
	`170`	`+ splitResult.emplace_back("");`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`void RemoveEmptyEntries()`