3 files changed, 4 insertions, 36 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index 29b7e68..b732205 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -37,26 +37,6 @@
 #include "modelresult.h"
 #include "log.h"
 
-#define ASYNCINTHREAD
-
-namespace async
-{
-    static void run(const std::function<void()> &runner) {
-        auto timer = new QTimer();
-        timer->setSingleShot(true);
-        QObject::connect(timer, &QTimer::timeout, [runner, timer]() {
-            delete timer;
-#ifndef ASYNCINTHREAD
-            runner();
-#else
-            QtConcurrent::run(runner);
-#endif
-        });
-        timer->start(0);
-    };
-} // namespace async
-
-
 namespace Akonadi2
 {
 
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 652154d..66f5dcf 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -85,8 +85,8 @@ public Q_SLOTS:
     }
 
 private:
-    Akonadi2::Storage mChangeReplayStore;
     Akonadi2::Storage mStorage;
+    Akonadi2::Storage mChangeReplayStore;
     ReplayFunction mReplayFunction;
 };
 
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index e365cfc..9f6d23f 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -53,27 +53,17 @@ static inline ResultSet fullScan(const Akonadi2::Storage::Transaction &transacti
 template<class DomainType>
 QueryRunner<DomainType>::QueryRunner(const Akonadi2::Query &query, const Akonadi2::ResourceAccessInterface::Ptr &resourceAccess, const QByteArray &instanceIdentifier, const DomainTypeAdaptorFactoryInterface::Ptr &factory, const QByteArray &bufferType)
     : QueryRunnerBase(),
-    mResourceAccess(resourceAccess),
     mResultProvider(new ResultProvider<typename DomainType::Ptr>),
+    mResourceAccess(resourceAccess),
     mDomainTypeAdaptorFactory(factory),
-    mQuery(query),
     mResourceInstanceIdentifier(instanceIdentifier),
-    mBufferType(bufferType)
+    mBufferType(bufferType),
+    mQuery(query)
 {
     Trace() << "Starting query";
     //We delegate loading of initial data to the result provider, os it can decide for itself what it needs to load.
     mResultProvider->setFetcher([this, query](const typename DomainType::Ptr &parent) {
         Trace() << "Running fetcher";
-
-        // auto watcher = new QFutureWatcher<qint64>;
-        // QObject::connect(watcher, &QFutureWatcher::finished, [](qint64 newRevision) {
-        //     mResourceAccess->sendRevisionReplayedCommand(newRevision);
-        // });
-        // auto future = QtConcurrent::run([&resultProvider]() -> qint64 {
-        //     const qint64 newRevision = executeInitialQuery(query, parent, resultProvider);
-        //     return newRevision;
-        // });
-        // watcher->setFuture(future);
         const qint64 newRevision = executeInitialQuery(query, parent, *mResultProvider);
         mResourceAccess->sendRevisionReplayedCommand(newRevision);
     });
@@ -109,11 +99,9 @@ typename Akonadi2::ResultEmitter<typename DomainType::Ptr>::Ptr QueryRunner<Doma
     return mResultProvider->emitter();
 }
 
-//TODO move into result provider?
 template<class DomainType>
 void QueryRunner<DomainType>::replaySet(ResultSet &resultSet, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
 {
-    // Trace() << "Replay set";
     int counter = 0;
     while (resultSet.next([&resultProvider, &counter](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value, Akonadi2::Operation operation) -> bool {
         counter++;