Merge pull request #65 from QMatrixClient/kitsune-simplify-events

Events refactoring

1 files changed, 8 insertions, 9 deletions

diff --git a/events/roomtopicevent.h b/events/roomtopicevent.h
index 4b0a24b0..fb849afe 100644
--- a/events/roomtopicevent.h
+++ b/events/roomtopicevent.h
@@ -22,18 +22,17 @@
 
 namespace QMatrixClient
 {
-    class RoomTopicEvent: public Event
+    class RoomTopicEvent: public RoomEvent
     {
         public:
-            RoomTopicEvent();
-            virtual ~RoomTopicEvent();
+            explicit RoomTopicEvent(const QJsonObject& obj)
+                : RoomEvent(Type::RoomTopic, obj)
+                , _topic(contentJson()["topic"].toString())
+            { }
 
-            QString topic() const;
-
-            static RoomTopicEvent* fromJson(const QJsonObject& obj);
+            QString topic() const { return _topic; }
 
         private:
-            class Private;
-            Private* d;
+            QString _topic;
     };
-}
+}  // namespace QMatrixClient