Skip to content

Commit bc50237

Browse files
authored
Partial fix for #12254 (cppcheck.cfg can't be loaded from relative paths anymore) (#5760)
1 parent b26b78b commit bc50237

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cli/cmdlineparser.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,10 +1629,10 @@ void CmdLineParser::printHelp() const
16291629
mLogger.printRaw(oss.str());
16301630
}
16311631

1632-
bool CmdLineParser::isCppcheckPremium() {
1633-
Settings settings;
1634-
settings.loadCppcheckCfg(); // TODO: how to handle errors?
1635-
return startsWith(settings.cppcheckCfgProductName, "Cppcheck Premium");
1632+
bool CmdLineParser::isCppcheckPremium() const {
1633+
if (mSettings.cppcheckCfgProductName.empty())
1634+
mSettings.loadCppcheckCfg();
1635+
return startsWith(mSettings.cppcheckCfgProductName, "Cppcheck Premium");
16361636
}
16371637

16381638
bool CmdLineParser::tryLoadLibrary(Library& destination, const std::string& basepath, const char* filename)

cli/cmdlineparser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class CmdLineParser {
111111
void printHelp() const;
112112

113113
private:
114-
static bool isCppcheckPremium();
114+
bool isCppcheckPremium() const;
115115

116116
template<typename T>
117117
bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool mustBePositive = false)

0 commit comments

Comments
 (0)