1 files changed, 10 insertions, 54 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index c9cef3f..44f5a75 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -65,6 +65,9 @@ int registerProperty() {
     return 0;
 }
 
+#define SINK_REGISTER_ENTITY(ENTITY) \
+    constexpr const char *ENTITY::name;
+
 #define SINK_REGISTER_PROPERTY(ENTITYTYPE, PROPERTY) \
     constexpr const char *ENTITYTYPE::PROPERTY::name; \
     static int foo##ENTITYTYPE##PROPERTY = registerProperty<ENTITYTYPE, ENTITYTYPE::PROPERTY>();
@@ -72,6 +75,10 @@ int registerProperty() {
 namespace Sink {
 namespace ApplicationDomain {
 
+constexpr const char *SinkResource::name;
+constexpr const char *SinkAccount::name;
+
+SINK_REGISTER_ENTITY(Mail);
 SINK_REGISTER_PROPERTY(Mail, Sender);
 SINK_REGISTER_PROPERTY(Mail, To);
 SINK_REGISTER_PROPERTY(Mail, Cc);
@@ -90,6 +97,7 @@ SINK_REGISTER_PROPERTY(Mail, MessageId);
 SINK_REGISTER_PROPERTY(Mail, ParentMessageId);
 SINK_REGISTER_PROPERTY(Mail, ThreadId);
 
+SINK_REGISTER_ENTITY(Folder);
 SINK_REGISTER_PROPERTY(Folder, Name);
 SINK_REGISTER_PROPERTY(Folder, Icon);
 SINK_REGISTER_PROPERTY(Folder, SpecialPurpose);
@@ -98,6 +106,7 @@ SINK_REGISTER_PROPERTY(Folder, Parent);
 SINK_REGISTER_PROPERTY(Folder, Count);
 SINK_REGISTER_PROPERTY(Folder, FullContentAvailable);
 
+SINK_REGISTER_ENTITY(Contact);
 SINK_REGISTER_PROPERTY(Contact, Uid);
 SINK_REGISTER_PROPERTY(Contact, Fn);
 SINK_REGISTER_PROPERTY(Contact, Firstname);
@@ -106,6 +115,7 @@ SINK_REGISTER_PROPERTY(Contact, Emails);
 SINK_REGISTER_PROPERTY(Contact, Vcard);
 SINK_REGISTER_PROPERTY(Contact, Addressbook);
 
+SINK_REGISTER_ENTITY(Addressbook);
 SINK_REGISTER_PROPERTY(Addressbook, Name);
 SINK_REGISTER_PROPERTY(Addressbook, Parent);
 SINK_REGISTER_PROPERTY(Addressbook, LastUpdated);
@@ -384,60 +394,6 @@ SinkResource CardDavResource::create(const QByteArray &account)
     return resource;
 }
 
-template<>
-QByteArray getTypeName<Contact>()
-{
-    return "contact";
-}
-
-template<>
-QByteArray getTypeName<Addressbook>()
-{
-    return "addressbook";
-}
-
-template<>
-QByteArray getTypeName<Event>()
-{
-    return "event";
-}
-
-template<>
-QByteArray getTypeName<Todo>()
-{
-    return "todo";
-}
-
-template<>
-QByteArray getTypeName<SinkResource>()
-{
-    return "resource";
-}
-
-template<>
-QByteArray getTypeName<SinkAccount>()
-{
-    return "account";
-}
-
-template<>
-QByteArray getTypeName<Identity>()
-{
-    return "identity";
-}
-
-template<>
-QByteArray getTypeName<Mail>()
-{
-    return "mail";
-}
-
-template<>
-QByteArray getTypeName<Folder>()
-{
-    return "folder";
-}
-
 QByteArrayList getTypeNames()
 {
     static QByteArrayList types;