diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-09-05 07:49:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-05 07:49:16 +0200 |
| commit | 1e263a32fcbc44985e474a626393494a81f15e37 (patch) | |
| tree | 8811e0a995dcd593cb9f233e02ece9402e76eb1b /lib/events/roommessageevent.cpp | |
| parent | 8cb629f406f5b8b1ff7ce787dd3967d5684e07c3 (diff) | |
| parent | bd2736bc9f8b6023ecbc21d0d831856703b853db (diff) | |
| download | libquotient-1e263a32fcbc44985e474a626393494a81f15e37.tar.gz libquotient-1e263a32fcbc44985e474a626393494a81f15e37.zip | |
Merge pull request #565 from quotient-im/kitsune/streamline-event-types-2
Streamline event types, part 2
Diffstat (limited to 'lib/events/roommessageevent.cpp')
| -rw-r--r-- | lib/events/roommessageevent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp index 2a6ae93c..df4840b3 100644 --- a/lib/events/roommessageevent.cpp +++ b/lib/events/roommessageevent.cpp @@ -128,8 +128,8 @@ QJsonObject RoomMessageEvent::assembleContentJson(const QString& plainBody, RoomMessageEvent::RoomMessageEvent(const QString& plainBody, const QString& jsonMsgType, TypedBase* content) - : RoomEvent(typeId(), matrixTypeId(), - assembleContentJson(plainBody, jsonMsgType, content)) + : RoomEvent( + basicJson(TypeId, assembleContentJson(plainBody, jsonMsgType, content))) , _content(content) {} @@ -175,7 +175,7 @@ RoomMessageEvent::RoomMessageEvent(const QString& plainBody, #endif RoomMessageEvent::RoomMessageEvent(const QJsonObject& obj) - : RoomEvent(typeId(), obj), _content(nullptr) + : RoomEvent(obj), _content(nullptr) { if (isRedacted()) return; |