From 6f06380f1cb99fa3e2b12f4cdb1812be21d6cb61 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Fri, 8 Nov 2024 09:07:22 +0100 Subject: [PATCH] Remove unecessary constructors leading to crash LdapCore code formatting glitch --- Linphone/core/address-books/carddav/CarddavGui.cpp | 8 -------- Linphone/core/address-books/carddav/CarddavGui.hpp | 1 - Linphone/core/address-books/ldap/LdapCore.cpp | 4 ++-- Linphone/core/address-books/ldap/LdapGui.cpp | 8 -------- Linphone/core/address-books/ldap/LdapGui.hpp | 1 - 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Linphone/core/address-books/carddav/CarddavGui.cpp b/Linphone/core/address-books/carddav/CarddavGui.cpp index 842c2fa57..28e0e8624 100644 --- a/Linphone/core/address-books/carddav/CarddavGui.cpp +++ b/Linphone/core/address-books/carddav/CarddavGui.cpp @@ -23,14 +23,6 @@ DEFINE_ABSTRACT_OBJECT(CarddavGui) -CarddavGui::CarddavGui(QObject *parent) : QObject(parent) { - mustBeInMainThread(getClassName()); - App::postModelSync([this]() { - mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); - mCore = CarddavCore::create(nullptr); - }); -} - CarddavGui::CarddavGui(QSharedPointer core) { App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership); mCore = core; diff --git a/Linphone/core/address-books/carddav/CarddavGui.hpp b/Linphone/core/address-books/carddav/CarddavGui.hpp index 5bc4d2400..a18ad9f11 100644 --- a/Linphone/core/address-books/carddav/CarddavGui.hpp +++ b/Linphone/core/address-books/carddav/CarddavGui.hpp @@ -31,7 +31,6 @@ class CarddavGui : public QObject, public AbstractObject { Q_PROPERTY(CarddavCore *core READ getCore CONSTANT) public: - CarddavGui(QObject *parent = nullptr); CarddavGui(QSharedPointer core); ~CarddavGui(); CarddavCore *getCore() const; diff --git a/Linphone/core/address-books/ldap/LdapCore.cpp b/Linphone/core/address-books/ldap/LdapCore.cpp index c16ce609d..d4d91aac7 100644 --- a/Linphone/core/address-books/ldap/LdapCore.cpp +++ b/Linphone/core/address-books/ldap/LdapCore.cpp @@ -104,9 +104,9 @@ void LdapCore::setSelf(QSharedPointer me) { DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, bool, debug, Debug) 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->invokeToCore([this]() { emit App::getInstance() -> getSettings()->ldapConfigChanged(); }); + mLdapModelConnection->invokeToCore([this]() { emit App::getInstance()->getSettings()->ldapConfigChanged(); }); }); } diff --git a/Linphone/core/address-books/ldap/LdapGui.cpp b/Linphone/core/address-books/ldap/LdapGui.cpp index e2c6956c3..40827ff10 100644 --- a/Linphone/core/address-books/ldap/LdapGui.cpp +++ b/Linphone/core/address-books/ldap/LdapGui.cpp @@ -23,14 +23,6 @@ DEFINE_ABSTRACT_OBJECT(LdapGui) -LdapGui::LdapGui(QObject *parent) : QObject(parent) { - mustBeInMainThread(getClassName()); - App::postModelSync([this]() { - mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); - mCore = LdapCore::create(nullptr); - }); -} - LdapGui::LdapGui(QSharedPointer core) { App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership); mCore = core; diff --git a/Linphone/core/address-books/ldap/LdapGui.hpp b/Linphone/core/address-books/ldap/LdapGui.hpp index c345e4d36..819c93f41 100644 --- a/Linphone/core/address-books/ldap/LdapGui.hpp +++ b/Linphone/core/address-books/ldap/LdapGui.hpp @@ -31,7 +31,6 @@ class LdapGui : public QObject, public AbstractObject { Q_PROPERTY(LdapCore *core READ getCore CONSTANT) public: - LdapGui(QObject *parent = nullptr); LdapGui(QSharedPointer core); ~LdapGui(); LdapCore *getCore() const;