diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-20 19:07:07 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-20 19:07:07 +0100 |
commit | bdb01c2c068df326f5a8328ed1492ab1bea388c5 (patch) | |
tree | 25c2ee1b29bc481b6914c244ed9ca194b1415d16 /common/modelresult.cpp | |
parent | 17e7ee40c9185c0505883853345fd6024c675b1a (diff) | |
download | sink-bdb01c2c068df326f5a8328ed1492ab1bea388c5.tar.gz sink-bdb01c2c068df326f5a8328ed1492ab1bea388c5.zip |
Renamed Akonadi2 to Sink
(except for documentation).
Diffstat (limited to 'common/modelresult.cpp')
-rw-r--r-- | common/modelresult.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/common/modelresult.cpp b/common/modelresult.cpp index 22798d9..3a9fb95 100644 --- a/common/modelresult.cpp +++ b/common/modelresult.cpp | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "domain/folder.h" | 24 | #include "domain/folder.h" |
25 | #include "log.h" | 25 | #include "log.h" |
26 | 26 | ||
27 | static uint qHash(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) | 27 | static uint qHash(const Sink::ApplicationDomain::ApplicationDomainType &type) |
28 | { | 28 | { |
29 | Q_ASSERT(!type.resourceInstanceIdentifier().isEmpty()); | 29 | Q_ASSERT(!type.resourceInstanceIdentifier().isEmpty()); |
30 | Q_ASSERT(!type.identifier().isEmpty()); | 30 | Q_ASSERT(!type.identifier().isEmpty()); |
@@ -32,7 +32,7 @@ static uint qHash(const Akonadi2::ApplicationDomain::ApplicationDomainType &typ | |||
32 | } | 32 | } |
33 | 33 | ||
34 | template<class T, class Ptr> | 34 | template<class T, class Ptr> |
35 | ModelResult<T, Ptr>::ModelResult(const Akonadi2::Query &query, const QList<QByteArray> &propertyColumns) | 35 | ModelResult<T, Ptr>::ModelResult(const Sink::Query &query, const QList<QByteArray> &propertyColumns) |
36 | :QAbstractItemModel(), | 36 | :QAbstractItemModel(), |
37 | mPropertyColumns(propertyColumns), | 37 | mPropertyColumns(propertyColumns), |
38 | mQuery(query) | 38 | mQuery(query) |
@@ -53,7 +53,7 @@ qint64 ModelResult<T, Ptr>::parentId(const Ptr &value) | |||
53 | if (!mQuery.parentProperty.isEmpty()) { | 53 | if (!mQuery.parentProperty.isEmpty()) { |
54 | const auto identifier = value->getProperty(mQuery.parentProperty).toByteArray(); | 54 | const auto identifier = value->getProperty(mQuery.parentProperty).toByteArray(); |
55 | if (!identifier.isEmpty()) { | 55 | if (!identifier.isEmpty()) { |
56 | return qHash(T(value->resourceInstanceIdentifier(), identifier, 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>())); | 56 | return qHash(T(value->resourceInstanceIdentifier(), identifier, 0, QSharedPointer<Sink::ApplicationDomain::BufferAdaptor>())); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | return 0; | 59 | return 0; |
@@ -91,7 +91,7 @@ QVariant ModelResult<T, Ptr>::data(const QModelIndex &index, int role) const | |||
91 | } | 91 | } |
92 | if (role == DomainObjectBaseRole) { | 92 | if (role == DomainObjectBaseRole) { |
93 | Q_ASSERT(mEntities.contains(index.internalId())); | 93 | Q_ASSERT(mEntities.contains(index.internalId())); |
94 | return QVariant::fromValue(mEntities.value(index.internalId()). template staticCast<Akonadi2::ApplicationDomain::ApplicationDomainType>()); | 94 | return QVariant::fromValue(mEntities.value(index.internalId()). template staticCast<Sink::ApplicationDomain::ApplicationDomainType>()); |
95 | } | 95 | } |
96 | if (role == ChildrenFetchedRole) { | 96 | if (role == ChildrenFetchedRole) { |
97 | return childrenFetched(index); | 97 | return childrenFetched(index); |
@@ -226,7 +226,7 @@ void ModelResult<T, Ptr>::setFetcher(const std::function<void(const Ptr &parent) | |||
226 | } | 226 | } |
227 | 227 | ||
228 | template<class T, class Ptr> | 228 | template<class T, class Ptr> |
229 | void ModelResult<T, Ptr>::setEmitter(const typename Akonadi2::ResultEmitter<Ptr>::Ptr &emitter) | 229 | void ModelResult<T, Ptr>::setEmitter(const typename Sink::ResultEmitter<Ptr>::Ptr &emitter) |
230 | { | 230 | { |
231 | setFetcher([this](const Ptr &parent) {mEmitter->fetch(parent);}); | 231 | setFetcher([this](const Ptr &parent) {mEmitter->fetch(parent);}); |
232 | emitter->onAdded([this](const Ptr &value) { | 232 | emitter->onAdded([this](const Ptr &value) { |
@@ -272,7 +272,7 @@ void ModelResult<T, Ptr>::modify(const Ptr &value) | |||
272 | emit dataChanged(idx, idx); | 272 | emit dataChanged(idx, idx); |
273 | } | 273 | } |
274 | 274 | ||
275 | template class ModelResult<Akonadi2::ApplicationDomain::Folder, Akonadi2::ApplicationDomain::Folder::Ptr>; | 275 | template class ModelResult<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Folder::Ptr>; |
276 | template class ModelResult<Akonadi2::ApplicationDomain::Mail, Akonadi2::ApplicationDomain::Mail::Ptr>; | 276 | template class ModelResult<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Mail::Ptr>; |
277 | template class ModelResult<Akonadi2::ApplicationDomain::Event, Akonadi2::ApplicationDomain::Event::Ptr>; | 277 | template class ModelResult<Sink::ApplicationDomain::Event, Sink::ApplicationDomain::Event::Ptr>; |
278 | template class ModelResult<Akonadi2::ApplicationDomain::AkonadiResource, Akonadi2::ApplicationDomain::AkonadiResource::Ptr>; | 278 | template class ModelResult<Sink::ApplicationDomain::SinkResource, Sink::ApplicationDomain::SinkResource::Ptr>; |