feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Analyzer: Re-use AnalyzerRunnable in StartRemote dialog interface

Browse Source 
Change-Id: I0cea5232555cc950342c56e60cfc2cf099b06f2b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-21 18:40:31 +01:00
parent 6062d3953d
commit 6de4accea9
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/analyzerbase/startremotedialog.cpp
View File

@@ -25,6 +25,8 @@
#include "startremotedialog.h" #include "startremotedialog.h"
#include "analyzerstartparameters.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/kitchooser.h> #include <projectexplorer/kitchooser.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
@@ -134,14 +136,12 @@ QSsh::SshConnectionParameters StartRemoteDialog::sshParams() const
return device->sshParameters(); return device->sshParameters();
} }
QString StartRemoteDialog::executable() const AnalyzerRunnable StartRemoteDialog::runnable() const
{ {
return d->executable->text(); AnalyzerRunnable r;
} r.debuggee = d->executable->text();
r.debuggeeArgs = d->arguments->text();
QString StartRemoteDialog::arguments() const return r;
{
return d->arguments->text();
} }
QString StartRemoteDialog::workingDirectory() const QString StartRemoteDialog::workingDirectory() const

5
src/plugins/analyzerbase/startremotedialog.h
View File

@@ -36,6 +36,8 @@ namespace Analyzer {
namespace Internal { class StartRemoteDialogPrivate; } namespace Internal { class StartRemoteDialogPrivate; }
class AnalyzerRunnable;
class ANALYZER_EXPORT StartRemoteDialog : public QDialog class ANALYZER_EXPORT StartRemoteDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
@@ -45,8 +47,7 @@ public:
~StartRemoteDialog(); ~StartRemoteDialog();
QSsh::SshConnectionParameters sshParams() const; QSsh::SshConnectionParameters sshParams() const;
QString executable() const; AnalyzerRunnable runnable() const;
QString arguments() const;
QString workingDirectory() const; QString workingDirectory() const;
private slots: private slots:

14
src/plugins/valgrind/valgrindplugin.cpp
View File

@@ -193,14 +193,11 @@ void ValgrindPlugin::extensionsInitialized()
return; return;
ValgrindRunControl *rc = mcTool->createRunControl(runConfig, MEMCHECK_RUN_MODE); ValgrindRunControl *rc = mcTool->createRunControl(runConfig, MEMCHECK_RUN_MODE);
QTC_ASSERT(rc, return); QTC_ASSERT(rc, return);
AnalyzerRunnable runnable; rc->setRunnable(dlg.runnable());
runnable.debuggee = dlg.executable();
runnable.debuggeeArgs = dlg.arguments();
rc->setRunnable(runnable);
AnalyzerConnection connection; AnalyzerConnection connection;
connection.connParams = dlg.sshParams(); connection.connParams = dlg.sshParams();
rc->setConnection(connection); rc->setConnection(connection);
rc->setDisplayName(dlg.executable()); rc->setDisplayName(dlg.runnable().debuggee);
rc->setWorkingDirectory(dlg.workingDirectory()); rc->setWorkingDirectory(dlg.workingDirectory());
rc->setCustomStart(); rc->setCustomStart();
ProjectExplorerPlugin::startRunControl(rc, MEMCHECK_RUN_MODE); ProjectExplorerPlugin::startRunControl(rc, MEMCHECK_RUN_MODE);
@@ -220,14 +217,11 @@ void ValgrindPlugin::extensionsInitialized()
return; return;
ValgrindRunControl *rc = cgTool->createRunControl(runConfig); ValgrindRunControl *rc = cgTool->createRunControl(runConfig);
QTC_ASSERT(rc, return); QTC_ASSERT(rc, return);
AnalyzerRunnable runnable; rc->setRunnable(dlg.runnable());
runnable.debuggee = dlg.executable();
runnable.debuggeeArgs = dlg.arguments();
rc->setRunnable(runnable);
AnalyzerConnection connection; AnalyzerConnection connection;
connection.connParams = dlg.sshParams(); connection.connParams = dlg.sshParams();
rc->setConnection(connection); rc->setConnection(connection);
rc->setDisplayName(dlg.executable()); rc->setDisplayName(dlg.runnable().debuggee);
rc->setWorkingDirectory(dlg.workingDirectory()); rc->setWorkingDirectory(dlg.workingDirectory());
rc->setCustomStart(); rc->setCustomStart();
ProjectExplorerPlugin::startRunControl(rc, CALLGRIND_RUN_MODE); ProjectExplorerPlugin::startRunControl(rc, CALLGRIND_RUN_MODE);