some Settings::premium related cleanups (danmar#8109)

Author: firewave

cli/cmdlineparser.cpp

@@ -353,7 +353,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         return Result::Fail;
 
     if (argc <= 1) {
-        printHelp(mSettings.premium);
+        printHelp();
         return Result::Exit;
     }
 
@@ -388,7 +388,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
         // Print help
         if (std::strcmp(argv[i], "-h") == 0 || std::strcmp(argv[i], "--help") == 0) {
-            printHelp(mSettings.premium);
+            printHelp();
             return Result::Exit;
         }
 
@@ -1700,7 +1700,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     return Result::Success;
 }
 
-void CmdLineParser::printHelp(bool premium) const
+void CmdLineParser::printHelp() const
 {
     std::ostringstream oss;
     // TODO: display product name
@@ -1901,7 +1901,7 @@ void CmdLineParser::printHelp(bool premium) const
         "    --plist-output=<path>\n"
         "                         Generate Clang-plist output files in folder.\n";
 
-    if (premium) {
+    if (mSettings.premium) {
         oss <<
             "    --premium=<option>\n"
             "                         Coding standards:\n"

cli/cmdlineparser.h

@@ -109,7 +109,7 @@ class CmdLineParser {
     /**
      * Print help text to the console.
      */
-    void printHelp(bool premium) const;
+    void printHelp() const;
 
     template<typename T>
     bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool mustBePositive = false)

lib/checkersreport.cpp

@@ -30,10 +30,6 @@
 #include <unordered_set>
 #include <vector>
 
-static bool isCppcheckPremium(const Settings& settings) {
-    return (settings.cppcheckCfgProductName.compare(0, 16, "Cppcheck Premium") == 0);
-}
-
 static int getMisraCVersion(const Settings& settings) {
     if (settings.premiumArgs.find("misra-c-2025") != std::string::npos)
         return 2025;
@@ -194,7 +190,7 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
         fout << std::endl;
     }
 
-    const bool cppcheckPremium = isCppcheckPremium(mSettings);
+    const bool cppcheckPremium = mSettings.premium;
 
     auto reportSection = [&fout, cppcheckPremium]
                          (const std::string& title,