diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index 51eded9cb71..0820b1fdabb 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -164,8 +164,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[]) // Check that all include paths exist { - for (std::list::iterator iter = mSettings.includePaths.begin(); - iter != mSettings.includePaths.end(); + for (std::list::const_iterator iter = mSettings.includePaths.cbegin(); + iter != mSettings.includePaths.cend(); ) { const std::string path(Path::toNativeSeparators(*iter)); if (Path::isDirectory(path)) diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp index a85552c7014..c242eb426f8 100644 --- a/cli/processexecutor.cpp +++ b/cli/processexecutor.cpp @@ -318,18 +318,18 @@ unsigned int ProcessExecutor::check() const int r = select(*std::max_element(rpipes.cbegin(), rpipes.cend()) + 1, &rfds, nullptr, nullptr, &tv); if (r > 0) { - std::list::iterator rp = rpipes.begin(); - while (rp != rpipes.end()) { + std::list::const_iterator rp = rpipes.cbegin(); + while (rp != rpipes.cend()) { if (FD_ISSET(*rp, &rfds)) { std::string name; - const std::map::iterator p = pipeFile.find(*rp); - if (p != pipeFile.end()) { + const std::map::const_iterator p = pipeFile.find(*rp); + if (p != pipeFile.cend()) { name = p->second; } const bool readRes = handleRead(*rp, result, name); if (!readRes) { std::size_t size = 0; - if (p != pipeFile.end()) { + if (p != pipeFile.cend()) { pipeFile.erase(p); const auto fs = std::find_if(mFiles.cbegin(), mFiles.cend(), [&name](const FileWithDetails& entry) { return entry.path() == name; @@ -358,8 +358,8 @@ unsigned int ProcessExecutor::check() const pid_t child = waitpid(0, &stat, WNOHANG); if (child > 0) { std::string childname; - const std::map::iterator c = childFile.find(child); - if (c != childFile.end()) { + const std::map::const_iterator c = childFile.find(child); + if (c != childFile.cend()) { childname = c->second; childFile.erase(c); } diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 91a79e51ca8..2fec3552af7 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -1298,7 +1298,7 @@ void CheckClass::privateFunctions() // Bailout for overridden virtual functions of base classes if (!scope->definedType->derivedFrom.empty()) { // Check virtual functions - for (std::list::iterator it = privateFuncs.begin(); it != privateFuncs.end();) { + for (std::list::const_iterator it = privateFuncs.cbegin(); it != privateFuncs.cend();) { if ((*it)->isImplicitlyVirtual(true)) // Give true as default value to be returned if we don't see all base classes it = privateFuncs.erase(it); else @@ -2026,8 +2026,8 @@ void CheckClass::virtualDestructor() if (baseDestructor->access == AccessControl::Public) { virtualDestructorError(baseDestructor->token, derivedFrom->name(), derivedClass->str(), false); // check for duplicate error and remove it if found - const std::list::iterator found = find(inconclusiveErrors.begin(), inconclusiveErrors.end(), baseDestructor); - if (found != inconclusiveErrors.end()) + const std::list::const_iterator found = std::find(inconclusiveErrors.cbegin(), inconclusiveErrors.cend(), baseDestructor); + if (found != inconclusiveErrors.cend()) inconclusiveErrors.erase(found); } } diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp index 984b297a8b0..e5e4523abd6 100644 --- a/lib/clangimport.cpp +++ b/lib/clangimport.cpp @@ -682,7 +682,7 @@ Scope *clangimport::AstNode::createScope(TokenList &tokenList, Scope::ScopeType const_cast(vartok)->variable(replaceVar[vartok->variable()]); } std::list &varlist = const_cast(def->scope())->varlist; - for (std::list::iterator var = varlist.begin(); var != varlist.end();) { + for (std::list::const_iterator var = varlist.cbegin(); var != varlist.cend();) { if (replaceVar.find(&(*var)) != replaceVar.end()) var = varlist.erase(var); else diff --git a/lib/importproject.cpp b/lib/importproject.cpp index 4910e259e96..d3a28530435 100644 --- a/lib/importproject.cpp +++ b/lib/importproject.cpp @@ -44,7 +44,7 @@ // TODO: align the exclusion logic with PathMatch void ImportProject::ignorePaths(const std::vector &ipaths) { - for (std::list::iterator it = fileSettings.begin(); it != fileSettings.end();) { + for (std::list::const_iterator it = fileSettings.cbegin(); it != fileSettings.cend();) { bool ignore = false; for (std::string i : ipaths) { if (it->filename().size() > i.size() && it->filename().compare(0,i.size(),i)==0) { @@ -72,7 +72,7 @@ void ImportProject::ignorePaths(const std::vector &ipaths) void ImportProject::ignoreOtherConfigs(const std::string &cfg) { - for (std::list::iterator it = fileSettings.begin(); it != fileSettings.end();) { + for (std::list::const_iterator it = fileSettings.cbegin(); it != fileSettings.cend();) { if (it->cfg != cfg) it = fileSettings.erase(it); else @@ -1409,7 +1409,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti void ImportProject::selectOneVsConfig(Platform::Type platform) { std::set filenames; - for (std::list::iterator it = fileSettings.begin(); it != fileSettings.end();) { + for (std::list::const_iterator it = fileSettings.cbegin(); it != fileSettings.cend();) { if (it->cfg.empty()) { ++it; continue; @@ -1436,7 +1436,7 @@ void ImportProject::selectOneVsConfig(Platform::Type platform) // cppcheck-suppress unusedFunction - used by GUI only void ImportProject::selectVsConfigurations(Platform::Type platform, const std::vector &configurations) { - for (std::list::iterator it = fileSettings.begin(); it != fileSettings.end();) { + for (std::list::const_iterator it = fileSettings.cbegin(); it != fileSettings.cend();) { if (it->cfg.empty()) { ++it; continue; diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp index 12c05dc7ebc..9961d783b4a 100644 --- a/lib/symboldatabase.cpp +++ b/lib/symboldatabase.cpp @@ -1253,8 +1253,8 @@ void SymbolDatabase::fixVarId(VarIdMap & varIds, const Token * vartok, Token * m varIds.insert(std::make_pair(vartok->varId(), memberId)); varId = varIds.find(vartok->varId()); } - MemberIdMap::iterator memberId = varId->second.find(membervar->nameToken()->varId()); - if (memberId == varId->second.end()) { + MemberIdMap::const_iterator memberId = varId->second.find(membervar->nameToken()->varId()); + if (memberId == varId->second.cend()) { if (membertok->varId() == 0) { varId->second.insert(std::make_pair(membervar->nameToken()->varId(), mTokenizer.newVarId())); mVariableList.push_back(membervar); diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp index 5933b279481..3baeae75f65 100644 --- a/lib/templatesimplifier.cpp +++ b/lib/templatesimplifier.cpp @@ -1236,9 +1236,9 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration) if (Token::Match(tok2, "(|{|[")) tok2 = tok2->link(); else if (Token::Match(tok2, "%type% <") && (tok2->strAt(2) == ">" || templateParameters(tok2->next()))) { - const std::list::iterator ti = std::find_if(mTemplateInstantiations.begin(), - mTemplateInstantiations.end(), - FindToken(tok2)); + const std::list::const_iterator ti = std::find_if(mTemplateInstantiations.cbegin(), + mTemplateInstantiations.cend(), + FindToken(tok2)); if (ti != mTemplateInstantiations.end()) mTemplateInstantiations.erase(ti); ++indentlevel; @@ -1255,9 +1255,9 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration) continue; // don't strip args from uninstantiated templates - const std::list::iterator ti2 = std::find_if(mTemplateInstantiations.begin(), - mTemplateInstantiations.end(), - FindName(declaration.name())); + const std::list::const_iterator ti2 = std::find_if(mTemplateInstantiations.cbegin(), + mTemplateInstantiations.cend(), + FindName(declaration.name())); if (ti2 == mTemplateInstantiations.end()) continue; @@ -1272,7 +1272,7 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration) void TemplateSimplifier::simplifyTemplateAliases() { - for (std::list::iterator it1 = mTemplateDeclarations.begin(); it1 != mTemplateDeclarations.end();) { + for (std::list::const_iterator it1 = mTemplateDeclarations.cbegin(); it1 != mTemplateDeclarations.cend();) { const TokenAndName &aliasDeclaration = *it1; if (!aliasDeclaration.isAlias()) { @@ -1289,7 +1289,7 @@ void TemplateSimplifier::simplifyTemplateAliases() // Look for alias usages.. bool found = false; - for (std::list::iterator it2 = mTemplateInstantiations.begin(); it2 != mTemplateInstantiations.end();) { + for (std::list::const_iterator it2 = mTemplateInstantiations.cbegin(); it2 != mTemplateInstantiations.cend();) { const TokenAndName &aliasUsage = *it2; if (!aliasUsage.token() || aliasUsage.fullName() != aliasDeclaration.fullName()) { ++it2; @@ -1849,9 +1849,9 @@ void TemplateSimplifier::expandTemplate( if (Token::Match(start, "[|{|(")) { links[start->link()] = dst->previous(); } else if (Token::Match(start, "]|}|)")) { - std::map::iterator link = links.find(start); + std::map::const_iterator link = links.find(start); // make sure link is valid - if (link != links.end()) { + if (link != links.cend()) { Token::createMutualLinks(link->second, dst->previous()); links.erase(start); } @@ -3389,8 +3389,8 @@ void TemplateSimplifier::replaceTemplateUsage( // Foo < int > => Foo for (const Token *tok = nameTok1->next(); tok != tok2; tok = tok->next()) { if (tok->isName() && tok->templateSimplifierPointers() && !tok->templateSimplifierPointers()->empty()) { - std::list::iterator ti; - for (ti = mTemplateInstantiations.begin(); ti != mTemplateInstantiations.end();) { + std::list::const_iterator ti; + for (ti = mTemplateInstantiations.cbegin(); ti != mTemplateInstantiations.cend();) { if (ti->token() == tok) { ti = mTemplateInstantiations.erase(ti); break; diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index 7b173e7174a..d542db04100 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -4353,8 +4353,8 @@ static void setVarIdStructMembers(Token *&tok1, tok = tok->link(); if (Token::Match(tok->previous(), "[,{] . %name% =|{")) { tok = tok->next(); - const std::map::iterator it = members.find(tok->str()); - if (it == members.end()) { + const std::map::const_iterator it = members.find(tok->str()); + if (it == members.cend()) { members[tok->str()] = ++varId; tok->varId(varId); } else { @@ -4387,8 +4387,8 @@ static void setVarIdStructMembers(Token *&tok1, break; std::map& members = structMembers[struct_varid]; - const std::map::iterator it = members.find(tok->str()); - if (it == members.end()) { + const std::map::const_iterator it = members.find(tok->str()); + if (it == members.cend()) { members[tok->str()] = ++varId; tok->varId(varId); } else { @@ -5049,8 +5049,8 @@ void Tokenizer::setVarIdPass2() } if (tok->str() == "}") { - const std::map::iterator it = endOfScope.find(tok); - if (it != endOfScope.end()) + const std::map::const_iterator it = endOfScope.find(tok); + if (it != endOfScope.cend()) scope.remove(it->second); }