Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
f72f40d0
Commit
f72f40d0
authored
Jan 26, 2018
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(CoreManager): coding style
parent
74639a7d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
CoreManager.cpp
src/components/core/CoreManager.cpp
+10
-7
CoreManager.hpp
src/components/core/CoreManager.hpp
+1
-1
No files found.
src/components/core/CoreManager.cpp
View file @
f72f40d0
...
@@ -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,11 +244,13 @@ void CoreManager::migrate () {
...
@@ -243,11 +244,13 @@ 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
())
{
...
...
src/components/core/CoreManager.hpp
View file @
f72f40d0
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment