From 9d1f1d37cb4cba94ed8559704e949b8f4b20eb41 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 23 Mar 2017 16:35:27 +0100 Subject: [PATCH] feat(src/app/App): rename `REGISTER_EXISTING_SINGLETON` to `registerSharedSingletonType` --- linphone-desktop/src/app/App.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index 36a541581..d9b1230c6 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -271,7 +271,7 @@ bool App::hasFocus () const { // ----------------------------------------------------------------------------- -#define REGISTER_EXISTING_SINGLETON(TYPE, NAME, METHOD) qmlRegisterSingletonType( \ +#define registerSharedSingletonType(TYPE, NAME, METHOD) qmlRegisterSingletonType( \ "Linphone", 1, 0, NAME, \ [](QQmlEngine *, QJSEngine *) -> QObject *{ \ QObject *object = METHOD(); \ @@ -319,15 +319,15 @@ void App::registerTypes () { registerSingletonType("PresenceStatusModel"); registerSingletonType("TimelineModel"); - REGISTER_EXISTING_SINGLETON(App, "App", App::getInstance); - REGISTER_EXISTING_SINGLETON(CoreManager, "CoreManager", CoreManager::getInstance); - REGISTER_EXISTING_SINGLETON(SettingsModel, "SettingsModel", CoreManager::getInstance()->getSettingsModel); - REGISTER_EXISTING_SINGLETON(SipAddressesModel, "SipAddressesModel", CoreManager::getInstance()->getSipAddressesModel); - REGISTER_EXISTING_SINGLETON(CallsListModel, "CallsListModel", CoreManager::getInstance()->getCallsListModel); - REGISTER_EXISTING_SINGLETON(ContactsListModel, "ContactsListModel", CoreManager::getInstance()->getContactsListModel); + registerSharedSingletonType(App, "App", App::getInstance); + registerSharedSingletonType(CoreManager, "CoreManager", CoreManager::getInstance); + registerSharedSingletonType(SettingsModel, "SettingsModel", CoreManager::getInstance()->getSettingsModel); + registerSharedSingletonType(SipAddressesModel, "SipAddressesModel", CoreManager::getInstance()->getSipAddressesModel); + registerSharedSingletonType(CallsListModel, "CallsListModel", CoreManager::getInstance()->getCallsListModel); + registerSharedSingletonType(ContactsListModel, "ContactsListModel", CoreManager::getInstance()->getContactsListModel); } -#undef REGISTER_EXISTING_SINGLETON +#undef registerSharedSingletonType // -----------------------------------------------------------------------------