summaryrefslogtreecommitdiffstats
path: root/voice
diff options
context:
space:
mode:
Diffstat (limited to 'voice')
-rw-r--r--voice/voice.cpp13
-rw-r--r--voice/voice.h2
-rw-r--r--voice/voiceagentregistry.cpp6
3 files changed, 7 insertions, 14 deletions
diff --git a/voice/voice.cpp b/voice/voice.cpp
index 5961882..396984a 100644
--- a/voice/voice.cpp
+++ b/voice/voice.cpp
@@ -21,27 +21,26 @@
#include "eventmessage.h"
#include "messagefactory.h"
#include "messageengine.h"
+#include "messageenginefactory.h"
#include "voiceagentregistry.h"
#include "voice.h"
Voice::Voice (QUrl &url, QQmlContext *context, QObject *parent) :
- QObject(parent),
- m_loop(nullptr)
+ QObject(parent)
{
- m_loop = new MessageEngine(url);
+ m_loop = MessageEngineFactory::getInstance().getMessageEngine(url);
m_var = new VoiceAgentRegistry(this, context, parent);
- QObject::connect(m_loop, &MessageEngine::connected,
+ QObject::connect(m_loop.get(), &MessageEngine::connected,
this, &Voice::onConnected);
- QObject::connect(m_loop, &MessageEngine::disconnected,
+ QObject::connect(m_loop.get(), &MessageEngine::disconnected,
this, &Voice::onDisconnected);
- QObject::connect(m_loop, &MessageEngine::messageReceived,
+ QObject::connect(m_loop.get(), &MessageEngine::messageReceived,
this, &Voice::onMessageReceived);
}
Voice::~Voice()
{
- delete m_loop;
delete m_var;
}
diff --git a/voice/voice.h b/voice/voice.h
index ea0649b..2dc38c3 100644
--- a/voice/voice.h
+++ b/voice/voice.h
@@ -41,7 +41,7 @@ class Voice : public QObject
Q_INVOKABLE void getCBLpair(QString id);
private:
- MessageEngine *m_loop;
+ std::shared_ptr<MessageEngine> m_loop;
VoiceAgentRegistry *m_var;
void subscribeAgentToVshlEvents(QString id);
diff --git a/voice/voiceagentregistry.cpp b/voice/voiceagentregistry.cpp
index 62e8cd6..00eed87 100644
--- a/voice/voiceagentregistry.cpp
+++ b/voice/voiceagentregistry.cpp
@@ -29,12 +29,6 @@ VoiceAgentRegistry::VoiceAgentRegistry(Voice *voice, QQmlContext *context, QObje
vc(voice)
{
m_model = new VoiceAgentModel();
- QSortFilterProxyModel *model = new QSortFilterProxyModel();
- model->setSourceModel(m_model);
- model->setSortRole(VoiceAgentModel::VoiceAgentRoles::IdRole);
- model->setSortCaseSensitivity(Qt::CaseInsensitive);
- model->sort(0);
-
context->setContextProperty("VoiceAgentModel", m_model);
context->setContextProperty("VoiceAgent", this);
}