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

ProjectExplorer: Split RunControl constructor

Browse Source 
Into a trivial bit and two setters. Plan is to use it only with information
that is truly there (e.g. kit/device only) at the user side without having
to invent a RunConfiguration "handle".

Also remove some dead code in the test runner.

Change-Id: I987881e41722178b14b91f973b84cbdb67a9f85e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-03-12 15:53:54 +01:00
parent d6dfa7fa77
commit efb7d8deb7
13 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -799,21 +799,11 @@ static QString stateName(RunControlState s)
class RunControlPrivate : public QObject
{
public:
RunControlPrivate(RunControl *parent, RunConfiguration *runConfiguration, Core::Id mode)
: q(parent), runMode(mode), runConfiguration(runConfiguration)
RunControlPrivate(RunControl *parent, Core::Id mode)
: q(parent), runMode(mode)
{
icon = Icons::RUN_SMALL_TOOLBAR;
if (runConfiguration) {
runnable = runConfiguration->runnable();
displayName = runConfiguration->displayName();
outputFormatter = runConfiguration->createOutputFormatter();
device = runnable.device;
target = runConfiguration->target();
if (!device)
device = DeviceKitAspect::device(target->kit());
} else {
outputFormatter = new OutputFormatter();
}
outputFormatter = new OutputFormatter();
}
~RunControlPrivate() override
@@ -856,7 +846,7 @@ public:
IDevice::ConstPtr device;
Core::Id runMode;
Utils::Icon icon;
const QPointer<RunConfiguration> runConfiguration; // Not owned.
QPointer<RunConfiguration> runConfiguration; // Not owned. Avoid use.
QPointer<Target> target; // Not owned.
QPointer<Utils::OutputFormatter> outputFormatter = nullptr;
std::function<bool(bool*)> promptToStop;
@@ -874,11 +864,33 @@ public:
using namespace Internal;
RunControl::RunControl(RunConfiguration *runConfiguration, Core::Id mode) :
d(std::make_unique<RunControlPrivate>(this, runConfiguration, mode))
RunControl::RunControl(Core::Id mode) :
d(std::make_unique<RunControlPrivate>(this, mode))
{
}
void RunControl::setRunConfiguration(RunConfiguration *runConfig)
{
QTC_ASSERT(runConfig, return);
d->runConfiguration = runConfig;
d->runnable = runConfig->runnable();
d->displayName = runConfig->displayName();
if (auto outputFormatter = runConfig->createOutputFormatter()) {
delete d->outputFormatter;
d->outputFormatter = outputFormatter;
}
d->target = runConfig->target();
if (d->runnable.device)
setDevice(d->runnable.device);
else
setDevice(DeviceKitAspect::device(d->target->kit()));
}
void RunControl::setDevice(const IDevice::ConstPtr &device)
{
d->device = device;
#ifdef WITH_JOURNALD
if (!device().isNull() && device()->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
if (!device.isNull() && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
JournaldWatcher::instance()->subscribe(this, [this](const JournaldWatcher::LogEntry &entry) {
if (entry.value("_MACHINE_ID") != JournaldWatcher::instance()->machineId())
@@ -899,12 +911,6 @@ RunControl::RunControl(RunConfiguration *runConfiguration, Core::Id mode) :
#endif
}
RunControl::RunControl(const IDevice::ConstPtr &device, Core::Id mode)
: RunControl(nullptr, mode)
{
d->device = device;
}
RunControl::~RunControl()
{
#ifdef WITH_JOURNALD