From 15e510abcf9138902c52e4caa79de804b04e59f1 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 18 Jun 2024 00:34:16 +0200 Subject: [PATCH] TaskTree: Make use of the trivial DoneResult handlers Change-Id: I71915fc50f073cc90b0fb2562bb82e9c4a73ccd1 Reviewed-by: Eike Ziller --- src/plugins/android/androidrunnerworker.cpp | 2 +- src/plugins/ios/iosrunner.cpp | 6 +----- tests/manual/tasking/trafficlight/recipe.cpp | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index b5041917b09..9befaba742a 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -676,7 +676,7 @@ void AndroidRunnerWorker::asyncStart() stopOnSuccess, ProcessTask(onPidSetup, onPidDone, CallDoneIf::Success), TimeoutTask([](std::chrono::milliseconds &timeout) { timeout = 200ms; }, - [] { return DoneResult::Error; }) + DoneResult::Error) }.withTimeout(45s), ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success), onGroupDone([pidStorage, this] { onProcessIdChanged(*pidStorage); }) diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 1d4bd33aa11..f2b59a46948 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -222,11 +222,7 @@ GroupItem DeviceCtlRunner::killProcess(Storage &appInfo) QString::number(appInfo->processIdentifier)}}); return SetupResult::Continue; }; - const auto onDone = [] { - // we tried our best and don't care at this point - return DoneResult::Success; - }; - return ProcessTask(onSetup, onDone); + return ProcessTask(onSetup, DoneResult::Success); // we tried our best and don't care at this point } GroupItem DeviceCtlRunner::launchTask(const QString &bundleIdentifier) diff --git a/tests/manual/tasking/trafficlight/recipe.cpp b/tests/manual/tasking/trafficlight/recipe.cpp index 6e08874ab64..abc70715364 100644 --- a/tests/manual/tasking/trafficlight/recipe.cpp +++ b/tests/manual/tasking/trafficlight/recipe.cpp @@ -21,7 +21,7 @@ Group recipe(GlueInterface *iface) [iface](Barrier &barrier) { QObject::connect(iface, &GlueInterface::smashed, &barrier, &Barrier::advance); }, - [] { return DoneResult::Error; }), + DoneResult::Error), Forever { TimeoutTask( // "red" state [iface](milliseconds &timeout) { @@ -56,7 +56,7 @@ Group recipe(GlueInterface *iface) [iface](Barrier &barrier) { QObject::connect(iface, &GlueInterface::repaired, &barrier, &Barrier::advance); }, - [] { return DoneResult::Error; }), + DoneResult::Error), Forever { TimeoutTask( // "blinking" state [iface](milliseconds &timeout) {