diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h index 4702c2acb9f..8d1b528309b 100644 --- a/src/plugins/analyzerbase/ianalyzertool.h +++ b/src/plugins/analyzerbase/ianalyzertool.h @@ -119,10 +119,6 @@ public: virtual AnalyzerRunControl *createRunControl(const AnalyzerStartParameters &sp, ProjectExplorer::RunConfiguration *runConfiguration = 0) = 0; - /// Returns true if the tool can be run - virtual bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - ProjectExplorer::RunMode mode) const = 0; - virtual void startTool(StartMode mode) = 0; /// Called when tools gets selected. diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp index 407fd0c88c6..55de88fd32f 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp @@ -66,12 +66,9 @@ QmlProfilerRunControlFactory::QmlProfilerRunControlFactory(QObject *parent) : bool QmlProfilerRunControlFactory::canRun(RunConfiguration *runConfiguration, RunMode mode) const { - if (mode != QmlProfilerRunMode) - return false; - IAnalyzerTool *tool = AnalyzerManager::toolFromRunMode(mode); - if (tool) - return tool->canRun(runConfiguration, mode); - return false; + return mode == QmlProfilerRunMode + && (qobject_cast(runConfiguration) + || qobject_cast(runConfiguration)); } static AnalyzerStartParameters createQmlProfilerStartParameters(RunConfiguration *runConfiguration) diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 1620ab6a70c..758729090da 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -266,14 +266,6 @@ AnalyzerRunControl *QmlProfilerTool::createRunControl(const AnalyzerStartParamet return engine; } -bool QmlProfilerTool::canRun(RunConfiguration *runConfiguration, RunMode mode) const -{ - if (qobject_cast(runConfiguration) - || qobject_cast(runConfiguration)) - return mode == runMode(); - return false; -} - static QString sysroot(RunConfiguration *runConfig) { QTC_ASSERT(runConfig, return QString()); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h index 91d06845589..5a3989e0e1c 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.h +++ b/src/plugins/qmlprofiler/qmlprofilertool.h @@ -59,9 +59,6 @@ public: Analyzer::AnalyzerRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp, ProjectExplorer::RunConfiguration *runConfiguration = 0); - bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - ProjectExplorer::RunMode mode) const; - QWidget *createWidgets(); void startTool(Analyzer::StartMode mode); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 2f276fecc94..078f55797b7 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -524,11 +524,6 @@ RunMode CallgrindTool::runMode() const return CallgrindRunMode; } -bool CallgrindTool::canRun(RunConfiguration *, RunMode mode) const -{ - return mode == CallgrindRunMode; -} - QString CallgrindTool::displayName() const { return tr("Valgrind Function Profiler"); diff --git a/src/plugins/valgrind/callgrindtool.h b/src/plugins/valgrind/callgrindtool.h index 01475604f13..14a5b201fb7 100644 --- a/src/plugins/valgrind/callgrindtool.h +++ b/src/plugins/valgrind/callgrindtool.h @@ -50,7 +50,6 @@ public: QString displayName() const; QString description() const; ToolMode toolMode() const; - bool canRun(ProjectExplorer::RunConfiguration *, ProjectExplorer::RunMode mode) const; void extensionsInitialized(); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 87d33bba1a2..644c947e159 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -286,11 +286,6 @@ RunMode MemcheckTool::runMode() const return MemcheckRunMode; } -bool MemcheckTool::canRun(RunConfiguration *, RunMode mode) const -{ - return mode == MemcheckRunMode; -} - QString MemcheckTool::displayName() const { return tr("Valgrind Memory Analyzer"); diff --git a/src/plugins/valgrind/memchecktool.h b/src/plugins/valgrind/memchecktool.h index 82d5b443ca1..550ea520e0f 100644 --- a/src/plugins/valgrind/memchecktool.h +++ b/src/plugins/valgrind/memchecktool.h @@ -88,7 +88,6 @@ public: ProjectExplorer::RunMode runMode() const; QString displayName() const; QString description() const; - bool canRun(ProjectExplorer::RunConfiguration *, ProjectExplorer::RunMode mode) const; // Create the valgrind settings (for all valgrind tools) Analyzer::AbstractAnalyzerSubConfig *createGlobalSettings(); diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp index 6d16d1663fa..e1b8efcab02 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp +++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp @@ -61,12 +61,8 @@ ValgrindRunControlFactory::ValgrindRunControlFactory(QObject *parent) : bool ValgrindRunControlFactory::canRun(RunConfiguration *runConfiguration, RunMode mode) const { - if (mode != CallgrindRunMode && mode != MemcheckRunMode) - return false; - IAnalyzerTool *tool = AnalyzerManager::toolFromRunMode(mode); - if (tool) - return tool->canRun(runConfiguration, mode); - return false; + Q_UNUSED(runConfiguration); + return mode == CallgrindRunMode || mode == MemcheckRunMode; } static AnalyzerStartParameters createValgrindStartParameters(RunConfiguration *runConfiguration)