dowhile cleanup, second dowhile version without separate condition.

2 files changed, 53 insertions, 27 deletions

diff --git a/async/src/async.cpp b/async/src/async.cpp
index 6eefd1b..20ba4e6 100644
--- a/async/src/async.cpp
+++ b/async/src/async.cpp
@@ -47,3 +47,43 @@ JobBase::~JobBase()
 {
 }
 
+static void asyncWhile(const std::function<void(std::function<void(bool)>)> &body, const std::function<void()> &completionHandler) {
+    body([body, completionHandler](bool complete) {
+        if (complete) {
+            completionHandler();
+        } else {
+            asyncWhile(body, completionHandler);
+        }
+    });
+}
+
+Job<void> Async::dowhile(Condition condition, ThenTask<void> body)
+{
+    return Async::start<void>([body, condition](Async::Future<void> &future) {
+        asyncWhile([condition, body](std::function<void(bool)> whileCallback) {
+            Async::start<void>(body).then<void>([whileCallback, condition]() {
+                whileCallback(!condition());
+            }).exec();
+        },
+        [&future]() { //while complete
+            future.setFinished();
+        });
+    });
+}
+
+Job<void> Async::dowhile(ThenTask<bool> body)
+{
+    return Async::start<void>([body](Async::Future<void> &future) {
+        asyncWhile([body](std::function<void(bool)> whileCallback) {
+            Async::start<bool>(body).then<bool, bool>([whileCallback](bool result) {
+                whileCallback(!result);
+                //FIXME this return value is only required because .then<bool, void> doesn't work
+                return true;
+            }).exec();
+        },
+        [&future]() { //while complete
+            future.setFinished();
+        });
+    });
+}
+
diff --git a/async/src/async.h b/async/src/async.h
index 0d1d81e..57879a7 100644
--- a/async/src/async.h
+++ b/async/src/async.h
@@ -227,8 +227,19 @@ template<typename ReturnType, typename KJobType, ReturnType (KJobType::*KJobResu
 Job<ReturnType, Args ...> start();
 #endif
 
-template<typename Out>
-Job<Out> dowhile(Condition condition, ThenTask<void> func);
+/**
+ * Async while loop.
+ * 
+ * The loop continues while @param condition returns true.
+ */
+Job<void> dowhile(Condition condition, ThenTask<void> func);
+
+/**
+ * Async while loop.
+ *
+ * Loop continues while body returns true.
+ */
+Job<void> dowhile(ThenTask<bool> body);
 
 
 /**
@@ -249,7 +260,6 @@ Job<Out> null();
 template<typename Out>
 Job<Out> error(int errorCode = 1, const QString &errorMessage = QString());
 
-
 class JobBase
 {
     template<typename Out, typename ... In>
@@ -511,30 +521,6 @@ Job<ReturnType, Args ...> start()
 }
 #endif
 
-static void asyncWhile(const std::function<void(std::function<void(bool)>)> &body, const std::function<void()> &completionHandler) {
-    body([body, completionHandler](bool complete) {
-        if (complete) {
-            completionHandler();
-        } else {
-            asyncWhile(body, completionHandler);
-        }
-    });
-}
-    }
-template<typename Out>
-Job<Out> dowhile(Condition condition, ThenTask<void> body)
-{
-    return Async::start<void>([body, condition](Async::Future<void> &future) {
-        asyncWhile([condition, body](std::function<void(bool)> whileCallback) {
-            Async::start<void>(body).then<void>([whileCallback, condition]() {
-                whileCallback(!condition());
-            }).exec();
-        },
-        [&future]() { //while complete
-            future.setFinished();
-        });
-    });
-}
 
 template<typename Out>
 Job<Out> null()