From b42047ad90470ecab329375fdacff03564c80074 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 18 Nov 2015 23:15:25 +0100
Subject: fixup

---
 common/facade.h                         | 7 ++-----
 examples/dummyresource/resourcefacade.h | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/facade.h b/common/facade.h
index 82fd5ff..f5c05f9 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -246,10 +246,8 @@ private:
         });
     }
 
-    ResultSet loadInitialResultSet(const QByteArray &parent, const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters)
+    ResultSet loadInitialResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters)
     {
-        Trace() << "Fetching initial set for parent:" << parent;
-        //TODO
         QSet<QByteArray> appliedFilters;
         auto resultSet = Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::queryIndexes(query, mResourceInstanceIdentifier, appliedFilters, transaction);
         remainingFilters = query.propertyFilter.keys().toSet() - appliedFilters;
@@ -264,7 +262,6 @@ private:
 
     ResultSet loadIncrementalResultSet(qint64 baseRevision, const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters)
     {
-        Trace() << "Loading incremental result set starting from revision: " << baseRevision;
         const auto bufferType = bufferTypeForDomainType();
         auto revisionCounter = QSharedPointer<qint64>::create(baseRevision);
         remainingFilters = query.propertyFilter.keys().toSet();
@@ -368,7 +365,7 @@ private:
         auto modifiedQuery = query;
         modifiedQuery.propertyFilter.insert("parent", parent);
         return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
-            return loadInitialResultSet(parent, modifiedQuery, transaction, remainingFilters);
+            return loadInitialResultSet(modifiedQuery, transaction, remainingFilters);
         }, resultProvider);
     }
 
diff --git a/examples/dummyresource/resourcefacade.h b/examples/dummyresource/resourcefacade.h
index aa2ab05..82e54fd 100644
--- a/examples/dummyresource/resourcefacade.h
+++ b/examples/dummyresource/resourcefacade.h
@@ -42,7 +42,7 @@ public:
     //Remove instance
     KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE;
     //Read configuration and available instances
-    KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProviderInterface<typename Akonadi2::ApplicationDomain::AkonadiResource::Ptr> > &resultProvider) Q_DECL_OVERRIDE;
+    KAsync::Job<void> load(const Akonadi2::Query &query, Akonadi2::ResultProviderInterface<typename Akonadi2::ApplicationDomain::AkonadiResource::Ptr> &resultProvider) Q_DECL_OVERRIDE;
 
 private:
     QSharedPointer<QSettings> getSettings();
-- 
cgit v1.2.3