diff --git a/linphone-app/src/components/assistant/AssistantModel.cpp b/linphone-app/src/components/assistant/AssistantModel.cpp index fb7051403..7005e62c1 100644 --- a/linphone-app/src/components/assistant/AssistantModel.cpp +++ b/linphone-app/src/components/assistant/AssistantModel.cpp @@ -226,19 +226,19 @@ bool AssistantModel::addOtherSipAccount (const QVariantMap &map) { if (proxyConfig->setServerAddr(address->asString())) { qWarning() << QStringLiteral("Unable to add server address: `%1`.") - .arg(Utils::coreStringToAppString(address->asString())); + .arg(QString::fromStdString(address->asString())); return false; } } // Sip Address. - shared_ptr address = factory->createAddress(Utils::appStringToCoreString(sipAddress)); + shared_ptr address = factory->createAddress(sipAddress.toStdString()); if (!address) { qWarning() << QStringLiteral("Unable to create sip address object from: `%1`.").arg(sipAddress); return false; } - address->setDisplayName(Utils::appStringToCoreString(map["displayName"].toString())); + address->setDisplayName(map["displayName"].toString().toStdString()); proxyConfig->setIdentityAddress(address); // AuthInfo. @@ -380,14 +380,14 @@ void AssistantModel::setUsername (const QString &username) { // ----------------------------------------------------------------------------- QString AssistantModel::getDisplayName () const { - return Utils::coreStringToAppString(mAccountCreator->getDisplayName()); + return QString::fromStdString(mAccountCreator->getDisplayName()); } void AssistantModel::setDisplayName (const QString &displayName) { emit displayNameChanged( displayName, mapAccountCreatorUsernameStatusToString( - mAccountCreator->setDisplayName(Utils::appStringToCoreString(displayName)) + mAccountCreator->setDisplayName(displayName.toStdString()) ) ); } diff --git a/linphone-app/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp index 5c058c7fc..c1aadc1aa 100644 --- a/linphone-app/src/components/call/CallModel.cpp +++ b/linphone-app/src/components/call/CallModel.cpp @@ -94,11 +94,11 @@ QString CallModel::getLocalAddress () const { return Utils::coreStringToAppString(mCall->getCallLog()->getLocalAddress()->asStringUriOnly()); } QString CallModel::getFullPeerAddress () const { - return Utils::coreStringToAppString(mCall->getRemoteAddress()->asString()); + return QString::fromStdString(mCall->getRemoteAddress()->asString()); } QString CallModel::getFullLocalAddress () const { - return Utils::coreStringToAppString(mCall->getCallLog()->getLocalAddress()->asString()); + return QString::fromStdString(mCall->getCallLog()->getLocalAddress()->asString()); } // ----------------------------------------------------------------------------- diff --git a/linphone-app/src/components/chat/ChatModel.cpp b/linphone-app/src/components/chat/ChatModel.cpp index 89b43b022..478a665bb 100644 --- a/linphone-app/src/components/chat/ChatModel.cpp +++ b/linphone-app/src/components/chat/ChatModel.cpp @@ -407,23 +407,19 @@ QString ChatModel::getLocalAddress () const { ); } QString ChatModel::getFullPeerAddress () const { - return Utils::coreStringToAppString( - mChatRoom->getPeerAddress()->asString() - ); + return QString::fromStdString(mChatRoom->getPeerAddress()->asString()); } QString ChatModel::getFullLocalAddress () const { - return Utils::coreStringToAppString( - mChatRoom->getLocalAddress()->asString() - ); + return QString::fromStdString(mChatRoom->getLocalAddress()->asString()); } void ChatModel::setSipAddresses (const QString &peerAddress, const QString &localAddress) { shared_ptr core = CoreManager::getInstance()->getCore(); shared_ptr factory(linphone::Factory::get()); mChatRoom = core->getChatRoom( - factory->createAddress(Utils::appStringToCoreString(peerAddress)), - factory->createAddress(Utils::appStringToCoreString(localAddress)) + factory->createAddress(peerAddress.toStdString()), + factory->createAddress(localAddress.toStdString()) ); Q_ASSERT(mChatRoom); diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp index 7927783b8..25307bd00 100644 --- a/linphone-app/src/components/core/CoreManager.cpp +++ b/linphone-app/src/components/core/CoreManager.cpp @@ -116,8 +116,8 @@ shared_ptr CoreManager::getChatModel (const QString &peerAddress, con QPair chatModelId{ peerAddress, localAddress }; if (!mChatModels.contains(chatModelId)) { if ( - !mCore->createAddress(Utils::appStringToCoreString(peerAddress)) || - !mCore->createAddress(Utils::appStringToCoreString(localAddress)) + !mCore->createAddress(peerAddress.toStdString()) || + !mCore->createAddress(localAddress.toStdString()) ) { qWarning() << QStringLiteral("Unable to get chat model from invalid chat model id: (%1, %2).") .arg(peerAddress).arg(localAddress); diff --git a/linphone-app/src/components/history/HistoryModel.cpp b/linphone-app/src/components/history/HistoryModel.cpp index 6c341f7cb..2e506cf3d 100644 --- a/linphone-app/src/components/history/HistoryModel.cpp +++ b/linphone-app/src/components/history/HistoryModel.cpp @@ -53,7 +53,7 @@ static inline void fillCallStartEntry (QVariantMap &dest, const shared_ptrgetDir() == linphone::Call::Dir::Outgoing; dest["status"] = static_cast(callLog->getStatus()); dest["isStart"] = true; - dest["sipAddress"] = Utils::coreStringToAppString(callLog->getRemoteAddress()->asString()); + dest["sipAddress"] = QString::fromStdString(callLog->getRemoteAddress()->asString()); } static inline void fillCallEndEntry (QVariantMap &dest, const shared_ptr &callLog) { @@ -62,7 +62,7 @@ static inline void fillCallEndEntry (QVariantMap &dest, const shared_ptrgetDir() == linphone::Call::Dir::Outgoing; dest["status"] = static_cast(callLog->getStatus()); dest["isStart"] = false; - dest["sipAddress"] = Utils::coreStringToAppString(callLog->getRemoteAddress()->asString()); + dest["sipAddress"] = QString::fromStdString(callLog->getRemoteAddress()->asString()); } // ----------------------------------------------------------------------------- diff --git a/linphone-app/src/components/notifier/Notifier.cpp b/linphone-app/src/components/notifier/Notifier.cpp index de5eb692b..3537c22b9 100644 --- a/linphone-app/src/components/notifier/Notifier.cpp +++ b/linphone-app/src/components/notifier/Notifier.cpp @@ -275,8 +275,8 @@ void Notifier::notifyReceivedMessage (const shared_ptr &m shared_ptr chatRoom(message->getChatRoom()); map["peerAddress"] = Utils::coreStringToAppString(chatRoom->getPeerAddress()->asStringUriOnly()); map["localAddress"] = Utils::coreStringToAppString(chatRoom->getLocalAddress()->asStringUriOnly()); - map["fullPeerAddress"] = Utils::coreStringToAppString(chatRoom->getPeerAddress()->asString()); - map["fullLocalAddress"] = Utils::coreStringToAppString(chatRoom->getLocalAddress()->asString()); + map["fullPeerAddress"] = QString::fromStdString(chatRoom->getPeerAddress()->asString()); + map["fullLocalAddress"] = QString::fromStdString(chatRoom->getLocalAddress()->asString()); map["window"].setValue(App::getInstance()->getMainWindow()); CREATE_NOTIFICATION(Notifier::ReceivedMessage, map) } diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp index c807ab87a..fd00664f4 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp @@ -84,7 +84,7 @@ QString AccountSettingsModel::getUsedSipAddressAsStringUriOnly () const { } QString AccountSettingsModel::getUsedSipAddressAsString () const { - return Utils::coreStringToAppString(getUsedSipAddress()->asString()); + return QString::fromStdString(getUsedSipAddress()->asString()); } // ----------------------------------------------------------------------------- @@ -98,14 +98,14 @@ bool AccountSettingsModel::addOrUpdateProxyConfig (const shared_ptrdone() == -1) { qWarning() << QStringLiteral("Unable to update proxy config: `%1`.") - .arg(Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asString())); + .arg(QString::fromStdString(proxyConfig->getIdentityAddress()->asString())); return false; } coreManager->getSettingsModel()->configureRlsUri(); } else { if (core->addProxyConfig(proxyConfig) == -1) { qWarning() << QStringLiteral("Unable to add proxy config: `%1`.") - .arg(Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asString())); + .arg(QString::fromStdString(proxyConfig->getIdentityAddress()->asString())); return false; } coreManager->getSettingsModel()->configureRlsUri(proxyConfig); @@ -123,7 +123,7 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr
  • address = proxyConfig->getIdentityAddress(); map["sipAddress"] = address - ? Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asString()) + ? QString::fromStdString(proxyConfig->getIdentityAddress()->asString()) : QString(""); } map["serverAddress"] = Utils::coreStringToAppString(proxyConfig->getServerAddr()); @@ -220,9 +220,7 @@ bool AccountSettingsModel::addOrUpdateProxyConfig ( // Sip address. { - shared_ptr address = linphone::Factory::get()->createAddress( - Utils::appStringToCoreString(literal) - ); + shared_ptr address = linphone::Factory::get()->createAddress(literal.toStdString()); if (!address) { qWarning() << QStringLiteral("Unable to create sip address object from: `%1`.").arg(literal); return false; @@ -329,7 +327,7 @@ QString AccountSettingsModel::getUsername () const { shared_ptr address = getUsedSipAddress(); const string displayName = address->getDisplayName(); - return Utils::coreStringToAppString( + return QString::fromStdString( displayName.empty() ? address->getUsername() : displayName ); } @@ -338,7 +336,7 @@ void AccountSettingsModel::setUsername (const QString &username) { shared_ptr address = getUsedSipAddress(); shared_ptr newAddress = address->clone(); - if (newAddress->setDisplayName(Utils::appStringToCoreString(username))) { + if (newAddress->setDisplayName(username.toStdString())) { qWarning() << QStringLiteral("Unable to set displayName on sip address: `%1`.") .arg(Utils::coreStringToAppString(newAddress->asStringUriOnly())); } else { @@ -374,23 +372,21 @@ void AccountSettingsModel::setPrimaryUsername (const QString &username) { } QString AccountSettingsModel::getPrimaryDisplayName () const { - return Utils::coreStringToAppString( - CoreManager::getInstance()->getCore()->createPrimaryContactParsed()->getDisplayName() - ); + return QString::fromStdString(CoreManager::getInstance()->getCore()->createPrimaryContactParsed()->getDisplayName()); } void AccountSettingsModel::setPrimaryDisplayName (const QString &displayName) { shared_ptr core = CoreManager::getInstance()->getCore(); shared_ptr primary = core->createPrimaryContactParsed(); - primary->setDisplayName(Utils::appStringToCoreString(displayName)); + primary->setDisplayName(displayName.toStdString()); core->setPrimaryContact(primary->asString()); emit accountSettingsUpdated(); } QString AccountSettingsModel::getPrimarySipAddress () const { - return Utils::coreStringToAppString( + return QString::fromStdString( CoreManager::getInstance()->getCore()->createPrimaryContactParsed()->asString() ); } @@ -404,7 +400,7 @@ QVariantList AccountSettingsModel::getAccounts () const { { QVariantMap account; account["sipAddress"] = Utils::coreStringToAppString(core->createPrimaryContactParsed()->asStringUriOnly()); - account["fullSipAddress"] = Utils::coreStringToAppString(core->createPrimaryContactParsed()->asString()); + account["fullSipAddress"] = QString::fromStdString(core->createPrimaryContactParsed()->asString()); account["unreadMessageCount"] = core->getUnreadChatMessageCountFromLocal(core->createPrimaryContactParsed()); account["missedCallCount"] = CoreManager::getInstance()->getMissedCallCountFromLocal(account["sipAddress"].toString()); account["proxyConfig"].setValue(nullptr); @@ -414,7 +410,7 @@ QVariantList AccountSettingsModel::getAccounts () const { for (const auto &proxyConfig : core->getProxyConfigList()) { QVariantMap account; account["sipAddress"] = Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asStringUriOnly()); - account["fullSipAddress"] = Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asString()); + account["fullSipAddress"] = QString::fromStdString(proxyConfig->getIdentityAddress()->asString()); account["proxyConfig"].setValue(proxyConfig); account["unreadMessageCount"] = proxyConfig->getUnreadChatMessageCount(); account["missedCallCount"] = CoreManager::getInstance()->getMissedCallCountFromLocal(account["sipAddress"].toString()); diff --git a/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp b/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp index 4de3697ac..31cb49424 100644 --- a/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp +++ b/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp @@ -155,10 +155,7 @@ SipAddressObserver *SipAddressesModel::getSipAddressObserver (const QString &pee QString SipAddressesModel::getTransportFromSipAddress (const QString &sipAddress) { if( sipAddress.toUpper().contains("TRANSPORT=")) {// Transport has been specified : check for it - const shared_ptr address = linphone::Factory::get()->createAddress( - Utils::appStringToCoreString(sipAddress) - ); - + const shared_ptr address = linphone::Factory::get()->createAddress(sipAddress.toStdString()); if (!address) return QString("TLS"); // Return TLS by default @@ -178,16 +175,14 @@ QString SipAddressesModel::getTransportFromSipAddress (const QString &sipAddress } QString SipAddressesModel::addTransportToSipAddress (const QString &sipAddress, const QString &transport) { - shared_ptr address = linphone::Factory::get()->createAddress( - Utils::appStringToCoreString(sipAddress) - ); + shared_ptr address = linphone::Factory::get()->createAddress(sipAddress.toStdString()); if (!address) return QString(""); address->setTransport(LinphoneUtils::stringToTransportType(transport.toUpper())); - return Utils::coreStringToAppString(address->asString()); + return QString::fromStdString(address->asString()); } // ----------------------------------------------------------------------------- @@ -207,15 +202,11 @@ QString SipAddressesModel::interpretSipAddress (const QUrl &sipAddress) { } bool SipAddressesModel::addressIsValid (const QString &address) { - return !!linphone::Factory::get()->createAddress( - Utils::appStringToCoreString(address) - ); + return !!linphone::Factory::get()->createAddress(address.toStdString()); } bool SipAddressesModel::sipAddressIsValid (const QString &sipAddress) { - shared_ptr address = linphone::Factory::get()->createAddress( - Utils::appStringToCoreString(sipAddress) - ); + shared_ptr address = linphone::Factory::get()->createAddress(sipAddress.toStdString()); return address && !address->getUsername().empty(); } // Return at most : sip:username@domain diff --git a/linphone-app/src/utils/Utils.cpp b/linphone-app/src/utils/Utils.cpp index 112cef63e..3ce2acbe8 100644 --- a/linphone-app/src/utils/Utils.cpp +++ b/linphone-app/src/utils/Utils.cpp @@ -97,7 +97,7 @@ std::shared_ptr Utils::getMatchingLocalAddress(std::shared_pt } // Return at most : sip:username@domain QString Utils::cleanSipAddress (const QString &sipAddress) { - std::shared_ptr addr = linphone::Factory::get()->createAddress(Utils::appStringToCoreString(sipAddress)); + std::shared_ptr addr = linphone::Factory::get()->createAddress(sipAddress.toStdString()); if( addr) { QStringList fields = Utils::coreStringToAppString(addr->asStringUriOnly()).split('@'); if(fields.size() > 0){// maybe useless but it's just to be sure to have a domain