Analyzer: Remove AnalyzerStartParameters

Change-Id: I4188ffd046cc92be64bf9751e90fe8c66942b08c
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>

src/plugins/analyzerbase/analyzermanager.cpp

@@ -710,21 +710,11 @@ void AnalyzerManager::handleToolFinished()
     d->handleToolFinished();
 }
 
-AnalyzerRunControl *AnalyzerManager::createRunControl(const AnalyzerStartParameters &sp, RunConfiguration *runConfiguration, Id runMode)
-{
-    foreach (AnalyzerAction *action, d->m_actions) {
-        if (action->runMode() == runMode)
-            return action->runControlCreator()(sp, runConfiguration, runMode);
-    }
-    return 0;
-}
-
 AnalyzerRunControl *AnalyzerManager::createRunControl(RunConfiguration *runConfiguration, Id runMode)
 {
-    AnalyzerStartParameters dummy;
     foreach (AnalyzerAction *action, d->m_actions) {
         if (action->runMode() == runMode)
-            return action->runControlCreator()(dummy, runConfiguration, runMode);
+            return action->runControlCreator()(runConfiguration, runMode);
     }
     return 0;
 }

src/plugins/analyzerbase/analyzermanager.h

@@ -42,7 +42,6 @@ namespace Analyzer {
 
 class AnalyzerAction;
 class AnalyzerRunControl;
-class AnalyzerStartParameters;
 
 
 // FIXME: Merge with AnalyzerPlugin.
@@ -77,11 +76,6 @@ public:
     static void handleToolFinished();
     static QAction *stopAction();
 
-    // FIXME: Remove.
-    static AnalyzerRunControl *createRunControl(const AnalyzerStartParameters &sp,
-        ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode);
-
-    // Use this.
     static AnalyzerRunControl *createRunControl(
         ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode);
 };

src/plugins/analyzerbase/analyzerstartparameters.h

@@ -54,12 +54,6 @@ public:
     quint16 analyzerPort = 0;
 };
 
-class ANALYZER_EXPORT AnalyzerStartParameters
-    : public AnalyzerRunnable, public AnalyzerConnection
-{
-public:
-};
-
 } // namespace Analyzer
 
 #endif // ANALYZERSTARTPARAMETERS_H

src/plugins/analyzerbase/ianalyzertool.h

@@ -42,7 +42,6 @@ namespace ProjectExplorer { class RunConfiguration; }
 
 namespace Analyzer {
 
-class AnalyzerStartParameters;
 class AnalyzerRunControl;
 
 /**
@@ -99,8 +98,8 @@ public:
 
     /// Returns a new engine for the given start parameters.
     /// Called each time the tool is launched.
-    typedef std::function<AnalyzerRunControl *(const AnalyzerStartParameters &,
+    typedef std::function<AnalyzerRunControl *(ProjectExplorer::RunConfiguration *runConfiguration,
-        ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode)> RunControlCreator;
+                                               Core::Id runMode)> RunControlCreator;
     RunControlCreator runControlCreator() const { return m_runControlCreator; }
     void setRunControlCreator(const RunControlCreator &creator) { m_runControlCreator = creator; }
 

src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp

@@ -132,8 +132,8 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList &
     addAutoReleasedObject(new ClangStaticAnalyzerOptionsPage);
 
     auto widgetCreator = [tool] { return tool->createWidgets(); };
-    auto runControlCreator = [tool](const AnalyzerStartParameters &,
+    auto runControlCreator = [tool](ProjectExplorer::RunConfiguration *runConfiguration,
-        ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode) {
+                                    Core::Id runMode) {
         return tool->createRunControl(runConfiguration, runMode);
     };
 

src/plugins/qmlprofiler/qmlprofilerplugin.cpp

@@ -54,8 +54,7 @@ bool QmlProfilerPlugin::initialize(const QStringList &arguments, QString *errorS
 
     auto tool = new QmlProfilerTool(this);
     auto widgetCreator = [tool] { return tool->createWidgets(); };
-    auto runControlCreator = [tool](const AnalyzerStartParameters &,
+    auto runControlCreator = [tool](ProjectExplorer::RunConfiguration *runConfiguration, Core::Id) {
-        ProjectExplorer::RunConfiguration *runConfiguration, Core::Id) {
         return tool->createRunControl(runConfiguration);
     };
 

src/plugins/valgrind/valgrindplugin.cpp

@@ -131,8 +131,7 @@ void ValgrindPlugin::extensionsInitialized()
     auto mcWidgetCreator = [mcTool] { return mcTool->createWidgets(); };
     auto cgTool = new CallgrindTool(this);
     auto cgWidgetCreator = [cgTool] { return cgTool->createWidgets(); };
-    auto cgRunControlCreator = [cgTool](const AnalyzerStartParameters &,
+    auto cgRunControlCreator = [cgTool](RunConfiguration *runConfiguration, Id) {
-        RunConfiguration *runConfiguration, Core::Id) {
         return cgTool->createRunControl(runConfiguration);
     };
 
@@ -141,8 +140,7 @@ void ValgrindPlugin::extensionsInitialized()
         action->setActionId("Memcheck.Local");
         action->setToolId("Memcheck");
         action->setWidgetCreator(mcWidgetCreator);
-        action->setRunControlCreator([mcTool](const AnalyzerStartParameters &,
+        action->setRunControlCreator([mcTool](RunConfiguration *runConfig, Id runMode) {
-            ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode) {
             return mcTool->createRunControl(runConfig, runMode);
         });
         action->setToolMode(DebugMode);
@@ -158,8 +156,7 @@ void ValgrindPlugin::extensionsInitialized()
         action->setActionId("MemcheckWithGdb.Local");
         action->setToolId("MemcheckWithGdb");
         action->setWidgetCreator([mcgTool] { return mcgTool->createWidgets(); });
-        action->setRunControlCreator([mcgTool](const AnalyzerStartParameters &,
+        action->setRunControlCreator([mcgTool](RunConfiguration *runConfig, Id runMode) {
-            ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode) {
             return mcgTool->createRunControl(runConfig, runMode);
         });
         action->setToolMode(DebugMode);