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

Adapt to SDK 5.5.

Browse source
This commit is contained in:
Simon Morlat 2025-08-27 15:00:34 +02:00
parent 5911cce057
commit d976decb3f
5 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Linphone/core/address-books/ldap/LdapCore.cpp
View file

@ -21,6 +21,21 @@
#include "LdapCore.hpp" #include "LdapCore.hpp"
#include "core/App.hpp" #include "core/App.hpp"
/*
* This files uses a few methods of linphone::LdapParams class that are marked as deprecated.
* They are replaced by equivalents in the linphone::RemoteContactDirectory class, that actually holds
* the linphone::LdapParams.
* TODO: do the migration to new methods.
* Meanwhile, make the deprecated warning not to be treated as an error.
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
DEFINE_ABSTRACT_OBJECT(LdapCore) DEFINE_ABSTRACT_OBJECT(LdapCore)
QSharedPointer<LdapCore> LdapCore::create(const std::shared_ptr<linphone::RemoteContactDirectory> &ldap) { QSharedPointer<LdapCore> LdapCore::create(const std::shared_ptr<linphone::RemoteContactDirectory> &ldap) {
@ -95,10 +110,10 @@ void LdapCore::setSelf(QSharedPointer<LdapCore> me) {
DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, bool, debug, Debug) DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, bool, debug, Debug)
mLdapModelConnection->makeConnectToModel(&LdapModel::saved, [this]() { mLdapModelConnection->makeConnectToModel(&LdapModel::saved, [this]() {
mLdapModelConnection->invokeToCore([this]() { emit App::getInstance()->getSettings()->ldapConfigChanged(); }); mLdapModelConnection->invokeToCore([this]() { emit App::getInstance() -> getSettings()->ldapConfigChanged(); });
}); });
mLdapModelConnection->makeConnectToModel(&LdapModel::removed, [this]() { mLdapModelConnection->makeConnectToModel(&LdapModel::removed, [this]() {
mLdapModelConnection->invokeToCore([this]() { emit App::getInstance()->getSettings()->ldapConfigChanged(); }); mLdapModelConnection->invokeToCore([this]() { emit App::getInstance() -> getSettings()->ldapConfigChanged(); });
}); });
} }

15
Linphone/model/address-books/ldap/LdapModel.cpp
View file

@ -22,6 +22,21 @@
#include "model/core/CoreModel.hpp" #include "model/core/CoreModel.hpp"
#include "tool/Utils.hpp" #include "tool/Utils.hpp"
/*
* This files uses a few methods of linphone::LdapParams class that are marked as deprecated.
* They are replaced by equivalents in the linphone::RemoteContactDirectory class, that actually holds
* the linphone::LdapParams.
* TODO: do the migration to new methods.
* Meanwhile, make the deprecated warning not to be treated as an error.
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
DEFINE_ABSTRACT_OBJECT(LdapModel) DEFINE_ABSTRACT_OBJECT(LdapModel)
LdapModel::LdapModel(const std::shared_ptr<linphone::RemoteContactDirectory> &ldap, QObject *parent) { LdapModel::LdapModel(const std::shared_ptr<linphone::RemoteContactDirectory> &ldap, QObject *parent) {

2
Linphone/model/chat/ChatModel.cpp
View file

@ -182,7 +182,7 @@ ChatModel::searchMessageByText(QString text, std::shared_ptr<const linphone::Eve
} }
void ChatModel::compose() { void ChatModel::compose() {
mMonitor->compose(); mMonitor->composeTextMessage();
} }
linphone::ChatRoom::State ChatModel::getState() const { linphone::ChatRoom::State ChatModel::getState() const {

2
cmake/install/install.cmake
View file

@ -20,7 +20,7 @@
# #
################################################################################ ################################################################################
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.5)
set(TARGET_NAME Linphone) set(TARGET_NAME Linphone)

2
external/linphone-sdk vendored

@ -1 +1 @@
Subproject commit 6a0195583bae2ca8e35972d9cceeb4688bfc31cf Subproject commit a55ec92858c1aca1f9f86d41e7a867b944393388