diff options
| author | hjk <[email protected]> | 2018-05-16 15:42:03 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2018-05-23 08:48:36 +0000 |
| commit | 36b835ff0ac1f6ab7b2ae8aab789352a9e297c21 (patch) | |
| tree | b3a63ee0ba58ca3bcfdb7631963f452c3658b8c3 /src/plugins/debugger/debuggerplugin.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 <[email protected]>
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index f92b55d6ea9..0857b63ba6b 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -101,7 +101,6 @@ #include <projectexplorer/projectexplorersettings.h> #include <projectexplorer/projecttree.h> #include <projectexplorer/runconfiguration.h> -#include <projectexplorer/runnables.h> #include <projectexplorer/session.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> @@ -3024,11 +3023,8 @@ void DebuggerPluginPrivate::extensionsInitialized() auto constraint = [](RunConfiguration *runConfig) { Runnable runnable = runConfig->runnable(); - if (runnable.is<StandardRunnable>()) { - IDevice::ConstPtr device = runnable.as<StandardRunnable>().device; - if (device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) - return true; - } + if (runnable.device && runnable.device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) + return true; if (DeviceTypeKitInformation::deviceTypeId(runConfig->target()->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) @@ -3663,7 +3659,7 @@ void DebuggerUnitTests::testStateMachine() auto runControl = new RunControl(rc, ProjectExplorer::Constants::DEBUG_RUN_MODE); auto debugger = new DebuggerRunTool(runControl); - debugger->setInferior(rc->runnable().as<StandardRunnable>()); + debugger->setInferior(rc->runnable()); debugger->setTestCase(TestNoBoundsOfCurrentFunction); connect(debugger, &DebuggerRunTool::stopped, |