From b74f36a770427ce5303286241eb452632b0e2fea Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Mon, 26 Jun 2017 20:32:20 +0200 Subject: [PATCH] feat(App): replace "" by QString("") when possible --- src/app/App.cpp | 4 ++-- src/components/assistant/AssistantModel.cpp | 20 +++++++++---------- src/components/call/CallModel.cpp | 2 +- src/components/contacts/ContactsListModel.cpp | 2 +- .../settings/AccountSettingsModel.cpp | 2 +- src/components/settings/SettingsModel.cpp | 2 +- .../sip-addresses/SipAddressesModel.cpp | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/app/App.cpp b/src/app/App.cpp index a10a0b88e..bd06b60f6 100644 --- a/src/app/App.cpp +++ b/src/app/App.cpp @@ -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 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); } } diff --git a/src/components/assistant/AssistantModel.cpp b/src/components/assistant/AssistantModel.cpp index 162cc307a..7715bf909 100644 --- a/src/components/assistant/AssistantModel.cpp +++ b/src/components/assistant/AssistantModel.cpp @@ -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 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 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("")); } // ----------------------------------------------------------------------------- diff --git a/src/components/call/CallModel.cpp b/src/components/call/CallModel.cpp index 4e7a52b67..67678fd42 100644 --- a/src/components/call/CallModel.cpp +++ b/src/components/call/CallModel.cpp @@ -597,7 +597,7 @@ void CallModel::updateStats (const shared_ptr &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())); diff --git a/src/components/contacts/ContactsListModel.cpp b/src/components/contacts/ContactsListModel.cpp index e470e9283..b70938013 100644 --- a/src/components/contacts/ContactsListModel.cpp +++ b/src/components/contacts/ContactsListModel.cpp @@ -181,7 +181,7 @@ void ContactsListModel::cleanAvatars () { for (const auto &contact : mList) { VcardModel *vcardModel = contact->cloneVcardModel(); - vcardModel->setAvatar(""); + vcardModel->setAvatar(QString("")); contact->setVcardModel(vcardModel); } } diff --git a/src/components/settings/AccountSettingsModel.cpp b/src/components/settings/AccountSettingsModel.cpp index 772bbe611..63980f322 100644 --- a/src/components/settings/AccountSettingsModel.cpp +++ b/src/components/settings/AccountSettingsModel.cpp @@ -91,7 +91,7 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr
  • address = proxyConfig->getIdentityAddress(); map["sipAddress"] = address ? ::Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asStringUriOnly()) - : ""; + : QString(""); } map["serverAddress"] = ::Utils::coreStringToAppString(proxyConfig->getServerAddr()); diff --git a/src/components/settings/SettingsModel.cpp b/src/components/settings/SettingsModel.cpp index 2f5babde4..0d908325a 100644 --- a/src/components/settings/SettingsModel.cpp +++ b/src/components/settings/SettingsModel.cpp @@ -583,7 +583,7 @@ QString SettingsModel::getTurnPassword () const { shared_ptr natPolicy = core->getNatPolicy(); shared_ptr authInfo = core->findAuthInfo(natPolicy->getStunServerUsername(), "", ""); - return authInfo ? ::Utils::coreStringToAppString(authInfo->getPasswd()) : ""; + return authInfo ? ::Utils::coreStringToAppString(authInfo->getPasswd()) : QString(""); } void SettingsModel::setTurnPassword (const QString &password) { diff --git a/src/components/sip-addresses/SipAddressesModel.cpp b/src/components/sip-addresses/SipAddressesModel.cpp index 6166872cd..4f7397260 100644 --- a/src/components/sip-addresses/SipAddressesModel.cpp +++ b/src/components/sip-addresses/SipAddressesModel.cpp @@ -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) {