4 files changed, 24 insertions, 28 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index 42c13e2..3036d8e 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -78,13 +78,7 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImple
 QSharedPointer<WritePropertyMapper<TypeImplementation<Event>::BufferBuilder> > TypeImplementation<Event>::initializeWritePropertyMapper()
 {
     auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
-    propertyMapper->addMapping("summary", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-        auto offset = variantToProperty<QString>(value, fbb);
-        return [offset](BufferBuilder &builder) { builder.add_summary(offset); };
-    });
-    propertyMapper->addMapping("uid", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-        auto offset = variantToProperty<QString>(value, fbb);
-        return [offset](BufferBuilder &builder) { builder.add_uid(offset); };
-    });
+    propertyMapper->addMapping<QString>("summary", &BufferBuilder::add_summary);
+    propertyMapper->addMapping<QString>("uid", &BufferBuilder::add_uid);
     return propertyMapper;
 }
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index 5558060..80e9f8f 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -89,17 +89,8 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Folder>::Buffer> > TypeImpl
 QSharedPointer<WritePropertyMapper<TypeImplementation<Folder>::BufferBuilder> > TypeImplementation<Folder>::initializeWritePropertyMapper()
 {
     auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
-    propertyMapper->addMapping("parent", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-        auto offset = variantToProperty<QByteArray>(value, fbb);
-        return [offset](BufferBuilder &builder) { builder.add_parent(offset); };
-    });
-    propertyMapper->addMapping("name", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-        auto offset = variantToProperty<QString>(value, fbb);
-        return [offset](BufferBuilder &builder) { builder.add_name(offset); };
-    });
-    propertyMapper->addMapping("icon", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-        auto offset = variantToProperty<QByteArray>(value, fbb);
-        return [offset](BufferBuilder &builder) { builder.add_icon(offset); };
-    });
+    propertyMapper->addMapping<QByteArray>("parent", &BufferBuilder::add_parent);
+    propertyMapper->addMapping<QString>("name", &BufferBuilder::add_name);
+    propertyMapper->addMapping<QByteArray>("icon", &BufferBuilder::add_icon);
     return propertyMapper;
 }
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 5373ac6..59b75ea 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -83,13 +83,13 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplem
 QSharedPointer<WritePropertyMapper<TypeImplementation<Mail>::BufferBuilder> > TypeImplementation<Mail>::initializeWritePropertyMapper()
 {
     auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
-    // propertyMapper->addMapping("summary", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-    //     auto offset = variantToProperty<QString>(value, fbb);
-    //     return [offset](BufferBuilder &builder) { builder.add_summary(offset); };
-    // });
-    propertyMapper->addMapping("uid", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-        auto offset = variantToProperty<QString>(value, fbb);
-        return [offset](BufferBuilder &builder) { builder.add_uid(offset); };
-    });
+    propertyMapper->addMapping<QString>("uid", &BufferBuilder::add_uid);
+    propertyMapper->addMapping<QString>("sender", &BufferBuilder::add_sender);
+    propertyMapper->addMapping<QString>("senderName", &BufferBuilder::add_senderName);
+    propertyMapper->addMapping<QString>("subject", &BufferBuilder::add_subject);
+    propertyMapper->addMapping<QString>("date", &BufferBuilder::add_date);
+    // propertyMapper->addMapping<bool>("unread", &BufferBuilder::add_unread);
+    // propertyMapper->addMapping<bool>("important", &BufferBuilder::add_important);
+    propertyMapper->addMapping<QString>("folder", &BufferBuilder::add_folder);
     return propertyMapper;
 }
diff --git a/common/propertymapper.h b/common/propertymapper.h
index 87c7485..98ad397 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -98,6 +98,17 @@ public:
     void addMapping(const QByteArray &property, const std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)> &mapping) {
         mWriteAccessors.insert(property, mapping);
     }
+
+    template <typename T>
+    void addMapping(const QByteArray &name, void (BufferBuilder::*f)(flatbuffers::Offset<flatbuffers::String>))
+    {
+        addMapping(name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+            auto offset = variantToProperty<T>(value, fbb);
+            return [offset, f](BufferBuilder &builder) {
+                (builder.*f)(offset);
+            };
+        });
+    }
 private:
     QHash<QByteArray, std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)> > mWriteAccessors;
 };