Analyzer: Use a StandardRunnable instead of an AnalyzerRunnable

... with a lot potential to code consolidation.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 209dd74df7..bdf5a2b557 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -193,12 +193,13 @@ void ValgrindPlugin::extensionsInitialized()
             return;
         ValgrindRunControl *rc = mcTool->createRunControl(runConfig, MEMCHECK_RUN_MODE);
         QTC_ASSERT(rc, return);
-        rc->setRunnable(dlg.runnable());
+        const auto runnable = dlg.runnable();
+        rc->setRunnable(runnable);
         AnalyzerConnection connection;
         connection.connParams = dlg.sshParams();
         rc->setConnection(connection);
-        rc->setDisplayName(dlg.runnable().debuggee);
-        rc->setWorkingDirectory(dlg.workingDirectory());
+        rc->setDisplayName(runnable.executable);
+        rc->setWorkingDirectory(runnable.workingDirectory);
         rc->setCustomStart();
         ProjectExplorerPlugin::startRunControl(rc, MEMCHECK_RUN_MODE);
     });
@@ -217,12 +218,13 @@ void ValgrindPlugin::extensionsInitialized()
             return;
         ValgrindRunControl *rc = cgTool->createRunControl(runConfig);
         QTC_ASSERT(rc, return);
-        rc->setRunnable(dlg.runnable());
+        const auto runnable = dlg.runnable();
+        rc->setRunnable(runnable);
         AnalyzerConnection connection;
         connection.connParams = dlg.sshParams();
         rc->setConnection(connection);
-        rc->setDisplayName(dlg.runnable().debuggee);
-        rc->setWorkingDirectory(dlg.workingDirectory());
+        rc->setDisplayName(runnable.executable);
+        rc->setWorkingDirectory(runnable.workingDirectory);
         rc->setCustomStart();
         ProjectExplorerPlugin::startRunControl(rc, CALLGRIND_RUN_MODE);
     });