Refactoring: Cppcheck::reportProgress needs to call _errorLogger::reportProgress. Ticket: cppcheck-opensource#1625

Daniel Marjamäki · Daniel Marjamäki · commit 11ef2c0a0657 · 2010-08-08T08:46:47.000+02:00
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -25,7 +25,7 @@
 
 CppCheckExecutor::CppCheckExecutor()
 {
-
+    time1 = std::time(0);
 }
 
 CppCheckExecutor::~CppCheckExecutor()
@@ -87,6 +87,32 @@ void CppCheckExecutor::reportOut(const std::string &outmsg)
     std::cout << outmsg << std::endl;
 }
 
+void CppCheckExecutor::reportProgress(const std::string &filename, const char stage[], const unsigned int value)
+{
+    (void)filename;
+
+    // Report progress messages every 10 seconds
+    const std::time_t time2 = std::time(NULL);
+    if (time2 >= (time1 + 1))
+    {
+        time1 = time2;
+
+        // current time in the format "Www Mmm dd hh:mm:ss yyyy"
+        const std::string str(std::ctime(&time2));
+
+        // format a progress message
+        std::ostringstream ostr;
+        ostr << "progress: "
+             << stage
+             << " " << int(value) << "%";
+        if (_settings._verbose)
+            ostr << " time=" << str.substr(11, 8);
+
+        // Report progress message
+        reportOut(ostr.str());
+    }
+}
+
 void CppCheckExecutor::reportStatus(unsigned int index, unsigned int max)
 {
     if (max > 1 && !_settings._errorsOnly)
diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
@@ -21,6 +21,7 @@
 
 #include "errorlogger.h"
 #include "settings.h"
+#include <ctime>
 
 /**
  * This class works as an example of how CppCheck can be used in external
@@ -66,6 +67,8 @@ class CppCheckExecutor : public ErrorLogger
     /** xml output of errors */
     virtual void reportErr(const ErrorLogger::ErrorMessage &msg);
 
+    void reportProgress(const std::string &filename, const char stage[], const unsigned int value);
+
     virtual void reportStatus(unsigned int index, unsigned int max);
 
 protected:
@@ -80,6 +83,13 @@ class CppCheckExecutor : public ErrorLogger
      * check() will setup this in the beginning of check().
      */
     Settings _settings;
+
+private:
+
+    /**
+     * Report progress time
+     */
+    std::time_t time1;
 };
 
 #endif // CPPCHECKEXECUTOR_H
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -171,7 +171,6 @@ CppCheck::CppCheck(ErrorLogger &errorLogger)
     : _errorLogger(errorLogger)
 {
     exitcode = 0;
-    time1 = std::time(0);
 }
 
 CppCheck::~CppCheck()
@@ -928,35 +927,14 @@ const std::vector<std::string> &CppCheck::filenames() const
     return _filenames;
 }
 
-void CppCheck::reportStatus(unsigned int /*index*/, unsigned int /*max*/)
+void CppCheck::reportProgress(const std::string &filename, const char stage[], const unsigned int value)
 {
-
+    _errorLogger.reportProgress(filename, stage, value);
 }
 
-void CppCheck::reportProgress(const std::string &filename, const char stage[], const unsigned int value)
+void CppCheck::reportStatus(unsigned int /*index*/, unsigned int /*max*/)
 {
-    (void)filename;
 
-    // Report progress messages every 10 seconds
-    const std::time_t time2 = std::time(NULL);
-    if (time2 >= (time1 + 10))
-    {
-        time1 = time2;
-
-        // current time in the format "Www Mmm dd hh:mm:ss yyyy"
-        const std::string str(std::ctime(&time2));
-
-        // format a progress message
-        std::ostringstream ostr;
-        ostr << "progress: "
-             << stage
-             << " " << int(value) << "%";
-        if (_settings._verbose)
-            ostr << " time=" << str.substr(11, 8);
-
-        // Report progress message
-        reportOut(ostr.str());
-    }
 }
 
 void CppCheck::getErrorMessages()
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -28,7 +28,6 @@
 #include <sstream>
 #include <vector>
 #include <map>
-#include <ctime>
 
 /// @addtogroup Core
 /// @{
@@ -157,14 +156,14 @@ class CppCheck : public ErrorLogger
      */
     virtual void reportOut(const std::string &outmsg);
 
-    void reportProgress(const std::string &filename, const char stage[], const unsigned int value);
-
     unsigned int exitcode;
     std::list<std::string> _errorList;
     std::ostringstream _errout;
     Settings _settings;
     std::vector<std::string> _filenames;
 
+    void reportProgress(const std::string &filename, const char stage[], const unsigned int value);
+
     /** @brief Key is file name, and value is the content of the file */
     std::map<std::string, std::string> _fileContents;
 
@@ -173,8 +172,6 @@ class CppCheck : public ErrorLogger
 
     /** @brief Current preprocessor configuration */
     std::string     cfg;
-
-    std::time_t     time1;
 };
 
 /// @}
