From 58ac8a99827a9d1bcc8e66c8542cafec85ba9d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 13 Jul 2018 23:43:03 +0200 Subject: [PATCH] Refactoring; Use range for loops --- lib/checkclass.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 05bd98b47..3f0e18d70 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -1039,10 +1039,10 @@ void CheckClass::privateFunctions() continue; std::list privateFuncs; - for (std::list::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { + for (const Function &func : scope->functionList) { // Get private functions.. - if (func->type == Function::eFunction && func->access == Private && !func->isOperator()) // TODO: There are smarter ways to check private operator usage - privateFuncs.push_back(&*func); + if (func.type == Function::eFunction && func.access == Private && !func.isOperator()) // TODO: There are smarter ways to check private operator usage + privateFuncs.push_back(&func); } // Bailout for overridden virtual functions of base classes @@ -1481,25 +1481,25 @@ void CheckClass::operatorEqToSelf() if (scope->definedType->derivedFrom.size() > 1) continue; - for (std::list::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { - if (func->type == Function::eOperatorEqual && func->hasBody()) { + for (const Function &func : scope->functionList) { + if (func.type == Function::eOperatorEqual && func.hasBody()) { // make sure that the operator takes an object of the same type as *this, otherwise we can't detect self-assignment checks - if (func->argumentList.empty()) + if (func.argumentList.empty()) continue; - const Token* typeTok = func->argumentList.front().typeEndToken(); + const Token* typeTok = func.argumentList.front().typeEndToken(); while (typeTok->str() == "const" || typeTok->str() == "&" || typeTok->str() == "*") typeTok = typeTok->previous(); if (typeTok->str() != scope->className) continue; // make sure return signature is correct - if (Token::Match(func->retDef, "%type% &") && func->retDef->str() == scope->className) { + if (Token::Match(func.retDef, "%type% &") && func.retDef->str() == scope->className) { // find the parameter name - const Token *rhs = func->argumentList.begin()->nameToken(); + const Token *rhs = func.argumentList.begin()->nameToken(); - if (!hasAssignSelf(&(*func), rhs)) { - if (hasAllocation(&(*func), scope)) - operatorEqToSelfError(func->token); + if (!hasAssignSelf(&func, rhs)) { + if (hasAllocation(&func, scope)) + operatorEqToSelfError(func.token); } } }