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

Valgrind: Simplify device setup and handling

Browse Source 
Make isLocal() less intrusively used and correct.  Use the stored device
more often, also handle errors more quickly.

Change-Id: I146d1f5788ea79d0a9d7b058c81908d451cf00d0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
hjk
2016-01-30 01:38:58 +01:00
parent d14257736e
commit dcfb622126
13 changed files with 41 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/valgrind/valgrindrunner.cpp
View File

@@ -56,8 +56,7 @@ public:
QString valgrindExecutable;
QStringList valgrindArguments;
StandardRunnable debuggee;
bool useStartupProject = true;
QSsh::SshConnectionParameters connParams;
IDevice::ConstPtr device;
};
void ValgrindRunner::Private::run(ValgrindProcess *_process)
@@ -144,29 +143,19 @@ void ValgrindRunner::setDebuggee(const StandardRunnable &debuggee)
d->debuggee = debuggee;
}
const QSsh::SshConnectionParameters &ValgrindRunner::connectionParameters() const
{
return d->connParams;
}
void ValgrindRunner::setConnectionParameters(const QSsh::SshConnectionParameters &connParams)
{
d->connParams = connParams;
}
void ValgrindRunner::setProcessChannelMode(QProcess::ProcessChannelMode mode)
{
d->channelMode = mode;
}
void ValgrindRunner::setUseStartupProject(bool useStartupProject)
void ValgrindRunner::setDevice(const IDevice::ConstPtr &device)
{
d->useStartupProject = useStartupProject;
d->device = device;
}
bool ValgrindRunner::useStartupProject() const
IDevice::ConstPtr ValgrindRunner::device() const
{
return d->useStartupProject;
return d->device;
}
void ValgrindRunner::waitForFinished() const
@@ -181,8 +170,7 @@ void ValgrindRunner::waitForFinished() const
bool ValgrindRunner::start()
{
// FIXME: This wrongly uses "useStartupProject" for a Local/Remote decision.
d->run(new ValgrindProcess(d->connParams, 0, this));
d->run(new ValgrindProcess(d->device, this));
return true;
}