Analyzer: Move non-static parts of IAnalyzerTool::start*Tool

... to user code.

Change-Id: Ibe278134e39cfb3f90acedc976fab5e9dc019046
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

src/plugins/analyzerbase/ianalyzertool.cpp

@@ -92,7 +92,7 @@ static bool buildTypeAccepted(IAnalyzerTool::ToolMode toolMode,
     return false;
 }
 
-void IAnalyzerTool::startLocalTool(ToolMode toolMode, RunMode runMode)
+bool checkForLocalStart(IAnalyzerTool::ToolMode toolMode)
 {
     // Make sure mode is shown.
     AnalyzerManager::showMode();
@@ -140,29 +140,26 @@ void IAnalyzerTool::startLocalTool(ToolMode toolMode, RunMode runMode)
         if (Utils::CheckableMessageBox::doNotAskAgainQuestion(ICore::mainWindow(),
                 title, message, ICore::settings(), QLatin1String("AnalyzerCorrectModeWarning"))
                     != QDialogButtonBox::Yes)
-            return;
+            return false;
     }
 
-    ProjectExplorerPlugin::instance()->runProject(pro, runMode);
+    return true;
 }
 
-void IAnalyzerTool::startRemoteTool(RunMode runMode)
+bool checkForRemoteStart(AnalyzerStartParameters *sp)
 {
     StartRemoteDialog dlg;
     if (dlg.exec() != QDialog::Accepted)
-        return;
+        return false;
 
-    AnalyzerStartParameters sp;
+    sp->startMode = StartRemote;
-    sp.startMode = StartRemote;
+    sp->connParams = dlg.sshParams();
-    sp.connParams = dlg.sshParams();
+    sp->debuggee = dlg.executable();
-    sp.debuggee = dlg.executable();
+    sp->debuggeeArgs = dlg.arguments();
-    sp.debuggeeArgs = dlg.arguments();
+    sp->displayName = dlg.executable();
-    sp.displayName = dlg.executable();
+    sp->workingDirectory = dlg.workingDirectory();
-    sp.workingDirectory = dlg.workingDirectory();
 
-    AnalyzerRunControl *rc = createRunControl(sp, 0);
+    return true;
-
-    ProjectExplorerPlugin::startRunControl(rc, runMode);
 }
 
 } // namespace Analyzer

src/plugins/analyzerbase/ianalyzertool.h

@@ -93,10 +93,12 @@ public:
 
     virtual void startTool(StartMode mode) = 0;
 
-    void startLocalTool(ToolMode toolMode, ProjectExplorer::RunMode runMode);
-    void startRemoteTool(ProjectExplorer::RunMode runMode);
 };
 
+ANALYZER_EXPORT bool checkForLocalStart(IAnalyzerTool::ToolMode toolMode);
+ANALYZER_EXPORT bool checkForRemoteStart(AnalyzerStartParameters *sp);
+
+
 /**
  * This class represents an analyzation action, i.e. a tool that runs in a specific mode.
  *

src/plugins/valgrind/callgrindtool.cpp

@@ -57,7 +57,10 @@
 
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/Overview.h>
+#include <cplusplus/Symbols.h>
+
 #include <extensionsystem/iplugin.h>
+
 #include <texteditor/texteditor.h>
 
 #include <utils/qtcassert.h>
@@ -65,7 +68,9 @@
 #include <utils/styledbar.h>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projecttree.h>
+#include <projectexplorer/session.h>
 
 #include <QFile>
 #include <QFileInfo>
@@ -87,9 +92,6 @@
 #include <QToolButton>
 #include <QVBoxLayout>
 
-// shared/cplusplus includes
-#include <cplusplus/Symbols.h>
-
 using namespace Analyzer;
 using namespace Core;
 using namespace Valgrind::Callgrind;
@@ -558,11 +560,18 @@ AnalyzerRunControl *CallgrindToolPrivate::createRunControl(const AnalyzerStartPa
 
 void CallgrindTool::startTool(StartMode mode)
 {
-    if (mode == StartLocal)
+    if (mode == StartLocal && checkForLocalStart(ReleaseMode)) {
-        startLocalTool(ReleaseMode, CallgrindRunMode);
+        Project *pro = SessionManager::startupProject();
-    if (mode == StartRemote)
+        ProjectExplorerPlugin::instance()->runProject(pro, CallgrindRunMode);
-        startRemoteTool(CallgrindRunMode);
         d->setBusyCursor(true);
+    }
+
+    AnalyzerStartParameters sp;
+    if (mode == StartRemote && checkForRemoteStart(&sp)) {
+        AnalyzerRunControl *rc = createRunControl(sp, 0);
+        ProjectExplorerPlugin::startRunControl(rc, CallgrindRunMode);
+        d->setBusyCursor(true);
+    }
 }
 
 void CallgrindTool::handleShowCostsOfFunction()

src/plugins/valgrind/memchecktool.cpp

@@ -599,10 +599,16 @@ void MemcheckTool::setBusyCursor(bool busy)
 
 void MemcheckTool::startTool(StartMode mode)
 {
-    if (mode == StartLocal)
+    if (mode == StartLocal && checkForLocalStart(DebugMode)) {
-        startLocalTool(DebugMode, MemcheckRunMode);
+        Project *pro = SessionManager::startupProject();
-    if (mode == StartRemote)
+        ProjectExplorerPlugin::instance()->runProject(pro, MemcheckRunMode);
-        startRemoteTool(MemcheckRunMode);
+    }
+
+    AnalyzerStartParameters sp;
+    if (mode == StartRemote && checkForRemoteStart(&sp)) {
+        AnalyzerRunControl *rc = createRunControl(sp, 0);
+        ProjectExplorerPlugin::startRunControl(rc, MemcheckRunMode);
+    }
 }
 
 MemcheckWithGdbTool::MemcheckWithGdbTool(QObject *parent) :
@@ -613,10 +619,16 @@ MemcheckWithGdbTool::MemcheckWithGdbTool(QObject *parent) :
 
 void MemcheckWithGdbTool::startTool(Analyzer::StartMode mode)
 {
-    if (mode == StartLocal)
+    if (mode == StartLocal && checkForLocalStart(DebugMode)) {
-        startLocalTool(DebugMode, MemcheckWithGdbRunMode);
+        Project *pro = SessionManager::startupProject();
-    if (mode == StartRemote)
+        ProjectExplorerPlugin::instance()->runProject(pro, MemcheckWithGdbRunMode);
-        startRemoteTool(MemcheckWithGdbRunMode);
+    }
+
+    AnalyzerStartParameters sp;
+    if (mode == StartRemote && checkForRemoteStart(&sp)) {
+        AnalyzerRunControl *rc = createRunControl(sp, 0);
+        ProjectExplorerPlugin::startRunControl(rc, MemcheckWithGdbRunMode);
+    }
 }
 
 MemcheckRunControl *MemcheckWithGdbTool::createMemcheckRunControl(const AnalyzerStartParameters &sp,

src/plugins/valgrind/memchecktool.h

@@ -103,14 +103,14 @@ private:
     QWidget *createWidgets();
     void setBusyCursor(bool busy);
 
-    Analyzer::AnalyzerRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp,
-                               ProjectExplorer::RunConfiguration *runConfiguration = 0);
-
     void clearErrorView();
     void updateFromSettings();
     int updateUiAfterFinishedHelper();
 
 protected:
+    Analyzer::AnalyzerRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp,
+                               ProjectExplorer::RunConfiguration *runConfiguration = 0);
+
     virtual MemcheckRunControl *createMemcheckRunControl(
             const Analyzer::AnalyzerStartParameters &sp,
             ProjectExplorer::RunConfiguration *runConfiguration);