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

modernize cppcheck.cpp, use range for loops

This commit is contained in:
Daniel Marjamäki 2018-05-22 23:22:46 +02:00
parent fc1d62fd45
commit 2ffbb37cee
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/cppcheck.cpp
View File

@ -124,8 +124,8 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
if (_settings.verbose) { if (_settings.verbose) {
_errorLogger.reportOut("Defines: " + _settings.userDefines); _errorLogger.reportOut("Defines: " + _settings.userDefines);
std::string includePaths; std::string includePaths;
for (std::list<std::string>::const_iterator I = _settings.includePaths.begin(); I != _settings.includePaths.end(); ++I) for (const std::string &I : _settings.includePaths)
includePaths += " -I" + *I; includePaths += " -I" + I;
_errorLogger.reportOut("Includes:" + includePaths); _errorLogger.reportOut("Includes:" + includePaths);
_errorLogger.reportOut(std::string("Platform:") + _settings.platformString()); _errorLogger.reportOut(std::string("Platform:") + _settings.platformString());
} }
@ -269,22 +269,22 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
} }
if (_settings.checkConfiguration) { if (_settings.checkConfiguration) {
for (std::set<std::string>::const_iterator it = configurations.begin(); it != configurations.end(); ++it) for (const std::string &config : configurations)
(void)preprocessor.getcode(tokens1, *it, files, true); (void)preprocessor.getcode(tokens1, config, files, true);
return 0; return 0;
} }
// Run define rules on raw code // Run define rules on raw code
for (std::list<Settings::Rule>::const_iterator it = _settings.rules.begin(); it != _settings.rules.end(); ++it) { for (const Settings::Rule &rule : _settings.rules) {
if (it->tokenlist != "define") if (rule.tokenlist != "define")
continue; continue;
std::string code; std::string code;
const std::list<Directive> &directives = preprocessor.getDirectives(); const std::list<Directive> &directives = preprocessor.getDirectives();
for (std::list<Directive>::const_iterator dir = directives.begin(); dir != directives.end(); ++dir) { for (const Directive &dir : directives) {
if (dir->str.compare(0,8,"#define ") == 0) if (dir.str.compare(0,8,"#define ") == 0)
code += "#line " + MathLib::toString(dir->linenr) + " \"" + dir->file + "\"\n" + dir->str + '\n'; code += "#line " + MathLib::toString(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';
} }
Tokenizer tokenizer2(&_settings, this); Tokenizer tokenizer2(&_settings, this);
std::istringstream istr2(code); std::istringstream istr2(code);