Simplified propertymapper

2 files changed, 10 insertions, 11 deletions

diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp
index eb3851e..5db35b7 100644
--- a/common/domain/typeimplementations.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -61,7 +61,7 @@ void TypeImplementation<Mail>::configure(IndexPropertyMapper &indexPropertyMappe
         });
 }
 
-void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+void TypeImplementation<Mail>::configure(ReadPropertyMapper &propertyMapper)
 {
     propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender);
     propertyMapper.addMapping<Mail::To, Buffer>(&Buffer::to);
@@ -108,7 +108,7 @@ void TypeImplementation<Folder>::configure(TypeIndex &index)
     index.addProperty<QString>(Folder::Name::name);
 }
 
-void TypeImplementation<Folder>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+void TypeImplementation<Folder>::configure(ReadPropertyMapper &propertyMapper)
 {
     propertyMapper.addMapping<Folder::Parent, Buffer>(&Buffer::parent);
     propertyMapper.addMapping<Folder::Name, Buffer>(&Buffer::name);
@@ -137,7 +137,7 @@ void TypeImplementation<Contact>::configure(TypeIndex &index)
     index.addProperty<QByteArray>(Contact::Uid::name);
 }
 
-void TypeImplementation<Contact>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+void TypeImplementation<Contact>::configure(ReadPropertyMapper &propertyMapper)
 {
     propertyMapper.addMapping<Contact::Uid, Buffer>(&Buffer::uid);
     propertyMapper.addMapping<Contact::Fn, Buffer>(&Buffer::fn);
@@ -171,7 +171,7 @@ void TypeImplementation<Addressbook>::configure(TypeIndex &index)
     index.addProperty<QString>(Addressbook::Name::name);
 }
 
-void TypeImplementation<Addressbook>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+void TypeImplementation<Addressbook>::configure(ReadPropertyMapper &propertyMapper)
 {
     propertyMapper.addMapping<Addressbook::Parent, Buffer>(&Buffer::parent);
     propertyMapper.addMapping<Addressbook::Name, Buffer>(&Buffer::name);
@@ -194,7 +194,7 @@ void TypeImplementation<Event>::configure(TypeIndex &index)
     index.addProperty<QByteArray>(Event::Uid::name);
 }
 
-void TypeImplementation<Event>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+void TypeImplementation<Event>::configure(ReadPropertyMapper &propertyMapper)
 {
     propertyMapper.addMapping<Event::Summary, Buffer>(&Buffer::summary);
     propertyMapper.addMapping<Event::Description, Buffer>(&Buffer::description);
diff --git a/common/domain/typeimplementations.h b/common/domain/typeimplementations.h
index 37d6ca9..705b059 100644
--- a/common/domain/typeimplementations.h
+++ b/common/domain/typeimplementations.h
@@ -26,7 +26,6 @@
 #include "contact_generated.h"
 #include "addressbook_generated.h"
 
-template<typename T>
 class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
@@ -48,7 +47,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::Mail Buffer;
     typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
     static void configure(TypeIndex &index);
-    static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
+    static void configure(ReadPropertyMapper &propertyMapper);
     static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
@@ -59,7 +58,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::Folder Buffer;
     typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
     static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(ReadPropertyMapper &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
@@ -70,7 +69,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::Contact Buffer;
     typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
     static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(ReadPropertyMapper &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
@@ -81,7 +80,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::Addressbook Buffer;
     typedef Sink::ApplicationDomain::Buffer::AddressbookBuilder BufferBuilder;
     static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(ReadPropertyMapper &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
@@ -92,7 +91,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::Event Buffer;
     typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
     static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(ReadPropertyMapper &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };