diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-10-17 22:35:27 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-10-21 09:18:49 +0200 |
commit | 2a9c738b813133d398683596df6d41d355e3cb3b (patch) | |
tree | addb16588fd31f8773120ba5600d82079fa9fd9e /common/datastorequery.h | |
parent | e661bd33b7bf8da546cbdbe23c9ddcf568930a1a (diff) | |
download | sink-2a9c738b813133d398683596df6d41d355e3cb3b.tar.gz sink-2a9c738b813133d398683596df6d41d355e3cb3b.zip |
We no longer access the typeindex directly
Diffstat (limited to 'common/datastorequery.h')
-rw-r--r-- | common/datastorequery.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/common/datastorequery.h b/common/datastorequery.h index 4cf25b2..77c8ed5 100644 --- a/common/datastorequery.h +++ b/common/datastorequery.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #include "query.h" | 21 | #include "query.h" |
22 | #include "storage.h" | 22 | #include "storage.h" |
23 | #include "resultset.h" | 23 | #include "resultset.h" |
24 | #include "typeindex.h" | ||
25 | #include "query.h" | 24 | #include "query.h" |
26 | #include "entitybuffer.h" | 25 | #include "entitybuffer.h" |
27 | #include "log.h" | 26 | #include "log.h" |
@@ -36,7 +35,7 @@ class DataStoreQuery { | |||
36 | public: | 35 | public: |
37 | typedef QSharedPointer<DataStoreQuery> Ptr; | 36 | typedef QSharedPointer<DataStoreQuery> Ptr; |
38 | 37 | ||
39 | DataStoreQuery(const Sink::Query &query, const QByteArray &type, Sink::Storage::EntityStore::Ptr store, TypeIndex &typeIndex, std::function<QVariant(const Sink::Entity &entity, const QByteArray &property)> getProperty); | 38 | DataStoreQuery(const Sink::Query &query, const QByteArray &type, Sink::Storage::EntityStore::Ptr store, std::function<QVariant(const Sink::Entity &entity, const QByteArray &property)> getProperty); |
40 | ResultSet execute(); | 39 | ResultSet execute(); |
41 | ResultSet update(qint64 baseRevision); | 40 | ResultSet update(qint64 baseRevision); |
42 | 41 | ||
@@ -58,7 +57,6 @@ private: | |||
58 | 57 | ||
59 | Sink::Query mQuery; | 58 | Sink::Query mQuery; |
60 | const QByteArray mType; | 59 | const QByteArray mType; |
61 | TypeIndex &mTypeIndex; | ||
62 | std::function<QVariant(const Sink::Entity &entity, const QByteArray &property)> mGetProperty; | 60 | std::function<QVariant(const Sink::Entity &entity, const QByteArray &property)> mGetProperty; |
63 | bool mInitialQuery; | 61 | bool mInitialQuery; |
64 | QSharedPointer<FilterBase> mCollector; | 62 | QSharedPointer<FilterBase> mCollector; |