From 39613b3b084d16c056ea22ea327712f4c05f5437 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 30 Jun 2015 10:56:56 +0200 Subject: Adapt to changes to run mode Change-Id: I9e299d6fa49920ffa98ececb5b96e9512055ba34 Reviewed-by: Nikolai Kosjar --- plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h | 1 + plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp | 5 +++-- .../clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp | 8 +++++--- .../clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h | 4 ++-- plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h b/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h index 0a0e734a7b..1114730614 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h @@ -24,6 +24,7 @@ namespace Constants { const char CLANG_EXECUTABLE_BASE_NAME[] = "clang"; const char SETTINGS_ID[] = "ClangStaticAnalyzer"; +const char CLANGSTATICANALYZER_RUN_MODE[] = "ClangStaticAnalyzer.RunMode"; } // Constants } // ClangStaticAnalyzer diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp index f31e7c3298..2afd35cec3 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp @@ -19,6 +19,7 @@ #include "clangstaticanalyzerplugin.h" #include "clangstaticanalyzerconfigwidget.h" +#include "clangstaticanalyzerconstants.h" #include "clangstaticanalyzerprojectsettingswidget.h" #include "clangstaticanalyzerruncontrolfactory.h" #include "clangstaticanalyzertool.h" @@ -153,7 +154,7 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList & "to find bugs."); AnalyzerAction *action = new AnalyzerAction(this); - action->setRunMode(ProjectExplorer::ClangStaticAnalyzerMode); + action->setRunMode(Constants::CLANGSTATICANALYZER_RUN_MODE); action->setToolId(ClangStaticAnalyzerToolId); action->setActionId("ClangStaticAnalyzer"); action->setWidgetCreator(widgetCreator); @@ -161,7 +162,7 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList & action->setCustomToolStarter([tool] { tool->startTool(); }); action->setText(tr("Clang Static Analyzer")); action->setToolTip(toolTip); - action->setMenuGroup(Constants::G_ANALYZER_TOOLS); + action->setMenuGroup(Analyzer::Constants::G_ANALYZER_TOOLS); action->setEnabled(false); AnalyzerManager::addAction(action); diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp index 81a8c21ec1..acc5f519e8 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp @@ -18,6 +18,8 @@ #include "clangstaticanalyzerruncontrolfactory.h" +#include "clangstaticanalyzerconstants.h" + #include #include #include @@ -51,9 +53,9 @@ ClangStaticAnalyzerRunControlFactory::ClangStaticAnalyzerRunControlFactory( } bool ClangStaticAnalyzerRunControlFactory::canRun(RunConfiguration *runConfiguration, - RunMode runMode) const + Core::Id runMode) const { - if (runMode != ClangStaticAnalyzerMode) + if (runMode != Constants::CLANGSTATICANALYZER_RUN_MODE) return false; Target *target = runConfiguration->target(); @@ -68,7 +70,7 @@ bool ClangStaticAnalyzerRunControlFactory::canRun(RunConfiguration *runConfigura } RunControl *ClangStaticAnalyzerRunControlFactory::create(RunConfiguration *runConfiguration, - RunMode runMode, + Core::Id runMode, QString *errorMessage) { using namespace CppTools; diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h index 9afd9f9f5c..68eb68e3cb 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h @@ -35,10 +35,10 @@ public: QObject *parent = 0); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - ProjectExplorer::RunMode runMode) const; + Core::Id runMode) const; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, - ProjectExplorer::RunMode runMode, + Core::Id runMode, QString *errorMessage); private: diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp index e6181c01e5..959de1c597 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp @@ -18,6 +18,7 @@ #include "clangstaticanalyzertool.h" +#include "clangstaticanalyzerconstants.h" #include "clangstaticanalyzerdiagnosticmodel.h" #include "clangstaticanalyzerdiagnosticview.h" #include "clangstaticanalyzerruncontrol.h" @@ -249,7 +250,7 @@ void ClangStaticAnalyzerTool::startTool() connect(SessionManager::instance(), &SessionManager::aboutToRemoveProject, this, onProjectRemoved, Qt::UniqueConnection); } - ProjectExplorerPlugin::runRunConfiguration(rc, ProjectExplorer::ClangStaticAnalyzerMode); + ProjectExplorerPlugin::runRunConfiguration(rc, Constants::CLANGSTATICANALYZER_RUN_MODE); } CppTools::ProjectInfo ClangStaticAnalyzerTool::projectInfoBeforeBuild() const -- cgit v1.2.1