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

fix(CoreManager): coding style

Browse source
This commit is contained in:
Ronan Abhamon 2018-01-26 15:59:54 +01:00
parent 74639a7d3d
commit f72f40d080
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/components/core/CoreManager.cpp
View file

@ -73,8 +73,9 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) :
mInstance->mSettingsModel = new SettingsModel(mInstance);
mInstance->mAccountSettingsModel = new AccountSettingsModel(mInstance);
mInstance->mStarted = true;
mInstance->migrate();
mInstance->mStarted = true;
emit mInstance->coreStarted();
});
@ -243,19 +244,21 @@ void CoreManager::migrate () {
if (rcVersion == RC_VERSION_CURRENT)
return;
if (rcVersion > RC_VERSION_CURRENT) {
qWarning() << "RC file version (" << rcVersion << ") is more recent than app rc file version (" << RC_VERSION_CURRENT << ")!!!";
qWarning() << QStringLiteral("RC file version (%1) is more recent than app rc file version (%2)!!!")
.arg(rcVersion).arg(RC_VERSION_CURRENT);
return;
}
qInfo() << "Migrate from old rc file (" << rcVersion << "to" << RC_VERSION_CURRENT << ").";
qInfo() << QStringLiteral("Migrate from old rc file (%1 to %2).")
.arg(rcVersion).arg(RC_VERSION_CURRENT);
// Add message_expires param on old proxy configs.
for (const auto &proxyConfig : mCore->getProxyConfigList()) {
if (proxyConfig->getDomain() == "sip.linphone.org") {
proxyConfig->setContactParameters("message-expires=604800");
proxyConfig->setExpires(3600);
proxyConfig->done();
}
proxyConfig->setContactParameters("message-expires=604800");
proxyConfig->setExpires(3600);
proxyConfig->done();
}
}
config->setInt(SettingsModel::UI_SECTION, RC_VERSION_NAME, RC_VERSION_CURRENT);
}

2
src/components/core/CoreManager.hpp
View file

@ -143,7 +143,7 @@ private:
void setResourcesPaths ();
void createLinphoneCore (const QString &configPath);
void migrate();
void migrate ();
QString getVersion () const;