ClangTools: Merge ClangTidyClazyRunControl into ClangToolsRunControl

Change-Id: I162bbb9374fda0bbfc7f3db8fa245f3b5d6e73ad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-08-29 15:00:03 +02:00
parent 342679292c
commit 58a724b489
8 changed files with 68 additions and 182 deletions

View File

@@ -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;