diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-06-13 09:11:37 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-06-13 09:11:37 +0200 |
commit | 1e2e4437094d80f1cdd849c7341019910fc29fb1 (patch) | |
tree | 5f75e3dab8da864eab8a51c06be205a24e185dcb /common/entityreader.cpp | |
parent | 3fa1766af3fa85067d4b2d48c8410e6c201ae323 (diff) | |
download | sink-1e2e4437094d80f1cdd849c7341019910fc29fb1.tar.gz sink-1e2e4437094d80f1cdd849c7341019910fc29fb1.zip |
Get folder moves to work, and fix the mime message moving.
Diffstat (limited to 'common/entityreader.cpp')
-rw-r--r-- | common/entityreader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/entityreader.cpp b/common/entityreader.cpp index b29b2a3..a3ca8e2 100644 --- a/common/entityreader.cpp +++ b/common/entityreader.cpp | |||
@@ -85,7 +85,9 @@ EntityReader<DomainType>::EntityReader(const QByteArray &resourceType, const QBy | |||
85 | mDomainTypeAdaptorFactoryPtr(Sink::AdaptorFactoryRegistry::instance().getFactory<DomainType>(resourceType)), | 85 | mDomainTypeAdaptorFactoryPtr(Sink::AdaptorFactoryRegistry::instance().getFactory<DomainType>(resourceType)), |
86 | mDomainTypeAdaptorFactory(*mDomainTypeAdaptorFactoryPtr) | 86 | mDomainTypeAdaptorFactory(*mDomainTypeAdaptorFactoryPtr) |
87 | { | 87 | { |
88 | 88 | Q_ASSERT(!resourceType.isEmpty()); | |
89 | Trace() << "resourceType " << resourceType; | ||
90 | Q_ASSERT(mDomainTypeAdaptorFactoryPtr); | ||
89 | } | 91 | } |
90 | 92 | ||
91 | template <class DomainType> | 93 | template <class DomainType> |
@@ -159,6 +161,7 @@ void EntityReader<DomainType>::readEntity(const Sink::Storage::NamedDatabase &db | |||
159 | const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1; | 161 | const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1; |
160 | const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation; | 162 | const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation; |
161 | auto adaptor = mDomainTypeAdaptorFactory.createAdaptor(entity); | 163 | auto adaptor = mDomainTypeAdaptorFactory.createAdaptor(entity); |
164 | Q_ASSERT(adaptor); | ||
162 | resultCallback(DomainType::Ptr::create(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, adaptor), operation); | 165 | resultCallback(DomainType::Ptr::create(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, adaptor), operation); |
163 | return false; | 166 | return false; |
164 | }, | 167 | }, |