diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-05-08 19:08:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-08 19:08:57 +0200 |
| commit | 3458fdf7b416fe64b82ec9b99553c7b2aa299e4c (patch) | |
| tree | b3b1bce3ebf0631597aa6d8451e62d198a42c2be /lib/events/stateevent.cpp | |
| parent | 272cb01b05529971ea38e09bf75d8d8f194a9dd8 (diff) | |
| parent | c42d268db0b40cdba06381fc64a6966a72c90709 (diff) | |
| download | libquotient-3458fdf7b416fe64b82ec9b99553c7b2aa299e4c.tar.gz libquotient-3458fdf7b416fe64b82ec9b99553c7b2aa299e4c.zip | |
Merge #548: Streamline usage of event types, part 1
Diffstat (limited to 'lib/events/stateevent.cpp')
| -rw-r--r-- | lib/events/stateevent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp index e53d47d4..c343e37f 100644 --- a/lib/events/stateevent.cpp +++ b/lib/events/stateevent.cpp @@ -6,9 +6,9 @@ using namespace Quotient; StateEventBase::StateEventBase(Type type, const QJsonObject& json) - : RoomEvent(json.contains(StateKeyKeyL) ? type : unknownEventTypeId(), json) + : RoomEvent(json.contains(StateKeyKeyL) ? type : UnknownEventTypeId, json) { - if (Event::type() == unknownEventTypeId() && !json.contains(StateKeyKeyL)) + if (Event::type() == UnknownEventTypeId && !json.contains(StateKeyKeyL)) qWarning(EVENTS) << "Attempt to create a state event with no stateKey -" "forcing the event type to unknown to avoid damage"; } @@ -16,7 +16,7 @@ StateEventBase::StateEventBase(Type type, const QJsonObject& json) StateEventBase::StateEventBase(Event::Type type, event_mtype_t matrixType, const QString& stateKey, const QJsonObject& contentJson) - : RoomEvent(type, basicStateEventJson(matrixType, contentJson, stateKey)) + : RoomEvent(type, basicJson(matrixType, contentJson, stateKey)) {} bool StateEventBase::repeatsState() const |