Refactored the query part of the entity reader into DataStoreQuery.

DataStoreQuery now encapsulates the low-level query that operates
directly on the storage. It no longer has access to the resource
buffers, and is instantiated by the type implementation, so we can
specialize the query alogorithm per type, but not per resource.

This will allow us to implement the threading queries for the mailtype.

1 files changed, 3 insertions, 3 deletions

diff --git a/common/resultset.cpp b/common/resultset.cpp
index 293035b..51914e9 100644
--- a/common/resultset.cpp
+++ b/common/resultset.cpp
@@ -18,7 +18,7 @@
  */
 #include "resultset.h"
 
-#include "common/log.h"
+#include "log.h"
 
 ResultSet::ResultSet() : mIt(nullptr)
 {
@@ -78,12 +78,12 @@ bool ResultSet::next()
             return true;
         }
     } else {
-        next([](const Sink::ApplicationDomain::ApplicationDomainType::Ptr &value, Sink::Operation) { return false; });
+        next([](const QByteArray &, const Sink::EntityBuffer &, Sink::Operation) { return false; });
     }
     return false;
 }
 
-bool ResultSet::next(std::function<bool(const Sink::ApplicationDomain::ApplicationDomainType::Ptr &value, Sink::Operation)> callback)
+bool ResultSet::next(const Callback &callback)
 {
     Q_ASSERT(mValueGenerator);
     return mValueGenerator(callback);