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,
             keys << value;
         },
         [](const Index::Error &error) {
-            Warning() << "Error in index: " <<  error.message;
+            Warning() << "Error in uid index: " <<  error.message;
         });
         appliedFilters << "uid";
     }
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::
     //First create a primitives such as strings using the mappings
     QList<std::function<void(Builder &)> > propertiesToAddToResource;
     for (const auto &property : domainObject.changedProperties()) {
-        qWarning() << "copying property " << property;
+        // Trace() << "copying property " << property;
         const auto value = domainObject.getProperty(property);
         if (mapper.hasMapping(property)) {
             mapper.setProperty(property, domainObject.getProperty(property), propertiesToAddToResource, fbb);
         } else {
-            qWarning() << "no mapping for property available " << property;
+            // Trace() << "no mapping for property available " << property;
         }
     }
 
@@ -173,11 +173,13 @@ public:
     {
         flatbuffers::FlatBufferBuilder localFbb;
         if (mLocalWriteMapper) {
+            Trace() << "Creating local buffer part";
             createBufferPartBuffer<LocalBuffer, LocalBuilder>(domainObject, localFbb, *mLocalWriteMapper);
         }
 
         flatbuffers::FlatBufferBuilder resFbb;
         if (mResourceWriteMapper) {
+            Trace() << "Creating resouce buffer part";
             createBufferPartBuffer<ResourceBuffer, ResourceBuilder>(domainObject, resFbb, *mResourceWriteMapper);
         }
 
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)
     //TODO error handler
 
     if (!current) {
-        Warning() << "Failed to read local value ";
+        Warning() << "Failed to read local value " << key;
         return KAsync::error<void>();
     }
 
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 <>
 QVariant propertyToVariant<QString>(const flatbuffers::String *property)
 {
     if (property) {
+        //We have to copy the memory, otherwise it would become eventually invalid
         return QString::fromStdString(property->c_str());
     }
     return QVariant();