3 files changed, 23 insertions, 18 deletions

diff --git a/common/domainadaptor.cpp b/common/domainadaptor.cpp
index aa8c3d9..8a4b5ed 100644
--- a/common/domainadaptor.cpp
+++ b/common/domainadaptor.cpp
@@ -20,7 +20,7 @@
 #include "domainadaptor.h"
 
 template <>
-flatbuffers::uoffset_t extractProperty<QString>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+flatbuffers::uoffset_t variantToProperty<QString>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
 {
     if (property.isValid()) {
         return fbb.CreateString(property.toString().toStdString()).o;
@@ -29,20 +29,23 @@ flatbuffers::uoffset_t extractProperty<QString>(const QVariant &property, flatbu
 }
 
 template <>
+QVariant propertyToVariant<QString>(const flatbuffers::String *property)
+{
+    if (property) {
+        return QString::fromStdString(property->c_str());
+    }
+    return QVariant();
+}
+
+template <>
 QSharedPointer<ReadPropertyMapper<Akonadi2::ApplicationDomain::Buffer::Event> > initializeReadPropertyMapper<Akonadi2::ApplicationDomain::Buffer::Event>()
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Akonadi2::ApplicationDomain::Buffer::Event> >::create();
     propertyMapper->addMapping("summary", [](Akonadi2::ApplicationDomain::Buffer::Event const *buffer) -> QVariant {
-        if (buffer->summary()) {
-            return QString::fromStdString(buffer->summary()->c_str());
-        }
-        return QVariant();
+        return propertyToVariant<QString>(buffer->summary());
     });
     propertyMapper->addMapping("uid", [](Akonadi2::ApplicationDomain::Buffer::Event const *buffer) -> QVariant {
-        if (buffer->uid()) {
-            return QString::fromStdString(buffer->uid()->c_str());
-        }
-        return QVariant();
+        return propertyToVariant<QString>(buffer->uid());
     });
     return propertyMapper;
 }
@@ -52,11 +55,11 @@ QSharedPointer<WritePropertyMapper<Akonadi2::ApplicationDomain::Buffer::EventBui
 {
     auto propertyMapper = QSharedPointer<WritePropertyMapper<Akonadi2::ApplicationDomain::Buffer::EventBuilder> >::create();
     propertyMapper->addMapping("summary", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(Akonadi2::ApplicationDomain::Buffer::EventBuilder &)> {
-        auto offset = extractProperty<QString>(value, fbb);
+        auto offset = variantToProperty<QString>(value, fbb);
         return [offset](Akonadi2::ApplicationDomain::Buffer::EventBuilder &builder) { builder.add_summary(offset); };
     });
     propertyMapper->addMapping("uid", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(Akonadi2::ApplicationDomain::Buffer::EventBuilder &)> {
-        auto offset = extractProperty<QString>(value, fbb);
+        auto offset = variantToProperty<QString>(value, fbb);
         return [offset](Akonadi2::ApplicationDomain::Buffer::EventBuilder &builder) { builder.add_uid(offset); };
     });
     return propertyMapper;
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index e356692..d07a2bd 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -79,10 +79,15 @@ private:
 
 /**
  * Defines how to convert qt primitives to flatbuffer ones
- * TODO: rename to createProperty or so?
  */
 template <class T>
-flatbuffers::uoffset_t extractProperty(const QVariant &, flatbuffers::FlatBufferBuilder &fbb);
+flatbuffers::uoffset_t variantToProperty(const QVariant &, flatbuffers::FlatBufferBuilder &fbb);
+
+/**
+ * Defines how to convert flatbuffer primitives to qt ones
+ */
+template <typename T>
+QVariant propertyToVariant(const flatbuffers::String *);
 
 /**
  * Create a buffer from a domain object using the provided mappings
diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp
index fa00bbc..8649bc3 100644
--- a/dummyresource/domainadaptor.cpp
+++ b/dummyresource/domainadaptor.cpp
@@ -23,14 +23,11 @@ DummyEventAdaptorFactory::DummyEventAdaptorFactory()
 {
     //TODO turn this into initializeReadPropertyMapper as well?
     mResourceMapper->addMapping("summary", [](DummyEvent const *buffer) -> QVariant {
-        if (buffer->summary()) {
-            return QString::fromStdString(buffer->summary()->c_str());
-        }
-        return QVariant();
+        return propertyToVariant<QString>(buffer->summary());
     });
 
     mResourceWriteMapper->addMapping("summary", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(DummyEventBuilder &)> {
-        auto offset = extractProperty<QString>(value, fbb);
+        auto offset = variantToProperty<QString>(value, fbb);
         return [offset](DummyEventBuilder &builder) { builder.add_summary(offset); };
     });
 }