CppCheckExecutor: moved some classes into anonymous namespace

cli/cppcheckexecutor.cpp

@@ -64,109 +64,111 @@
 #include <windows.h>
 #endif
 
-class CmdLineLoggerStd : public CmdLineLogger
-{
-public:
-    CmdLineLoggerStd() = default;
-
-    void printMessage(const std::string &message) override
+namespace {
+    class CmdLineLoggerStd : public CmdLineLogger
     {
-        printRaw("cppcheck: " + message);
-    }
+    public:
+        CmdLineLoggerStd() = default;
 
-    void printError(const std::string &message) override
-    {
-        printMessage("error: " + message);
-    }
+        void printMessage(const std::string &message) override
+        {
+            printRaw("cppcheck: " + message);
+        }
 
-    void printRaw(const std::string &message) override
-    {
-        std::cout << message << std::endl;
-    }
-};
+        void printError(const std::string &message) override
+        {
+            printMessage("error: " + message);
+        }
 
-class StdLogger : public ErrorLogger
-{
-public:
-    explicit StdLogger(const Settings& settings)
-        : mSettings(settings)
+        void printRaw(const std::string &message) override
+        {
+            std::cout << message << std::endl;
+        }
+    };
+
+    class StdLogger : public ErrorLogger
     {
-        if (!mSettings.outputFile.empty()) {
-            mErrorOutput = new std::ofstream(settings.outputFile);
+    public:
+        explicit StdLogger(const Settings& settings)
+            : mSettings(settings)
+        {
+            if (!mSettings.outputFile.empty()) {
+                mErrorOutput = new std::ofstream(settings.outputFile);
+            }
         }
-    }
 
-    ~StdLogger() override {
-        delete mErrorOutput;
-    }
+        ~StdLogger() override {
+            delete mErrorOutput;
+        }
 
-    StdLogger(const StdLogger&) = delete;
-    StdLogger& operator=(const SingleExecutor &) = delete;
+        StdLogger(const StdLogger&) = delete;
+        StdLogger& operator=(const SingleExecutor &) = delete;
 
-    void resetLatestProgressOutputTime() {
-        mLatestProgressOutputTime = std::time(nullptr);
-    }
+        void resetLatestProgressOutputTime() {
+            mLatestProgressOutputTime = std::time(nullptr);
+        }
 
-    /**
-     * Helper function to print out errors. Appends a line change.
-     * @param errmsg String printed to error stream
-     */
-    void reportErr(const std::string &errmsg);
+        /**
+         * Helper function to print out errors. Appends a line change.
+         * @param errmsg String printed to error stream
+         */
+        void reportErr(const std::string &errmsg);
 
-    /**
-     * @brief Write the checkers report
-     */
-    void writeCheckersReport();
+        /**
+         * @brief Write the checkers report
+         */
+        void writeCheckersReport();
 
-    bool hasCriticalErrors() const {
-        return !mCriticalErrors.empty();
-    }
+        bool hasCriticalErrors() const {
+            return !mCriticalErrors.empty();
+        }
 
-private:
-    /**
-     * Information about progress is directed here. This should be
-     * called by the CppCheck class only.
-     *
-     * @param outmsg Progress message e.g. "Checking main.cpp..."
-     */
-    void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
-
-    /** xml output of errors */
-    void reportErr(const ErrorMessage &msg) override;
-
-    void reportProgress(const std::string &filename, const char stage[], const std::size_t value) override;
-
-    /**
-     * Pointer to current settings; set while check() is running for reportError().
-     */
-    const Settings& mSettings;
-
-    /**
-     * Used to filter out duplicate error messages.
-     */
-    // TODO: store hashes instead of the full messages
-    std::unordered_set<std::string> mShownErrors;
-
-    /**
-     * Report progress time
-     */
-    std::time_t mLatestProgressOutputTime{};
-
-    /**
-     * Error output
-     */
-    std::ofstream* mErrorOutput{};
-
-    /**
-     * Checkers that has been executed
-     */
-    std::set<std::string> mActiveCheckers;
-
-    /**
-     * True if there are critical errors
-     */
-    std::string mCriticalErrors;
-};
+    private:
+        /**
+         * Information about progress is directed here. This should be
+         * called by the CppCheck class only.
+         *
+         * @param outmsg Progress message e.g. "Checking main.cpp..."
+         */
+        void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
+
+        /** xml output of errors */
+        void reportErr(const ErrorMessage &msg) override;
+
+        void reportProgress(const std::string &filename, const char stage[], const std::size_t value) override;
+
+        /**
+         * Pointer to current settings; set while check() is running for reportError().
+         */
+        const Settings& mSettings;
+
+        /**
+         * Used to filter out duplicate error messages.
+         */
+        // TODO: store hashes instead of the full messages
+        std::unordered_set<std::string> mShownErrors;
+
+        /**
+         * Report progress time
+         */
+        std::time_t mLatestProgressOutputTime{};
+
+        /**
+         * Error output
+         */
+        std::ofstream* mErrorOutput{};
+
+        /**
+         * Checkers that has been executed
+         */
+        std::set<std::string> mActiveCheckers;
+
+        /**
+         * True if there are critical errors
+         */
+        std::string mCriticalErrors;
+    };
+}
 
 // TODO: do not directly write to stdout