From d96628e0e9d9d017cf838ac37ce66e1a461ee2ae Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 21 Aug 2018 14:01:03 +0200
Subject: Factor typeDatabases implementations for different entity types

---
 common/domain/typeimplementations.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp
index d6b5b76..c74701d 100644
--- a/common/domain/typeimplementations.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -77,7 +77,11 @@ typedef IndexConfig<Calendar,
         ValueIndex<Calendar::Name>
     > CalendarIndexConfig;
 
-
+template <typename EntityType, typename EntityIndexConfig>
+QMap<QByteArray, int> defaultTypeDatabases()
+{
+    return merge(QMap<QByteArray, int>{{QByteArray{EntityType::name} + ".main", Storage::IntegerKeys}}, EntityIndexConfig::databases());
+}
 
 void TypeImplementation<Mail>::configure(TypeIndex &index)
 {
@@ -86,7 +90,7 @@ void TypeImplementation<Mail>::configure(TypeIndex &index)
 
 QMap<QByteArray, int> TypeImplementation<Mail>::typeDatabases()
 {
-    return merge(QMap<QByteArray, int>{{QByteArray{Mail::name} + ".main", Storage::IntegerKeys}}, MailIndexConfig::databases());
+    return defaultTypeDatabases<Mail, MailIndexConfig>();
 }
 
 void TypeImplementation<Mail>::configure(IndexPropertyMapper &indexPropertyMapper)
@@ -129,7 +133,7 @@ void TypeImplementation<Folder>::configure(TypeIndex &index)
 
 QMap<QByteArray, int> TypeImplementation<Folder>::typeDatabases()
 {
-    return merge(QMap<QByteArray, int>{{QByteArray{Folder::name} + ".main", Storage::IntegerKeys}}, FolderIndexConfig::databases());
+    return defaultTypeDatabases<Folder, FolderIndexConfig>();
 }
 
 void TypeImplementation<Folder>::configure(PropertyMapper &propertyMapper)
@@ -154,7 +158,7 @@ void TypeImplementation<Contact>::configure(TypeIndex &index)
 
 QMap<QByteArray, int> TypeImplementation<Contact>::typeDatabases()
 {
-    return merge(QMap<QByteArray, int>{{QByteArray{Contact::name} + ".main", Storage::IntegerKeys}}, ContactIndexConfig::databases());
+    return defaultTypeDatabases<Contact, ContactIndexConfig>();
 }
 
 void TypeImplementation<Contact>::configure(PropertyMapper &propertyMapper)
@@ -182,7 +186,7 @@ void TypeImplementation<Addressbook>::configure(TypeIndex &index)
 
 QMap<QByteArray, int> TypeImplementation<Addressbook>::typeDatabases()
 {
-    return merge(QMap<QByteArray, int>{{QByteArray{Addressbook::name} + ".main", Storage::IntegerKeys}}, AddressbookIndexConfig::databases());
+    return defaultTypeDatabases<Addressbook, AddressbookIndexConfig>();
 }
 
 void TypeImplementation<Addressbook>::configure(PropertyMapper &propertyMapper)
@@ -204,7 +208,7 @@ void TypeImplementation<Event>::configure(TypeIndex &index)
 
 QMap<QByteArray, int> TypeImplementation<Event>::typeDatabases()
 {
-    return merge(QMap<QByteArray, int>{{QByteArray{Event::name} + ".main", Storage::IntegerKeys}}, EventIndexConfig::databases());
+    return defaultTypeDatabases<Event, EventIndexConfig>();
 }
 
 void TypeImplementation<Event>::configure(PropertyMapper &propertyMapper)
@@ -232,7 +236,7 @@ void TypeImplementation<Todo>::configure(TypeIndex &index)
 
 QMap<QByteArray, int> TypeImplementation<Todo>::typeDatabases()
 {
-    return merge(QMap<QByteArray, int>{{QByteArray{Todo::name} + ".main", Storage::IntegerKeys}}, TodoIndexConfig::databases());
+    return defaultTypeDatabases<Todo, TodoIndexConfig>();
 }
 
 void TypeImplementation<Todo>::configure(PropertyMapper &propertyMapper)
@@ -263,7 +267,7 @@ void TypeImplementation<Calendar>::configure(TypeIndex &index)
 
 QMap<QByteArray, int> TypeImplementation<Calendar>::typeDatabases()
 {
-    return merge(QMap<QByteArray, int>{{QByteArray{Calendar::name} + ".main", Storage::IntegerKeys}}, CalendarIndexConfig::databases());
+    return defaultTypeDatabases<Calendar, CalendarIndexConfig>();
 }
 
 void TypeImplementation<Calendar>::configure(PropertyMapper &propertyMapper)
-- 
cgit v1.2.3