From b70f1326f483fc3e42a95f792c63d8d80ff0ce32 Mon Sep 17 00:00:00 2001 From: Raquel Medina Date: Wed, 20 May 2020 16:17:37 +0200 Subject: use MessageEngineFactory Bug-AGL: SPEC-3112 Signed-off-by: Raquel Medina Change-Id: I7b601d89db9b31407ac6b99e03946e7c249c58a7 --- app/taskmanager.cpp | 9 +++++---- app/taskmanager.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/taskmanager.cpp b/app/taskmanager.cpp index 6c620a9..77ef412 100644 --- a/app/taskmanager.cpp +++ b/app/taskmanager.cpp @@ -8,21 +8,22 @@ #include #include #include +#include #include "taskmanager.h" TaskManager::TaskManager(QObject* parent) : QObject(parent), m_loop(nullptr) { } TaskManager::~TaskManager() { - delete m_loop; } void TaskManager::open(const QUrl &bindingAddress) { qRegisterMetaType>("std::shared_ptr"); - m_loop = new MessageEngine(bindingAddress); - QObject::connect(m_loop, &MessageEngine::connected, this, &TaskManager::onConnected); - QObject::connect(m_loop, &MessageEngine::messageReceived, this, &TaskManager::onMessageReceived, Qt::QueuedConnection); + m_loop.reset(); + m_loop = MessageEngineFactory::getInstance().getMessageEngine(bindingAddress); + QObject::connect(m_loop.get(), &MessageEngine::connected, this, &TaskManager::onConnected); + QObject::connect(m_loop.get(), &MessageEngine::messageReceived, this, &TaskManager::onMessageReceived, Qt::QueuedConnection); } void TaskManager::onConnected() diff --git a/app/taskmanager.h b/app/taskmanager.h index 8926639..00a560a 100644 --- a/app/taskmanager.h +++ b/app/taskmanager.h @@ -41,7 +41,7 @@ private slots: void loadAvg(); private: - MessageEngine *m_loop; + std::shared_ptr m_loop; std::vector m_procinfos; unsigned int inOctets, outOctets; -- cgit 1.2.3-korg