From 2bf7294d5b70a5ee1e847659ab76ca8adcc76e57 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 15 Nov 2021 20:37:08 +0100 Subject: [PATCH] Fix member shadowing (#3563) --- lib/settings.cpp | 4 ++-- lib/settings.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/settings.cpp b/lib/settings.cpp index 359fd3c77..46a50a9d7 100644 --- a/lib/settings.cpp +++ b/lib/settings.cpp @@ -76,9 +76,9 @@ Settings::Settings() 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 if (Path::fileExists(FILESDIR "/cppcheck.cfg")) fileName = FILESDIR "/cppcheck.cfg"; diff --git a/lib/settings.h b/lib/settings.h index f36922b08..b245557cd 100644 --- a/lib/settings.h +++ b/lib/settings.h @@ -95,7 +95,7 @@ private: public: Settings(); - void loadCppcheckCfg(const std::string &exename); + void loadCppcheckCfg(const std::string &executable); /** @brief addons, either filename of python/json file or json data */ std::list addons;