data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unecessary constructors leading to crash

Browse source 
LdapCore code formatting glitch
This commit is contained in:
Christophe Deschamps 2024-11-08 09:07:22 +01:00
parent 6a26363aa8
commit 6f06380f1c
5 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Linphone/core/address-books/carddav/CarddavGui.cpp
View file

@ -23,14 +23,6 @@
DEFINE_ABSTRACT_OBJECT(CarddavGui) 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<CarddavCore> core) { CarddavGui::CarddavGui(QSharedPointer<CarddavCore> core) {
App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership); App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership);
mCore = core; mCore = core;

1
Linphone/core/address-books/carddav/CarddavGui.hpp
View file

@ -31,7 +31,6 @@ class CarddavGui : public QObject, public AbstractObject {
Q_PROPERTY(CarddavCore *core READ getCore CONSTANT) Q_PROPERTY(CarddavCore *core READ getCore CONSTANT)
public: public:
CarddavGui(QObject *parent = nullptr);
CarddavGui(QSharedPointer<CarddavCore> core); CarddavGui(QSharedPointer<CarddavCore> core);
~CarddavGui(); ~CarddavGui();
CarddavCore *getCore() const; CarddavCore *getCore() const;

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

@ -104,9 +104,9 @@ 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(); });
}); });
} }

8
Linphone/core/address-books/ldap/LdapGui.cpp
View file

@ -23,14 +23,6 @@
DEFINE_ABSTRACT_OBJECT(LdapGui) 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<LdapCore> core) { LdapGui::LdapGui(QSharedPointer<LdapCore> core) {
App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership); App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership);
mCore = core; mCore = core;

1
Linphone/core/address-books/ldap/LdapGui.hpp
View file

@ -31,7 +31,6 @@ class LdapGui : public QObject, public AbstractObject {
Q_PROPERTY(LdapCore *core READ getCore CONSTANT) Q_PROPERTY(LdapCore *core READ getCore CONSTANT)
public: public:
LdapGui(QObject *parent = nullptr);
LdapGui(QSharedPointer<LdapCore> core); LdapGui(QSharedPointer<LdapCore> core);
~LdapGui(); ~LdapGui();
LdapCore *getCore() const; LdapCore *getCore() const;