use std::string::empty() (cppcheck-opensource#3910)

firewave · web-flow · commit 25ef9eeb2654 · 2022-04-09T19:02:37.000+02:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -637,7 +637,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                         mSettings->platform(Settings::Unix64);
                     else if (platform == "native")
                         mSettings->platform(Settings::Native);
-                    else if (platform == "unspecified" || platform == "Unspecified" || platform == "")
+                    else if (platform == "unspecified" || platform == "Unspecified" || platform.empty())
                         ;
                     else if (!mSettings->loadPlatformFile(projectFile.c_str(), platform) && !mSettings->loadPlatformFile(argv[0], platform)) {
                         std::string message("unrecognized platform: \"");
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -755,7 +755,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
                 if (rhs->varId() == tok->varId()) {
                     // simple assignment
                     varInfo->erase(tok->varId());
-                } else if (rhs->str() == "(" && mSettings->library.returnValue(rhs->astOperand1()) != emptyString) {
+                } else if (rhs->str() == "(" && !mSettings->library.returnValue(rhs->astOperand1()).empty()) {
                     // #9298, assignment through return value of a function
                     const std::string &returnValue = mSettings->library.returnValue(rhs->astOperand1());
                     if (returnValue.compare(0, 3, "arg") == 0) {
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
@@ -258,7 +258,7 @@ std::string Suppressions::addSuppressions(const std::list<Suppression> &suppress
 {
     for (const auto &newSuppression : suppressions) {
         auto errmsg = addSuppression(newSuppression);
-        if (errmsg != "")
+        if (!errmsg.empty())
             return errmsg;
     }
     return "";
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -3439,7 +3439,7 @@ void Tokenizer::calculateScopes()
                 // New scope is opening, record it here
                 std::shared_ptr<ScopeInfo2> newScopeInfo = std::make_shared<ScopeInfo2>(tok->scopeInfo()->name, tok->link(), tok->scopeInfo()->usingNamespaces);
 
-                if (newScopeInfo->name != "" && nextScopeNameAddition != "")
+                if (!newScopeInfo->name.empty() && !nextScopeNameAddition.empty())
                     newScopeInfo->name.append(" :: ");
                 newScopeInfo->name.append(nextScopeNameAddition);
                 nextScopeNameAddition = "";
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -4564,7 +4564,7 @@ static bool isOpenParenthesisMemberFunctionCallOfVarId(const Token * openParenth
 {
     const Token * varTok = openParenthesisToken->tokAt(-3);
     return Token::Match(varTok, "%varid% . %name% (", varId) &&
-           varTok->next()->originalName() == emptyString;
+           varTok->next()->originalName().empty();
 }
 
 static const Token * findOpenParentesisOfMove(const Token * moveVarTok)
@@ -4603,7 +4603,7 @@ static void valueFlowAfterMove(TokenList* tokenlist, SymbolDatabase* symboldatab
 
         for (Token* tok = const_cast<Token*>(start); tok != scope->bodyEnd; tok = tok->next()) {
             Token * varTok;
-            if (Token::Match(tok, "%var% . reset|clear (") && tok->next()->originalName() == emptyString) {
+            if (Token::Match(tok, "%var% . reset|clear (") && tok->next()->originalName().empty()) {
                 varTok = tok;
                 ValueFlow::Value value;
                 value.valueType = ValueFlow::Value::ValueType::MOVED;
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -2220,7 +2220,7 @@ class TestSymbolDatabase : public TestFixture {
             const Scope* f = db->findScopeByName("f");
             ASSERT(f && f->type == Scope::eFunction && f->function);
 
-            ASSERT(f->function->argumentList.size() == 2 && f->function->argumentList.front().index() == 0 && f->function->argumentList.front().name() == "" && f->function->argumentList.back().index() == 1);
+            ASSERT(f->function->argumentList.size() == 2 && f->function->argumentList.front().index() == 0 && f->function->argumentList.front().name().empty() && f->function->argumentList.back().index() == 1);
             ASSERT_EQUALS("", errout.str());
         }
         {
diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
@@ -88,7 +88,7 @@ class TestUnusedFunctions : public TestFixture {
         checkUnusedFunctions.parseTokens(tokenizer,  "someFile.c", &settings);
         // check() returns error if and only if errout is not empty.
         if ((checkUnusedFunctions.check)(this, settings)) {
-            ASSERT(errout.str() != "");
+            ASSERT(!errout.str().empty());
         } else {
             ASSERT_EQUALS("", errout.str());
         }

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`637`	`637`	`mSettings->platform(Settings::Unix64);`
`638`	`638`	`else if (platform == "native")`
`639`	`639`	`mSettings->platform(Settings::Native);`
`640`		`- else if (platform == "unspecified" \|\| platform == "Unspecified" \|\| platform == "")`
	`640`	`+ else if (platform == "unspecified" \|\| platform == "Unspecified" \|\| platform.empty())`
`641`	`641`	`;`
`642`	`642`	`else if (!mSettings->loadPlatformFile(projectFile.c_str(), platform) && !mSettings->loadPlatformFile(argv[0], platform)) {`
`643`	`643`	`std::string message("unrecognized platform: \"");`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ std::string Suppressions::addSuppressions(const std::list<Suppression> &suppress`
`258`	`258`	`{`
`259`	`259`	`for (const auto &newSuppression : suppressions) {`
`260`	`260`	`auto errmsg = addSuppression(newSuppression);`
`261`		`- if (errmsg != "")`
	`261`	`+ if (!errmsg.empty())`
`262`	`262`	`return errmsg;`
`263`	`263`	`}`
`264`	`264`	`return "";`
Original file line number	Diff line number	Diff line change
`@@ -2220,7 +2220,7 @@ class TestSymbolDatabase : public TestFixture {`
`2220`	`2220`	`const Scope* f = db->findScopeByName("f");`
`2221`	`2221`	`ASSERT(f && f->type == Scope::eFunction && f->function);`
`2222`	`2222`
`2223`		`- ASSERT(f->function->argumentList.size() == 2 && f->function->argumentList.front().index() == 0 && f->function->argumentList.front().name() == "" && f->function->argumentList.back().index() == 1);`
	`2223`	`+ ASSERT(f->function->argumentList.size() == 2 && f->function->argumentList.front().index() == 0 && f->function->argumentList.front().name().empty() && f->function->argumentList.back().index() == 1);`
`2224`	`2224`	`ASSERT_EQUALS("", errout.str());`
`2225`	`2225`	`}`
`2226`	`2226`	`{`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class TestUnusedFunctions : public TestFixture {`
`88`	`88`	`checkUnusedFunctions.parseTokens(tokenizer, "someFile.c", &settings);`
`89`	`89`	`// check() returns error if and only if errout is not empty.`
`90`	`90`	`if ((checkUnusedFunctions.check)(this, settings)) {`
`91`		`- ASSERT(errout.str() != "");`
	`91`	`+ ASSERT(!errout.str().empty());`
`92`	`92`	`} else {`
`93`	`93`	`ASSERT_EQUALS("", errout.str());`
`94`	`94`	`}`