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

Refactoring: Use range for loops

This commit is contained in:
Daniel Marjamäki 2018-07-15 14:45:15 +02:00
parent 5d1fdf7958
commit faea8e1c02
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/templatesimplifier.cpp
View File

@ -456,8 +456,8 @@ namespace {
static std::string getScopeName(const std::list<ScopeInfo2> &scopeInfo) static std::string getScopeName(const std::list<ScopeInfo2> &scopeInfo)
{ {
std::string ret; std::string ret;
for (std::list<ScopeInfo2>::const_iterator it = scopeInfo.begin(); it != scopeInfo.end(); ++it) for (const ScopeInfo2 &i : scopeInfo)
ret += (ret.empty() ? "" : " :: ") + (it->name); ret += (ret.empty() ? "" : " :: ") + i.name;
return ret; return ret;
} }
static std::string getFullName(const std::list<ScopeInfo2> &scopeInfo, const std::string &name) static std::string getFullName(const std::list<ScopeInfo2> &scopeInfo, const std::string &name)
@ -602,7 +602,7 @@ std::list<TemplateSimplifier::TokenAndName> TemplateSimplifier::getTemplateInsta
void TemplateSimplifier::useDefaultArgumentValues(const std::list<TokenAndName> &templates, void TemplateSimplifier::useDefaultArgumentValues(const std::list<TokenAndName> &templates,
std::list<TokenAndName> * const templateInstantiations) std::list<TokenAndName> * const templateInstantiations)
{ {
for (std::list<TokenAndName>::const_iterator iter1 = templates.begin(); iter1 != templates.end(); ++iter1) { for (const TokenAndName &template1 : templates) {
// template parameters with default value has syntax such as: // template parameters with default value has syntax such as:
// x = y // x = y
// this list will contain all the '=' tokens for such arguments // this list will contain all the '=' tokens for such arguments
@ -620,7 +620,7 @@ void TemplateSimplifier::useDefaultArgumentValues(const std::list<TokenAndName>
std::string classname; std::string classname;
// Scan template declaration.. // Scan template declaration..
for (Token *tok = iter1->token; tok; tok = tok->next()) { for (Token *tok = template1.token; tok; tok = tok->next()) {
if (Token::simpleMatch(tok, "template < >")) { // Ticket #5762: Skip specialization tokens if (Token::simpleMatch(tok, "template < >")) { // Ticket #5762: Skip specialization tokens
tok = tok->tokAt(2); tok = tok->tokAt(2);
if (0 == templateParmDepth) if (0 == templateParmDepth)
@ -665,8 +665,8 @@ void TemplateSimplifier::useDefaultArgumentValues(const std::list<TokenAndName>
continue; continue;
// iterate through all template instantiations // iterate through all template instantiations
for (std::list<TokenAndName>::const_iterator iter2 = templateInstantiations->begin(); iter2 != templateInstantiations->end(); ++iter2) { for (const TokenAndName &templateInst : *templateInstantiations) {
Token *tok = iter2->token; Token *tok = templateInst.token;
if (!Token::simpleMatch(tok, (classname + " <").c_str())) if (!Token::simpleMatch(tok, (classname + " <").c_str()))
continue; continue;
@ -707,8 +707,7 @@ void TemplateSimplifier::useDefaultArgumentValues(const std::list<TokenAndName>
} }
} }
for (std::list<Token *>::iterator it = eq.begin(); it != eq.end(); ++it) { for (Token * const eqtok : eq) {
Token * const eqtok = *it;
Token *tok2; Token *tok2;
int indentlevel = 0; int indentlevel = 0;
for (tok2 = eqtok->next(); tok2; tok2 = tok2->next()) { for (tok2 = eqtok->next(); tok2; tok2 = tok2->next()) {