diff options
Diffstat (limited to 'map')
| -rw-r--r-- | map/map.cpp | 13 | ||||
| -rw-r--r-- | map/map.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/map/map.cpp b/map/map.cpp index e7a4157..b85a323 100644 --- a/map/map.cpp +++ b/map/map.cpp @@ -21,21 +21,20 @@ #include "responsemessage.h" #include "messagefactory.h" #include "messageengine.h" +#include "messageenginefactory.h" #include "map.h" Map::Map (QUrl &url, QObject * parent) : - QObject(parent), - m_mloop(nullptr) + QObject(parent) { - m_mloop = new MessageEngine(url); - QObject::connect(m_mloop, &MessageEngine::connected, this, &Map::onConnected); - QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Map::onDisconnected); - QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Map::onMessageReceived); + m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url); + QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Map::onConnected); + QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Map::onDisconnected); + QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Map::onMessageReceived); } Map::~Map() { - delete m_mloop; } void Map::compose(QString recipient, QString message) @@ -44,7 +44,7 @@ class Map : public QObject void messageResult(QString handle, QVariantMap message); private: - MessageEngine *m_mloop; + std::shared_ptr<MessageEngine> m_mloop; // slots void onConnected(); |