TaskTree: Refactor For loops

Make the syntax more consistent with conditional API.

Change-Id: I52353d0a0044252e1e3bac0b424ac7c22d927262
Reviewed-by: Marcus Tillmanns <[email protected]>

5 files changed, 9 insertions, 18 deletions

diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 9fe8212ac35..19c8d69b0f7 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -138,8 +138,7 @@ static ExecutableItem serialNumberRecipe(const QString &avdName, const Storage<Q
     return Group {
         outputStorage,
         AndroidConfig::devicesCommandOutputRecipe(outputStorage),
-        For {
-            iterator,
+        For (iterator) >> Do {
             parallel,
             stopOnSuccess,
             Group {
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index f8551e7a971..1d5de995a73 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -417,13 +417,11 @@ GroupItem AndroidDeployQtStep::runRecipe()
             onGroupDone(onSerialNumberGroupDone)
         },
         deployRecipe(),
-        For {
-            iterator,
+        For (iterator) >> Do {
             parallelIdealThreadCountLimit,
             AsyncTask<void>(onRemoveFileSetup)
         },
-        For {
-            iterator,
+        For (iterator) >> Do {
             ProcessTask(onAdbSetup, onAdbDone)
         }
     };
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index de164f03c49..f42ca27f878 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -858,8 +858,7 @@ AndroidDeviceManagerInstance::AndroidDeviceManagerInstance(QObject *parent)
     // otherwise, Android Studio would give an error during parsing also. So this fix
     // aim to keep support for Qt Creator and Android Studio.
 
-    m_avdListRecipe = For {
-        iterator,
+    m_avdListRecipe = For (iterator) >> Do {
         storage,
         ProcessTask(onProcessSetup, onProcessDone)
     };
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 3c43275bdb9..656d01839d6 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -582,8 +582,7 @@ static ExecutableItem preStartRecipe(RunnerStorage *storage)
     return Group {
         argsStorage,
         onGroupSetup(onArgsSetup),
-        For {
-            iterator,
+        For (iterator) >> Do {
             ProcessTask(onPreCommandSetup, onPreCommandDone, CallDoneIf::Error)
         },
         Group {
@@ -614,8 +613,7 @@ static ExecutableItem postDoneRecipe(RunnerStorage *storage)
 
     return Group {
         finishAllAndSuccess,
-        For {
-            iterator,
+        For (iterator) >> Do {
             ProcessTask(onProcessSetup)
         },
         onGroupDone(onDone)
@@ -674,8 +672,7 @@ static ExecutableItem uploadDebugServerRecipe(RunnerStorage *storage, const QStr
 
     return Group {
         tempDebugServerPathStorage,
-        For {
-            iterator,
+        For (iterator) >> Do {
             ProcessTask(onDeviceFileExistsSetup, onDeviceFileExistsDone)
         },
         Sync(onTempDebugServerPath),
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 1a7db4ea49f..55a630fb0a9 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -294,13 +294,11 @@ static GroupItem installationRecipe(const Storage<DialogStorage> &dialogStorage,
 
     return Group {
         onGroupSetup(onSetup),
-        For {
-            uninstallIterator,
+        For (uninstallIterator) >> Do {
             finishAllAndSuccess,
             ProcessTask(onUninstallSetup, onDone)
         },
-        For {
-            installIterator,
+        For (installIterator) >> Do {
             finishAllAndSuccess,
             ProcessTask(onInstallSetup, onDone)
         }