RoomEvent/RoomMemberEvent: do not store what can be calculated on the fly

Basically, segments of originalJsonObject() are used as-you-go instead of parsing them upon event creation.

1 files changed, 7 insertions, 7 deletions

diff --git a/events/event.h b/events/event.h
index b5a4d94e..968bc1ad 100644
--- a/events/event.h
+++ b/events/event.h
@@ -167,10 +167,10 @@ namespace QMatrixClient
             RoomEvent(Type type, const QJsonObject& rep);
             ~RoomEvent();
 
-            const QString& id() const { return _id; }
-            const QDateTime& timestamp() const { return _serverTimestamp; }
-            const QString& roomId() const { return _roomId; }
-            const QString& senderId() const { return _senderId; }
+            QString id() const { return _id; }
+            QDateTime timestamp() const;
+            QString roomId() const;
+            QString senderId() const;
             bool isRedacted() const { return bool(_redactedBecause); }
             const RedactionEvent* redactedBecause() const
             {
@@ -202,9 +202,9 @@ namespace QMatrixClient
 
         private:
             QString _id;
-            QString _roomId;
-            QString _senderId;
-            QDateTime _serverTimestamp;
+//            QString _roomId;
+//            QString _senderId;
+//            QDateTime _serverTimestamp;
             event_ptr_tt<RedactionEvent> _redactedBecause;
             QString _txnId;
     };