4 files changed, 5 insertions, 14 deletions

diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 4d05721..22682d3 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -105,8 +105,7 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
                 .template then<void, qint64>([query, this](qint64 newRevision) {
                     //Only send the revision replayed information if we're connected to the resource, there's no need to start the resource otherwise.
                     mResourceAccess->sendRevisionReplayedCommand(newRevision);
-                })
-                .template then<void>([](){});
+                });
         });
         //Ensure the connection is open, if it wasn't already opened
         //TODO If we are not connected already, we have to check for the latest revision once connected, otherwise we could miss some updates
diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp
index 4a6f9b4..83558bd 100644
--- a/common/resourcecontrol.cpp
+++ b/common/resourcecontrol.cpp
@@ -53,9 +53,7 @@ KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier)
     [](int, const QString &) {
         Trace() << "Resource is already closed.";
         //Resource isn't started, nothing to shutdown
-    })
-    //FIXME JOBAPI this is only required because we don't care about the return value of connectToServer
-    .template then<void>([](){});
+    });
 }
 
 KAsync::Job<void> ResourceControl::start(const QByteArray &identifier)
@@ -81,9 +79,7 @@ KAsync::Job<void> ResourceControl::flushMessageQueue(const QByteArrayList &resou
         resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() {
             future.setFinished();
         }).exec();
-    })
-    //FIXME JOBAPI this is only required because we don't care about the return value of each (and each shouldn't even have a return value)
-    .template then<void>([](){});
+    });
 }
 
 KAsync::Job<void> ResourceControl::flushReplayQueue(const QByteArrayList &resourceIdentifier)
diff --git a/common/store.cpp b/common/store.cpp
index 7f93202..6f080b5 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -176,9 +176,7 @@ KAsync::Job<void> Store::synchronize(const Sink::Query &query)
         resourceAccess->synchronizeResource(true, false).then<void>([&future, resourceAccess]() {
             future.setFinished();
         }).exec();
-    })
-    //FIXME JOBAPI this is only required because we don't care about the return value of each (and each shouldn't even have a return value)
-    .template then<void>([](){});
+    });
 }
 
 template <class DomainType>
diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index d47a3ac..28a1d44 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -329,7 +329,6 @@ private Q_SLOTS:
                     .then(ResourceControl::flushReplayQueue(query.resources)) //The change needs to be replayed already
                     .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::ExistenceInspection(*mail, false)));
             });
-            // .then<void>([](){});
         })
         .exec();
         result.waitForFinished();
@@ -366,8 +365,7 @@ private Q_SLOTS:
                 .then<void>(ResourceControl::flushReplayQueue(query.resources)) //The change needs to be replayed already
                 .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, "unread", true)))
                 .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, "subject", mail->getProperty("subject"))));
-            })
-            .then<void>([](){});
+            });
         })
         .exec();
         result.waitForFinished();