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

TaskTree: Make use of the trivial DoneResult handlers

Browse Source 
Change-Id: I71915fc50f073cc90b0fb2562bb82e9c4a73ccd1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2024-06-18 00:34:16 +02:00
parent 33eb5f509c
commit 15e510abcf
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidrunnerworker.cpp
View File

@@ -676,7 +676,7 @@ void AndroidRunnerWorker::asyncStart()
stopOnSuccess, stopOnSuccess,
ProcessTask(onPidSetup, onPidDone, CallDoneIf::Success), ProcessTask(onPidSetup, onPidDone, CallDoneIf::Success),
TimeoutTask([](std::chrono::milliseconds &timeout) { timeout = 200ms; }, TimeoutTask([](std::chrono::milliseconds &timeout) { timeout = 200ms; },
[] { return DoneResult::Error; }) DoneResult::Error)
}.withTimeout(45s), }.withTimeout(45s),
ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success), ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success),
onGroupDone([pidStorage, this] { onProcessIdChanged(*pidStorage); }) onGroupDone([pidStorage, this] { onProcessIdChanged(*pidStorage); })

6
src/plugins/ios/iosrunner.cpp
View File

@@ -222,11 +222,7 @@ GroupItem DeviceCtlRunner::killProcess(Storage<AppInfo> &appInfo)
QString::number(appInfo->processIdentifier)}}); QString::number(appInfo->processIdentifier)}});
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onDone = [] { return ProcessTask(onSetup, DoneResult::Success); // we tried our best and don't care at this point
// we tried our best and don't care at this point
return DoneResult::Success;
};
return ProcessTask(onSetup, onDone);
} }
GroupItem DeviceCtlRunner::launchTask(const QString &bundleIdentifier) GroupItem DeviceCtlRunner::launchTask(const QString &bundleIdentifier)

4
tests/manual/tasking/trafficlight/recipe.cpp
View File

@@ -21,7 +21,7 @@ Group recipe(GlueInterface *iface)
[iface](Barrier &barrier) { [iface](Barrier &barrier) {
QObject::connect(iface, &GlueInterface::smashed, &barrier, &Barrier::advance); QObject::connect(iface, &GlueInterface::smashed, &barrier, &Barrier::advance);
}, },
[] { return DoneResult::Error; }), DoneResult::Error),
Forever { Forever {
TimeoutTask( // "red" state TimeoutTask( // "red" state
[iface](milliseconds &timeout) { [iface](milliseconds &timeout) {
@@ -56,7 +56,7 @@ Group recipe(GlueInterface *iface)
[iface](Barrier &barrier) { [iface](Barrier &barrier) {
QObject::connect(iface, &GlueInterface::repaired, &barrier, &Barrier::advance); QObject::connect(iface, &GlueInterface::repaired, &barrier, &Barrier::advance);
}, },
[] { return DoneResult::Error; }), DoneResult::Error),
Forever { Forever {
TimeoutTask( // "blinking" state TimeoutTask( // "blinking" state
[iface](milliseconds &timeout) { [iface](milliseconds &timeout) {