1 files changed, 21 insertions, 20 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 2f3973a..706e410 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -75,31 +75,32 @@ void TypeImplementation<Mail>::removeIndex(const QByteArray &identifier, const B
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplementation<Mail>::initializeReadPropertyMapper()
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    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<QDateTime, Buffer>("date", &Buffer::date);
-    propertyMapper->addMapping<bool, Buffer>("unread", &Buffer::unread);
-    propertyMapper->addMapping<bool, Buffer>("important", &Buffer::important);
-    propertyMapper->addMapping<QByteArray, Buffer>("folder", &Buffer::folder);
-    propertyMapper->addMapping<QString, Buffer>("mimeMessage", &Buffer::mimeMessage);
-    propertyMapper->addMapping<bool, Buffer>("draft", &Buffer::draft);
+    propertyMapper->addMapping<Mail::Uid, Buffer>(&Buffer::uid);
+    propertyMapper->addMapping<Mail::Sender, Buffer>(&Buffer::sender);
+    propertyMapper->addMapping<Mail::SenderName, Buffer>(&Buffer::senderName);
+    propertyMapper->addMapping<Mail::Subject, Buffer>(&Buffer::subject);
+    propertyMapper->addMapping<Mail::Date, Buffer>(&Buffer::date);
+    propertyMapper->addMapping<Mail::Unread, Buffer>(&Buffer::unread);
+    propertyMapper->addMapping<Mail::Important, Buffer>(&Buffer::important);
+    propertyMapper->addMapping<Mail::Folder, Buffer>(&Buffer::folder);
+    propertyMapper->addMapping<Mail::MimeMessage, Buffer>(&Buffer::mimeMessage);
+    propertyMapper->addMapping<Mail::Draft, Buffer>(&Buffer::draft);
     return propertyMapper;
 }
 
 QSharedPointer<WritePropertyMapper<TypeImplementation<Mail>::BufferBuilder> > TypeImplementation<Mail>::initializeWritePropertyMapper()
 {
     auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
-    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<QDateTime>("date", &BufferBuilder::add_date);
-    propertyMapper->addMapping<bool>("unread", &BufferBuilder::add_unread);
-    propertyMapper->addMapping<bool>("important", &BufferBuilder::add_important);
-    propertyMapper->addMapping<QByteArray>("folder", &BufferBuilder::add_folder);
-    propertyMapper->addMapping<QString>("mimeMessage", &BufferBuilder::add_mimeMessage);
-    propertyMapper->addMapping<bool>("draft", &BufferBuilder::add_draft);
+
+    propertyMapper->addMapping<Mail::Uid>(&BufferBuilder::add_uid);
+    propertyMapper->addMapping<Mail::Sender>(&BufferBuilder::add_sender);
+    propertyMapper->addMapping<Mail::SenderName>(&BufferBuilder::add_senderName);
+    propertyMapper->addMapping<Mail::Subject>(&BufferBuilder::add_subject);
+    propertyMapper->addMapping<Mail::Date>(&BufferBuilder::add_date);
+    propertyMapper->addMapping<Mail::Unread>(&BufferBuilder::add_unread);
+    propertyMapper->addMapping<Mail::Important>(&BufferBuilder::add_important);
+    propertyMapper->addMapping<Mail::Folder>(&BufferBuilder::add_folder);
+    propertyMapper->addMapping<Mail::MimeMessage>(&BufferBuilder::add_mimeMessage);
+    propertyMapper->addMapping<Mail::Draft>(&BufferBuilder::add_draft);
     return propertyMapper;
 }