Removed Cppcheck::terminate()

danmar · danmar · commit aa28f3fe8c29 · 2020-12-04T18:47:43.000+01:00
diff --git a/democlient/democlient.cpp b/democlient/democlient.cpp
@@ -61,7 +61,7 @@ class CppcheckExecutor : public ErrorLogger {
                         const std::size_t value) override {
         if (std::time(nullptr) >= stoptime) {
             std::cout << "Time to analyse the code exceeded 2 seconds. Terminating.\n\n";
-            cppcheck.terminate();
+            Settings::terminate();
         }
     }
 };
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -301,7 +301,7 @@ void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSetti
 void CheckThread::stop()
 {
     mState = Stopping;
-    mCppcheck.terminate();
+    Settings::terminate();
 }
 
 void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QString err)
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -112,13 +112,6 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
 
     virtual void reportStatus(unsigned int fileindex, unsigned int filecount, std::size_t sizedone, std::size_t sizetotal);
 
-    /**
-     * @brief Terminate checking. The checking will be terminated as soon as possible.
-     */
-    void terminate() {
-        Settings::terminate();
-    }
-
     /**
      * @brief Call all "getErrorMessages" in all registered Check classes.
      * Also print out XML header and footer.

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class CppcheckExecutor : public ErrorLogger {`
`61`	`61`	`const std::size_t value) override {`
`62`	`62`	`if (std::time(nullptr) >= stoptime) {`
`63`	`63`	`std::cout << "Time to analyse the code exceeded 2 seconds. Terminating.\n\n";`
`64`		`- cppcheck.terminate();`
	`64`	`+ Settings::terminate();`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`};`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSetti`
`301`	`301`	`void CheckThread::stop()`
`302`	`302`	`{`
`303`	`303`	`mState = Stopping;`
`304`		`- mCppcheck.terminate();`
	`304`	`+ Settings::terminate();`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QString err)`