diff options
author | Raquel Medina <raquel.medina@konsulko.com> | 2020-03-18 23:56:31 +0100 |
---|---|---|
committer | Raquel Medina <raquel.medina@konsulko.com> | 2020-03-23 14:02:28 +0100 |
commit | 0ed292d3ccf93c889734960676a321d1166d3f66 (patch) | |
tree | b8d64d1685d2f4bf599ab3867a0d3ff557ff0479 /voice/voice.h | |
parent | 5c750385d02116a92fa4c120ccc26abb8267bc97 (diff) |
rework message hierarchy
Rework message hierarchy with the final objective
of splitting libqtappfw into several libraries.
This commit carries the following changes:
- Simplify message hierarchy, keeping abstract
Message class, adding specialization for call and
event messages, keeping ResponseMessage, and
removing all module specific specializations.
- Add MessageFactory class to create message
objects.
- Change messages life cycle: using smart pointers
and removing QObject from message hierarchy (a
Message is not a QObject anymore and thus
'deleteLater()' is not available).
- Adapt all modules to use new message hierarchy.
- Keep ResponseMessage original constructor to
avoid breaking TaskManager.
- Message constructors have been kept public, but
will go private on a follow-up patch (once
TaskManager class has been modified to use new
MessageFactory).
Bug-AGL: SPEC-3112
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I3a7a6325209ddeca2293f1ac745371861a947bfb
Diffstat (limited to 'voice/voice.h')
-rw-r--r-- | voice/voice.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/voice/voice.h b/voice/voice.h index e3132be..ea0649b 100644 --- a/voice/voice.h +++ b/voice/voice.h @@ -17,6 +17,7 @@ #ifndef VOICE_H #define VOICE_H +#include <memory> #include <QObject> #include <QJsonArray> #include <QtQml/QQmlContext> @@ -24,10 +25,6 @@ class VoiceAgentRegistry; class MessageEngine; class Message; -class ResponseMessage; -class VoiceMessage; - -enum class MessageType; class Voice : public QObject { @@ -51,16 +48,16 @@ class Voice : public QObject void unsubscribeAgentFromVshlEvents(QString id); void triggerCBLProcess(QString id); void parseAgentsList(QJsonArray agents); - void processVshlEvent(VoiceMessage *vmsg); - void processLoginEvent(VoiceMessage *vmsg); + void processVshlEvent(std::shared_ptr<Message> msg); + void processLoginEvent(std::shared_ptr<Message> msg); - void processEvent(VoiceMessage *vmsg); - void processReply(ResponseMessage *rmsg); + void processEvent(std::shared_ptr<Message> emsg); + void processReply(std::shared_ptr<Message> rmsg); // slots void onConnected(); void onDisconnected(); - void onMessageReceived(MessageType type, Message *msg); + void onMessageReceived(std::shared_ptr<Message> msg); const QStringList vshl_events { "voice_authstate_event", |