moved enforcedLang from Settings to CmdLineParser

Author: firewave

cli/cmdlineparser.cpp

@@ -221,14 +221,14 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
 
         mFileSettings.clear();
 
-        if (mSettings.enforcedLang != Standards::Language::None)
+        if (mEnforcedLang != Standards::Language::None)
         {
             // apply enforced language
             for (auto& fs : fileSettings)
             {
                 if (mSettings.library.markupFile(fs.filename()))
                     continue;
-                fs.file.setLang(mSettings.enforcedLang);
+                fs.file.setLang(mEnforcedLang);
             }
         }
         else
@@ -324,14 +324,14 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             files = std::move(filesResolved);
         }
 
-        if (mSettings.enforcedLang != Standards::Language::None)
+        if (mEnforcedLang != Standards::Language::None)
         {
             // apply enforced language
             for (auto& f : files)
             {
                 if (mSettings.library.markupFile(f.path()))
                     continue;
-                f.setLang(mSettings.enforcedLang);
+                f.setLang(mEnforcedLang);
             }
         }
         else
@@ -985,9 +985,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
 
             if (str == "c")
-                mSettings.enforcedLang = Standards::Language::C;
+                mEnforcedLang = Standards::Language::C;
             else if (str == "c++")
-                mSettings.enforcedLang = Standards::Language::CPP;
+                mEnforcedLang = Standards::Language::CPP;
             else {
                 mLogger.printError("unknown language '" + str + "' enforced.");
                 return Result::Fail;

cli/cmdlineparser.h

@@ -27,6 +27,7 @@
 
 #include "cmdlinelogger.h"
 #include "filesettings.h"
+#include "standards.h"
 #include "utils.h"
 
 class Settings;
@@ -46,6 +47,7 @@ class Library;
  * class internal options.
  */
 class CmdLineParser {
+    friend class TestCmdlineParser;
 public:
     /**
      * The constructor.
@@ -175,8 +177,8 @@ class CmdLineParser {
     Settings &mSettings;
     Suppressions &mSuppressions;
     bool mAnalyzeAllVsConfigsSetOnCmdLine = false;
-
-    friend class TestCmdlineParser;
+    /** @brief Name of the language that is enforced. Empty per default. */
+    Standards::Language mEnforcedLang{Standards::Language::None};
 };
 
 /// @}

gui/mainwindow.cpp

@@ -1208,7 +1208,7 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
         settings.platform.set(static_cast<Platform::Type>(mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt()));
     settings.standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
     settings.standards.setC(mSettings->value(SETTINGS_STD_C, QString()).toString().toStdString());
-    settings.enforcedLang = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
+    Standards::Language enforcedLang = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
 
     settings.jobs = std::max(settings.jobs, 1u);
 

lib/settings.h

@@ -236,9 +236,6 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Do not filter duplicated errors. */
     bool emitDuplicates{};
 
-    /** @brief Name of the language that is enforced. Empty per default. */
-    Standards::Language enforcedLang{};
-
 #if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
     /** @brief Is --exception-handling given */
     bool exceptionHandling{};

test/testcmdlineparser.cpp

@@ -765,14 +765,14 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::None, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::None, parser->mEnforcedLang);
     }
 
     void enforceLanguage2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::CPP, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::CPP, parser->mEnforcedLang);
     }
 
     void enforceLanguage3() {
@@ -793,14 +793,14 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::CPP, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::CPP, parser->mEnforcedLang);
     }
 
     void enforceLanguage6() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::C, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::C, parser->mEnforcedLang);
     }
 
     void enforceLanguage7() {