3 files changed, 25 insertions, 53 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 49bfb5f..530056d 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -384,14 +384,10 @@ QByteArrayList getTypeNames()
 {
     static QByteArrayList types;
     if (types.isEmpty()) {
-        types << ApplicationDomain::getTypeName<SinkResource>();
-        types << ApplicationDomain::getTypeName<SinkAccount>();
-        types << ApplicationDomain::getTypeName<Identity>();
-        types << ApplicationDomain::getTypeName<Mail>();
-        types << ApplicationDomain::getTypeName<Folder>();
-        types << ApplicationDomain::getTypeName<Event>();
-        types << ApplicationDomain::getTypeName<Todo>();
-        types << ApplicationDomain::getTypeName<Contact>();
+#define REGISTER_TYPE(TYPE) \
+        types << ApplicationDomain::getTypeName<TYPE>();
+SINK_REGISTER_TYPES()
+#undef REGISTER_TYPE
     }
     return types;
 }
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index c822895..98b7de7 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -519,35 +519,27 @@ class SINK_EXPORT TypeImplementation;
  * This macro can be used to instantiate templates for all domain types.
  */
 #define SINK_REGISTER_TYPES() \
-    REGISTER_TYPE(Sink::ApplicationDomain::Contact); \
-    REGISTER_TYPE(Sink::ApplicationDomain::Event); \
-    REGISTER_TYPE(Sink::ApplicationDomain::Mail); \
-    REGISTER_TYPE(Sink::ApplicationDomain::Folder); \
-    REGISTER_TYPE(Sink::ApplicationDomain::SinkResource); \
-    REGISTER_TYPE(Sink::ApplicationDomain::SinkAccount); \
-    REGISTER_TYPE(Sink::ApplicationDomain::Identity); \
+    REGISTER_TYPE(Sink::ApplicationDomain::Contact) \
+    REGISTER_TYPE(Sink::ApplicationDomain::Event) \
+    REGISTER_TYPE(Sink::ApplicationDomain::Mail) \
+    REGISTER_TYPE(Sink::ApplicationDomain::Folder) \
+    REGISTER_TYPE(Sink::ApplicationDomain::SinkResource) \
+    REGISTER_TYPE(Sink::ApplicationDomain::SinkAccount) \
+    REGISTER_TYPE(Sink::ApplicationDomain::Identity) \
 
 SINK_EXPORT QDataStream &operator<<(QDataStream &out, const Sink::ApplicationDomain::Reference &reference);
 SINK_EXPORT QDataStream &operator>>(QDataStream &in, Sink::ApplicationDomain::Reference &reference);
 
+#define REGISTER_TYPE(TYPE) \
+    Q_DECLARE_METATYPE(TYPE) \
+    Q_DECLARE_METATYPE(TYPE::Ptr)
+SINK_REGISTER_TYPES()
+#undef REGISTER_TYPE
+
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity::Ptr)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Contact)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Contact::Ptr)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Event)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Event::Ptr)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail::Ptr)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Folder)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Folder::Ptr)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkResource)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkResource::Ptr)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount::Ptr)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Identity)
-Q_DECLARE_METATYPE(Sink::ApplicationDomain::Identity::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail::Contact)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Error)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Progress)
diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp
index 9a0d1d8..3bbffef 100644
--- a/sinksh/sinksh_utils.cpp
+++ b/sinksh/sinksh_utils.cpp
@@ -36,31 +36,15 @@ StoreBase &getStore(const QString &type)
 {
     using namespace Sink::ApplicationDomain;
 
-    if (type == getTypeName<Folder>()) {
-        static Store<Folder> store;
-        return store;
-    } else if (type == getTypeName<Mail>()) {
-        static Store<Mail> store;
-        return store;
-    } else if (type == getTypeName<Event>()) {
-        static Store<Event> store;
-        return store;
-    } else if (type == getTypeName<SinkResource>()) {
-        static Store<SinkResource> store;
-        return store;
-    } else if (type == getTypeName<SinkAccount>()) {
-        static Store<SinkAccount> store;
-        return store;
-    } else if (type == getTypeName<Identity>()) {
-        static Store<Identity> store;
-        return store;
-    } else if (type == getTypeName<Contact>()) {
-        static Store<Contact> store;
-        return store;
-    }
+#define REGISTER_TYPE(TYPE) \
+        if (type == getTypeName<TYPE>()) { static Store<TYPE> store; return store; } else
+SINK_REGISTER_TYPES()
+#undef REGISTER_TYPE
+        {
+            SinkWarning_("", "") << "Trying to get a store that doesn't exist: " << type;
+            Q_ASSERT(false);
+        }
 
-    SinkWarning_("", "") << "Trying to get a store that doesn't exist: " << type;
-    Q_ASSERT(false);
     static DummyStore store;
     return store;
 }