diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-05 19:36:15 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-05 19:36:15 +0900 |
| commit | a8d2a73c771f188fc0fdc6351b4923af788317d5 (patch) | |
| tree | b2795b93149f7c0ae3cd5005331b650a8eb6fd1e /lib/events/roommemberevent.h | |
| parent | da16225dfbec9b155c2c299757203f7676ac6ccf (diff) | |
| parent | a63838235134b066c092ad98e1f18ff7991c91c1 (diff) | |
| download | libquotient-a8d2a73c771f188fc0fdc6351b4923af788317d5.tar.gz libquotient-a8d2a73c771f188fc0fdc6351b4923af788317d5.zip | |
Merge branch 'kitsune-gtad'
Diffstat (limited to 'lib/events/roommemberevent.h')
| -rw-r--r-- | lib/events/roommemberevent.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h index 89b970c9..8e0cc0a4 100644 --- a/lib/events/roommemberevent.h +++ b/lib/events/roommemberevent.h @@ -52,16 +52,18 @@ namespace QMatrixClient { Q_GADGET public: - static constexpr const char* TypeId = "m.room.member"; + static constexpr const char* typeId() { return "m.room.member"; } using MembershipType = MemberEventContent::MembershipType; + explicit RoomMemberEvent(Type type, const QJsonObject& obj) + : StateEvent(type, obj) + { } RoomMemberEvent(MemberEventContent&& c) : StateEvent(Type::RoomMember, c) { } explicit RoomMemberEvent(const QJsonObject& obj) - : StateEvent(Type::RoomMember, obj) -// , _userId(obj["state_key"].toString()) + : RoomMemberEvent(Type::RoomMember, obj) { } MembershipType membership() const { return content().membership; } @@ -72,7 +74,6 @@ namespace QMatrixClient QUrl avatarUrl() const { return content().avatarUrl; } private: -// QString _userId; REGISTER_ENUM(MembershipType) }; } // namespace QMatrixClient |