diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-07-21 18:10:32 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-07-23 17:37:53 +0200 |
commit | 4f18f360f8980adcb98d93fd95e94f0e95725070 (patch) | |
tree | 48d40bc7c22d4f071180513fdef932f7633f3df4 | |
parent | 5b64da01a381aca6890490fc92ef704f4342eb7e (diff) | |
download | sink-4f18f360f8980adcb98d93fd95e94f0e95725070.tar.gz sink-4f18f360f8980adcb98d93fd95e94f0e95725070.zip |
Debuginfo
-rw-r--r-- | common/domain/event.cpp | 2 | ||||
-rw-r--r-- | common/domainadaptor.h | 6 | ||||
-rw-r--r-- | common/pipeline.cpp | 2 | ||||
-rw-r--r-- | common/propertymapper.cpp | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/common/domain/event.cpp b/common/domain/event.cpp index 08ce698..d86ac16 100644 --- a/common/domain/event.cpp +++ b/common/domain/event.cpp | |||
@@ -41,7 +41,7 @@ ResultSet TypeImplementation<Event>::queryIndexes(const Akonadi2::Query &query, | |||
41 | keys << value; | 41 | keys << value; |
42 | }, | 42 | }, |
43 | [](const Index::Error &error) { | 43 | [](const Index::Error &error) { |
44 | Warning() << "Error in index: " << error.message; | 44 | Warning() << "Error in uid index: " << error.message; |
45 | }); | 45 | }); |
46 | appliedFilters << "uid"; | 46 | appliedFilters << "uid"; |
47 | } | 47 | } |
diff --git a/common/domainadaptor.h b/common/domainadaptor.h index f275d5a..7e9b171 100644 --- a/common/domainadaptor.h +++ b/common/domainadaptor.h | |||
@@ -41,12 +41,12 @@ flatbuffers::Offset<Buffer> createBufferPart(const Akonadi2::ApplicationDomain:: | |||
41 | //First create a primitives such as strings using the mappings | 41 | //First create a primitives such as strings using the mappings |
42 | QList<std::function<void(Builder &)> > propertiesToAddToResource; | 42 | QList<std::function<void(Builder &)> > propertiesToAddToResource; |
43 | for (const auto &property : domainObject.changedProperties()) { | 43 | for (const auto &property : domainObject.changedProperties()) { |
44 | qWarning() << "copying property " << property; | 44 | // Trace() << "copying property " << property; |
45 | const auto value = domainObject.getProperty(property); | 45 | const auto value = domainObject.getProperty(property); |
46 | if (mapper.hasMapping(property)) { | 46 | if (mapper.hasMapping(property)) { |
47 | mapper.setProperty(property, domainObject.getProperty(property), propertiesToAddToResource, fbb); | 47 | mapper.setProperty(property, domainObject.getProperty(property), propertiesToAddToResource, fbb); |
48 | } else { | 48 | } else { |
49 | qWarning() << "no mapping for property available " << property; | 49 | // Trace() << "no mapping for property available " << property; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
@@ -173,11 +173,13 @@ public: | |||
173 | { | 173 | { |
174 | flatbuffers::FlatBufferBuilder localFbb; | 174 | flatbuffers::FlatBufferBuilder localFbb; |
175 | if (mLocalWriteMapper) { | 175 | if (mLocalWriteMapper) { |
176 | Trace() << "Creating local buffer part"; | ||
176 | createBufferPartBuffer<LocalBuffer, LocalBuilder>(domainObject, localFbb, *mLocalWriteMapper); | 177 | createBufferPartBuffer<LocalBuffer, LocalBuilder>(domainObject, localFbb, *mLocalWriteMapper); |
177 | } | 178 | } |
178 | 179 | ||
179 | flatbuffers::FlatBufferBuilder resFbb; | 180 | flatbuffers::FlatBufferBuilder resFbb; |
180 | if (mResourceWriteMapper) { | 181 | if (mResourceWriteMapper) { |
182 | Trace() << "Creating resouce buffer part"; | ||
181 | createBufferPartBuffer<ResourceBuffer, ResourceBuilder>(domainObject, resFbb, *mResourceWriteMapper); | 183 | createBufferPartBuffer<ResourceBuffer, ResourceBuilder>(domainObject, resFbb, *mResourceWriteMapper); |
182 | } | 184 | } |
183 | 185 | ||
diff --git a/common/pipeline.cpp b/common/pipeline.cpp index 1197408..31c9a52 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp | |||
@@ -210,7 +210,7 @@ KAsync::Job<void> Pipeline::modifiedEntity(void const *command, size_t size) | |||
210 | //TODO error handler | 210 | //TODO error handler |
211 | 211 | ||
212 | if (!current) { | 212 | if (!current) { |
213 | Warning() << "Failed to read local value "; | 213 | Warning() << "Failed to read local value " << key; |
214 | return KAsync::error<void>(); | 214 | return KAsync::error<void>(); |
215 | } | 215 | } |
216 | 216 | ||
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp index 0896aa6..89495ae 100644 --- a/common/propertymapper.cpp +++ b/common/propertymapper.cpp | |||
@@ -32,6 +32,7 @@ template <> | |||
32 | QVariant propertyToVariant<QString>(const flatbuffers::String *property) | 32 | QVariant propertyToVariant<QString>(const flatbuffers::String *property) |
33 | { | 33 | { |
34 | if (property) { | 34 | if (property) { |
35 | //We have to copy the memory, otherwise it would become eventually invalid | ||
35 | return QString::fromStdString(property->c_str()); | 36 | return QString::fromStdString(property->c_str()); |
36 | } | 37 | } |
37 | return QVariant(); | 38 | return QVariant(); |