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

Finish merging Runnable and StandardRunnable

Browse Source 
As all Runnables are known to be StandardRunnables, this here
essentially replaces all .is<StandardRunnable> by 'true'.
.as<StandardRunnable> by no-op, and fixes the fallout.

Change-Id: I1632f8e164fa0a9dff063df47a9e191fdf7bbb2e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-05-16 15:42:03 +02:00
parent fdccc54275
commit 36b835ff0a
73 changed files with 147 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ public:
void findPidOutputReceived(const QString &out);
ValgrindRunner *q;
StandardRunnable m_debuggee;
Runnable m_debuggee;
ApplicationLauncher m_valgrindProcess;
IDevice::ConstPtr m_device;
@@ -106,7 +106,7 @@ void ValgrindRunner::Private::run()
fullArgs << "--dsymutil=yes";
fullArgs << m_debuggee.executable;
StandardRunnable valgrind;
Runnable valgrind;
valgrind.executable = m_valgrindExecutable;
valgrind.workingDirectory = m_debuggee.workingDirectory;
valgrind.environment = m_debuggee.environment;
@@ -154,7 +154,7 @@ void ValgrindRunner::Private::remoteProcessStarted()
// plain path to exe, m_valgrindExe contains e.g. env vars etc. pp.
const QString proc = m_valgrindExecutable.split(' ').last();
StandardRunnable findPid;
Runnable findPid;
findPid.executable = "/bin/sh";
// sleep required since otherwise we might only match "bash -c..."
// and not the actual valgrind run
@@ -238,7 +238,7 @@ void ValgrindRunner::setValgrindArguments(const QStringList &toolArguments)
d->m_valgrindArguments = toolArguments;
}
void ValgrindRunner::setDebuggee(const StandardRunnable &debuggee)
void ValgrindRunner::setDebuggee(const Runnable &debuggee)
{
d->m_debuggee = debuggee;
}