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

Fix member shadowing (#3563)

This commit is contained in:
chrchr-github 2021-11-15 20:37:08 +01:00 committed by GitHub
parent 9c31e0ce54
commit 2bf7294d5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/settings.cpp
View File

@ -76,9 +76,9 @@ Settings::Settings()
certainty.setEnabled(Certainty::normal, true); certainty.setEnabled(Certainty::normal, true);
} }
void Settings::loadCppcheckCfg(const std::string &exename) void Settings::loadCppcheckCfg(const std::string &executable)
{ {
std::string fileName = Path::getPathFromFilename(exename) + "cppcheck.cfg"; std::string fileName = Path::getPathFromFilename(executable) + "cppcheck.cfg";
#ifdef FILESDIR #ifdef FILESDIR
if (Path::fileExists(FILESDIR "/cppcheck.cfg")) if (Path::fileExists(FILESDIR "/cppcheck.cfg"))
fileName = FILESDIR "/cppcheck.cfg"; fileName = FILESDIR "/cppcheck.cfg";

2
lib/settings.h
View File

@ -95,7 +95,7 @@ private:
public: public:
Settings(); Settings();
void loadCppcheckCfg(const std::string &exename); void loadCppcheckCfg(const std::string &executable);
/** @brief addons, either filename of python/json file or json data */ /** @brief addons, either filename of python/json file or json data */
std::list<std::string> addons; std::list<std::string> addons;