move guideline mapping to StdLogger

Author: ludviggunne

cli/cmdlineparser.cpp

@@ -1247,7 +1247,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     mLogger.printError("Unknown report type \'" + typeStr + "\'");
                     return Result::Fail;
                 }
-                mSettings.guidelineMapping = createGuidelineMapping(mSettings.reportType);
             }
 
             // Rule given at command line

cli/cppcheckexecutor.cpp

@@ -249,6 +249,7 @@ namespace {
     public:
         explicit StdLogger(const Settings& settings)
             : mSettings(settings)
+            , mGuidelineMapping(createGuidelineMapping(settings.reportType))
         {
             if (!mSettings.outputFile.empty()) {
                 mErrorOutput = new std::ofstream(settings.outputFile);
@@ -342,6 +343,11 @@ namespace {
          * SARIF report generator
          */
         SarifReport mSarifReport;
+
+        /**
+         * Coding standard guideline mapping
+         */
+        std::map<std::string, std::string> mGuidelineMapping;
     };
 }
 
@@ -628,7 +634,7 @@ void StdLogger::reportErr(const ErrorMessage &msg)
 
     ErrorMessage msgCopy = msg;
     msgCopy.guideline = getGuideline(msgCopy.id, mSettings.reportType,
-                                     mSettings.guidelineMapping, msgCopy.severity);
+                                     mGuidelineMapping, msgCopy.severity);
     msgCopy.classification = getClassification(msgCopy.guideline, mSettings.reportType);
 
     if (mSettings.outputFormat == Settings::OutputFormat::sarif)

lib/settings.h

@@ -114,9 +114,6 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Report type */
     ReportType reportType;
 
-    /** @brief Maps cppcheck error ids to guidelines */
-    std::map<std::string, std::string> guidelineMapping;
-
     /** @brief addons, either filename of python/json file or json data */
     std::unordered_set<std::string> addons;