Commit 92079ab5 authored by hjk's avatar hjk

RemoteLinux: Remove RemoteLinuxRunControlPrivate::runnable

Instead, use the copy in the RunControl base class.

Change-Id: Ib72876b131236de8cb8f5cecbad9ec381d7e0e3e
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@theqtcompany.com>
parent 90074022
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <projectexplorer/devicesupport/deviceapplicationrunner.h> #include <projectexplorer/devicesupport/deviceapplicationrunner.h>
#include <projectexplorer/projectexplorericons.h> #include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/runnables.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
...@@ -38,16 +37,15 @@ class RemoteLinuxRunControl::RemoteLinuxRunControlPrivate ...@@ -38,16 +37,15 @@ class RemoteLinuxRunControl::RemoteLinuxRunControlPrivate
public: public:
bool running; bool running;
DeviceApplicationRunner runner; DeviceApplicationRunner runner;
StandardRunnable runnable;
}; };
RemoteLinuxRunControl::RemoteLinuxRunControl(RunConfiguration *rc) RemoteLinuxRunControl::RemoteLinuxRunControl(RunConfiguration *rc)
: RunControl(rc, ProjectExplorer::Constants::NORMAL_RUN_MODE), d(new RemoteLinuxRunControlPrivate) : RunControl(rc, ProjectExplorer::Constants::NORMAL_RUN_MODE), d(new RemoteLinuxRunControlPrivate)
{ {
setIcon(ProjectExplorer::Icons::RUN_SMALL); setIcon(ProjectExplorer::Icons::RUN_SMALL);
setRunnable(rc->runnable());
d->running = false; d->running = false;
d->runnable = rc->runnable().as<StandardRunnable>();
} }
RemoteLinuxRunControl::~RemoteLinuxRunControl() RemoteLinuxRunControl::~RemoteLinuxRunControl()
...@@ -70,7 +68,7 @@ void RemoteLinuxRunControl::start() ...@@ -70,7 +68,7 @@ void RemoteLinuxRunControl::start()
this, &RemoteLinuxRunControl::handleRunnerFinished); this, &RemoteLinuxRunControl::handleRunnerFinished);
connect(&d->runner, &DeviceApplicationRunner::reportProgress, connect(&d->runner, &DeviceApplicationRunner::reportProgress,
this, &RemoteLinuxRunControl::handleProgressReport); this, &RemoteLinuxRunControl::handleProgressReport);
d->runner.start(device(), d->runnable); d->runner.start(device(), runnable());
} }
RunControl::StopResult RemoteLinuxRunControl::stop() RunControl::StopResult RemoteLinuxRunControl::stop()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment