From 1386ff6443ffb186eaf4d896ddc276f5a9630c9d Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 20 Jan 2016 10:55:34 +0100 Subject: Adapt to upstream analyzer changes Change-Id: I541aeb4de35ec89146721ef017d6a58f0a1911a9 Reviewed-by: Nikolai Kosjar --- .../clangstaticanalyzer/clangstaticanalyzerplugin.cpp | 6 +++--- .../clangstaticanalyzerruncontrol.cpp | 3 +-- .../clangstaticanalyzerruncontrol.h | 3 +-- .../clangstaticanalyzerruncontrolfactory.cpp | 2 +- .../clangstaticanalyzer/clangstaticanalyzertool.cpp | 18 ++++++++---------- plugins/clangstaticanalyzer/clangstaticanalyzertool.h | 3 +-- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp index 5d5cec13e1..eb9683e3d4 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp @@ -132,15 +132,15 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList & addAutoReleasedObject(new ClangStaticAnalyzerOptionsPage); auto widgetCreator = [tool] { return tool->createWidgets(); }; - auto runControlCreator = [tool](const AnalyzerStartParameters &sp, + auto runControlCreator = [tool](const AnalyzerStartParameters &, ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode) { - return tool->createRunControl(sp, runConfiguration, runMode); + return tool->createRunControl(runConfiguration, runMode); }; const QString toolTip = tr("Clang Static Analyzer uses the analyzer from the clang project " "to find bugs."); - AnalyzerAction *action = new AnalyzerAction(this); + auto action = new AnalyzerAction(this); action->setRunMode(Constants::CLANGSTATICANALYZER_RUN_MODE); action->setToolId(ClangStaticAnalyzerToolId); action->setActionId("ClangStaticAnalyzer"); diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index 1d329109dd..35652728c4 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -66,11 +66,10 @@ namespace ClangStaticAnalyzer { namespace Internal { ClangStaticAnalyzerRunControl::ClangStaticAnalyzerRunControl( - const Analyzer::AnalyzerStartParameters &startParams, RunConfiguration *runConfiguration, Core::Id runMode, const ProjectInfo &projectInfo) - : AnalyzerRunControl(startParams, runConfiguration, runMode) + : AnalyzerRunControl(runConfiguration, runMode) , m_projectInfo(projectInfo) , m_wordWidth(runConfiguration->abi().wordWidth()) , m_initialFilesToProcessSize(0) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h index fae23663bb..06cbc7ed93 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h @@ -53,8 +53,7 @@ class ClangStaticAnalyzerRunControl : public Analyzer::AnalyzerRunControl Q_OBJECT public: - ClangStaticAnalyzerRunControl(const Analyzer::AnalyzerStartParameters &startParams, - ProjectExplorer::RunConfiguration *runConfiguration, + ClangStaticAnalyzerRunControl(ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode, const CppTools::ProjectInfo &projectInfo); diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp index 43b171d4e8..b89ea1cee5 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp @@ -115,7 +115,7 @@ RunControl *ClangStaticAnalyzerRunControlFactory::create(RunConfiguration *runCo return 0; } - return AnalyzerManager::createRunControl(AnalyzerStartParameters(), runConfiguration, runMode); + return AnalyzerManager::createRunControl(runConfiguration, runMode); } } // namespace Internal diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp index b1162316f9..9fe109d63d 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp @@ -165,10 +165,8 @@ QWidget *ClangStaticAnalyzerTool::createWidgets() return toolbarWidget; } -AnalyzerRunControl *ClangStaticAnalyzerTool::createRunControl( - const AnalyzerStartParameters &sp, - RunConfiguration *runConfiguration, - Core::Id runMode) +AnalyzerRunControl *ClangStaticAnalyzerTool::createRunControl(RunConfiguration *runConfiguration, + Core::Id runMode) { QTC_ASSERT(runConfiguration, return 0); QTC_ASSERT(m_projectInfoBeforeBuild.isValid(), return 0); @@ -184,15 +182,15 @@ AnalyzerRunControl *ClangStaticAnalyzerTool::createRunControl( return 0); m_projectInfoBeforeBuild = CppTools::ProjectInfo(); - auto engine = new ClangStaticAnalyzerRunControl(sp, runConfiguration, runMode, - projectInfoAfterBuild); - connect(engine, &ClangStaticAnalyzerRunControl::starting, + auto runControl = new ClangStaticAnalyzerRunControl(runConfiguration, runMode, + projectInfoAfterBuild); + connect(runControl, &ClangStaticAnalyzerRunControl::starting, this, &ClangStaticAnalyzerTool::onEngineIsStarting); - connect(engine, &ClangStaticAnalyzerRunControl::newDiagnosticsAvailable, + connect(runControl, &ClangStaticAnalyzerRunControl::newDiagnosticsAvailable, this, &ClangStaticAnalyzerTool::onNewDiagnosticsAvailable); - connect(engine, &ClangStaticAnalyzerRunControl::finished, + connect(runControl, &ClangStaticAnalyzerRunControl::finished, this, &ClangStaticAnalyzerTool::onEngineFinished); - return engine; + return runControl; } static bool dontStartAfterHintForDebugMode(Project *project) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzertool.h b/plugins/clangstaticanalyzer/clangstaticanalyzertool.h index d60c04d393..e5a748d0cd 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzertool.h +++ b/plugins/clangstaticanalyzer/clangstaticanalyzertool.h @@ -59,8 +59,7 @@ public: QList diagnostics() const; QWidget *createWidgets(); - Analyzer::AnalyzerRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration, + Analyzer::AnalyzerRunControl *createRunControl(ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode); void startTool(); -- cgit v1.2.1