Modernise and fix code dealing with call events

Call events no more store deserialised values; instead they deserialise
values on the fly, same as all other events. They are no more treated as
state events (The Spec doesn't define them as state events in the first
place). A common base class, CallEventBase, is introduced that defines
data pieces common to all call events (call id and version).

1 files changed, 1 insertions, 19 deletions

diff --git a/lib/events/callhangupevent.h b/lib/events/callhangupevent.h
index 57e565a6..c74e20d5 100644
--- a/lib/events/callhangupevent.h
+++ b/lib/events/callhangupevent.h
@@ -22,31 +22,13 @@
 
 namespace QMatrixClient
 {
-    class CallHangupEvent: public RoomEvent
+    class CallHangupEvent: public CallEventBase
     {
     public:
         DEFINE_EVENT_TYPEID("m.call.hangup", CallHangupEvent)
         
         explicit CallHangupEvent(const QJsonObject& obj);
-
         explicit CallHangupEvent(const QString& callId);
-
-        bool isStateEvent() const override { return true; }
-
-        const QString& callId() const { return _callId; }
-        const int version() const { return _version; }
-
-        QJsonObject toJson() const
-        {
-            QJsonObject obj;
-            obj.insert("call_id", _callId);
-            obj.insert("version", _version);
-            return obj;
-        }
-
-    private:
-        QString _callId;
-        int _version;
     };
 
     REGISTER_EVENT_TYPE(CallHangupEvent)