From d35947661ec86abecf479729c42644433eb70203 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Thu, 5 Nov 2020 10:59:35 +0100
Subject: [PATCH] Rename manager to coreManager

---
 linphone-app/src/app/App.cpp                     | 4 ++--
 linphone-app/src/components/core/CoreManager.cpp | 6 +++---
 linphone-app/src/components/core/CoreManager.hpp | 4 ++--
 linphone-app/ui/views/App/Main/MainWindow.qml    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp
index 805a6f0b0..a933ac9de 100644
--- a/linphone-app/src/app/App.cpp
+++ b/linphone-app/src/app/App.cpp
@@ -397,7 +397,7 @@ void App::initContentApp () {
 
   QObject::connect(
     CoreManager::getInstance(),
-    &CoreManager::managerInitialized, CoreManager::getInstance(),
+    &CoreManager::coreManagerInitialized, CoreManager::getInstance(),
     [this, mustBeIconified]() mutable {
       if(CoreManager::getInstance()->started())
         openAppAfterInit(mustBeIconified);
@@ -894,7 +894,7 @@ void App::openAppAfterInit (bool mustBeIconified) {
           coreManager->getCallsListModel()->launchAudioCall(sipAddress);
         }else{
           QObject * context = new QObject();
-          QObject::connect(CoreManager::getInstance(), &CoreManager::managerInitialized,context,
+          QObject::connect(CoreManager::getInstance(), &CoreManager::coreManagerInitialized,context,
           [sipAddress,coreManager, context]() mutable {
             if(context){
               delete context;
diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp
index 5318a59b8..98ce44f5f 100644
--- a/linphone-app/src/components/core/CoreManager.cpp
+++ b/linphone-app/src/components/core/CoreManager.cpp
@@ -75,7 +75,7 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) :
 	mCore = nullptr;
 	CoreHandlers *coreHandlers = mHandlers.get();
 	QObject::connect(coreHandlers, &CoreHandlers::coreStarting, this, &CoreManager::startIterate, Qt::QueuedConnection);
-	QObject::connect(coreHandlers, &CoreHandlers::coreStarted, this, &CoreManager::initManager, Qt::QueuedConnection);
+	QObject::connect(coreHandlers, &CoreHandlers::coreStarted, this, &CoreManager::initCoreManager, Qt::QueuedConnection);
 	QObject::connect(coreHandlers, &CoreHandlers::coreStopped, this, &CoreManager::stopIterate, Qt::QueuedConnection);
 	QObject::connect(coreHandlers, &CoreHandlers::logsUploadStateChanged, this, &CoreManager::handleLogsUploadStateChanged);
 
@@ -90,7 +90,7 @@ CoreManager::~CoreManager(){
 
 // -----------------------------------------------------------------------------
 
-void CoreManager::initManager(){
+void CoreManager::initCoreManager(){
 	mCallsListModel = new CallsListModel(this);
 	mContactsListModel = new ContactsListModel(this);
 	mAccountSettingsModel = new AccountSettingsModel(this);
@@ -102,7 +102,7 @@ void CoreManager::initManager(){
 	migrate();
 	mStarted = true;
 	qInfo() << QStringLiteral("CoreManager initialized");
-	emit managerInitialized();
+	emit coreManagerInitialized();
 }
 
 shared_ptr<ChatModel> CoreManager::getChatModel (const QString &peerAddress, const QString &localAddress) {
diff --git a/linphone-app/src/components/core/CoreManager.hpp b/linphone-app/src/components/core/CoreManager.hpp
index d6e040c9d..74b45193b 100644
--- a/linphone-app/src/components/core/CoreManager.hpp
+++ b/linphone-app/src/components/core/CoreManager.hpp
@@ -138,12 +138,12 @@ public:
   static bool isInstanciated(){return mInstance!=nullptr;}
 
 public slots:
-    void initManager();
+    void initCoreManager();
     void startIterate();
     void stopIterate();
 
 signals:
-  void managerInitialized ();
+  void coreManagerInitialized ();
 
   void chatModelCreated (const std::shared_ptr<ChatModel> &chatModel);
   void historyModelCreated (HistoryModel *historyModel);
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index de88c2123..8cbcfbadf 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -51,7 +51,7 @@ ApplicationWindow {
 
   Connections {
     target: CoreManager
-    onManagerInitialized: mainLoader.active = true
+    onCoreManagerInitialized: mainLoader.active = true
   }
 
   Shortcut {