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

ProjectExplorer: Replace RunControl::producer

Browse Source 
... by two more specialized canRun() / createMainWorker() functions
resulting in somewhat leaner code on the user side and paving the
way for introducing a RunWorkerFactory class intended to follow the
now-canonical way of having factories as members in the plugin pimpl.

Change-Id: Id6fc2043a340203f14ab0b896a8dfa1e298f58a6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-03-13 15:34:44 +01:00
parent 358bb49f62
commit 68a10d71e7
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -443,19 +443,25 @@ RunWorker *RunControl::createWorker(Core::Id id)
return nullptr;
}
RunWorkerFactory::WorkerCreator RunControl::producer(RunConfiguration *runConfig, Core::Id runMode)
bool RunControl::createMainWorker()
{
const auto canRun = std::bind(&RunWorkerFactory::canRun, std::placeholders::_1, runConfig, runMode);
const auto canRun = std::bind(&RunWorkerFactory::canRun, std::placeholders::_1,
d->runConfiguration, d->runMode);
const QList<RunWorkerFactory *> candidates = Utils::filtered(g_runWorkerFactories, canRun);
// This is legit, there might be combinations that cannot run.
if (candidates.empty())
return {};
// There might be combinations that cannot run. But that should have been checked
// with canRun below.
QTC_ASSERT(!candidates.empty(), return false);
// There should be at most one top-level producer feeling responsible per combination.
// Breaking a tie should be done by tightening the restrictions on one of them.
QTC_CHECK(candidates.size() == 1);
return candidates.front()->producer();
return candidates.front()->producer()(this) != nullptr;
}
bool RunControl::canRun(RunConfiguration *runConfig, Core::Id runMode)
{
const auto check = std::bind(&RunWorkerFactory::canRun, std::placeholders::_1, runConfig, runMode);
return Utils::contains(g_runWorkerFactories, check);
}
void RunControlPrivate::initiateStart()