Skip to content

Commit 0491515

Browse files
ludviggunneludviggunne
committed
new names
1 parent a792458 commit 0491515

8 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎gui/mainwindow.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void MainWindow::saveSettings() const
562562
mUI->mResults->saveSettings(mSettings);
563563
}
564564

565-
void MainWindow::doAnalyzeProject(ImportProject p, const bool doCheckLibrary, const bool doCheckConfiguration)
565+
void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bool checkConfig)
566566
{
567567
Settings checkSettings;
568568
auto supprs = std::make_shared<Suppressions>();
@@ -606,8 +606,8 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool doCheckLibrary, co
606606

607607
mUI->mResults->setCheckDirectory(checkPath);
608608
checkSettings.force = false;
609-
checkSettings.checkLibrary = doCheckLibrary;
610-
checkSettings.checkConfiguration = doCheckConfiguration;
609+
checkSettings.checkLibrary = checkLib;
610+
checkSettings.checkConfiguration = checkConfig;
611611

612612
if (mProjectFile)
613613
qDebug() << "Checking project file" << mProjectFile->getFilename();
@@ -634,7 +634,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool doCheckLibrary, co
634634
mUI->mResults->setCheckSettings(checkSettings);
635635
}
636636

637-
void MainWindow::doAnalyzeFiles(const QStringList &files, const bool doCheckLibrary, const bool doCheckConfiguration)
637+
void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, const bool checkConfig)
638638
{
639639
if (files.isEmpty())
640640
return;
@@ -675,7 +675,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool doCheckLibr
675675
// TODO: lock UI here?
676676
mUI->mResults->checkingStarted(fdetails.size());
677677
mThread->setFiles(std::move(fdetails));
678-
if (mProjectFile && !doCheckConfiguration)
678+
if (mProjectFile && !checkConfig)
679679
mThread->setAddonsAndTools(mProjectFile->getAddonsAndTools());
680680
mThread->setSuppressions(mProjectFile ? mProjectFile->getCheckingSuppressions() : QList<SuppressionList::Suppression>());
681681
QDir inf(mCurrentDirectory);
@@ -685,8 +685,8 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool doCheckLibr
685685
checkLockDownUI(); // lock UI while checking
686686

687687
mUI->mResults->setCheckDirectory(checkPath);
688-
checkSettings.checkLibrary = doCheckLibrary;
689-
checkSettings.checkConfiguration = doCheckConfiguration;
688+
checkSettings.checkLibrary = checkLib;
689+
checkSettings.checkConfiguration = checkConfig;
690690

691691
if (mProjectFile)
692692
qDebug() << "Checking project file" << mProjectFile->getFilename();
@@ -1856,7 +1856,7 @@ bool MainWindow::loadLastResults()
18561856
return true;
18571857
}
18581858

1859-
void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool doCheckLibrary, const bool doCheckConfiguration)
1859+
void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool checkLib, const bool checkConfig)
18601860
{
18611861
Settings::terminate(false);
18621862

@@ -1985,7 +1985,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
19851985
msg.exec();
19861986
return;
19871987
}
1988-
doAnalyzeProject(p, doCheckLibrary, doCheckConfiguration); // TODO: avoid copy
1988+
doAnalyzeProject(p, checkLib, checkConfig); // TODO: avoid copy
19891989
return;
19901990
}
19911991

@@ -1998,7 +1998,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
19981998
if (paths.isEmpty()) {
19991999
paths << mCurrentDirectory;
20002000
}
2001-
doAnalyzeFiles(paths, doCheckLibrary, doCheckConfiguration);
2001+
doAnalyzeFiles(paths, checkLib, checkConfig);
20022002
}
20032003

20042004
void MainWindow::newProjectFile()

‎gui/mainwindow.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@ private slots:
267267
* @brief Analyze the project.
268268
* @param projectFile Pointer to the project to analyze.
269269
* @param recheckFiles files to recheck, empty => check all files
270-
* @param doCheckLibrary Flag to indicate if the library should be checked.
271-
* @param doCheckConfiguration Flag to indicate if the configuration should be checked.
270+
* @param checkLib Flag to indicate if the library should be checked.
271+
* @param checkConfig Flag to indicate if the configuration should be checked.
272272
*/
273-
void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool doCheckLibrary = false, bool doCheckConfiguration = false);
273+
void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool checkLib = false, bool checkConfig = false);
274274

275275
/**
276276
* @brief Set current language
@@ -306,19 +306,19 @@ private slots:
306306
/**
307307
* @brief Analyze project
308308
* @param p imported project
309-
* @param doCheckLibrary Flag to indicate if library should be checked
310-
* @param doCheckConfiguration Flag to indicate if the configuration should be checked.
309+
* @param checkLib Flag to indicate if library should be checked
310+
* @param checkConfig Flag to indicate if the configuration should be checked.
311311
*/
312-
void doAnalyzeProject(ImportProject p, bool doCheckLibrary = false, bool doCheckConfiguration = false);
312+
void doAnalyzeProject(ImportProject p, bool checkLib = false, bool checkConfig = false);
313313

314314
/**
315315
* @brief Analyze all files specified in parameter files
316316
*
317317
* @param files List of files and/or directories to analyze
318-
* @param doCheckLibrary Flag to indicate if library should be checked
319-
* @param doCheckConfiguration Flag to indicate if the configuration should be checked.
318+
* @param checkLib Flag to indicate if library should be checked
319+
* @param checkConfig Flag to indicate if the configuration should be checked.
320320
*/
321-
void doAnalyzeFiles(const QStringList &files, bool doCheckLibrary = false, bool doCheckConfiguration = false);
321+
void doAnalyzeFiles(const QStringList &files, bool checkLib = false, bool checkConfig = false);
322322

323323
/**
324324
* @brief Get our default cppcheck settings and read project file.

‎lib/checkcondition.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,10 +2085,10 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
20852085
}
20862086
}
20872087

2088-
void CheckCondition::compareValueOutOfTypeRangeError(const Token *comp, const std::string &type, MathLib::bigint value, bool result)
2088+
void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparisonTok, const std::string &type, MathLib::bigint value, bool result)
20892089
{
20902090
reportError(
2091-
comp,
2091+
comparisonTok,
20922092
Severity::style,
20932093
"compareValueOutOfTypeRangeError",
20942094
"Comparing expression of type '" + type + "' against value " + MathLib::toString(value) + ". Condition is always " + bool_to_string(result) + ".",

‎lib/checkcondition.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class CPPCHECKLIB CheckCondition : public Check {
156156
void assignmentInCondition(const Token *eq);
157157

158158
void checkCompareValueOutOfTypeRange();
159-
void compareValueOutOfTypeRangeError(const Token *comp, const std::string &type, MathLib::bigint value, bool result);
159+
void compareValueOutOfTypeRangeError(const Token *comparisonTok, const std::string &type, MathLib::bigint value, bool result);
160160

161161
void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
162162

‎lib/symboldatabase.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2370,9 +2370,9 @@ void SymbolDatabase::validate() const
23702370
validateVariables();
23712371
}
23722372

2373-
void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &list)
2373+
void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &vars)
23742374
{
2375-
mVariableList = list;
2375+
mVariableList = vars;
23762376
}
23772377

23782378
void SymbolDatabase::debugSymbolDatabase() const

‎lib/symboldatabase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ class CPPCHECKLIB SymbolDatabase {
14241424
/** Set array dimensions when valueflow analysis is completed */
14251425
void setArrayDimensionsUsingValueFlow();
14261426

1427-
void clangSetVariables(const std::vector<const Variable *> &list);
1427+
void clangSetVariables(const std::vector<const Variable *> &vars);
14281428
void createSymbolDatabaseExprIds();
14291429

14301430
/* returns the opening { if tok points to enum */

‎lib/tokenlist.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,7 +2307,7 @@ bool TokenList::isCPP() const
23072307
return mLang == Standards::Language::CPP;
23082308
}
23092309

2310-
const Token * TokenList::isFunctionHead(const Token *tok, const std::string &end)
2310+
const Token * TokenList::isFunctionHead(const Token *tok, const std::string &suffix)
23112311
{
23122312
if (!tok)
23132313
return nullptr;
@@ -2320,11 +2320,11 @@ const Token * TokenList::isFunctionHead(const Token *tok, const std::string &end
23202320
if (Token::Match(tok, ") ;|{|[")) {
23212321
tok = tok->next();
23222322
while (tok && tok->str() == "[" && tok->link()) {
2323-
if (end.find(tok->str()) != std::string::npos)
2323+
if (suffix.find(tok->str()) != std::string::npos)
23242324
return tok;
23252325
tok = tok->link()->next();
23262326
}
2327-
return (tok && end.find(tok->str()) != std::string::npos) ? tok : nullptr;
2327+
return (tok && suffix.find(tok->str()) != std::string::npos) ? tok : nullptr;
23282328
}
23292329
if (tok->isCpp() && tok->str() == ")") {
23302330
tok = tok->next();
@@ -2359,7 +2359,7 @@ const Token * TokenList::isFunctionHead(const Token *tok, const std::string &end
23592359
}
23602360
if (tok && tok->str() == ":" && !Token::Match(tok->next(), "%name%|::"))
23612361
return nullptr;
2362-
return (tok && end.find(tok->str()) != std::string::npos) ? tok : nullptr;
2362+
return (tok && suffix.find(tok->str()) != std::string::npos) ? tok : nullptr;
23632363
}
23642364
return nullptr;
23652365
}

‎lib/tokenlist.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ class CPPCHECKLIB TokenList {
206206
/**
207207
* is token pointing at function head?
208208
* @param tok A '(' or ')' token in a possible function head
209-
* @param end string after function head
210-
* @return token matching with endsWith if syntax seems to be a function head else nullptr
209+
* @param suffix string after function head
210+
* @return token matching with suffix if syntax seems to be a function head else nullptr
211211
*/
212-
static const Token * isFunctionHead(const Token *tok, const std::string &end);
212+
static const Token * isFunctionHead(const Token *tok, const std::string &suffix);
213213

214214
const Settings& getSettings() const {
215215
return mSettings;

0 commit comments

Comments
 (0)