The parent is always an object, so we might as well make that explicit

4 files changed, 18 insertions, 22 deletions

diff --git a/common/facade.h b/common/facade.h
index d150d60..8b8a2a8 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -172,7 +172,7 @@ public:
     KAsync::Job<void> load(const Akonadi2::Query &query, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider) Q_DECL_OVERRIDE
     {
         //We delegate loading of initial data to the result provider, os it can decide for itself what it needs to load.
-        resultProvider.setFetcher([this, query, &resultProvider](const QByteArray &parent) {
+        resultProvider.setFetcher([this, query, &resultProvider](const typename DomainType::Ptr &parent) {
             const qint64 newRevision = executeInitialQuery(query, parent, resultProvider);
             mResourceAccess->sendRevisionReplayedCommand(newRevision);
         });
@@ -358,11 +358,16 @@ private:
         }, resultProvider);
     }
 
-    qint64 executeInitialQuery(const Akonadi2::Query &query, const QByteArray &parent, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
+    qint64 executeInitialQuery(const Akonadi2::Query &query, const typename DomainType::Ptr &parent, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
     {
-        Trace() << "Running initial query for parent:" << parent;
         auto modifiedQuery = query;
-        modifiedQuery.propertyFilter.insert("parent", parent);
+        if (parent) {
+            Trace() << "Running initial query for parent:" << parent->identifier();
+            modifiedQuery.propertyFilter.insert("parent", parent->identifier());
+        } else {
+            Trace() << "Running initial query for toplevel";
+            modifiedQuery.propertyFilter.insert("parent", QVariant());
+        }
         return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
             return loadInitialResultSet(modifiedQuery, transaction, remainingFilters);
         }, resultProvider);
diff --git a/common/modelresult.h b/common/modelresult.h
index 1675e60..26f96d8 100644
--- a/common/modelresult.h
+++ b/common/modelresult.h
@@ -179,20 +179,11 @@ public:
     {
         const auto id = getIdentifier(parent);
         mEntityChildrenFetched[id] = true;
-        QByteArray parentIdentifier;
-        if (!parent.isValid()) {
-            qDebug() << "no parent";
-        } else {
-            qDebug() << "parent is valid";
-            auto object = parent.data(DomainObjectRole).template value<Ptr>();
-            Q_ASSERT(object);
-            parentIdentifier = object->identifier();
-        }
-        Trace() << "Loading child entities of: " << parentIdentifier;
-        loadEntities(parentIdentifier);
+        Trace() << "Loading child entities";
+        loadEntities(parent.data(DomainObjectRole).template value<Ptr>());
     }
 
-    void setFetcher(const std::function<void(const QByteArray &parent)> &fetcher)
+    void setFetcher(const std::function<void(const Ptr &parent)> &fetcher)
     {
         Trace() << "Setting fetcher";
         loadEntities = fetcher;
@@ -206,6 +197,6 @@ private:
     QMap<qint64 /* entity id */, bool> mEntityChildrenFetched;
     QList<QByteArray> mPropertyColumns;
     Akonadi2::Query mQuery;
-    std::function<void(const QByteArray &)> loadEntities;
+    std::function<void(const Ptr &)> loadEntities;
 };
 
diff --git a/common/resultprovider.h b/common/resultprovider.h
index 0d23127..921cd6b 100644
--- a/common/resultprovider.h
+++ b/common/resultprovider.h
@@ -53,7 +53,7 @@ public:
     virtual void initialResultSetComplete() = 0;
     virtual void complete() = 0;
     virtual void clear() = 0;
-    virtual void setFetcher(const std::function<void(const QByteArray &parent)> &fetcher)
+    virtual void setFetcher(const std::function<void(const T &parent)> &fetcher)
     {
     }
 
@@ -141,7 +141,7 @@ public:
         return true;
     }
 
-    void setFetcher(const std::function<void(const QByteArray &parent)> &fetcher)
+    void setFetcher(const std::function<void(const Ptr &parent)> &fetcher)
     {
         if (auto model = mModel.toStrongRef()) {
             model->setFetcher(fetcher);
@@ -297,9 +297,9 @@ public:
         return mResultEmitter.toStrongRef().isNull();
     }
 
-    void setFetcher(const std::function<void(const QByteArray &parent)> &fetcher)
+    void setFetcher(const std::function<void(const T &parent)> &fetcher)
     {
-        fetcher(QByteArray());
+        fetcher(T());
     }
 
 private:
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 9202e29..ce11221 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -30,7 +30,7 @@ public:
     KAsync::Job<void> load(const Akonadi2::Query &query, Akonadi2::ResultProviderInterface<typename T::Ptr> &resultProvider) Q_DECL_OVERRIDE
     {
         capturedResultProvider = &resultProvider;
-        resultProvider.setFetcher([query, &resultProvider, this](const QByteArray &) {
+        resultProvider.setFetcher([query, &resultProvider, this](const typename T::Ptr &) {
              for (const auto &res : results) {
                 qDebug() << "Parent filter " << query.propertyFilter.value("parent").toByteArray() << res->identifier();
                 if (!query.propertyFilter.contains("parent") || query.propertyFilter.value("parent").toByteArray() == res->getProperty("parent").toByteArray()) {