From 277e5d40a321a13393d1a808acb40d903964097e Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 3 May 2017 16:26:00 +0200
Subject: [PATCH] feat(src/app/App): better way to register components

---
 linphone-desktop/src/app/App.cpp | 55 ++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index ad0411b5d..7886188ae 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -278,6 +278,15 @@ bool App::hasFocus () const {
   } \
 )
 
+#define registerUncreatableType(TYPE, NAME) qmlRegisterUncreatableType<TYPE>( \
+  "Linphone", 1, 0, NAME, NAME " is uncreatable." \
+)
+
+template<class T>
+void registerMetaType (const char *name) {
+  qRegisterMetaType<T>(name);
+}
+
 template<class T>
 void registerSingletonType (const char *name) {
   qmlRegisterSingletonType<T>(
@@ -288,33 +297,23 @@ void registerSingletonType (const char *name) {
   );
 }
 
+template<class T>
+void registerType (const char *name) {
+  qmlRegisterType<T>("Linphone", 1, 0, name);
+}
+
 void App::registerTypes () {
   qInfo() << "Registering types...";
 
-  qmlRegisterType<AssistantModel>("Linphone", 1, 0, "AssistantModel");
-  qmlRegisterType<AuthenticationNotifier>("Linphone", 1, 0, "AuthenticationNotifier");
-  qmlRegisterType<Camera>("Linphone", 1, 0, "Camera");
-  qmlRegisterType<CameraPreview>("Linphone", 1, 0, "CameraPreview");
-  qmlRegisterType<ChatModel>("Linphone", 1, 0, "ChatModel");
-  qmlRegisterType<ChatProxyModel>("Linphone", 1, 0, "ChatProxyModel");
-  qmlRegisterType<ContactsListProxyModel>("Linphone", 1, 0, "ContactsListProxyModel");
-  qmlRegisterType<SmartSearchBarModel>("Linphone", 1, 0, "SmartSearchBarModel");
-  qmlRegisterType<SoundPlayer>("Linphone", 1, 0, "SoundPlayer");
-
-  qRegisterMetaType<ChatModel::EntryType>("ChatModel::EntryType");
-
-  qmlRegisterUncreatableType<CallModel>(
-    "Linphone", 1, 0, "CallModel", "CallModel is uncreatable."
-  );
-  qmlRegisterUncreatableType<ContactModel>(
-    "Linphone", 1, 0, "ContactModel", "ContactModel is uncreatable."
-  );
-  qmlRegisterUncreatableType<SipAddressObserver>(
-    "Linphone", 1, 0, "SipAddressObserver", "SipAddressObserver is uncreatable."
-  );
-  qmlRegisterUncreatableType<VcardModel>(
-    "Linphone", 1, 0, "VcardModel", "VcardModel is uncreatable."
-  );
+  registerType<AssistantModel>("AssistantModel");
+  registerType<AuthenticationNotifier>("AuthenticationNotifier");
+  registerType<Camera>("Camera");
+  registerType<CameraPreview>("CameraPreview");
+  registerType<ChatModel>("ChatModel");
+  registerType<ChatProxyModel>("ChatProxyModel");
+  registerType<ContactsListProxyModel>("ContactsListProxyModel");
+  registerType<SmartSearchBarModel>("SmartSearchBarModel");
+  registerType<SoundPlayer>("SoundPlayer");
 
   registerSingletonType<AudioCodecsModel>("AudioCodecsModel");
   registerSingletonType<OwnPresenceModel>("OwnPresenceModel");
@@ -322,6 +321,13 @@ void App::registerTypes () {
   registerSingletonType<TimelineModel>("TimelineModel");
   registerSingletonType<VideoCodecsModel>("VideoCodecsModel");
 
+  registerMetaType<ChatModel::EntryType>("ChatModel::EntryType");
+
+  registerUncreatableType(CallModel, "CallModel");
+  registerUncreatableType(ContactModel, "ContactModel");
+  registerUncreatableType(SipAddressObserver, "SipAddressObserver");
+  registerUncreatableType(VcardModel, "VcardModel");
+
   registerSharedSingletonType(App, "App", App::getInstance);
   registerSharedSingletonType(CoreManager, "CoreManager", CoreManager::getInstance);
   registerSharedSingletonType(SettingsModel, "SettingsModel", CoreManager::getInstance()->getSettingsModel);
@@ -331,6 +337,7 @@ void App::registerTypes () {
   registerSharedSingletonType(ContactsListModel, "ContactsListModel", CoreManager::getInstance()->getContactsListModel);
 }
 
+#undef registerUncreatableType
 #undef registerSharedSingletonType
 
 // -----------------------------------------------------------------------------