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
4415bf52
Commit
4415bf52
authored
Jun 26, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(Notifier): do not use std string params
parent
9853b693
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
CoreHandlers.cpp
src/components/core/CoreHandlers.cpp
+4
-1
Notifier.cpp
src/components/notifier/Notifier.cpp
+3
-3
Notifier.hpp
src/components/notifier/Notifier.hpp
+1
-1
No files found.
src/components/core/CoreHandlers.cpp
View file @
4415bf52
...
...
@@ -236,5 +236,8 @@ void CoreHandlers::onVersionUpdateCheckResultReceived (
const
string
&
url
)
{
if
(
result
==
linphone
::
VersionUpdateCheckResultNewVersionAvailable
)
App
::
getInstance
()
->
getNotifier
()
->
notifyNewVersionAvailable
(
version
,
url
);
App
::
getInstance
()
->
getNotifier
()
->
notifyNewVersionAvailable
(
::
Utils
::
coreStringToAppString
(
version
),
::
Utils
::
coreStringToAppString
(
url
)
);
}
src/components/notifier/Notifier.cpp
View file @
4415bf52
...
...
@@ -261,14 +261,14 @@ void Notifier::notifyReceivedCall (const shared_ptr<linphone::Call> &call) {
showNotification
(
notification
,
NOTIFICATION_TIMEOUT_RECEIVED_CALL
);
}
void
Notifier
::
notifyNewVersionAvailable
(
const
string
&
version
,
const
s
tring
&
url
)
{
void
Notifier
::
notifyNewVersionAvailable
(
const
QString
&
version
,
const
QS
tring
&
url
)
{
QObject
*
notification
=
createNotification
(
Notifier
::
NewVersionAvailable
);
if
(
!
notification
)
return
;
QVariantMap
map
;
map
[
"message"
]
=
tr
(
"newVersionAvailable"
).
arg
(
::
Utils
::
coreStringToAppString
(
version
)
);
map
[
"url"
]
=
::
Utils
::
coreStringToAppString
(
url
)
;
map
[
"message"
]
=
tr
(
"newVersionAvailable"
).
arg
(
version
);
map
[
"url"
]
=
url
;
::
setProperty
(
*
notification
,
NOTIFICATION_PROPERTY_DATA
,
map
);
showNotification
(
notification
,
NOTIFICATION_TIMEOUT_NEW_VERSION_AVAILABLE
);
...
...
src/components/notifier/Notifier.hpp
View file @
4415bf52
...
...
@@ -49,7 +49,7 @@ public:
void
notifyReceivedMessage
(
const
std
::
shared_ptr
<
linphone
::
ChatMessage
>
&
message
);
void
notifyReceivedFileMessage
(
const
std
::
shared_ptr
<
linphone
::
ChatMessage
>
&
message
);
void
notifyReceivedCall
(
const
std
::
shared_ptr
<
linphone
::
Call
>
&
call
);
void
notifyNewVersionAvailable
(
const
std
::
string
&
version
,
const
std
::
s
tring
&
url
);
void
notifyNewVersionAvailable
(
const
QString
&
version
,
const
QS
tring
&
url
);
public
slots
:
void
deleteNotification
(
QVariant
notification
);
...
...
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