3 files changed, 17 insertions, 32 deletions

diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp
index 38422f4..2bb630c 100644
--- a/common/domain/typeimplementations.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -29,12 +29,6 @@
 #include "mail/threadindexer.h"
 #include "domainadaptor.h"
 
-#include "mail_generated.h"
-#include "folder_generated.h"
-#include "event_generated.h"
-#include "contact_generated.h"
-#include "addressbook_generated.h"
-
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
diff --git a/common/domain/typeimplementations.h b/common/domain/typeimplementations.h
index cb63949..37d6ca9 100644
--- a/common/domain/typeimplementations.h
+++ b/common/domain/typeimplementations.h
@@ -20,7 +20,11 @@
 
 #include "applicationdomaintype.h"
 
-class QByteArray;
+#include "mail_generated.h"
+#include "folder_generated.h"
+#include "event_generated.h"
+#include "contact_generated.h"
+#include "addressbook_generated.h"
 
 template<typename T>
 class ReadPropertyMapper;
@@ -38,11 +42,6 @@ class TypeIndex;
 namespace Sink {
 namespace ApplicationDomain {
 
-namespace Buffer {
-    struct Mail;
-    struct MailBuilder;
-}
-
 template<>
 class TypeImplementation<Sink::ApplicationDomain::Mail> {
 public:
@@ -54,11 +53,6 @@ public:
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
-namespace Buffer {
-    struct Folder;
-    struct FolderBuilder;
-}
-
 template<>
 class TypeImplementation<Sink::ApplicationDomain::Folder> {
 public:
@@ -70,11 +64,6 @@ public:
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
-namespace Buffer {
-    struct Contact;
-    struct ContactBuilder;
-}
-
 template<>
 class TypeImplementation<Sink::ApplicationDomain::Contact> {
 public:
@@ -86,11 +75,6 @@ public:
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
-namespace Buffer {
-    struct Addressbook;
-    struct AddressbookBuilder;
-}
-
 template<>
 class TypeImplementation<Sink::ApplicationDomain::Addressbook> {
 public:
@@ -102,11 +86,6 @@ public:
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
-namespace Buffer {
-    struct Event;
-    struct EventBuilder;
-}
-
 template<>
 class TypeImplementation<Sink::ApplicationDomain::Event> {
 public:
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 54aa53e..af5d5fc 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -242,3 +242,15 @@ protected:
     QSharedPointer<WritePropertyMapper<ResourceBuilder>> mResourceWriteMapper;
     QSharedPointer<IndexPropertyMapper> mIndexMapper;
 };
+
+/**
+ * A default adaptorfactory implemenation that simply instantiates a generic resource
+ */
+template<typename DomainType>
+class DefaultAdaptorFactory : public DomainTypeAdaptorFactory<DomainType>
+{
+public:
+    DefaultAdaptorFactory() : DomainTypeAdaptorFactory<DomainType>()  {}
+    virtual ~DefaultAdaptorFactory(){}
+};
+