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
9d1f1d37
Commit
9d1f1d37
authored
Mar 23, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(src/app/App): rename `REGISTER_EXISTING_SINGLETON` to `registerSharedSingletonType`
parent
cc40bead
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
App.cpp
linphone-desktop/src/app/App.cpp
+8
-8
No files found.
linphone-desktop/src/app/App.cpp
View file @
9d1f1d37
...
...
@@ -271,7 +271,7 @@ bool App::hasFocus () const {
// -----------------------------------------------------------------------------
#define
REGISTER_EXISTING_SINGLETON
(TYPE, NAME, METHOD) qmlRegisterSingletonType<TYPE>( \
#define
registerSharedSingletonType
(TYPE, NAME, METHOD) qmlRegisterSingletonType<TYPE>( \
"Linphone", 1, 0, NAME, \
[](QQmlEngine *, QJSEngine *) -> QObject *{ \
QObject *object = METHOD(); \
...
...
@@ -319,15 +319,15 @@ void App::registerTypes () {
registerSingletonType
<
PresenceStatusModel
>
(
"PresenceStatusModel"
);
registerSingletonType
<
TimelineModel
>
(
"TimelineModel"
);
REGISTER_EXISTING_SINGLETON
(
App
,
"App"
,
App
::
getInstance
);
REGISTER_EXISTING_SINGLETON
(
CoreManager
,
"CoreManager"
,
CoreManager
::
getInstance
);
REGISTER_EXISTING_SINGLETON
(
SettingsModel
,
"SettingsModel"
,
CoreManager
::
getInstance
()
->
getSettingsModel
);
REGISTER_EXISTING_SINGLETON
(
SipAddressesModel
,
"SipAddressesModel"
,
CoreManager
::
getInstance
()
->
getSipAddressesModel
);
REGISTER_EXISTING_SINGLETON
(
CallsListModel
,
"CallsListModel"
,
CoreManager
::
getInstance
()
->
getCallsListModel
);
REGISTER_EXISTING_SINGLETON
(
ContactsListModel
,
"ContactsListModel"
,
CoreManager
::
getInstance
()
->
getContactsListModel
);
registerSharedSingletonType
(
App
,
"App"
,
App
::
getInstance
);
registerSharedSingletonType
(
CoreManager
,
"CoreManager"
,
CoreManager
::
getInstance
);
registerSharedSingletonType
(
SettingsModel
,
"SettingsModel"
,
CoreManager
::
getInstance
()
->
getSettingsModel
);
registerSharedSingletonType
(
SipAddressesModel
,
"SipAddressesModel"
,
CoreManager
::
getInstance
()
->
getSipAddressesModel
);
registerSharedSingletonType
(
CallsListModel
,
"CallsListModel"
,
CoreManager
::
getInstance
()
->
getCallsListModel
);
registerSharedSingletonType
(
ContactsListModel
,
"ContactsListModel"
,
CoreManager
::
getInstance
()
->
getContactsListModel
);
}
#undef
REGISTER_EXISTING_SINGLETON
#undef
registerSharedSingletonType
// -----------------------------------------------------------------------------
...
...
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