summaryrefslogtreecommitdiffstats
path: root/common/facade.h
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2015-11-18 23:15:25 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2015-11-18 23:15:25 +0100
commitb42047ad90470ecab329375fdacff03564c80074 (patch)
treeabcbd6bc6d13714aebb7e7241aca5325738a84fc /common/facade.h
parent0f24357d01bd8a278f03793db863d3f71ac37ef2 (diff)
downloadsink-b42047ad90470ecab329375fdacff03564c80074.tar.gz
sink-b42047ad90470ecab329375fdacff03564c80074.zip
fixup
Diffstat (limited to 'common/facade.h')
-rw-r--r--common/facade.h7
1 files changed, 2 insertions, 5 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:
246 }); 246 });
247 } 247 }
248 248
249 ResultSet loadInitialResultSet(const QByteArray &parent, const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) 249 ResultSet loadInitialResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters)
250 { 250 {
251 Trace() << "Fetching initial set for parent:" << parent;
252 //TODO
253 QSet<QByteArray> appliedFilters; 251 QSet<QByteArray> appliedFilters;
254 auto resultSet = Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::queryIndexes(query, mResourceInstanceIdentifier, appliedFilters, transaction); 252 auto resultSet = Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::queryIndexes(query, mResourceInstanceIdentifier, appliedFilters, transaction);
255 remainingFilters = query.propertyFilter.keys().toSet() - appliedFilters; 253 remainingFilters = query.propertyFilter.keys().toSet() - appliedFilters;
@@ -264,7 +262,6 @@ private:
264 262
265 ResultSet loadIncrementalResultSet(qint64 baseRevision, const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) 263 ResultSet loadIncrementalResultSet(qint64 baseRevision, const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters)
266 { 264 {
267 Trace() << "Loading incremental result set starting from revision: " << baseRevision;
268 const auto bufferType = bufferTypeForDomainType(); 265 const auto bufferType = bufferTypeForDomainType();
269 auto revisionCounter = QSharedPointer<qint64>::create(baseRevision); 266 auto revisionCounter = QSharedPointer<qint64>::create(baseRevision);
270 remainingFilters = query.propertyFilter.keys().toSet(); 267 remainingFilters = query.propertyFilter.keys().toSet();
@@ -368,7 +365,7 @@ private:
368 auto modifiedQuery = query; 365 auto modifiedQuery = query;
369 modifiedQuery.propertyFilter.insert("parent", parent); 366 modifiedQuery.propertyFilter.insert("parent", parent);
370 return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet { 367 return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
371 return loadInitialResultSet(parent, modifiedQuery, transaction, remainingFilters); 368 return loadInitialResultSet(modifiedQuery, transaction, remainingFilters);
372 }, resultProvider); 369 }, resultProvider);
373 } 370 }
374 371