mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-27 08:49:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename manager to coreManager

Browse source
This commit is contained in:
Julien Wadel 2020-11-05 10:59:35 +01:00
parent aebf6b8d07
commit d35947661e
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-app/src/app/App.cpp
View file

@ -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;

6
linphone-app/src/components/core/CoreManager.cpp
View file

@ -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) {

4
linphone-app/src/components/core/CoreManager.hpp
View file

@ -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);

2
linphone-app/ui/views/App/Main/MainWindow.qml
View file

@ -51,7 +51,7 @@ ApplicationWindow {
Connections {
target: CoreManager
onManagerInitialized: mainLoader.active = true
onCoreManagerInitialized: mainLoader.active = true
}
Shortcut {