mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 11:28:07 +00:00
Remove unecessary constructors leading to crash
LdapCore code formatting glitch
This commit is contained in:
parent
6a26363aa8
commit
6f06380f1c
5 changed files with 2 additions and 20 deletions
|
|
@ -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<CarddavCore> core) {
|
||||
App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership);
|
||||
mCore = core;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ class CarddavGui : public QObject, public AbstractObject {
|
|||
Q_PROPERTY(CarddavCore *core READ getCore CONSTANT)
|
||||
|
||||
public:
|
||||
CarddavGui(QObject *parent = nullptr);
|
||||
CarddavGui(QSharedPointer<CarddavCore> core);
|
||||
~CarddavGui();
|
||||
CarddavCore *getCore() const;
|
||||
|
|
|
|||
|
|
@ -104,9 +104,9 @@ void LdapCore::setSelf(QSharedPointer<LdapCore> 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(); });
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<LdapCore> core) {
|
||||
App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::JavaScriptOwnership);
|
||||
mCore = core;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ class LdapGui : public QObject, public AbstractObject {
|
|||
Q_PROPERTY(LdapCore *core READ getCore CONSTANT)
|
||||
|
||||
public:
|
||||
LdapGui(QObject *parent = nullptr);
|
||||
LdapGui(QSharedPointer<LdapCore> core);
|
||||
~LdapGui();
|
||||
LdapCore *getCore() const;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue