Refactorization: Use emplace methods in CLI

PKEuS · PKEuS · commit e92a95150ad0 · 2020-05-19T08:35:12.000+02:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -59,7 +59,7 @@ static void addFilesToList(const std::string& fileList, std::vector<std::string>
         std::string fileName;
         while (std::getline(*files, fileName)) { // next line
             if (!fileName.empty()) {
-                pathNames.push_back(fileName);
+                pathNames.emplace_back(fileName);
             }
         }
     }
@@ -79,7 +79,7 @@ static bool addIncludePathsToList(const std::string& fileList, std::list<std::st
                 if (!endsWith(pathName, '/'))
                     pathName += '/';
 
-                pathNames->push_back(pathName);
+                pathNames->emplace_back(pathName);
             }
         }
         return true;
@@ -185,7 +185,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 if (!endsWith(path,'/'))
                     path += '/';
 
-                mSettings->includePaths.push_back(path);
+                mSettings->includePaths.emplace_back(path);
             }
 
             // User undef
@@ -207,7 +207,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                     undef = 2 + argv[i];
                 }
 
-                mSettings->userUndefs.insert(undef);
+                mSettings->userUndefs.emplace(undef);
             }
 
             else if (std::strncmp(argv[i], "--addon=", 8) == 0)
@@ -231,9 +231,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 mSettings->clang = true;
 
             else if (std::strncmp(argv[i], "--config-exclude=",17) ==0) {
-                std::string path = argv[i] + 17;
-                path = Path::fromNativeSeparators(path);
-                mSettings->configExcludePaths.insert(path);
+                mSettings->configExcludePaths.emplace(Path::fromNativeSeparators(argv[i] + 17));
             }
 
             else if (std::strncmp(argv[i], "--config-excludes-file=", 23) == 0) {
@@ -354,7 +352,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
 
             // use a file filter
             else if (std::strncmp(argv[i], "--file-filter=", 14) == 0)
-                mSettings->fileFilter = std::string(argv[i] + 14);
+                mSettings->fileFilter = argv[i] + 14;
 
             // file list specified
             else if (std::strncmp(argv[i], "--file-list=", 12) == 0)
@@ -402,14 +400,12 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                         if (!endsWith(path, '/'))
                             path += '/';
                     }
-                    mIgnoredPaths.push_back(path);
+                    mIgnoredPaths.emplace_back(path);
                 }
             }
 
             else if (std::strncmp(argv[i], "--include=", 10) == 0) {
-                std::string path = argv[i] + 10;
-                path = Path::fromNativeSeparators(path);
-                mSettings->userIncludes.push_back(path);
+                mSettings->userIncludes.emplace_back(Path::fromNativeSeparators(argv[i] + 10));
             }
 
             else if (std::strncmp(argv[i], "--includes-file=", 16) == 0) {
@@ -513,8 +509,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
 
             // --library
             else if (std::strncmp(argv[i], "--library=", 10) == 0) {
-                std::string lib(argv[i] + 10);
-                mSettings->libraries.push_back(lib);
+                mSettings->libraries.emplace_back(argv[i] + 10);
             }
 
             // Set maximum number of #ifdef configurations to check
@@ -588,7 +583,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 if (projType == ImportProject::Type::CPPCHECK_GUI) {
                     mPathNames = mSettings->project.guiProject.pathNames;
                     for (const std::string &lib : mSettings->project.guiProject.libraries)
-                        mSettings->libraries.push_back(lib);
+                        mSettings->libraries.emplace_back(lib);
 
                     for (const std::string &ignorePath : mSettings->project.guiProject.excludedPaths)
                         mIgnoredPaths.emplace_back(ignorePath);
@@ -660,10 +655,10 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                     for (;;) {
                         const std::string::size_type pos = paths.find(';');
                         if (pos == std::string::npos) {
-                            mSettings->basePaths.push_back(Path::fromNativeSeparators(paths));
+                            mSettings->basePaths.emplace_back(Path::fromNativeSeparators(paths));
                             break;
                         }
-                        mSettings->basePaths.push_back(Path::fromNativeSeparators(paths.substr(0, pos)));
+                        mSettings->basePaths.emplace_back(Path::fromNativeSeparators(paths.substr(0, pos)));
                         paths.erase(0, pos + 1);
                     }
                 } else {
@@ -682,7 +677,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
             else if (std::strncmp(argv[i], "--rule=", 7) == 0) {
                 Settings::Rule rule;
                 rule.pattern = 7 + argv[i];
-                mSettings->rules.push_back(rule);
+                mSettings->rules.emplace_back(rule);
             }
 
             // Rule file
@@ -718,7 +713,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                         }
 
                         if (!rule.pattern.empty())
-                            mSettings->rules.push_back(rule);
+                            mSettings->rules.emplace_back(rule);
                     }
                 } else {
                     printMessage("cppcheck: error: unable to load rule-file: " + std::string(12+argv[i]));
@@ -739,10 +734,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 else if (showtimeMode.empty())
                     mSettings->showtime = SHOWTIME_MODES::SHOWTIME_NONE;
                 else {
-                    std::string message("cppcheck: error: unrecognized showtime mode: \"");
-                    message += showtimeMode;
-                    message += "\". Supported modes: file, summary, top5.";
-                    printMessage(message);
+                    printMessage("cppcheck: error: unrecognized showtime mode: \"" + showtimeMode + "\". Supported modes: file, summary, top5.");
                     return false;
                 }
             }
@@ -899,9 +891,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
         }
 
         else {
-            std::string path = Path::removeQuotationMarks(argv[i]);
-            path = Path::fromNativeSeparators(path);
-            mPathNames.push_back(path);
+            mPathNames.emplace_back(Path::fromNativeSeparators(Path::removeQuotationMarks(argv[i])));
         }
     }
 
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -164,7 +164,7 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
 
         for (const ImportProject::FileSettings &fsetting : settings.project.fileSettings) {
             if (matchglob(mSettings->fileFilter, fsetting.filename)) {
-                newList.push_back(fsetting);
+                newList.emplace_back(fsetting);
             }
         }
         if (!newList.empty())
@@ -897,7 +897,7 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck, int /*argc*/, const cha
     if (!settings.buildDir.empty()) {
         std::list<std::string> fileNames;
         for (std::map<std::string, std::size_t>::const_iterator i = mFiles.begin(); i != mFiles.end(); ++i)
-            fileNames.push_back(i->first);
+            fileNames.emplace_back(i->first);
         AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, settings.project.fileSettings);
     }
 
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -124,7 +124,7 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
             // Alert only about unique errors
             std::string errmsg = msg.toString(mSettings.verbose);
             if (std::find(mErrorList.begin(), mErrorList.end(), errmsg) == mErrorList.end()) {
-                mErrorList.push_back(errmsg);
+                mErrorList.emplace_back(errmsg);
                 if (type == REPORT_ERROR)
                     mErrorLogger.reportErr(msg);
                 else
@@ -522,7 +522,7 @@ void ThreadExecutor::report(const ErrorLogger::ErrorMessage &msg, MessageType ms
 
     EnterCriticalSection(&mErrorSync);
     if (std::find(mErrorList.begin(), mErrorList.end(), errmsg) == mErrorList.end()) {
-        mErrorList.push_back(errmsg);
+        mErrorList.emplace_back(errmsg);
         reportError = true;
     }
     LeaveCriticalSection(&mErrorSync);

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static void addFilesToList(const std::string& fileList, std::vector<std::string>`
`59`	`59`	`std::string fileName;`
`60`	`60`	`while (std::getline(*files, fileName)) { // next line`
`61`	`61`	`if (!fileName.empty()) {`
`62`		`- pathNames.push_back(fileName);`
	`62`	`+ pathNames.emplace_back(fileName);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`@@ -79,7 +79,7 @@ static bool addIncludePathsToList(const std::string& fileList, std::list<std::st`
`79`	`79`	`if (!endsWith(pathName, '/'))`
`80`	`80`	`pathName += '/';`
`81`	`81`
`82`		`- pathNames->push_back(pathName);`
	`82`	`+ pathNames->emplace_back(pathName);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`return true;`
`@@ -185,7 +185,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`185`	`185`	`if (!endsWith(path,'/'))`
`186`	`186`	`path += '/';`
`187`	`187`
`188`		`- mSettings->includePaths.push_back(path);`
	`188`	`+ mSettings->includePaths.emplace_back(path);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`// User undef`
`@@ -207,7 +207,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`207`	`207`	`undef = 2 + argv[i];`
`208`	`208`	`}`
`209`	`209`
`210`		`- mSettings->userUndefs.insert(undef);`
	`210`	`+ mSettings->userUndefs.emplace(undef);`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`else if (std::strncmp(argv[i], "--addon=", 8) == 0)`
`@@ -231,9 +231,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`231`	`231`	`mSettings->clang = true;`
`232`	`232`
`233`	`233`	`else if (std::strncmp(argv[i], "--config-exclude=",17) ==0) {`
`234`		`- std::string path = argv[i] + 17;`
`235`		`- path = Path::fromNativeSeparators(path);`
`236`		`- mSettings->configExcludePaths.insert(path);`
	`234`	`+ mSettings->configExcludePaths.emplace(Path::fromNativeSeparators(argv[i] + 17));`
`237`	`235`	`}`
`238`	`236`
`239`	`237`	`else if (std::strncmp(argv[i], "--config-excludes-file=", 23) == 0) {`
`@@ -354,7 +352,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`354`	`352`
`355`	`353`	`// use a file filter`
`356`	`354`	`else if (std::strncmp(argv[i], "--file-filter=", 14) == 0)`
`357`		`- mSettings->fileFilter = std::string(argv[i] + 14);`
	`355`	`+ mSettings->fileFilter = argv[i] + 14;`
`358`	`356`
`359`	`357`	`// file list specified`
`360`	`358`	`else if (std::strncmp(argv[i], "--file-list=", 12) == 0)`
`@@ -402,14 +400,12 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`402`	`400`	`if (!endsWith(path, '/'))`
`403`	`401`	`path += '/';`
`404`	`402`	`}`
`405`		`- mIgnoredPaths.push_back(path);`
	`403`	`+ mIgnoredPaths.emplace_back(path);`
`406`	`404`	`}`
`407`	`405`	`}`
`408`	`406`
`409`	`407`	`else if (std::strncmp(argv[i], "--include=", 10) == 0) {`
`410`		`- std::string path = argv[i] + 10;`
`411`		`- path = Path::fromNativeSeparators(path);`
`412`		`- mSettings->userIncludes.push_back(path);`
	`408`	`+ mSettings->userIncludes.emplace_back(Path::fromNativeSeparators(argv[i] + 10));`
`413`	`409`	`}`
`414`	`410`
`415`	`411`	`else if (std::strncmp(argv[i], "--includes-file=", 16) == 0) {`
`@@ -513,8 +509,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`513`	`509`
`514`	`510`	`// --library`
`515`	`511`	`else if (std::strncmp(argv[i], "--library=", 10) == 0) {`
`516`		`- std::string lib(argv[i] + 10);`
`517`		`- mSettings->libraries.push_back(lib);`
	`512`	`+ mSettings->libraries.emplace_back(argv[i] + 10);`
`518`	`513`	`}`
`519`	`514`
`520`	`515`	`// Set maximum number of #ifdef configurations to check`
`@@ -588,7 +583,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`588`	`583`	`if (projType == ImportProject::Type::CPPCHECK_GUI) {`
`589`	`584`	`mPathNames = mSettings->project.guiProject.pathNames;`
`590`	`585`	`for (const std::string &lib : mSettings->project.guiProject.libraries)`
`591`		`- mSettings->libraries.push_back(lib);`
	`586`	`+ mSettings->libraries.emplace_back(lib);`
`592`	`587`
`593`	`588`	`for (const std::string &ignorePath : mSettings->project.guiProject.excludedPaths)`
`594`	`589`	`mIgnoredPaths.emplace_back(ignorePath);`
`@@ -660,10 +655,10 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`660`	`655`	`for (;;) {`
`661`	`656`	`const std::string::size_type pos = paths.find(';');`
`662`	`657`	`if (pos == std::string::npos) {`
`663`		`- mSettings->basePaths.push_back(Path::fromNativeSeparators(paths));`
	`658`	`+ mSettings->basePaths.emplace_back(Path::fromNativeSeparators(paths));`
`664`	`659`	`break;`
`665`	`660`	`}`
`666`		`- mSettings->basePaths.push_back(Path::fromNativeSeparators(paths.substr(0, pos)));`
	`661`	`+ mSettings->basePaths.emplace_back(Path::fromNativeSeparators(paths.substr(0, pos)));`
`667`	`662`	`paths.erase(0, pos + 1);`
`668`	`663`	`}`
`669`	`664`	`} else {`
`@@ -682,7 +677,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`682`	`677`	`else if (std::strncmp(argv[i], "--rule=", 7) == 0) {`
`683`	`678`	`Settings::Rule rule;`
`684`	`679`	`rule.pattern = 7 + argv[i];`
`685`		`- mSettings->rules.push_back(rule);`
	`680`	`+ mSettings->rules.emplace_back(rule);`
`686`	`681`	`}`
`687`	`682`
`688`	`683`	`// Rule file`
`@@ -718,7 +713,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`718`	`713`	`}`
`719`	`714`
`720`	`715`	`if (!rule.pattern.empty())`
`721`		`- mSettings->rules.push_back(rule);`
	`716`	`+ mSettings->rules.emplace_back(rule);`
`722`	`717`	`}`
`723`	`718`	`} else {`
`724`	`719`	`printMessage("cppcheck: error: unable to load rule-file: " + std::string(12+argv[i]));`
`@@ -739,10 +734,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`739`	`734`	`else if (showtimeMode.empty())`
`740`	`735`	`mSettings->showtime = SHOWTIME_MODES::SHOWTIME_NONE;`
`741`	`736`	`else {`
`742`		`- std::string message("cppcheck: error: unrecognized showtime mode: \"");`
`743`		`- message += showtimeMode;`
`744`		`- message += "\". Supported modes: file, summary, top5.";`
`745`		`- printMessage(message);`
	`737`	`+ printMessage("cppcheck: error: unrecognized showtime mode: \"" + showtimeMode + "\". Supported modes: file, summary, top5.");`
`746`	`738`	`return false;`
`747`	`739`	`}`
`748`	`740`	`}`
`@@ -899,9 +891,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`899`	`891`	`}`
`900`	`892`
`901`	`893`	`else {`
`902`		`- std::string path = Path::removeQuotationMarks(argv[i]);`
`903`		`- path = Path::fromNativeSeparators(path);`
`904`		`- mPathNames.push_back(path);`
	`894`	`+ mPathNames.emplace_back(Path::fromNativeSeparators(Path::removeQuotationMarks(argv[i])));`
`905`	`895`	`}`
`906`	`896`	`}`
`907`	`897`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ bool CppCheckExecutor::parseFromArgs(CppCheck cppcheck, int argc, const char c`
`164`	`164`
`165`	`165`	`for (const ImportProject::FileSettings &fsetting : settings.project.fileSettings) {`
`166`	`166`	`if (matchglob(mSettings->fileFilter, fsetting.filename)) {`
`167`		`- newList.push_back(fsetting);`
	`167`	`+ newList.emplace_back(fsetting);`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`	`if (!newList.empty())`
`@@ -897,7 +897,7 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck, int /argc/, const cha`
`897`	`897`	`if (!settings.buildDir.empty()) {`
`898`	`898`	`std::list<std::string> fileNames;`
`899`	`899`	`for (std::map<std::string, std::size_t>::const_iterator i = mFiles.begin(); i != mFiles.end(); ++i)`
`900`		`- fileNames.push_back(i->first);`
	`900`	`+ fileNames.emplace_back(i->first);`
`901`	`901`	`AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, settings.project.fileSettings);`
`902`	`902`	`}`
`903`	`903`