diff options
Diffstat (limited to 'pbap')
| -rw-r--r-- | pbap/pbap.cpp | 13 | ||||
| -rw-r--r-- | pbap/pbap.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pbap/pbap.cpp b/pbap/pbap.cpp index 53b07bd..f92139b 100644 --- a/pbap/pbap.cpp +++ b/pbap/pbap.cpp @@ -24,6 +24,7 @@ #include "responsemessage.h" #include "messagefactory.h" #include "messageengine.h" +#include "messageenginefactory.h" #include "pbap.h" @@ -81,24 +82,22 @@ int RecentCall::stringToEnum(QString key) } Pbap::Pbap (QUrl &url, QQmlContext *context, QObject * parent) : - QObject(parent), - m_mloop(nullptr) + QObject(parent) { - m_mloop = new MessageEngine(url); + m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url); m_context = context; m_context->setContextProperty("ContactsModel", QVariant::fromValue(m_contacts)); qmlRegisterUncreatableType<PhoneNumber>("PhoneNumber", 1, 0, "PhoneNumber", "Enum"); m_context->setContextProperty("RecentCallModel", QVariant::fromValue(m_calls)); qmlRegisterUncreatableType<RecentCall>("RecentCall", 1, 0, "RecentCall", "Enum"); - QObject::connect(m_mloop, &MessageEngine::connected, this, &Pbap::onConnected); - QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Pbap::onDisconnected); - QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Pbap::onMessageReceived); + QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Pbap::onConnected); + QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Pbap::onDisconnected); + QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Pbap::onMessageReceived); } Pbap::~Pbap() { - delete m_mloop; } void Pbap::importContacts(int max_entries) diff --git a/pbap/pbap.h b/pbap/pbap.h index 4deb9c6..676b49d 100644 --- a/pbap/pbap.h +++ b/pbap/pbap.h @@ -157,7 +157,7 @@ class Pbap : public QObject void statusChanged(bool connected); private: - MessageEngine *m_mloop; + std::shared_ptr<MessageEngine> m_mloop; QQmlContext *m_context; QList<QObject *>m_contacts; QList<QObject *>m_calls; |