1 files changed, 33 insertions, 61 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 4b33f06..8abe259 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -21,32 +21,19 @@
 #include <QVector>
 #include <QByteArray>
 #include <QString>
-#include <QMutex>
-#include <QMutexLocker>
 
-#include "../resultset.h"
-#include "../index.h"
-#include "../storage.h"
-#include "../log.h"
 #include "../propertymapper.h"
-#include "../query.h"
-#include "../definitions.h"
 #include "../typeindex.h"
 #include "entitybuffer.h"
-#include "datastorequery.h"
 #include "entity_generated.h"
 #include "mail/threadindexer.h"
 
 #include "mail_generated.h"
 
-SINK_DEBUG_AREA("mail");
-
-static QMutex sMutex;
-
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
-void TypeImplementation<Mail>::configureIndex(TypeIndex &index)
+void TypeImplementation<Mail>::configure(TypeIndex &index)
 {
     index.addProperty<QByteArray>(Mail::Uid::name);
     index.addProperty<QByteArray>(Mail::Sender::name);
@@ -66,56 +53,41 @@ void TypeImplementation<Mail>::configureIndex(TypeIndex &index)
     index.addSecondaryProperty<Mail::ThreadId, Mail::MessageId>();
 }
 
-static TypeIndex &getIndex()
-{
-    QMutexLocker locker(&sMutex);
-    static TypeIndex *index = 0;
-    if (!index) {
-        index = new TypeIndex("mail");
-        TypeImplementation<Mail>::configureIndex(*index);
-    }
-    return *index;
-}
 
-QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplementation<Mail>::initializeReadPropertyMapper()
+void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {
-    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    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);
-    propertyMapper->addMapping<Mail::Trash, Buffer>(&Buffer::trash);
-    propertyMapper->addMapping<Mail::Sent, Buffer>(&Buffer::sent);
-    propertyMapper->addMapping<Mail::MessageId, Buffer>(&Buffer::messageId);
-    propertyMapper->addMapping<Mail::ParentMessageId, Buffer>(&Buffer::parentMessageId);
-    return propertyMapper;
-}
 
-QSharedPointer<WritePropertyMapper<TypeImplementation<Mail>::BufferBuilder> > TypeImplementation<Mail>::initializeWritePropertyMapper()
-{
-    auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
 
-    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);
-    propertyMapper->addMapping<Mail::Trash>(&BufferBuilder::add_trash);
-    propertyMapper->addMapping<Mail::Sent>(&BufferBuilder::add_sent);
-    propertyMapper->addMapping<Mail::MessageId>(&BufferBuilder::add_messageId);
-    propertyMapper->addMapping<Mail::ParentMessageId>(&BufferBuilder::add_parentMessageId);
-    return propertyMapper;
+    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);
+    propertyMapper.addMapping<Mail::Trash, Buffer>(&Buffer::trash);
+    propertyMapper.addMapping<Mail::Sent, Buffer>(&Buffer::sent);
+    propertyMapper.addMapping<Mail::MessageId, Buffer>(&Buffer::messageId);
+    propertyMapper.addMapping<Mail::ParentMessageId, Buffer>(&Buffer::parentMessageId);
 }
 
-
+void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    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);
+    propertyMapper.addMapping<Mail::Trash>(&BufferBuilder::add_trash);
+    propertyMapper.addMapping<Mail::Sent>(&BufferBuilder::add_sent);
+    propertyMapper.addMapping<Mail::MessageId>(&BufferBuilder::add_messageId);
+    propertyMapper.addMapping<Mail::ParentMessageId>(&BufferBuilder::add_parentMessageId);
+}