From 1414f3b5cc2bca3a3871bfe569510c1a422629fe Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 8 Dec 2018 15:24:45 +0900
Subject: RoomMemberEvent: cleanup

Don't make JSON for event content only to parse it again; drop extraneous constructs.
---
 lib/events/roommemberevent.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib/events')

diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index db25d026..149d74f8 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -29,13 +29,10 @@ namespace QMatrixClient
             enum MembershipType : size_t { Invite = 0, Join, Knock, Leave, Ban,
                                            Undefined };
 
-            explicit MemberEventContent(MembershipType mt = MembershipType::Join)
+            explicit MemberEventContent(MembershipType mt = Join)
                 : membership(mt)
             { }
             explicit MemberEventContent(const QJsonObject& json);
-            explicit MemberEventContent(const QJsonValue& jv)
-                : MemberEventContent(jv.toObject())
-            { }
 
             MembershipType membership;
             bool isDirect = false;
@@ -60,7 +57,7 @@ namespace QMatrixClient
                 : StateEvent(typeId(), obj)
             { }
             RoomMemberEvent(MemberEventContent&& c)
-                : StateEvent(typeId(), matrixTypeId(), c.toJson())
+                : StateEvent(typeId(), matrixTypeId(), c)
             { }
 
             // This is a special constructor enabling RoomMemberEvent to be
-- 
cgit v1.2.3


From ced7179117fd67cb1632f943f4ba1fde96423c0c Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 8 Dec 2018 15:26:35 +0900
Subject: StateEvent<>: make data members private

Keeping them protected extends API surface with no reasonable use from it (and for now derived classes don't access StateEvent<> data members directly, anyway).
---
 lib/events/stateevent.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/events')

diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index d4a7e8b3..d82de7e1 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -95,7 +95,7 @@ namespace QMatrixClient {
             QString prevSenderId() const
                 { return _prev ? _prev->senderId : QString(); }
 
-        protected:
+        private:
             ContentT _content;
             std::unique_ptr<Prev<ContentT>> _prev;
     };
-- 
cgit v1.2.3