19 files changed, 81 insertions, 81 deletions

diff --git a/common/changereplay.cpp b/common/changereplay.cpp
index 5d5afbb..224fb25 100644
--- a/common/changereplay.cpp
+++ b/common/changereplay.cpp
@@ -151,7 +151,7 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
                         return KAsync::value(KAsync::Break);
                     });
             }))
-        .syncThen<void>([this, lastReplayedRevision]() {
+        .then([this, lastReplayedRevision]() {
             recordReplayedRevision(*lastReplayedRevision);
             mMainStoreTransaction.abort();
             if (ChangeReplay::allChangesReplayed()) {
diff --git a/common/commandprocessor.cpp b/common/commandprocessor.cpp
index 7cd4a5f..87a120b 100644
--- a/common/commandprocessor.cpp
+++ b/common/commandprocessor.cpp
@@ -169,7 +169,7 @@ void CommandProcessor::process()
     }
     mProcessingLock = true;
     auto job = processPipeline()
-                    .syncThen<void>([this]() {
+                    .then([this]() {
                         mProcessingLock = false;
                         if (messagesToProcessAvailable()) {
                             process();
@@ -193,10 +193,10 @@ KAsync::Job<qint64> CommandProcessor::processQueuedCommand(const Sink::QueuedCom
         case Sink::Commands::InspectionCommand:
             Q_ASSERT(mInspector);
             return mInspector->processCommand(data, size)
-                    .syncThen<qint64>([]() { return -1; });
+                    .then(KAsync::value<qint64>(-1));
         case Sink::Commands::FlushCommand:
             return flush(data, size)
-                .syncThen<qint64>([]() { return -1; });
+                .then(KAsync::value<qint64>(-1));
         default:
             return KAsync::error<qint64>(-1, "Unhandled command");
     }
@@ -234,7 +234,7 @@ KAsync::Job<void> CommandProcessor::processQueue(MessageQueue *queue)
                     [this, time](const QByteArray &data) -> KAsync::Job<void> {
                         time->start();
                         return processQueuedCommand(data)
-                        .syncThen<void, qint64>([this, time](qint64 createdRevision) {
+                        .then([this, time](qint64 createdRevision) {
                             SinkTraceCtx(mLogCtx) << "Created revision " << createdRevision << ". Processing took: " << Log::TraceTime(time->elapsed());
                         });
                     })
@@ -251,7 +251,7 @@ KAsync::Job<void> CommandProcessor::processQueue(MessageQueue *queue)
                             }
                         });
             }))
-        .syncThen<void>([this](const KAsync::Error &) { mPipeline->commit(); });
+        .then([this](const KAsync::Error &) { mPipeline->commit(); });
 }
 
 KAsync::Job<void> CommandProcessor::processPipeline()
@@ -273,7 +273,7 @@ KAsync::Job<void> CommandProcessor::processPipeline()
 
             auto queue = it->next();
             return processQueue(queue)
-                .syncThen<KAsync::ControlFlowFlag>([this, time, it]() {
+                .then([this, time, it]() {
                     SinkTraceCtx(mLogCtx) << "Queue processed." << Log::TraceTime(time->elapsed());
                     if (it->hasNext()) {
                         return KAsync::Continue;
diff --git a/common/messagequeue.cpp b/common/messagequeue.cpp
index 0fcbf99..6e79d89 100644
--- a/common/messagequeue.cpp
+++ b/common/messagequeue.cpp
@@ -108,7 +108,7 @@ KAsync::Job<void> MessageQueue::dequeueBatch(int maxBatchSize, const std::functi
 
         // Trace() << "Waiting on " << waitCondition.size() << " results";
         KAsync::waitForCompletion(waitCondition)
-            .syncThen<void>([this, resultCount, &future]() {
+            .then([this, resultCount, &future]() {
                 processRemovals();
                 if (*resultCount == 0) {
                     future.setFinished();
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 4cb5f21..32f6454 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -279,7 +279,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
 
         SinkTraceCtx(d->logCtx) << "Moving entity to new resource " << newEntity.identifier() << newEntity.resourceInstanceIdentifier() << targetResource;
         auto job = TypeHelper<CreateHelper>{bufferType}.operator()<KAsync::Job<void>, ApplicationDomain::ApplicationDomainType&>(newEntity);
-        job = job.syncThen<void>([this, current, isMove, targetResource, bufferType](const KAsync::Error &error) {
+        job = job.then([this, current, isMove, targetResource, bufferType](const KAsync::Error &error) {
             if (!error) {
                 SinkTraceCtx(d->logCtx) << "Move of " << current.identifier() << "was successfull";
                 if (isMove) {
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index f1e21f4..6730894 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -94,7 +94,7 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
                 const auto  newRevisionAndReplayedEntities = worker.executeInitialQuery(query, parent, *resultProvider, offset, batchSize);
                 return newRevisionAndReplayedEntities;
             })
-                .template syncThen<void, ReplayResult>([this, parentId, query, parent, resultProvider, guardPtr](const ReplayResult &newRevisionAndReplayedEntities) {
+                .template then([this, parentId, query, parent, resultProvider, guardPtr](const ReplayResult &newRevisionAndReplayedEntities) {
                     if (!guardPtr) {
                         qWarning() << "The parent object is already gone";
                         return;
@@ -124,7 +124,7 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
                        const auto newRevisionAndReplayedEntities = worker.executeIncrementalQuery(query, *resultProvider);
                        return newRevisionAndReplayedEntities;
                    })
-                .template syncThen<void, ReplayResult>([query, this, resultProvider, guardPtr](const ReplayResult &newRevisionAndReplayedEntities) {
+                .template then([query, this, resultProvider, guardPtr](const ReplayResult &newRevisionAndReplayedEntities) {
                     if (!guardPtr) {
                         qWarning() << "The parent object is already gone";
                         return;
diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp
index c1fbf06..b24c902 100644
--- a/common/resourcecontrol.cpp
+++ b/common/resourcecontrol.cpp
@@ -64,7 +64,7 @@ KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier)
                                     future.setFinished();
                                 }
                             });
-                    }).syncThen<void>([time] {
+                    }).then([time] {
                         SinkTrace() << "Shutdown complete." << Log::TraceTime(time->elapsed());
                     });
             });
@@ -77,7 +77,7 @@ KAsync::Job<void> ResourceControl::start(const QByteArray &identifier)
     time->start();
     auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier, ResourceConfig::getResourceType(identifier));
     resourceAccess->open();
-    return resourceAccess->sendCommand(Sink::Commands::PingCommand).addToContext(resourceAccess).syncThen<void>([time]() { SinkTrace() << "Start complete." << Log::TraceTime(time->elapsed()); });
+    return resourceAccess->sendCommand(Sink::Commands::PingCommand).addToContext(resourceAccess).then([time]() { SinkTrace() << "Start complete." << Log::TraceTime(time->elapsed()); });
 }
 
 KAsync::Job<void> ResourceControl::flushMessageQueue(const QByteArrayList &resourceIdentifier)
diff --git a/common/store.cpp b/common/store.cpp
index 38445e5..b4ef2b7 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -263,7 +263,7 @@ KAsync::Job<void> Store::removeDataFromDisk(const QByteArray &identifier)
                 future.setFinished();
             }
         })
-        .syncThen<void>([time]() {
+        .then([time]() {
             SinkTrace() << "Remove from disk complete." << Log::TraceTime(time->elapsed());
         });
 }
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index a4e64c9..bb1a3f4 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -286,7 +286,7 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
     while (!mSyncRequestQueue.isEmpty()) {
         auto request = mSyncRequestQueue.takeFirst();
         if (request.requestType == Synchronizer::SyncRequest::Synchronization) {
-            job = job.syncThen<void>([this, request] {
+            job = job.then([this, request] {
                 Sink::Notification n;
                 n.id = request.requestId;
                 n.type = Notification::Status;
@@ -294,7 +294,7 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
                 n.code = ApplicationDomain::BusyStatus;
                 emit notify(n);
                 SinkLogCtx(mLogCtx) << "Synchronizing " << request.query;
-            }).then(synchronizeWithSource(request.query)).syncThen<void>([this] {
+            }).then(synchronizeWithSource(request.query)).then([this] {
                 //Commit after every request, so implementations only have to commit more if they add a lot of data.
                 commit();
             }).then<void>([this, request](const KAsync::Error &error) {
@@ -431,7 +431,7 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
         job = replay(mail, operation, oldRemoteId, modifiedProperties);
     }
 
-    return job.syncThen<void, QByteArray>([this, operation, type, uid, oldRemoteId](const QByteArray &remoteId) {
+    return job.then([this, operation, type, uid, oldRemoteId](const QByteArray &remoteId) {
         if (operation == Sink::Operation_Creation) {
             SinkTrace() << "Replayed creation with remote id: " << remoteId;
             if (remoteId.isEmpty()) {
@@ -453,7 +453,7 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
             SinkError() << "Unkown operation" << operation;
         }
     })
-    .syncThen<void>([this](const KAsync::Error &error) {
+    .then([this](const KAsync::Error &error) {
         if (error) {
             SinkWarning() << "Failed to replay change: " << error.errorMessage;
         }
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index a204f4c..c608b04 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -116,7 +116,7 @@ public:
         if (!parentFolderRid.isEmpty()) {
             folder.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, parentFolderRid));
         }
-        createOrModify(ApplicationDomain::getTypeName<ApplicationDomain::Folder>, remoteId, folder);
+        createOrModify(ApplicationDomain::getTypeName<ApplicationDomain::Folder>(), remoteId, folder);
         return remoteId;
     }
 
@@ -244,14 +244,14 @@ public:
 
                     modify(ENTITY_TYPE_MAIL, remoteId, mail);
                 })
-                .syncThen<void, SelectResult>([=](const SelectResult &selectResult) {
+                .then([=](const SelectResult &selectResult) {
                     SinkLogCtx(mLogCtx) << "Flags updated. New changedsince value: " << selectResult.highestModSequence;
                     syncStore().writeValue(folderRemoteId, "changedsince", QByteArray::number(selectResult.highestModSequence));
                 });
             } else {
                 //We hit this path on initial sync and simply record the current changedsince value
                 return imap->select(imap->mailboxFromFolder(folder))
-                .syncThen<void, SelectResult>([=](const SelectResult &selectResult) {
+                .then([=](const SelectResult &selectResult) {
                     SinkLogCtx(mLogCtx) << "No flags to update. New changedsince value: " << selectResult.highestModSequence;
                     syncStore().writeValue(folderRemoteId, "changedsince", QByteArray::number(selectResult.highestModSequence));
                 });
@@ -303,7 +303,7 @@ public:
                         commit();
                     }
                 })
-                .syncThen<void>([=]() {
+                .then([=]() {
                     SinkLogCtx(mLogCtx) << "UIDMAX: " << *maxUid << folder.path();
                     if (*maxUid > 0) {
                         syncStore().writeValue(folderRemoteId, "uidnext", QByteArray::number(*maxUid));
@@ -345,7 +345,7 @@ public:
                         }
                     });
                 })
-                .syncThen<void>([=]() {
+                .then([=]() {
                     SinkLogCtx(mLogCtx) << "Headers fetched: " << folder.path();
                     syncStore().writeValue(folderRemoteId, "headersFetched", "true");
                     commit();
@@ -359,7 +359,7 @@ public:
         //Finally remove messages that are no longer existing on the server.
         .then<void>([=]() {
             //TODO do an examine with QRESYNC and remove VANISHED messages if supported instead
-            return imap->fetchUids(folder).syncThen<void, QVector<qint64>>([=](const QVector<qint64> &uids) {
+            return imap->fetchUids(folder).then([=](const QVector<qint64> &uids) {
                 SinkTraceCtx(mLogCtx) << "Syncing removals: " << folder.path();
                 synchronizeRemovals(folderRemoteId, uids.toList().toSet());
                 commit();
@@ -425,7 +425,7 @@ public:
             .onError([](const KAsync::Error &error) {
                 SinkWarning() << "Folder list sync failed.";
             })
-            .syncThen<QVector<Folder>>([folderList]() { return *folderList; } );
+            .then([folderList]() { return *folderList; } );
         }
     }
 
@@ -439,7 +439,7 @@ public:
                 return  imap->fetchFolders([folderList](const Folder &folder) {
                     *folderList << folder;
                 })
-                .syncThen<void>([this, folderList]() {
+                .then([this, folderList]() {
                     synchronizeFolders(*folderList);
                 });
             })
@@ -537,7 +537,7 @@ public:
             QDateTime internalDate = mail.getDate();
             job = login.then(imap->append(mailbox, content, flags, internalDate))
                 .addToContext(imap)
-                .syncThen<QByteArray, qint64>([mail](qint64 uid) {
+                .then([mail](qint64 uid) {
                     const auto remoteId = assembleMailRid(mail, uid);
                     SinkTrace() << "Finished creating a new mail: " << remoteId;
                     return remoteId;
@@ -550,7 +550,7 @@ public:
             KIMAP2::ImapSet set;
             set.add(uid);
             job = login.then(imap->remove(mailbox, set))
-                .syncThen<QByteArray>([imap, oldRemoteId] {
+                .then([imap, oldRemoteId] {
                     SinkTrace() << "Finished removing a mail: " << oldRemoteId;
                     return QByteArray();
                 });
@@ -586,7 +586,7 @@ public:
                 job = login.then(imap->select(mailbox))
                     .addToContext(imap)
                     .then(imap->storeFlags(set, flags))
-                    .syncThen<QByteArray>([=] {
+                    .then([=] {
                         SinkTrace() << "Finished modifying mail";
                         return oldRemoteId;
                     });
@@ -616,13 +616,13 @@ public:
             SinkTrace() << "Creating a new folder: " << parentFolder << folder.getName();
             auto rid = QSharedPointer<QByteArray>::create();
             auto createFolder = login.then<QString>(imap->createSubfolder(parentFolder, folder.getName()))
-                .syncThen<void, QString>([imap, rid](const QString &createdFolder) {
+                .then([imap, rid](const QString &createdFolder) {
                     SinkTrace() << "Finished creating a new folder: " << createdFolder;
                     *rid = createdFolder.toUtf8();
                 });
             if (folder.getSpecialPurpose().isEmpty()) {
                 return createFolder
-                    .syncThen<QByteArray>([rid](){
+                    .then([rid](){
                         return *rid;
                     });
             } else { //We try to merge special purpose folders first
@@ -644,13 +644,13 @@ public:
                         }
                         SinkTrace() << "No match found for merging, creating a new folder";
                         return imap->createSubfolder(parentFolder, folder.getName())
-                            .syncThen<void, QString>([imap, rid](const QString &createdFolder) {
+                            .then([imap, rid](const QString &createdFolder) {
                                 SinkTrace() << "Finished creating a new folder: " << createdFolder;
                                 *rid = createdFolder.toUtf8();
                             });
 
                     })
-                .syncThen<QByteArray>([rid](){
+                .then([rid](){
                     return *rid;
                 });
                 return mergeJob;
@@ -658,7 +658,7 @@ public:
         } else if (operation == Sink::Operation_Removal) {
             SinkTrace() << "Removing a folder: " << oldRemoteId;
             return login.then<void>(imap->remove(oldRemoteId))
-                .syncThen<QByteArray>([oldRemoteId, imap]() {
+                .then([oldRemoteId, imap]() {
                     SinkTrace() << "Finished removing a folder: " << oldRemoteId;
                     return QByteArray();
                 });
@@ -666,11 +666,11 @@ public:
             SinkTrace() << "Renaming a folder: " << oldRemoteId << folder.getName();
             auto rid = QSharedPointer<QByteArray>::create();
             return login.then<QString>(imap->renameSubfolder(oldRemoteId, folder.getName()))
-                .syncThen<void, QString>([imap, rid](const QString &createdFolder) {
+                .then([imap, rid](const QString &createdFolder) {
                     SinkTrace() << "Finished renaming a folder: " << createdFolder;
                     *rid = createdFolder.toUtf8();
                 })
-                .syncThen<QByteArray>([rid](){
+                .then([rid](){
                     return *rid;
                 });
         }
@@ -731,7 +731,7 @@ protected:
             SinkTrace() << "as:" << mUser;
             auto inspectionJob = imap->login(mUser, mPassword)
                 .then<Imap::SelectResult>(imap->select(folderRemoteId))
-                .syncThen<void, Imap::SelectResult>([](Imap::SelectResult){})
+                .then([](Imap::SelectResult){})
                 .then<void>(imap->fetch(set, scope, [imap, messageByUid](const Imap::Message &message) {
                     messageByUid->insert(message.uid, message);
                 }));
@@ -792,7 +792,7 @@ protected:
                 auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
                 auto messageByUid = QSharedPointer<QHash<qint64, Imap::Message>>::create();
                 return imap->login(mUser, mPassword)
-                    .then<void>(imap->select(remoteId).syncThen<void>([](){}))
+                    .then<void>(imap->select(remoteId).then([](){}))
                     .then<void>(imap->fetch(set, scope, [=](const Imap::Message message) {
                         messageByUid->insert(message.uid, message);
                     }))
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index c16021e..a98483b 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -130,7 +130,7 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
     });
     auto namespaceJob = new KIMAP2::NamespaceJob(mSession);
 
-    return runJob(loginJob).then(runJob(capabilitiesJob)).syncThen<void>([this](){
+    return runJob(loginJob).then(runJob(capabilitiesJob)).then([this](){
         SinkTrace() << "Supported capabilities: " << mCapabilities;
         QStringList requiredExtensions = QStringList() << "UIDPLUS" << "NAMESPACE";
         for (const auto &requiredExtension : requiredExtensions) {
@@ -139,7 +139,7 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
                 //TODO fail the job
             }
         }
-    }).then(runJob(namespaceJob)).syncThen<void>([this, namespaceJob] {
+    }).then(runJob(namespaceJob)).then([this, namespaceJob] {
         for (const auto &ns :namespaceJob->personalNamespaces()) {
             mPersonalNamespaces << ns.name;
             mPersonalNamespaceSeparator = ns.separator;
@@ -324,7 +324,7 @@ KAsync::Job<QVector<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbo
 
                 list->append(result.uid);
             })
-    .syncThen<QVector<qint64>>([list](){
+    .then([list](){
         return *list;
     });
 }
@@ -378,7 +378,7 @@ KAsync::Job<QString> ImapServerProxy::createSubfolder(const QString &parentMailb
         }
         SinkTrace() << "Creating subfolder: " << *folder;
         return create(*folder)
-            .syncThen<QString>([=]() {
+            .then([=]() {
                 return *folder;
             });
     });
@@ -393,7 +393,7 @@ KAsync::Job<QString> ImapServerProxy::renameSubfolder(const QString &oldMailbox,
         auto folder = QSharedPointer<QString>::create(parts.join(mPersonalNamespaceSeparator) + mPersonalNamespaceSeparator + newName);
         SinkTrace() << "Renaming subfolder: " << oldMailbox << *folder;
         return rename(oldMailbox, *folder)
-            .syncThen<QString>([=]() {
+            .then([=]() {
                 return *folder;
             });
     });
@@ -436,7 +436,7 @@ KAsync::Job<SelectResult> ImapServerProxy::fetchFlags(const Folder &folder, cons
         scope.mode = KIMAP2::FetchJob::FetchScope::Flags;
         scope.changedSince = changedsince;
 
-        return fetch(set, scope, callback).syncThen<SelectResult>([selectResult] {
+        return fetch(set, scope, callback).then([selectResult] {
             return selectResult;
         });
     });
@@ -503,7 +503,7 @@ KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, const QVe
             callback(message);
         });
     })
-    .syncThen<void>([time]() {
+    .then([time]() {
         SinkTrace() << "The fetch took: " << Sink::Log::TraceTime(time->elapsed());
     });
 }
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 6ddb5d2..3d299b4 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -369,11 +369,11 @@ public:
         });
 
         if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
-            job = job.syncThen<void>([this] {
+            job = job.then([this] {
                 synchronizeFolders();
             });
         } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
-            job = job.syncThen<void>([this, query] {
+            job = job.then([this, query] {
                 QStringList folders;
                 if (query.hasFilter<ApplicationDomain::Mail::Folder>()) {
                     auto folderFilter = query.getFilter<ApplicationDomain::Mail::Folder>();
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index e475139..a4622f3 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -118,7 +118,7 @@ public:
                         });
                 });
             }
-            job = job.syncThen<void>([&future](const KAsync::Error &) {
+            job = job.then([&future](const KAsync::Error &) {
                 future.setFinished();
             });
             job.exec();
diff --git a/sinksh/syntax_modules/sink_sync.cpp b/sinksh/syntax_modules/sink_sync.cpp
index f90f055..250cd75 100644
--- a/sinksh/syntax_modules/sink_sync.cpp
+++ b/sinksh/syntax_modules/sink_sync.cpp
@@ -54,7 +54,7 @@ bool sync(const QStringList &args, State &state)
     QTimer::singleShot(0, [query, state]() {
     Sink::Store::synchronize(query)
         .then(Sink::ResourceControl::flushMessageQueue(query.getResourceFilter().ids))
-        .syncThen<void>([state](const KAsync::Error &error) {
+        .then([state](const KAsync::Error &error) {
             if (error) {
                 state.printLine("Synchronization failed!");
             } else {
diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index cce5c7b..0ab18ef 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -39,7 +39,7 @@ private slots:
         account.setIcon(accountIcon);
         Store::create(account).exec().waitForFinished();
 
-        Store::fetchAll<SinkAccount>(Query()).syncThen<void, QList<SinkAccount::Ptr>>([&](const QList<SinkAccount::Ptr> &accounts) {
+        Store::fetchAll<SinkAccount>(Query()).then([&](const QList<SinkAccount::Ptr> &accounts) {
             QCOMPARE(accounts.size(), 1);
             auto account = accounts.first();
             QCOMPARE(account->getAccountType(), QString("maildir"));
@@ -60,7 +60,7 @@ private slots:
         Store::create(resource).exec().waitForFinished();
 
 
-        Store::fetchAll<SinkResource>(Query()).syncThen<void, QList<SinkResource::Ptr>>([&](const QList<SinkResource::Ptr> &resources) {
+        Store::fetchAll<SinkResource>(Query()).then([&](const QList<SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 1);
             auto resource = resources.first();
             QCOMPARE(resource->getResourceType(), QByteArray("sink.mailtransport"));
@@ -74,7 +74,7 @@ private slots:
         identity.setAccount(account.identifier());
         Store::create(identity).exec().waitForFinished();
 
-        Store::fetchAll<Identity>(Query()).syncThen<void, QList<Identity::Ptr>>([&](const QList<Identity::Ptr> &identities) {
+        Store::fetchAll<Identity>(Query()).then([&](const QList<Identity::Ptr> &identities) {
             QCOMPARE(identities.size(), 1);
             QCOMPARE(identities.first()->getName(), smtpServer);
             QCOMPARE(identities.first()->getAddress(), smtpUsername);
@@ -85,7 +85,7 @@ private slots:
 
         Store::remove(resource).exec().waitForFinished();
 
-        Store::fetchAll<SinkResource>(Query()).syncThen<void, QList<SinkResource::Ptr>>([](const QList<SinkResource::Ptr> &resources) {
+        Store::fetchAll<SinkResource>(Query()).then([](const QList<SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 0);
         })
         .exec().waitForFinished();
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 544b981..8fc76df 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -276,7 +276,7 @@ private slots:
 
         bool gotValue = false;
         auto result = Sink::Store::fetchOne<Sink::ApplicationDomain::Event>(query)
-                          .syncThen<void, Sink::ApplicationDomain::Event>([&gotValue](const Sink::ApplicationDomain::Event &event) { gotValue = true; })
+                          .then([&gotValue](const Sink::ApplicationDomain::Event &event) { gotValue = true; })
                           .exec();
         result.waitForFinished();
         QVERIFY(!result.errorCode());
diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index 96a2daa..d3b0fe3 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -68,7 +68,7 @@ void MailSyncTest::testListFolders()
     //First figure out how many folders we have by default
     {
         auto job = Store::fetchAll<Folder>(Query())
-            .syncThen<void, QList<Folder::Ptr>>([&](const QList<Folder::Ptr> &folders) {
+            .then([&](const QList<Folder::Ptr> &folders) {
                 QStringList names;
                 for (const auto &folder : folders) {
                     names << folder->getName();
@@ -87,7 +87,7 @@ void MailSyncTest::testListFolders()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([=](const QList<Folder::Ptr> &folders) {
         QStringList names;
         QHash<QByteArray, QByteArray> specialPurposeFolders;
         for (const auto &folder : folders) {
@@ -128,7 +128,7 @@ void MailSyncTest::testListNewFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -153,7 +153,7 @@ void MailSyncTest::testListRemovedFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -178,7 +178,7 @@ void MailSyncTest::testListFolderHierarchy()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([=](const QList<Folder::Ptr> &folders) {
         QHash<QString, Folder::Ptr> map;
         for (const auto &folder : folders) {
             map.insert(folder->getName(), folder);
@@ -221,7 +221,7 @@ void MailSyncTest::testListNewSubFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -249,7 +249,7 @@ void MailSyncTest::testListRemovedSubFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -269,7 +269,7 @@ void MailSyncTest::testListMails()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+    auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
         QCOMPARE(mails.size(), 1);
         QVERIFY(mails.first()->getSubject().startsWith(QString("[Nepomuk] Jenkins build is still unstable")));
         const auto data = mails.first()->getMimeMessage();
@@ -298,7 +298,7 @@ void MailSyncTest::testResyncMails()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+    auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
         QCOMPARE(mails.size(), 1);
     });
     VERIFYEXEC(job);
@@ -323,7 +323,7 @@ void MailSyncTest::testFetchNewRemovedMessages()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 2);
         });
         VERIFYEXEC(job);
@@ -335,7 +335,7 @@ void MailSyncTest::testFetchNewRemovedMessages()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 1);
         });
         VERIFYEXEC(job);
@@ -358,7 +358,7 @@ void MailSyncTest::testFlagChange()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 0);
         });
         VERIFYEXEC(job);
@@ -371,7 +371,7 @@ void MailSyncTest::testFlagChange()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 1);
             QVERIFY(mails.first()->getImportant());
         });
@@ -387,7 +387,7 @@ void MailSyncTest::testSyncSingleFolder()
 
     Folder::Ptr folder;
     {
-        auto job = Store::fetchAll<Folder>(Sink::Query{}.resourceFilter(mResourceInstanceIdentifier).filter<Folder::Name>("test")).template syncThen<void, QList<Folder::Ptr>>([&](const QList<Folder::Ptr> &folders) {
+        auto job = Store::fetchAll<Folder>(Sink::Query{}.resourceFilter(mResourceInstanceIdentifier).filter<Folder::Name>("test")).template then([&](const QList<Folder::Ptr> &folders) {
             QCOMPARE(folders.size(), 1);
             folder = folders.first();
         });
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index fe28cde..c51fc56 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -67,7 +67,7 @@ void MailTest::testCreateModifyDeleteFolder()
     //First figure out how many folders we have by default
     {
         auto job = Store::fetchAll<Folder>(Query())
-            .syncThen<void, QList<Folder::Ptr>>([&](const QList<Folder::Ptr> &folders) {
+            .then([&](const QList<Folder::Ptr> &folders) {
                 baseCount = folders.size();
             });
         VERIFYEXEC(job);
@@ -84,7 +84,7 @@ void MailTest::testCreateModifyDeleteFolder()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Folder>(Query().request<Folder::Name>().request<Folder::Icon>())
-            .syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+            .then([=](const QList<Folder::Ptr> &folders) {
                 QCOMPARE(folders.size(), baseCount + 1);
                 QHash<QString, Folder::Ptr> foldersByName;
                 for (const auto &folder : folders) {
@@ -110,7 +110,7 @@ void MailTest::testCreateModifyDeleteFolder()
         VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
         {
             auto job = Store::fetchAll<Folder>(Query().request<Folder::Name>().request<Folder::Icon>())
-                .syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+                .then([=](const QList<Folder::Ptr> &folders) {
                     QCOMPARE(folders.size(), baseCount + 1);
                     QHash<QString, Folder::Ptr> foldersByName;
                     for (const auto &folder : folders) {
@@ -131,7 +131,7 @@ void MailTest::testCreateModifyDeleteFolder()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Folder>(Query().request<Folder::Name>().request<Folder::Icon>())
-            .syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+            .then([=](const QList<Folder::Ptr> &folders) {
                 QCOMPARE(folders.size(), baseCount);
             });
         VERIFYEXEC(job);
@@ -161,7 +161,7 @@ void MailTest::testCreateModifyDeleteMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 QCOMPARE(mail.getSubject(), subject);
@@ -190,7 +190,7 @@ void MailTest::testCreateModifyDeleteMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 QCOMPARE(mail.getSubject(), subject2);
@@ -212,7 +212,7 @@ void MailTest::testCreateModifyDeleteMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 0);
             });
         VERIFYEXEC(job);
@@ -248,7 +248,7 @@ void MailTest::testMoveMail()
     Mail modifiedMail;
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=, &modifiedMail](const QList<Mail::Ptr> &mails) {
+            .then([=, &modifiedMail](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 modifiedMail = mail;
@@ -267,7 +267,7 @@ void MailTest::testMoveMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 QCOMPARE(mail.getFolder(), folder1.identifier());
diff --git a/tests/mailthreadtest.cpp b/tests/mailthreadtest.cpp
index 3684514..82f9331 100644
--- a/tests/mailthreadtest.cpp
+++ b/tests/mailthreadtest.cpp
@@ -179,7 +179,7 @@ void MailThreadTest::testIndexInMixedOrder()
     /* VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier)); */
     /* { */
     /*     auto job = Store::fetchAll<Mail>(Query::RequestedProperties(QByteArrayList() << Mail::Folder::name << Mail::Subject::name)) */
-    /*         .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) { */
+    /*         .then([=](const QList<Mail::Ptr> &mails) { */
     /*             QCOMPARE(mails.size(), 0); */
     /*         }); */
     /*     VERIFYEXEC(job); */
diff --git a/tests/resourcecommunicationtest.cpp b/tests/resourcecommunicationtest.cpp
index 201db53..7beafc7 100644
--- a/tests/resourcecommunicationtest.cpp
+++ b/tests/resourcecommunicationtest.cpp
@@ -51,7 +51,7 @@ private slots:
         int errors = 0;
         for (int i = 0; i < count; i++) {
             auto result = resourceAccess.sendCommand(Sink::Commands::PingCommand)
-                                .syncThen<void>([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
+                                .then([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
                                     complete++;
                                     if (error) {
                                         qWarning() << error.errorMessage;
@@ -77,7 +77,7 @@ private slots:
         int errors = 0;
         for (int i = 0; i < count; i++) {
             resourceAccess.sendCommand(Sink::Commands::PingCommand)
-                .syncThen<void>([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
+                .then([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
                     complete++;
                     if (error) {
                         qWarning() << error.errorMessage;
@@ -104,7 +104,7 @@ private slots:
             auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resourceIdentifier, "");
             weakRef = resourceAccess.toWeakRef();
             resourceAccess->open();
-            resourceAccess->sendCommand(Sink::Commands::PingCommand).syncThen<void>([resourceAccess]() { qDebug() << "Ping complete";  }).exec();
+            resourceAccess->sendCommand(Sink::Commands::PingCommand).then([resourceAccess]() { qDebug() << "Ping complete";  }).exec();
         }
         QVERIFY(weakRef.toStrongRef());
         QTRY_VERIFY(!weakRef.toStrongRef());