3 files changed, 26 insertions, 30 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index e107441..38872f9 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -62,12 +62,8 @@ void TypeImplementation<Event>::index(const Event &type, Akonadi2::Storage::Tran
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImplementation<Event>::initializeReadPropertyMapper()
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    propertyMapper->addMapping("summary", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->summary());
-    });
-    propertyMapper->addMapping("uid", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->uid());
-    });
+    propertyMapper->addMapping<QString, Buffer>("summary", &Buffer::summary);
+    propertyMapper->addMapping<QString, Buffer>("uid", &Buffer::uid);
     return propertyMapper;
 }
 
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 230ef31..d40dde9 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -62,30 +62,14 @@ void TypeImplementation<Mail>::index(const Mail &type, Akonadi2::Storage::Transa
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplementation<Mail>::initializeReadPropertyMapper()
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    propertyMapper->addMapping("uid", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->uid());
-    });
-    propertyMapper->addMapping("sender", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->sender());
-    });
-    propertyMapper->addMapping("senderName", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->senderName());
-    });
-    propertyMapper->addMapping("subject", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->subject());
-    });
-    propertyMapper->addMapping("date", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->date());
-    });
-    propertyMapper->addMapping("unread", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<bool>(buffer->unread());
-    });
-    propertyMapper->addMapping("important", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<bool>(buffer->important());
-    });
-    propertyMapper->addMapping("folder", [](Buffer const *buffer) -> QVariant {
-        return propertyToVariant<QString>(buffer->folder());
-    });
+    propertyMapper->addMapping<QString, Buffer>("uid", &Buffer::uid);
+    propertyMapper->addMapping<QString, Buffer>("sender", &Buffer::sender);
+    propertyMapper->addMapping<QString, Buffer>("senderName", &Buffer::senderName);
+    propertyMapper->addMapping<QString, Buffer>("subject", &Buffer::subject);
+    propertyMapper->addMapping<QString, Buffer>("date", &Buffer::date);
+    propertyMapper->addMapping<bool, Buffer>("unread", &Buffer::unread);
+    propertyMapper->addMapping<bool, Buffer>("important", &Buffer::important);
+    propertyMapper->addMapping<QString, Buffer>("folder", &Buffer::folder);
     return propertyMapper;
 }
 
diff --git a/common/propertymapper.h b/common/propertymapper.h
index 72468e2..87c7485 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -63,6 +63,22 @@ public:
     void addMapping(const QByteArray &property, const std::function<QVariant(BufferType const *)> &mapping) {
         mReadAccessors.insert(property, mapping);
     }
+
+    template <typename T, typename Buffer>
+    void addMapping(const QByteArray &name, const flatbuffers::String *(Buffer::*f)() const)
+    {
+        addMapping(name, [f](Buffer const *buffer) -> QVariant {
+            return propertyToVariant<T>((buffer->*f)());
+        });
+    }
+
+    template <typename T, typename Buffer>
+    void addMapping(const QByteArray &name, uint8_t (Buffer::*f)() const)
+    {
+        addMapping(name, [f](Buffer const *buffer) -> QVariant {
+            return propertyToVariant<T>((buffer->*f)());
+        });
+    }
 private:
     QHash<QByteArray, std::function<QVariant(BufferType const *)> > mReadAccessors;
 };