From 1e34f3878254440e2dca2298e26f3d38927b5161 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 14 Mar 2024 15:07:25 +0100 Subject: [PATCH] Fix build --- Linphone/core/timezone/TimeZone.cpp | 4 ++-- Linphone/core/timezone/TimeZoneList.cpp | 2 +- Linphone/model/conference/ConferenceModel.cpp | 9 ++++----- Linphone/model/conference/ConferenceModel.hpp | 4 ++-- Linphone/model/core/CoreModel.cpp | 2 +- Linphone/model/core/CoreModel.hpp | 4 ++-- Linphone/tool/Utils.cpp | 6 +++--- Linphone/tool/Utils.hpp | 2 +- external/linphone-sdk | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Linphone/core/timezone/TimeZone.cpp b/Linphone/core/timezone/TimeZone.cpp index 30677317a..ef19b17ef 100644 --- a/Linphone/core/timezone/TimeZone.cpp +++ b/Linphone/core/timezone/TimeZone.cpp @@ -48,9 +48,9 @@ int TimeZoneModel::getStandardTimeOffset() const { } QString TimeZoneModel::getCountryName() const { - return QLocale::countryToString(mTimeZone.country()); + return QLocale::territoryToString(mTimeZone.territory()); } QString TimeZoneModel::getDisplayName() const { return mTimeZone.displayName(QTimeZone::TimeType::GenericTime, QTimeZone::NameType::LongName); -} \ No newline at end of file +} diff --git a/Linphone/core/timezone/TimeZoneList.cpp b/Linphone/core/timezone/TimeZoneList.cpp index b3da8ea81..b32e56383 100644 --- a/Linphone/core/timezone/TimeZoneList.cpp +++ b/Linphone/core/timezone/TimeZoneList.cpp @@ -97,7 +97,7 @@ int TimeZoneList::get(const QTimeZone &timeZone) const { auto today = QDateTime::currentDateTime(); it = find_if(mList.cbegin(), mList.cend(), [&timeZone, today](QSharedPointer item) { auto tz = item.objectCast()->getTimeZone(); - return (timeZone.country() == QLocale::AnyCountry || tz.country() == timeZone.country()) && + return (timeZone.territory() == QLocale::AnyCountry || tz.territory() == timeZone.territory()) && tz.standardTimeOffset(today) == timeZone.standardTimeOffset(today); }); } diff --git a/Linphone/model/conference/ConferenceModel.cpp b/Linphone/model/conference/ConferenceModel.cpp index e18fc885f..38232b1f1 100644 --- a/Linphone/model/conference/ConferenceModel.cpp +++ b/Linphone/model/conference/ConferenceModel.cpp @@ -139,7 +139,7 @@ void ConferenceModel::onActiveSpeakerParticipantDevice( } void ConferenceModel::onParticipantAdded(const std::shared_ptr &conference, - const std::shared_ptr &participant) { + const std::shared_ptr &participant) { qDebug() << "onParticipantAdded: " << participant->getAddress()->asString().c_str(); emit participantAdded(participant); } @@ -148,9 +148,8 @@ void ConferenceModel::onParticipantRemoved(const std::shared_ptr &conference, - const std::shared_ptr &participantDevice) { +void ConferenceModel::onParticipantDeviceAdded(const std::shared_ptr &conference, + const std::shared_ptr &participantDevice) { qDebug() << "onParticipantDeviceAdded"; qDebug() << "Me devices : " << conference->getMe()->getDevices().size(); if (conference->getMe()->getDevices().size() > 1) @@ -215,4 +214,4 @@ void ConferenceModel::onSubjectChanged(const std::shared_ptr &conference, const std::shared_ptr &audioDevice) { qDebug() << "onAudioDeviceChanged is not yet implemented."; -} \ No newline at end of file +} diff --git a/Linphone/model/conference/ConferenceModel.hpp b/Linphone/model/conference/ConferenceModel.hpp index 70cc9bf23..2948a10a8 100644 --- a/Linphone/model/conference/ConferenceModel.hpp +++ b/Linphone/model/conference/ConferenceModel.hpp @@ -72,7 +72,7 @@ private: const std::shared_ptr &conference, const std::shared_ptr &participantDevice) override; virtual void onParticipantAdded(const std::shared_ptr &conference, - const std::shared_ptr &participant) override; + const std::shared_ptr &participant) override; virtual void onParticipantRemoved(const std::shared_ptr &conference, const std::shared_ptr &participant) override; virtual void @@ -80,7 +80,7 @@ private: const std::shared_ptr &participant) override; virtual void onParticipantDeviceAdded(const std::shared_ptr &conference, - const std::shared_ptr &participantDevice) override; + const std::shared_ptr &participantDevice) override; virtual void onParticipantDeviceRemoved(const std::shared_ptr &conference, const std::shared_ptr &participantDevice) override; diff --git a/Linphone/model/core/CoreModel.cpp b/Linphone/model/core/CoreModel.cpp index 3d3264b29..cf71c5d9a 100644 --- a/Linphone/model/core/CoreModel.cpp +++ b/Linphone/model/core/CoreModel.cpp @@ -226,7 +226,7 @@ void CoreModel::onConferenceStateChanged(const std::shared_ptr & emit conferenceStateChanged(core, conference, state); } void CoreModel::onConfiguringStatus(const std::shared_ptr &core, - linphone::Config::ConfiguringState status, + linphone::ConfiguringState status, const std::string &message) { emit configuringStatus(core, status, message); } diff --git a/Linphone/model/core/CoreModel.hpp b/Linphone/model/core/CoreModel.hpp index 8be452323..e5fe65865 100644 --- a/Linphone/model/core/CoreModel.hpp +++ b/Linphone/model/core/CoreModel.hpp @@ -113,7 +113,7 @@ private: linphone::Conference::State state) override; virtual void onConfiguringStatus(const std::shared_ptr &core, - linphone::Config::ConfiguringState status, + linphone::ConfiguringState status, const std::string &message) override; virtual void onDefaultAccountChanged(const std::shared_ptr &core, const std::shared_ptr &account) override; @@ -200,7 +200,7 @@ signals: const std::shared_ptr &conference, linphone::Conference::State state); void configuringStatus(const std::shared_ptr &core, - linphone::Config::ConfiguringState status, + linphone::ConfiguringState status, const std::string &message); void defaultAccountChanged(const std::shared_ptr &core, const std::shared_ptr &account); diff --git a/Linphone/tool/Utils.cpp b/Linphone/tool/Utils.cpp index 05dc10902..7e508ce44 100644 --- a/Linphone/tool/Utils.cpp +++ b/Linphone/tool/Utils.cpp @@ -355,7 +355,7 @@ QString Utils::computeUserAgent() { .arg(qVersion()); */ } -QString Utils::getCountryName(const QLocale::Country &p_country) { +QString Utils::getCountryName(const QLocale::Territory &p_country) { QString countryName; switch (p_country) { case QLocale::Afghanistan: @@ -1087,10 +1087,10 @@ QString Utils::getCountryName(const QLocale::Country &p_country) { if ((countryName = QCoreApplication::translate("country", "Zimbabwe")) == "Zimbabwe") countryName = ""; break; default: { - countryName = QLocale::countryToString(p_country); + countryName = QLocale::territoryToString(p_country); } } - if (countryName == "") countryName = QLocale::countryToString(p_country); + if (countryName == "") countryName = QLocale::territoryToString(p_country); return countryName; } QString Utils::toDateString(QDateTime date, const QString &format) { diff --git a/Linphone/tool/Utils.hpp b/Linphone/tool/Utils.hpp index 85aa4c84e..588729df8 100644 --- a/Linphone/tool/Utils.hpp +++ b/Linphone/tool/Utils.hpp @@ -95,7 +95,7 @@ public: Q_INVOKABLE static QString findAvatarByAddress(const QString &address); static QString generateSavedFilename(const QString &from, const QString &to); Q_INVOKABLE static bool isMe(const QString &address); - static QString getCountryName(const QLocale::Country &p_country); + static QString getCountryName(const QLocale::Territory &p_country); static QString getApplicationProduct(); static QString getOsProduct(); diff --git a/external/linphone-sdk b/external/linphone-sdk index f771d655e..98c2b724e 160000 --- a/external/linphone-sdk +++ b/external/linphone-sdk @@ -1 +1 @@ -Subproject commit f771d655e30169e59d8b3736d4e2a30e52e29f18 +Subproject commit 98c2b724e1a045eb46ccba23a912ba6e1ac0647d