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-11-05 09:49:28 +01:00
parent 2275f05f65
commit 307a19d17e
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/cppcheck.cpp
View File

@ -156,9 +156,9 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
simplecpp::TokenList tokens1(fileStream, files, filename, &outputList); simplecpp::TokenList tokens1(fileStream, files, filename, &outputList);
// If there is a syntax error, report it and stop // If there is a syntax error, report it and stop
for (simplecpp::OutputList::const_iterator it = outputList.begin(); it != outputList.end(); ++it) { for (const simplecpp::Output &output : outputList) {
bool err; bool err;
switch (it->type) { switch (output.type) {
case simplecpp::Output::ERROR: case simplecpp::Output::ERROR:
case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY: case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY:
case simplecpp::Output::SYNTAX_ERROR: case simplecpp::Output::SYNTAX_ERROR:
@ -173,13 +173,13 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
}; };
if (err) { if (err) {
const ErrorLogger::ErrorMessage::FileLocation loc1(it->location.file(), it->location.line); const ErrorLogger::ErrorMessage::FileLocation loc1(output.location.file(), output.location.line);
std::list<ErrorLogger::ErrorMessage::FileLocation> callstack(1, loc1); std::list<ErrorLogger::ErrorMessage::FileLocation> callstack(1, loc1);
ErrorLogger::ErrorMessage errmsg(callstack, ErrorLogger::ErrorMessage errmsg(callstack,
"", "",
Severity::error, Severity::error,
it->msg, output.msg,
"syntaxError", "syntaxError",
false); false);
reportErr(errmsg); reportErr(errmsg);
@ -314,7 +314,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
unsigned int checkCount = 0; unsigned int checkCount = 0;
bool hasValidConfig = false; bool hasValidConfig = false;
std::list<std::string> configurationError; std::list<std::string> configurationError;
for (std::set<std::string>::const_iterator it = configurations.begin(); it != configurations.end(); ++it) { for (const std::string &currCfg : configurations) {
// bail out if terminated // bail out if terminated
if (mSettings.terminated()) if (mSettings.terminated())
break; break;
@ -324,7 +324,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
if (!mSettings.force && ++checkCount > mSettings.maxConfigs) if (!mSettings.force && ++checkCount > mSettings.maxConfigs)
break; break;
mCurrentConfig = *it; mCurrentConfig = currCfg;
if (!mSettings.userDefines.empty()) { if (!mSettings.userDefines.empty()) {
if (!mCurrentConfig.empty()) if (!mCurrentConfig.empty())
@ -367,7 +367,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
hasValidConfig = true; hasValidConfig = true;
// If only errors are printed, print filename after the check // If only errors are printed, print filename after the check
if (!mSettings.quiet && (!mCurrentConfig.empty() || it != configurations.begin())) { if (!mSettings.quiet && (!mCurrentConfig.empty() || checkCount > 1)) {
std::string fixedpath = Path::simplifyPath(filename); std::string fixedpath = Path::simplifyPath(filename);
fixedpath = Path::toNativeSeparators(fixedpath); fixedpath = Path::toNativeSeparators(fixedpath);
mErrorLogger.reportOut("Checking " + fixedpath + ": " + mCurrentConfig + "..."); mErrorLogger.reportOut("Checking " + fixedpath + ": " + mCurrentConfig + "...");