walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Refactoring: Use range for loop

This commit is contained in:
Daniel Marjamäki 2018-04-20 22:08:22 +02:00
parent d5fb529d4f
commit 46bb63ceaf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/checkother.cpp
View File

@ -1751,16 +1751,16 @@ void CheckOther::checkDuplicateBranch()
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase(); const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
for (std::list<Scope>::const_iterator scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) { for (const Scope & scope : symbolDatabase->scopeList) {
if (scope->type != Scope::eIf) if (scope.type != Scope::eIf)
continue; continue;
// check all the code in the function for if (..) else // check all the code in the function for if (..) else
if (Token::simpleMatch(scope->classEnd, "} else {")) { if (Token::simpleMatch(scope.classEnd, "} else {")) {
// Make sure there are no macros (different macros might be expanded // Make sure there are no macros (different macros might be expanded
// to the same code) // to the same code)
bool macro = false; bool macro = false;
for (const Token *tok = scope->classStart; tok != scope->classEnd->linkAt(2); tok = tok->next()) { for (const Token *tok = scope.classStart; tok != scope.classEnd->linkAt(2); tok = tok->next()) {
if (tok->isExpandedMacro()) { if (tok->isExpandedMacro()) {
macro = true; macro = true;
break; break;
@ -1770,17 +1770,17 @@ void CheckOther::checkDuplicateBranch()
continue; continue;
// save if branch code // save if branch code
std::string branch1 = scope->classStart->next()->stringifyList(scope->classEnd); const std::string branch1 = scope.classStart->next()->stringifyList(scope.classEnd);
if (branch1.empty()) if (branch1.empty())
continue; continue;
// save else branch code // save else branch code
const std::string branch2 = scope->classEnd->tokAt(3)->stringifyList(scope->classEnd->linkAt(2)); const std::string branch2 = scope.classEnd->tokAt(3)->stringifyList(scope.classEnd->linkAt(2));
// check for duplicates // check for duplicates
if (branch1 == branch2) if (branch1 == branch2)
duplicateBranchError(scope->classDef, scope->classEnd->next()); duplicateBranchError(scope.classDef, scope.classEnd->next());
} }
} }
} }