mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(App): replace "" by QString("") when possible

Browse source
This commit is contained in:
Wescoeur 2017-06-26 20:32:20 +02:00
parent a292d0ef0d
commit b74f36a770
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/App.cpp
View file

@ -230,7 +230,7 @@ void App::initContentApp () {
QString App::getCommandArgument () {
// TODO: Remove me when cmd option will be available.
return "";
return QString("");
// return mParser->value("cmd");
}
@ -542,7 +542,7 @@ void App::openAppAfterInit () {
{
shared_ptr<linphone::Config> config = CoreManager::getInstance()->getCore()->getConfig();
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);
}
}

20
src/components/assistant/AssistantModel.cpp
View file

@ -46,7 +46,7 @@ private:
const string &
) override {
if (status == linphone::AccountCreatorStatusAccountCreated)
emit mAssistant->createStatusChanged("");
emit mAssistant->createStatusChanged(QString(""));
else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit mAssistant->createStatusChanged(tr("requestFailed"));
@ -66,7 +66,7 @@ private:
shared_ptr<linphone::ProxyConfig> proxyConfig = creator->createProxyConfig();
Q_CHECK_PTR(proxyConfig);
emit mAssistant->loginStatusChanged("");
emit mAssistant->loginStatusChanged(QString(""));
} else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit mAssistant->loginStatusChanged(tr("requestFailed"));
@ -89,7 +89,7 @@ private:
Q_CHECK_PTR(proxyConfig);
}
emit mAssistant->activateStatusChanged("");
emit mAssistant->activateStatusChanged(QString(""));
} else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit mAssistant->activateStatusChanged(tr("requestFailed"));
@ -107,7 +107,7 @@ private:
shared_ptr<linphone::ProxyConfig> proxyConfig = creator->createProxyConfig();
Q_CHECK_PTR(proxyConfig);
emit mAssistant->activateStatusChanged("");
emit mAssistant->activateStatusChanged(QString(""));
} else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit mAssistant->activateStatusChanged(tr("requestFailed"));
@ -122,7 +122,7 @@ private:
const string &
) override {
if (status == linphone::AccountCreatorStatusRequestOk) {
emit mAssistant->recoverStatusChanged("");
emit mAssistant->recoverStatusChanged(QString(""));
} else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit mAssistant->recoverStatusChanged(tr("requestFailed"));
@ -170,13 +170,13 @@ void AssistantModel::login () {
}
void AssistantModel::reset () {
mCountryCode = "";
mCountryCode = QString("");
mAccountCreator->reset();
emit emailChanged("", "");
emit passwordChanged("", "");
emit phoneNumberChanged("", "");
emit usernameChanged("", "");
emit emailChanged(QString(""), QString(""));
emit passwordChanged(QString(""), QString(""));
emit phoneNumberChanged(QString(""), QString(""));
emit usernameChanged(QString(""), QString(""));
}
// -----------------------------------------------------------------------------

2
src/components/call/CallModel.cpp
View file

@ -597,7 +597,7 @@ void CallModel::updateStats (const shared_ptr<const linphone::CallStats> &callSt
statsList << ::createStat(tr("callStatsCodec"), payloadType
? 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("callStatsDownloadBandwidth"), QStringLiteral("%1 kbits/s").arg(int(callStats->getDownloadBandwidth())));
statsList << ::createStat(tr("callStatsIceState"), iceStateToString(callStats->getIceState()));

2
src/components/contacts/ContactsListModel.cpp
View file

@ -181,7 +181,7 @@ void ContactsListModel::cleanAvatars () {
for (const auto &contact : mList) {
VcardModel *vcardModel = contact->cloneVcardModel();
vcardModel->setAvatar("");
vcardModel->setAvatar(QString(""));
contact->setVcardModel(vcardModel);
}
}

2
src/components/settings/AccountSettingsModel.cpp
View file

@ -91,7 +91,7 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
const shared_ptr<const linphone::Address> address = proxyConfig->getIdentityAddress();
map["sipAddress"] = address
? ::Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asStringUriOnly())
: "";
: QString("");
}
map["serverAddress"] = ::Utils::coreStringToAppString(proxyConfig->getServerAddr());

2
src/components/settings/SettingsModel.cpp
View file

@ -583,7 +583,7 @@ QString SettingsModel::getTurnPassword () const {
shared_ptr<linphone::NatPolicy> natPolicy = core->getNatPolicy();
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) {

2
src/components/sip-addresses/SipAddressesModel.cpp
View file

@ -183,7 +183,7 @@ QString SipAddressesModel::interpretUrl (const QString &sipAddress) {
::Utils::appStringToCoreString(sipAddress)
);
return lAddress ? ::Utils::coreStringToAppString(lAddress->asStringUriOnly()) : "";
return lAddress ? ::Utils::coreStringToAppString(lAddress->asStringUriOnly()) : QString("");
}
QString SipAddressesModel::interpretUrl (const QUrl &sipAddress) {