Update existing code to avoid shadow argument warnings

ludviggunne · ludviggunne · commit a005907f5b19 · 2026-03-30T10:29:10.000+02:00
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -566,7 +566,7 @@ void MainWindow::saveSettings() const
     mUI->mResults->saveSettings(mSettings);
 }
 
-void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::doAnalyzeProject(ImportProject p, const bool doCheckLibrary, const bool doCheckConfiguration)
 {
     Settings checkSettings;
     auto supprs = std::make_shared<Suppressions>();
@@ -610,8 +610,8 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
 
     mUI->mResults->setCheckDirectory(checkPath);
     checkSettings.force = false;
-    checkSettings.checkLibrary = checkLibrary;
-    checkSettings.checkConfiguration = checkConfiguration;
+    checkSettings.checkLibrary = doCheckLibrary;
+    checkSettings.checkConfiguration = doCheckConfiguration;
 
     if (mProjectFile)
         qDebug() << "Checking project file" << mProjectFile->getFilename();
@@ -638,7 +638,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
     mUI->mResults->setCheckSettings(checkSettings);
 }
 
-void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::doAnalyzeFiles(const QStringList &files, const bool doCheckLibrary, const bool doCheckConfiguration)
 {
     if (files.isEmpty())
         return;
@@ -679,7 +679,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     // TODO: lock UI here?
     mUI->mResults->checkingStarted(fdetails.size());
     mThread->setFiles(std::move(fdetails));
-    if (mProjectFile && !checkConfiguration)
+    if (mProjectFile && !doCheckConfiguration)
         mThread->setAddonsAndTools(mProjectFile->getAddonsAndTools());
     mThread->setSuppressions(mProjectFile ? mProjectFile->getCheckingSuppressions() : QList<SuppressionList::Suppression>());
     QDir inf(mCurrentDirectory);
@@ -689,8 +689,8 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     checkLockDownUI(); // lock UI while checking
 
     mUI->mResults->setCheckDirectory(checkPath);
-    checkSettings.checkLibrary = checkLibrary;
-    checkSettings.checkConfiguration = checkConfiguration;
+    checkSettings.checkLibrary = doCheckLibrary;
+    checkSettings.checkConfiguration = doCheckConfiguration;
 
     if (mProjectFile)
         qDebug() << "Checking project file" << mProjectFile->getFilename();
@@ -1883,7 +1883,7 @@ bool MainWindow::loadLastResults()
     return true;
 }
 
-void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool doCheckLibrary, const bool doCheckConfiguration)
 {
     Settings::terminate(false);
 
@@ -2011,7 +2011,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
             msg.exec();
             return;
         }
-        doAnalyzeProject(p, checkLibrary, checkConfiguration);  // TODO: avoid copy
+        doAnalyzeProject(p, doCheckLibrary, doCheckConfiguration);  // TODO: avoid copy
         return;
     }
 
@@ -2024,7 +2024,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
     if (paths.isEmpty()) {
         paths << mCurrentDirectory;
     }
-    doAnalyzeFiles(paths, checkLibrary, checkConfiguration);
+    doAnalyzeFiles(paths, doCheckLibrary, doCheckConfiguration);
 }
 
 void MainWindow::newProjectFile()
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
@@ -273,7 +273,7 @@ private slots:
      * @param checkLibrary Flag to indicate if the library should be checked.
      * @param checkConfiguration Flag to indicate if the configuration should be checked.
      */
-    void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool checkLibrary = false, bool checkConfiguration = false);
+    void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool doCheckLibrary = false, bool doCheckConfiguration = false);
 
     /**
      * @brief Set current language
@@ -312,7 +312,7 @@ private slots:
      * @param checkLibrary Flag to indicate if library should be checked
      * @param checkConfiguration Flag to indicate if the configuration should be checked.
      */
-    void doAnalyzeProject(ImportProject p, bool checkLibrary = false, bool checkConfiguration = false);
+    void doAnalyzeProject(ImportProject p, bool doCheckLibrary = false, bool doCheckConfiguration = false);
 
     /**
      * @brief Analyze all files specified in parameter files
@@ -321,7 +321,7 @@ private slots:
      * @param checkLibrary Flag to indicate if library should be checked
      * @param checkConfiguration Flag to indicate if the configuration should be checked.
      */
-    void doAnalyzeFiles(const QStringList &files, bool checkLibrary = false, bool checkConfiguration = false);
+    void doAnalyzeFiles(const QStringList &files, bool doCheckLibrary = false, bool doCheckConfiguration = false);
 
     /**
      * @brief Get our default cppcheck settings and read project file.
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -2071,10 +2071,10 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
     }
 }
 
-void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result)
+void CheckCondition::compareValueOutOfTypeRangeError(const Token *comp, const std::string &type, MathLib::bigint value, bool result)
 {
     reportError(
-        comparison,
+        comp,
         Severity::style,
         "compareValueOutOfTypeRangeError",
         "Comparing expression of type '" + type + "' against value " + MathLib::toString(value) + ". Condition is always " + bool_to_string(result) + ".",
diff --git a/lib/checkcondition.h b/lib/checkcondition.h
@@ -155,7 +155,7 @@ class CPPCHECKLIB CheckCondition : public Check {
     void assignmentInCondition(const Token *eq);
 
     void checkCompareValueOutOfTypeRange();
-    void compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result);
+    void compareValueOutOfTypeRangeError(const Token *comp, const std::string &type, MathLib::bigint value, bool result);
 
     void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -502,9 +502,9 @@ void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLo
     }
 }
 
-void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)
+void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& checkUnusedFunctions)
 {
-    for (const auto& entry : check.mFunctions)
+    for (const auto& entry : checkUnusedFunctions.mFunctions)
     {
         FunctionUsage &usage = mFunctions[entry.first];
         if (!usage.lineNumber) {
@@ -518,6 +518,6 @@ void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)
         usage.usedOtherFile |= entry.second.usedOtherFile;
         usage.usedSameFile |= entry.second.usedSameFile;
     }
-    mFunctionDecl.insert(mFunctionDecl.cend(), check.mFunctionDecl.cbegin(), check.mFunctionDecl.cend());
-    mFunctionCalls.insert(check.mFunctionCalls.cbegin(), check.mFunctionCalls.cend());
+    mFunctionDecl.insert(mFunctionDecl.cend(), checkUnusedFunctions.mFunctionDecl.cbegin(), checkUnusedFunctions.mFunctionDecl.cend());
+    mFunctionCalls.insert(checkUnusedFunctions.mFunctionCalls.cbegin(), checkUnusedFunctions.mFunctionCalls.cend());
 }
diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
@@ -58,7 +58,7 @@ class CPPCHECKLIB CheckUnusedFunctions {
     // Return true if an error is reported.
     bool check(const Settings& settings, ErrorLogger& errorLogger) const;
 
-    void updateFunctionData(const CheckUnusedFunctions& check);
+    void updateFunctionData(const CheckUnusedFunctions& checkUnusedFunctions);
 
 private:
     static void unusedFunctionError(ErrorLogger& errorLogger,
diff --git a/lib/filesettings.h b/lib/filesettings.h
@@ -91,9 +91,9 @@ class FileWithDetails
         return mFsFileId;
     }
 
-    void setFsFileId(std::size_t fsFileId)
+    void setFsFileId(std::size_t id)
     {
-        mFsFileId = fsFileId;
+        mFsFileId = id;
     }
 private:
     std::string mPath;
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -512,14 +512,14 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
     return cfgStr;
 }
 
-static bool hasDefine(const std::string &userDefines, const std::string &cfg)
+static bool hasDefine(const std::string &userDefines, const std::string &cfgStr)
 {
-    if (cfg.empty()) {
+    if (cfgStr.empty()) {
         return false;
     }
 
     std::string::size_type pos = 0;
-    const std::string cfgname = cfg.substr(0, cfg.find('='));
+    const std::string cfgname = cfgStr.substr(0, cfgStr.find('='));
     while (pos < userDefines.size()) {
         pos = userDefines.find(cfgname, pos);
         if (pos == std::string::npos)
@@ -550,11 +550,11 @@ static std::string cfg(const std::vector<std::string> &configs, const std::strin
     return ret;
 }
 
-static bool isUndefined(const std::string &cfg, const std::set<std::string> &undefined)
+static bool isUndefined(const std::string &cfgStr, const std::set<std::string> &undefined)
 {
-    for (std::string::size_type pos1 = 0U; pos1 < cfg.size();) {
-        const std::string::size_type pos2 = cfg.find(';',pos1);
-        const std::string def = (pos2 == std::string::npos) ? cfg.substr(pos1) : cfg.substr(pos1, pos2 - pos1);
+    for (std::string::size_type pos1 = 0U; pos1 < cfgStr.size();) {
+        const std::string::size_type pos2 = cfgStr.find(';',pos1);
+        const std::string def = (pos2 == std::string::npos) ? cfgStr.substr(pos1) : cfgStr.substr(pos1, pos2 - pos1);
 
         const std::string::size_type eq = def.find('=');
         if (eq == std::string::npos && undefined.find(def) != undefined.end())
@@ -797,11 +797,11 @@ std::set<std::string> Preprocessor::getConfigs() const
     return ret;
 }
 
-static void splitcfg(const std::string &cfg, std::list<std::string> &defines, const std::string &defaultValue)
+static void splitcfg(const std::string &cfgStr, std::list<std::string> &defines, const std::string &defaultValue)
 {
-    for (std::string::size_type defineStartPos = 0U; defineStartPos < cfg.size();) {
-        const std::string::size_type defineEndPos = cfg.find(';', defineStartPos);
-        std::string def = (defineEndPos == std::string::npos) ? cfg.substr(defineStartPos) : cfg.substr(defineStartPos, defineEndPos - defineStartPos);
+    for (std::string::size_type defineStartPos = 0U; defineStartPos < cfgStr.size();) {
+        const std::string::size_type defineEndPos = cfgStr.find(';', defineStartPos);
+        std::string def = (defineEndPos == std::string::npos) ? cfgStr.substr(defineStartPos) : cfgStr.substr(defineStartPos, defineEndPos - defineStartPos);
         if (!defaultValue.empty() && def.find('=') == std::string::npos)
             def += '=' + defaultValue;
         defines.push_back(std::move(def));
@@ -811,14 +811,14 @@ static void splitcfg(const std::string &cfg, std::list<std::string> &defines, co
     }
 }
 
-static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfg, Standards::Language lang)
+static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfgStr, Standards::Language lang)
 {
     // TODO: make it possible to specify platform-dependent sizes
     simplecpp::DUI dui;
 
     splitcfg(mSettings.userDefines, dui.defines, "1");
-    if (!cfg.empty())
-        splitcfg(cfg, dui.defines, "");
+    if (!cfgStr.empty())
+        splitcfg(cfgStr, dui.defines, "");
 
     for (const std::string &def : mSettings.library.defines()) {
         const std::string::size_type pos = def.find_first_of(" (");
@@ -899,9 +899,9 @@ void Preprocessor::setPlatformInfo()
     mTokens.sizeOfType["long double *"] = mSettings.platform.sizeof_pointer;
 }
 
-simplecpp::TokenList Preprocessor::preprocess(const std::string &cfg, std::vector<std::string> &files, simplecpp::OutputList& outputList)
+simplecpp::TokenList Preprocessor::preprocess(const std::string &cfgStr, std::vector<std::string> &files, simplecpp::OutputList& outputList)
 {
-    const simplecpp::DUI dui = createDUI(mSettings, cfg, mLang);
+    const simplecpp::DUI dui = createDUI(mSettings, cfgStr, mLang);
 
     std::list<simplecpp::MacroUsage> macroUsage;
     std::list<simplecpp::IfCond> ifCond;
@@ -915,10 +915,10 @@ simplecpp::TokenList Preprocessor::preprocess(const std::string &cfg, std::vecto
     return tokens2;
 }
 
-std::string Preprocessor::getcode(const std::string &cfg, std::vector<std::string> &files, const bool writeLocations)
+std::string Preprocessor::getcode(const std::string &cfgStr, std::vector<std::string> &files, const bool writeLocations)
 {
     simplecpp::OutputList outputList;
-    simplecpp::TokenList tokens2 = preprocess(cfg, files, outputList);
+    simplecpp::TokenList tokens2 = preprocess(cfgStr, files, outputList);
     handleErrors(outputList);
     unsigned int prevfile = 0;
     unsigned int line = 1;
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
@@ -118,9 +118,9 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
 
     void setPlatformInfo();
 
-    simplecpp::TokenList preprocess(const std::string &cfg, std::vector<std::string> &files, simplecpp::OutputList& outputList);
+    simplecpp::TokenList preprocess(const std::string &cfgStr, std::vector<std::string> &files, simplecpp::OutputList& outputList);
 
-    std::string getcode(const std::string &cfg, std::vector<std::string> &files, bool writeLocations);
+    std::string getcode(const std::string &cfgStr, std::vector<std::string> &files, bool writeLocations);
 
     /**
      * Calculate HASH. Using toolinfo, tokens1, filedata.
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -150,11 +150,11 @@ bool ProgramMemory::getContainerEmptyValue(nonneg int exprid, MathLib::bigint& r
     return false;
 }
 
-void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool isEqual)
+void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool equal)
 {
     ValueFlow::Value v(value);
     v.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
-    if (!isEqual)
+    if (!equal)
         v.valueKind = ValueFlow::Value::ValueKind::Impossible;
     setValue(expr, v);
 }
diff --git a/lib/programmemory.h b/lib/programmemory.h
@@ -116,7 +116,7 @@ struct CPPCHECKLIB ProgramMemory {
 
     bool getContainerSizeValue(nonneg int exprid, MathLib::bigint& result) const;
     bool getContainerEmptyValue(nonneg int exprid, MathLib::bigint& result) const;
-    void setContainerSizeValue(const Token* expr, MathLib::bigint value, bool isEqual = true);
+    void setContainerSizeValue(const Token* expr, MathLib::bigint value, bool equal = true);
 
     void setUnknown(const Token* expr);
 
diff --git a/lib/regex.cpp b/lib/regex.cpp
@@ -219,7 +219,7 @@ namespace {
         return "";
     }
 
-    std::string PcreRegex::match(const std::string& str, const MatchFn& match) const
+    std::string PcreRegex::match(const std::string& str, const MatchFn& matchFn) const
     {
         if (!mRe)
             return "pcre_exec failed: regular expression has not been compiled yet";
@@ -236,7 +236,7 @@ namespace {
             const auto pos1 = static_cast<unsigned int>(ovector[0]);
             const auto pos2 = static_cast<unsigned int>(ovector[1]);
 
-            match(pos1, pos2);
+            matchFn(pos1, pos2);
 
             // jump to the end of the match for the next pcre_exec
             pos = static_cast<int>(pos2);
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -2370,9 +2370,9 @@ void SymbolDatabase::validate() const
     validateVariables();
 }
 
-void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &variableList)
+void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &list)
 {
-    mVariableList = variableList;
+    mVariableList = list;
 }
 
 void SymbolDatabase::debugSymbolDatabase() const
@@ -2636,16 +2636,16 @@ void Variable::evaluate(const Settings& settings)
     }
 }
 
-void Variable::setValueType(const ValueType &valueType)
+void Variable::setValueType(const ValueType &vt)
 {
-    if (valueType.type == ValueType::Type::UNKNOWN_TYPE) {
+    if (vt.type == ValueType::Type::UNKNOWN_TYPE) {
         const Token *declType = Token::findsimplematch(mTypeStartToken, "decltype (", mTypeEndToken);
         if (declType && !declType->next()->valueType())
             return;
     }
-    const auto* vt = new ValueType(valueType);
+    const auto* tmp = new ValueType(vt);
     delete mValueType;
-    mValueType = vt;
+    mValueType = tmp;
     if ((mValueType->pointer > 0) && (!isArray() || Token::Match(mNameToken->previous(), "( * %name% )")))
         setFlag(fIsPointer, true);
     setFlag(fIsConst, mValueType->constness & (1U << mValueType->pointer));
diff --git a/lib/token.cpp b/lib/token.cpp
diff --git a/lib/token.h b/lib/token.h
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
diff --git a/lib/vf_analyzers.cpp b/lib/vf_analyzers.cpp
diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp
diff --git a/tools/triage/mainwindow.h b/tools/triage/mainwindow.h

Original file line number	Diff line number	Diff line change
`@@ -2071,10 +2071,10 @@ void CheckCondition::checkCompareValueOutOfTypeRange()`
`2071`	`2071`	`}`
`2072`	`2072`	`}`
`2073`	`2073`
`2074`		`-void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result)`
	`2074`	`+void CheckCondition::compareValueOutOfTypeRangeError(const Token *comp, const std::string &type, MathLib::bigint value, bool result)`
`2075`	`2075`	`{`
`2076`	`2076`	`reportError(`
`2077`		`- comparison,`
	`2077`	`+ comp,`
`2078`	`2078`	`Severity::style,`
`2079`	`2079`	`"compareValueOutOfTypeRangeError",`
`2080`	`2080`	`"Comparing expression of type '" + type + "' against value " + MathLib::toString(value) + ". Condition is always " + bool_to_string(result) + ".",`
Original file line number	Diff line number	Diff line change
`@@ -502,9 +502,9 @@ void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLo`
`502`	`502`	`}`
`503`	`503`	`}`
`504`	`504`
`505`		`-void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)`
	`505`	`+void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& checkUnusedFunctions)`
`506`	`506`	`{`
`507`		`- for (const auto& entry : check.mFunctions)`
	`507`	`+ for (const auto& entry : checkUnusedFunctions.mFunctions)`
`508`	`508`	`{`
`509`	`509`	`FunctionUsage &usage = mFunctions[entry.first];`
`510`	`510`	`if (!usage.lineNumber) {`
`@@ -518,6 +518,6 @@ void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)`
`518`	`518`	`usage.usedOtherFile \|= entry.second.usedOtherFile;`
`519`	`519`	`usage.usedSameFile \|= entry.second.usedSameFile;`
`520`	`520`	`}`
`521`		`- mFunctionDecl.insert(mFunctionDecl.cend(), check.mFunctionDecl.cbegin(), check.mFunctionDecl.cend());`
`522`		`- mFunctionCalls.insert(check.mFunctionCalls.cbegin(), check.mFunctionCalls.cend());`
	`521`	`+ mFunctionDecl.insert(mFunctionDecl.cend(), checkUnusedFunctions.mFunctionDecl.cbegin(), checkUnusedFunctions.mFunctionDecl.cend());`
	`522`	`+ mFunctionCalls.insert(checkUnusedFunctions.mFunctionCalls.cbegin(), checkUnusedFunctions.mFunctionCalls.cend());`
`523`	`523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ class FileWithDetails`
`91`	`91`	`return mFsFileId;`
`92`	`92`	`}`
`93`	`93`
`94`		`- void setFsFileId(std::size_t fsFileId)`
	`94`	`+ void setFsFileId(std::size_t id)`
`95`	`95`	`{`
`96`		`- mFsFileId = fsFileId;`
	`96`	`+ mFsFileId = id;`
`97`	`97`	`}`
`98`	`98`	`private:`
`99`	`99`	`std::string mPath;`
Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,11 @@ bool ProgramMemory::getContainerEmptyValue(nonneg int exprid, MathLib::bigint& r`
`150`	`150`	`return false;`
`151`	`151`	`}`
`152`	`152`
`153`		`-void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool isEqual)`
	`153`	`+void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool equal)`
`154`	`154`	`{`
`155`	`155`	`ValueFlow::Value v(value);`
`156`	`156`	`v.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;`
`157`		`- if (!isEqual)`
	`157`	`+ if (!equal)`
`158`	`158`	`v.valueKind = ValueFlow::Value::ValueKind::Impossible;`
`159`	`159`	`setValue(expr, v);`
`160`	`160`	`}`