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
b74f36a7
Commit
b74f36a7
authored
Jun 26, 2017
by
Wescoeur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(App): replace "" by QString("") when possible
parent
a292d0ef
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
17 deletions
+17
-17
App.cpp
src/app/App.cpp
+2
-2
AssistantModel.cpp
src/components/assistant/AssistantModel.cpp
+10
-10
CallModel.cpp
src/components/call/CallModel.cpp
+1
-1
ContactsListModel.cpp
src/components/contacts/ContactsListModel.cpp
+1
-1
AccountSettingsModel.cpp
src/components/settings/AccountSettingsModel.cpp
+1
-1
SettingsModel.cpp
src/components/settings/SettingsModel.cpp
+1
-1
SipAddressesModel.cpp
src/components/sip-addresses/SipAddressesModel.cpp
+1
-1
No files found.
src/app/App.cpp
View file @
b74f36a7
...
@@ -230,7 +230,7 @@ void App::initContentApp () {
...
@@ -230,7 +230,7 @@ void App::initContentApp () {
QString
App
::
getCommandArgument
()
{
QString
App
::
getCommandArgument
()
{
// TODO: Remove me when cmd option will be available.
// TODO: Remove me when cmd option will be available.
return
""
;
return
QString
(
""
)
;
// return mParser->value("cmd");
// return mParser->value("cmd");
}
}
...
@@ -542,7 +542,7 @@ void App::openAppAfterInit () {
...
@@ -542,7 +542,7 @@ void App::openAppAfterInit () {
{
{
shared_ptr
<
linphone
::
Config
>
config
=
CoreManager
::
getInstance
()
->
getCore
()
->
getConfig
();
shared_ptr
<
linphone
::
Config
>
config
=
CoreManager
::
getInstance
()
->
getCore
()
->
getConfig
();
if
(
config
->
getInt
(
SettingsModel
::
UI_SECTION
,
"force_assistant_at_startup"
,
1
))
{
if
(
config
->
getInt
(
SettingsModel
::
UI_SECTION
,
"force_assistant_at_startup"
,
1
))
{
QMetaObject
::
invokeMethod
(
mainWindow
,
"setView"
,
Q_ARG
(
QVariant
,
"Assistant"
),
Q_ARG
(
QVariant
,
""
));
QMetaObject
::
invokeMethod
(
mainWindow
,
"setView"
,
Q_ARG
(
QVariant
,
"Assistant"
),
Q_ARG
(
QVariant
,
QString
(
""
)
));
config
->
setInt
(
SettingsModel
::
UI_SECTION
,
"force_assistant_at_startup"
,
0
);
config
->
setInt
(
SettingsModel
::
UI_SECTION
,
"force_assistant_at_startup"
,
0
);
}
}
}
}
...
...
src/components/assistant/AssistantModel.cpp
View file @
b74f36a7
...
@@ -46,7 +46,7 @@ private:
...
@@ -46,7 +46,7 @@ private:
const
string
&
const
string
&
)
override
{
)
override
{
if
(
status
==
linphone
::
AccountCreatorStatusAccountCreated
)
if
(
status
==
linphone
::
AccountCreatorStatusAccountCreated
)
emit
mAssistant
->
createStatusChanged
(
""
);
emit
mAssistant
->
createStatusChanged
(
QString
(
""
)
);
else
{
else
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
emit
mAssistant
->
createStatusChanged
(
tr
(
"requestFailed"
));
emit
mAssistant
->
createStatusChanged
(
tr
(
"requestFailed"
));
...
@@ -66,7 +66,7 @@ private:
...
@@ -66,7 +66,7 @@ private:
shared_ptr
<
linphone
::
ProxyConfig
>
proxyConfig
=
creator
->
createProxyConfig
();
shared_ptr
<
linphone
::
ProxyConfig
>
proxyConfig
=
creator
->
createProxyConfig
();
Q_CHECK_PTR
(
proxyConfig
);
Q_CHECK_PTR
(
proxyConfig
);
emit
mAssistant
->
loginStatusChanged
(
""
);
emit
mAssistant
->
loginStatusChanged
(
QString
(
""
)
);
}
else
{
}
else
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
emit
mAssistant
->
loginStatusChanged
(
tr
(
"requestFailed"
));
emit
mAssistant
->
loginStatusChanged
(
tr
(
"requestFailed"
));
...
@@ -89,7 +89,7 @@ private:
...
@@ -89,7 +89,7 @@ private:
Q_CHECK_PTR
(
proxyConfig
);
Q_CHECK_PTR
(
proxyConfig
);
}
}
emit
mAssistant
->
activateStatusChanged
(
""
);
emit
mAssistant
->
activateStatusChanged
(
QString
(
""
)
);
}
else
{
}
else
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
emit
mAssistant
->
activateStatusChanged
(
tr
(
"requestFailed"
));
emit
mAssistant
->
activateStatusChanged
(
tr
(
"requestFailed"
));
...
@@ -107,7 +107,7 @@ private:
...
@@ -107,7 +107,7 @@ private:
shared_ptr
<
linphone
::
ProxyConfig
>
proxyConfig
=
creator
->
createProxyConfig
();
shared_ptr
<
linphone
::
ProxyConfig
>
proxyConfig
=
creator
->
createProxyConfig
();
Q_CHECK_PTR
(
proxyConfig
);
Q_CHECK_PTR
(
proxyConfig
);
emit
mAssistant
->
activateStatusChanged
(
""
);
emit
mAssistant
->
activateStatusChanged
(
QString
(
""
)
);
}
else
{
}
else
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
emit
mAssistant
->
activateStatusChanged
(
tr
(
"requestFailed"
));
emit
mAssistant
->
activateStatusChanged
(
tr
(
"requestFailed"
));
...
@@ -122,7 +122,7 @@ private:
...
@@ -122,7 +122,7 @@ private:
const
string
&
const
string
&
)
override
{
)
override
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestOk
)
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestOk
)
{
emit
mAssistant
->
recoverStatusChanged
(
""
);
emit
mAssistant
->
recoverStatusChanged
(
QString
(
""
)
);
}
else
{
}
else
{
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
if
(
status
==
linphone
::
AccountCreatorStatusRequestFailed
)
emit
mAssistant
->
recoverStatusChanged
(
tr
(
"requestFailed"
));
emit
mAssistant
->
recoverStatusChanged
(
tr
(
"requestFailed"
));
...
@@ -170,13 +170,13 @@ void AssistantModel::login () {
...
@@ -170,13 +170,13 @@ void AssistantModel::login () {
}
}
void
AssistantModel
::
reset
()
{
void
AssistantModel
::
reset
()
{
mCountryCode
=
""
;
mCountryCode
=
QString
(
""
)
;
mAccountCreator
->
reset
();
mAccountCreator
->
reset
();
emit
emailChanged
(
""
,
""
);
emit
emailChanged
(
QString
(
""
),
QString
(
""
)
);
emit
passwordChanged
(
""
,
""
);
emit
passwordChanged
(
QString
(
""
),
QString
(
""
)
);
emit
phoneNumberChanged
(
""
,
""
);
emit
phoneNumberChanged
(
QString
(
""
),
QString
(
""
)
);
emit
usernameChanged
(
""
,
""
);
emit
usernameChanged
(
QString
(
""
),
QString
(
""
)
);
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
...
...
src/components/call/CallModel.cpp
View file @
b74f36a7
...
@@ -597,7 +597,7 @@ void CallModel::updateStats (const shared_ptr<const linphone::CallStats> &callSt
...
@@ -597,7 +597,7 @@ void CallModel::updateStats (const shared_ptr<const linphone::CallStats> &callSt
statsList
<<
::
createStat
(
tr
(
"callStatsCodec"
),
payloadType
statsList
<<
::
createStat
(
tr
(
"callStatsCodec"
),
payloadType
?
QStringLiteral
(
"%1 / %2kHz"
).
arg
(
Utils
::
coreStringToAppString
(
payloadType
->
getMimeType
())).
arg
(
payloadType
->
getClockRate
()
/
1000
)
?
QStringLiteral
(
"%1 / %2kHz"
).
arg
(
Utils
::
coreStringToAppString
(
payloadType
->
getMimeType
())).
arg
(
payloadType
->
getClockRate
()
/
1000
)
:
""
);
:
QString
(
""
)
);
statsList
<<
::
createStat
(
tr
(
"callStatsUploadBandwidth"
),
QStringLiteral
(
"%1 kbits/s"
).
arg
(
int
(
callStats
->
getUploadBandwidth
())));
statsList
<<
::
createStat
(
tr
(
"callStatsUploadBandwidth"
),
QStringLiteral
(
"%1 kbits/s"
).
arg
(
int
(
callStats
->
getUploadBandwidth
())));
statsList
<<
::
createStat
(
tr
(
"callStatsDownloadBandwidth"
),
QStringLiteral
(
"%1 kbits/s"
).
arg
(
int
(
callStats
->
getDownloadBandwidth
())));
statsList
<<
::
createStat
(
tr
(
"callStatsDownloadBandwidth"
),
QStringLiteral
(
"%1 kbits/s"
).
arg
(
int
(
callStats
->
getDownloadBandwidth
())));
statsList
<<
::
createStat
(
tr
(
"callStatsIceState"
),
iceStateToString
(
callStats
->
getIceState
()));
statsList
<<
::
createStat
(
tr
(
"callStatsIceState"
),
iceStateToString
(
callStats
->
getIceState
()));
...
...
src/components/contacts/ContactsListModel.cpp
View file @
b74f36a7
...
@@ -181,7 +181,7 @@ void ContactsListModel::cleanAvatars () {
...
@@ -181,7 +181,7 @@ void ContactsListModel::cleanAvatars () {
for
(
const
auto
&
contact
:
mList
)
{
for
(
const
auto
&
contact
:
mList
)
{
VcardModel
*
vcardModel
=
contact
->
cloneVcardModel
();
VcardModel
*
vcardModel
=
contact
->
cloneVcardModel
();
vcardModel
->
setAvatar
(
""
);
vcardModel
->
setAvatar
(
QString
(
""
)
);
contact
->
setVcardModel
(
vcardModel
);
contact
->
setVcardModel
(
vcardModel
);
}
}
}
}
...
...
src/components/settings/AccountSettingsModel.cpp
View file @
b74f36a7
...
@@ -91,7 +91,7 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
...
@@ -91,7 +91,7 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
const
shared_ptr
<
const
linphone
::
Address
>
address
=
proxyConfig
->
getIdentityAddress
();
const
shared_ptr
<
const
linphone
::
Address
>
address
=
proxyConfig
->
getIdentityAddress
();
map
[
"sipAddress"
]
=
address
map
[
"sipAddress"
]
=
address
?
::
Utils
::
coreStringToAppString
(
proxyConfig
->
getIdentityAddress
()
->
asStringUriOnly
())
?
::
Utils
::
coreStringToAppString
(
proxyConfig
->
getIdentityAddress
()
->
asStringUriOnly
())
:
""
;
:
QString
(
""
)
;
}
}
map
[
"serverAddress"
]
=
::
Utils
::
coreStringToAppString
(
proxyConfig
->
getServerAddr
());
map
[
"serverAddress"
]
=
::
Utils
::
coreStringToAppString
(
proxyConfig
->
getServerAddr
());
...
...
src/components/settings/SettingsModel.cpp
View file @
b74f36a7
...
@@ -583,7 +583,7 @@ QString SettingsModel::getTurnPassword () const {
...
@@ -583,7 +583,7 @@ QString SettingsModel::getTurnPassword () const {
shared_ptr
<
linphone
::
NatPolicy
>
natPolicy
=
core
->
getNatPolicy
();
shared_ptr
<
linphone
::
NatPolicy
>
natPolicy
=
core
->
getNatPolicy
();
shared_ptr
<
const
linphone
::
AuthInfo
>
authInfo
=
core
->
findAuthInfo
(
natPolicy
->
getStunServerUsername
(),
""
,
""
);
shared_ptr
<
const
linphone
::
AuthInfo
>
authInfo
=
core
->
findAuthInfo
(
natPolicy
->
getStunServerUsername
(),
""
,
""
);
return
authInfo
?
::
Utils
::
coreStringToAppString
(
authInfo
->
getPasswd
())
:
""
;
return
authInfo
?
::
Utils
::
coreStringToAppString
(
authInfo
->
getPasswd
())
:
QString
(
""
)
;
}
}
void
SettingsModel
::
setTurnPassword
(
const
QString
&
password
)
{
void
SettingsModel
::
setTurnPassword
(
const
QString
&
password
)
{
...
...
src/components/sip-addresses/SipAddressesModel.cpp
View file @
b74f36a7
...
@@ -183,7 +183,7 @@ QString SipAddressesModel::interpretUrl (const QString &sipAddress) {
...
@@ -183,7 +183,7 @@ QString SipAddressesModel::interpretUrl (const QString &sipAddress) {
::
Utils
::
appStringToCoreString
(
sipAddress
)
::
Utils
::
appStringToCoreString
(
sipAddress
)
);
);
return
lAddress
?
::
Utils
::
coreStringToAppString
(
lAddress
->
asStringUriOnly
())
:
""
;
return
lAddress
?
::
Utils
::
coreStringToAppString
(
lAddress
->
asStringUriOnly
())
:
QString
(
""
)
;
}
}
QString
SipAddressesModel
::
interpretUrl
(
const
QUrl
&
sipAddress
)
{
QString
SipAddressesModel
::
interpretUrl
(
const
QUrl
&
sipAddress
)
{
...
...
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