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
2ba712cc
Commit
2ba712cc
authored
Jan 06, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): replace all `asString` calls by `asStringUriOnly` calls
parent
65e53dee
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ChatModel.cpp
tests/src/components/chat/ChatModel.cpp
+1
-1
ContactsListProxyModel.cpp
tests/src/components/contacts/ContactsListProxyModel.cpp
+1
-1
SipAddressesModel.cpp
tests/src/components/sip-addresses/SipAddressesModel.cpp
+3
-3
No files found.
tests/src/components/chat/ChatModel.cpp
View file @
2ba712cc
...
@@ -134,7 +134,7 @@ QString ChatModel::getSipAddress () const {
...
@@ -134,7 +134,7 @@ QString ChatModel::getSipAddress () const {
return
""
;
return
""
;
return
::
Utils
::
linphoneStringToQString
(
return
::
Utils
::
linphoneStringToQString
(
m_chat_room
->
getPeerAddress
()
->
asString
()
m_chat_room
->
getPeerAddress
()
->
asString
UriOnly
()
);
);
}
}
...
...
tests/src/components/contacts/ContactsListProxyModel.cpp
View file @
2ba712cc
...
@@ -110,7 +110,7 @@ float ContactsListProxyModel::computeContactWeight (const ContactModel &contact)
...
@@ -110,7 +110,7 @@ float ContactsListProxyModel::computeContactWeight (const ContactModel &contact)
float
size
=
static_cast
<
float
>
(
addresses
.
size
());
float
size
=
static_cast
<
float
>
(
addresses
.
size
());
for
(
auto
it
=
addresses
.
cbegin
();
it
!=
addresses
.
cend
();
++
it
)
for
(
auto
it
=
addresses
.
cbegin
();
it
!=
addresses
.
cend
();
++
it
)
weight
+=
computeStringWeight
(
weight
+=
computeStringWeight
(
::
Utils
::
linphoneStringToQString
((
*
it
)
->
asString
()),
::
Utils
::
linphoneStringToQString
((
*
it
)
->
asString
UriOnly
()),
SIP_ADDRESSES_WEIGHT
/
size
SIP_ADDRESSES_WEIGHT
/
size
);
);
...
...
tests/src/components/sip-addresses/SipAddressesModel.cpp
View file @
2ba712cc
...
@@ -173,7 +173,7 @@ void SipAddressesModel::handleReceivedMessage (
...
@@ -173,7 +173,7 @@ void SipAddressesModel::handleReceivedMessage (
const
shared_ptr
<
linphone
::
ChatRoom
>
&
,
const
shared_ptr
<
linphone
::
ChatRoom
>
&
,
const
shared_ptr
<
linphone
::
ChatMessage
>
&
message
const
shared_ptr
<
linphone
::
ChatMessage
>
&
message
)
{
)
{
const
QString
&
sip_address
=
::
Utils
::
linphoneStringToQString
(
message
->
getFromAddress
()
->
asString
());
const
QString
&
sip_address
=
::
Utils
::
linphoneStringToQString
(
message
->
getFromAddress
()
->
asString
UriOnly
());
addOrUpdateSipAddress
(
sip_address
,
nullptr
,
static_cast
<
qint64
>
(
message
->
getTime
()));
addOrUpdateSipAddress
(
sip_address
,
nullptr
,
static_cast
<
qint64
>
(
message
->
getTime
()));
}
}
...
@@ -253,7 +253,7 @@ void SipAddressesModel::initSipAddresses () {
...
@@ -253,7 +253,7 @@ void SipAddressesModel::initSipAddresses () {
if
(
history
.
size
()
==
0
)
if
(
history
.
size
()
==
0
)
continue
;
continue
;
QString
sip_address
=
::
Utils
::
linphoneStringToQString
(
chat_room
->
getPeerAddress
()
->
asString
());
QString
sip_address
=
::
Utils
::
linphoneStringToQString
(
chat_room
->
getPeerAddress
()
->
asString
UriOnly
());
QVariantMap
map
;
QVariantMap
map
;
map
[
"sipAddress"
]
=
sip_address
;
map
[
"sipAddress"
]
=
sip_address
;
...
@@ -265,7 +265,7 @@ void SipAddressesModel::initSipAddresses () {
...
@@ -265,7 +265,7 @@ void SipAddressesModel::initSipAddresses () {
// Get sip addresses from calls.
// Get sip addresses from calls.
QSet
<
QString
>
address_done
;
QSet
<
QString
>
address_done
;
for
(
const
auto
&
call_log
:
core
->
getCallLogs
())
{
for
(
const
auto
&
call_log
:
core
->
getCallLogs
())
{
QString
sip_address
=
::
Utils
::
linphoneStringToQString
(
call_log
->
getRemoteAddress
()
->
asStringUriOnly
());
const
QString
&
sip_address
=
::
Utils
::
linphoneStringToQString
(
call_log
->
getRemoteAddress
()
->
asStringUriOnly
());
if
(
address_done
.
contains
(
sip_address
))
if
(
address_done
.
contains
(
sip_address
))
continue
;
// Already used.
continue
;
// Already used.
...
...
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