Commit f72f40d0 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(CoreManager): coding style

parent 74639a7d
...@@ -73,8 +73,9 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) : ...@@ -73,8 +73,9 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) :
mInstance->mSettingsModel = new SettingsModel(mInstance); mInstance->mSettingsModel = new SettingsModel(mInstance);
mInstance->mAccountSettingsModel = new AccountSettingsModel(mInstance); mInstance->mAccountSettingsModel = new AccountSettingsModel(mInstance);
mInstance->mStarted = true;
mInstance->migrate(); mInstance->migrate();
mInstance->mStarted = true;
emit mInstance->coreStarted(); emit mInstance->coreStarted();
}); });
...@@ -243,19 +244,21 @@ void CoreManager::migrate () { ...@@ -243,19 +244,21 @@ void CoreManager::migrate () {
if (rcVersion == RC_VERSION_CURRENT) if (rcVersion == RC_VERSION_CURRENT)
return; return;
if (rcVersion > RC_VERSION_CURRENT) { 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; 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. // Add message_expires param on old proxy configs.
for (const auto &proxyConfig : mCore->getProxyConfigList()) { for (const auto &proxyConfig : mCore->getProxyConfigList()) {
if (proxyConfig->getDomain() == "sip.linphone.org") { if (proxyConfig->getDomain() == "sip.linphone.org") {
proxyConfig->setContactParameters("message-expires=604800"); proxyConfig->setContactParameters("message-expires=604800");
proxyConfig->setExpires(3600); proxyConfig->setExpires(3600);
proxyConfig->done(); proxyConfig->done();
} }
} }
config->setInt(SettingsModel::UI_SECTION, RC_VERSION_NAME, RC_VERSION_CURRENT); config->setInt(SettingsModel::UI_SECTION, RC_VERSION_NAME, RC_VERSION_CURRENT);
} }
......
...@@ -143,7 +143,7 @@ private: ...@@ -143,7 +143,7 @@ private:
void setResourcesPaths (); void setResourcesPaths ();
void createLinphoneCore (const QString &configPath); void createLinphoneCore (const QString &configPath);
void migrate(); void migrate ();
QString getVersion () const; QString getVersion () const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment