Always return jobs, not futures.

Otherwise the calls are not composable.

4 files changed, 21 insertions, 17 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 5e5aae6..2bb28e7 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -54,6 +54,7 @@
 #define DEBUG_AREA "resource.imap"
 
 using namespace Imap;
+using namespace Sink;
 
 class MailPropertyExtractor : public Sink::Preprocessor
 {
@@ -273,7 +274,7 @@ public:
                 commitSync();
                 folderList << folders;
 
-            });
+            }).exec();
             folderFuture.waitForFinished();
             if (folderFuture.errorCode()) {
                 Warning() << "Folder sync failed.";
@@ -293,7 +294,7 @@ public:
                     synchronizeMails(folder.normalizedPath(), messages);
                     commit();
                     commitSync();
-                });
+                }).exec();
                 messagesFuture.waitForFinished();
                 if (messagesFuture.errorCode()) {
                     future.setError(1, "Folder sync failed: " + folder.normalizedPath());
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 58d2772..18b8dcf 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -24,6 +24,7 @@
 #include <KIMAP/KIMAP/SelectJob>
 #include <KIMAP/KIMAP/AppendJob>
 #include <KIMAP/KIMAP/CreateJob>
+#include <KIMAP/KIMAP/RenameJob>
 #include <KIMAP/KIMAP/DeleteJob>
 #include <KIMAP/KIMAP/StoreJob>
 #include <KIMAP/KIMAP/ExpungeJob>
@@ -113,6 +114,14 @@ KAsync::Job<void> ImapServerProxy::create(const QString &mailbox)
     return runJob(create);
 }
 
+KAsync::Job<void> ImapServerProxy::rename(const QString &mailbox, const QString &newMailbox)
+{
+    auto rename = new KIMAP::RenameJob(mSession);
+    rename->setSourceMailBox(mailbox);
+    rename->setDestinationMailBox(newMailbox);
+    return runJob(rename);
+}
+
 KAsync::Job<void> ImapServerProxy::remove(const QString &mailbox)
 {
     auto job = new KIMAP::DeleteJob(mSession);
@@ -216,10 +225,10 @@ KAsync::Job<void> ImapServerProxy::remove(const QString &mailbox, const QByteArr
     return select(mailbox).then<void>(store(set, QByteArrayList() << Flags::Deleted)).then<void>(expunge());
 }
 
-KAsync::Future<void> ImapServerProxy::fetchFolders(std::function<void(const QVector<Folder> &)> callback)
+KAsync::Job<void> ImapServerProxy::fetchFolders(std::function<void(const QVector<Folder> &)> callback)
 {
     Trace() << "Fetching folders";
-    auto job = list(KIMAP::ListJob::IncludeUnsubscribed, [callback](const QList<KIMAP::MailBoxDescriptor> &mailboxes, const QList<QList<QByteArray> > &flags){
+    return list(KIMAP::ListJob::IncludeUnsubscribed, [callback](const QList<KIMAP::MailBoxDescriptor> &mailboxes, const QList<QList<QByteArray> > &flags){
         QVector<Folder> list;
         for (const auto &mailbox : mailboxes) {
             Trace() << "Found mailbox: " << mailbox.name;
@@ -227,13 +236,12 @@ KAsync::Future<void> ImapServerProxy::fetchFolders(std::function<void(const QVec
         }
         callback(list);
     });
-    return job.exec();
 }
 
-KAsync::Future<void> ImapServerProxy::fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback)
+KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback)
 {
     Q_ASSERT(!mSeparatorCharacter.isNull());
-    auto job = select(folder.pathParts.join(mSeparatorCharacter)).then<void, KAsync::Job<void>>([this, callback, folder]() -> KAsync::Job<void> {
+    return select(folder.pathParts.join(mSeparatorCharacter)).then<void, KAsync::Job<void>>([this, callback, folder]() -> KAsync::Job<void> {
         return fetchHeaders(folder.pathParts.join(mSeparatorCharacter)).then<void, KAsync::Job<void>, QList<qint64>>([this, callback](const QList<qint64> &uidsToFetch){
             Trace() << "Uids to fetch: " << uidsToFetch;
             if (uidsToFetch.isEmpty()) {
@@ -251,5 +259,4 @@ KAsync::Future<void> ImapServerProxy::fetchMessages(const Folder &folder, std::f
         });
 
     });
-    return job.exec();
 }
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index a5a1296..cf315df 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -69,6 +69,7 @@ public:
     KAsync::Job<void> append(const QString &mailbox, const QByteArray &content, const QList<QByteArray> &flags = QList<QByteArray>(), const QDateTime &internalDate = QDateTime());
     KAsync::Job<void> store(const KIMAP::ImapSet &set, const QList<QByteArray> &flags);
     KAsync::Job<void> create(const QString &mailbox);
+    KAsync::Job<void> rename(const QString &mailbox, const QString &newMailbox);
     KAsync::Job<void> remove(const QString &mailbox);
     KAsync::Job<void> expunge();
 
@@ -87,8 +88,8 @@ public:
     KAsync::Job<QList<qint64>> fetchHeaders(const QString &mailbox);
     KAsync::Job<void> remove(const QString &mailbox, const QByteArray &imapSet);
 
-    KAsync::Future<void> fetchFolders(std::function<void(const QVector<Folder> &)> callback);
-    KAsync::Future<void> fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback);
+    KAsync::Job<void> fetchFolders(std::function<void(const QVector<Folder> &)> callback);
+    KAsync::Job<void> fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback);
 };
 
 }
diff --git a/examples/imapresource/tests/imapserverproxytest.cpp b/examples/imapresource/tests/imapserverproxytest.cpp
index b30cc33..3761dac 100644
--- a/examples/imapresource/tests/imapserverproxytest.cpp
+++ b/examples/imapresource/tests/imapserverproxytest.cpp
@@ -80,18 +80,13 @@ private slots:
     {
         ImapServerProxy imap("localhost", 993);
         VERIFYEXEC(imap.login("doe", "doe"));
-        auto future = imap.fetchFolders([](const QVector<Folder> &){});
-        future.waitForFinished();
-        QVERIFY(!future.errorCode());
+        VERIFYEXEC(imap.fetchFolders([](const QVector<Folder> &){}));
     }
 
     void testFetchFoldersFailure()
     {
         ImapServerProxy imap("foobar", 993);
-        auto future = imap.fetchFolders([](const QVector<Folder> &){});
-        auto future2 = future;
-        future2.waitForFinished();
-        QVERIFY(future2.errorCode());
+        VERIFYEXEC_FAIL(imap.fetchFolders([](const QVector<Folder> &){}));
     }
 
     void testFetchMail()