diff options
| author | hjk <hjk@qt.io> | 2018-05-16 15:42:03 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-05-23 08:48:36 +0000 |
| commit | 36b835ff0ac1f6ab7b2ae8aab789352a9e297c21 (patch) | |
| tree | b3a63ee0ba58ca3bcfdb7631963f452c3658b8c3 /src/plugins/valgrind/valgrindengine.cpp | |
| parent | fdccc542754bc5361b8391ecd3902a88a84ab3cf (diff) | |
Finish merging Runnable and StandardRunnable
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>
Diffstat (limited to 'src/plugins/valgrind/valgrindengine.cpp')
| -rw-r--r-- | src/plugins/valgrind/valgrindengine.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 7b6309247f..82ed9cc0f9 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -83,8 +83,7 @@ void ValgrindToolRunner::start() m_runner.setValgrindExecutable(m_settings->valgrindExecutable()); m_runner.setValgrindArguments(genericToolArguments() + toolArguments()); m_runner.setDevice(device()); - QTC_ASSERT(runnable().is<StandardRunnable>(), reportFailure()); - m_runner.setDebuggee(runnable().as<StandardRunnable>()); + m_runner.setDebuggee(runnable()); connect(&m_runner, &ValgrindRunner::processOutputReceived, this, &ValgrindToolRunner::receiveProcessOutput); @@ -114,8 +113,7 @@ void ValgrindToolRunner::stop() QString ValgrindToolRunner::executable() const { - QTC_ASSERT(runnable().is<StandardRunnable>(), return QString()); - return runnable().as<StandardRunnable>().executable; + return runnable().executable; } QStringList ValgrindToolRunner::genericToolArguments() const |