ClangTools: Merge ClangTidyClazyRunControl into ClangToolsRunControl

Change-Id: I162bbb9374fda0bbfc7f3db8fa245f3b5d6e73ad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h
index 16a07b2d85..842350a7f4 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.h
+++ b/src/plugins/clangtools/clangtoolruncontrol.h
@@ -27,8 +27,9 @@
 
 #include "clangfileinfo.h"
 
-#include <projectexplorer/runcontrol.h>
+#include <cpptools/clangdiagnosticconfig.h>
 #include <cpptools/projectinfo.h>
+#include <projectexplorer/runcontrol.h>
 #include <utils/environment.h>
 #include <utils/temporarydirectory.h>
 
@@ -39,7 +40,6 @@
 namespace ClangTools {
 namespace Internal {
 
-class ClangTool;
 class ClangToolRunner;
 class ProjectBuilder;
 
@@ -66,18 +66,13 @@ class ClangToolRunWorker : public ProjectExplorer::RunWorker
 
 public:
     ClangToolRunWorker(ProjectExplorer::RunControl *runControl,
+                       const CppTools::ClangDiagnosticConfig &diagnosticConfig,
                        const FileInfos &fileInfos,
                        bool preventBuild);
 
     bool success() const { return m_success; } // For testing.
 
-    virtual ClangTool *tool() = 0;
-
 protected:
-    void init();
-
-    virtual QList<RunnerCreator> runnerCreators() = 0;
-
     void onRunnerFinishedWithSuccess(const QString &filePath);
     void onRunnerFinishedWithFailure(const QString &errorMessage, const QString &errorDetails);
 
@@ -85,6 +80,9 @@ private:
     void start() final;
     void stop() final;
 
+    QList<RunnerCreator> runnerCreators();
+    template <class T> ClangToolRunner *createRunner();
+
     AnalyzeUnits unitsToAnalyze();
     void analyzeNextFile();
 
@@ -101,6 +99,7 @@ protected:
     Utils::TemporaryDirectory m_temporaryDir;
 
 private:
+    CppTools::ClangDiagnosticConfig m_diagnosticConfig;
     FileInfos m_fileInfos;
 
     CppTools::ProjectInfo m_projectInfoBeforeBuild;