5 files changed, 21 insertions, 28 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index ea0931c..776fa50 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -56,28 +56,28 @@ void TypeImplementation<Event>::index(const Event &type)
     }
 }
 
-QSharedPointer<ReadPropertyMapper<Buffer::Event> > TypeImplementation<Event>::initializeReadPropertyMapper()
+QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImplementation<Event>::initializeReadPropertyMapper()
 {
-    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer::Event> >::create();
-    propertyMapper->addMapping("summary", [](Buffer::Event const *buffer) -> QVariant {
+    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
+    propertyMapper->addMapping("summary", [](Buffer const *buffer) -> QVariant {
         return propertyToVariant<QString>(buffer->summary());
     });
-    propertyMapper->addMapping("uid", [](Buffer::Event const *buffer) -> QVariant {
+    propertyMapper->addMapping("uid", [](Buffer const *buffer) -> QVariant {
         return propertyToVariant<QString>(buffer->uid());
     });
     return propertyMapper;
 }
 
-QSharedPointer<WritePropertyMapper<Buffer::EventBuilder> > TypeImplementation<Event>::initializeWritePropertyMapper()
+QSharedPointer<WritePropertyMapper<TypeImplementation<Event>::BufferBuilder> > TypeImplementation<Event>::initializeWritePropertyMapper()
 {
-    auto propertyMapper = QSharedPointer<WritePropertyMapper<Buffer::EventBuilder> >::create();
-    propertyMapper->addMapping("summary", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(Buffer::EventBuilder &)> {
+    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](Buffer::EventBuilder &builder) { builder.add_summary(offset); };
+        return [offset](BufferBuilder &builder) { builder.add_summary(offset); };
     });
-    propertyMapper->addMapping("uid", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(Buffer::EventBuilder &)> {
+    propertyMapper->addMapping("uid", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
         auto offset = variantToProperty<QString>(value, fbb);
-        return [offset](Buffer::EventBuilder &builder) { builder.add_uid(offset); };
+        return [offset](BufferBuilder &builder) { builder.add_uid(offset); };
     });
     return propertyMapper;
 }
diff --git a/common/domain/event.h b/common/domain/event.h
index d4ce20e..d40e55d 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -41,7 +41,10 @@ namespace ApplicationDomain {
  * Implements all type-specific code such as updating and querying indexes.
  */
 template<>
-struct TypeImplementation<Akonadi2::ApplicationDomain::Event> {
+class TypeImplementation<Akonadi2::ApplicationDomain::Event> {
+public:
+    typedef Akonadi2::ApplicationDomain::Buffer::Event Buffer;
+    typedef Akonadi2::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
     /**
      * Returns the potential result set based on the indexes.
      * 
@@ -49,8 +52,8 @@ struct TypeImplementation<Akonadi2::ApplicationDomain::Event> {
      */
     static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier);
     static void index(const Event &type);
-    static QSharedPointer<ReadPropertyMapper<Akonadi2::ApplicationDomain::Buffer::Event> > initializeReadPropertyMapper();
-    static QSharedPointer<WritePropertyMapper<Akonadi2::ApplicationDomain::Buffer::EventBuilder> > initializeWritePropertyMapper();
+    static QSharedPointer<ReadPropertyMapper<Buffer> > initializeReadPropertyMapper();
+    static QSharedPointer<WritePropertyMapper<BufferBuilder> > initializeWritePropertyMapper();
 };
 
 }
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 70c3a42..c9a3a01 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -25,7 +25,6 @@
 #include <functional>
 #include "clientapi.h" //for domain parts
 
-#include "event_generated.h"
 #include "entity_generated.h"
 #include "metadata_generated.h"
 #include "entitybuffer.h"
@@ -103,17 +102,6 @@ public:
     QSharedPointer<ReadPropertyMapper<ResourceBuffer> > mResourceMapper;
 };
 
-/**
- * Initializes the local property mapper.
- *
- * Provide an implementation for each application domain type.
- */
-template <class T>
-QSharedPointer<ReadPropertyMapper<T> > initializeReadPropertyMapper();
-
-template <class T>
-QSharedPointer<WritePropertyMapper<T> > initializeWritePropertyMapper();
-
 template<typename DomainType>
 class DomainTypeAdaptorFactoryInterface
 {
@@ -128,9 +116,11 @@ public:
  * It defines how values are split accross local and resource buffer.
  * This is required by the facade the read the value, and by the pipeline preprocessors to access the domain values in a generic way.
  */
-template<typename DomainType, typename LocalBuffer, typename ResourceBuffer, typename LocalBuilder, typename ResourceBuilder>
+template<typename DomainType, typename ResourceBuffer, typename ResourceBuilder>
 class DomainTypeAdaptorFactory : public DomainTypeAdaptorFactoryInterface<DomainType>
 {
+    typedef typename Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::Buffer LocalBuffer;
+    typedef typename Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::BufferBuilder LocalBuilder;
 public:
     DomainTypeAdaptorFactory() :
         mLocalMapper(Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::initializeReadPropertyMapper()),
diff --git a/examples/dummyresource/domainadaptor.h b/examples/dummyresource/domainadaptor.h
index 9d351e7..0490387 100644
--- a/examples/dummyresource/domainadaptor.h
+++ b/examples/dummyresource/domainadaptor.h
@@ -5,7 +5,7 @@
 #include "dummycalendar_generated.h"
 #include "entity_generated.h"
 
-class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Event, Akonadi2::ApplicationDomain::Buffer::Event, DummyCalendar::DummyEvent, Akonadi2::ApplicationDomain::Buffer::EventBuilder, DummyCalendar::DummyEventBuilder>
+class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Event, DummyCalendar::DummyEvent, DummyCalendar::DummyEventBuilder>
 {
 public:
     DummyEventAdaptorFactory();
diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp
index 97a78c2..ccf9a3c 100644
--- a/tests/domainadaptortest.cpp
+++ b/tests/domainadaptortest.cpp
@@ -13,7 +13,7 @@
 #include "metadata_generated.h"
 #include "entity_generated.h"
 
-class TestFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Event, Akonadi2::ApplicationDomain::Buffer::Event, Akonadi2::ApplicationDomain::Buffer::Event, Akonadi2::ApplicationDomain::Buffer::EventBuilder, Akonadi2::ApplicationDomain::Buffer::EventBuilder>
+class TestFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Event, Akonadi2::ApplicationDomain::Buffer::Event, Akonadi2::ApplicationDomain::Buffer::EventBuilder>
 {
 public:
     TestFactory()