diff options
Diffstat (limited to 'lib/events')
| -rw-r--r-- | lib/events/roomcreateevent.cpp | 4 | ||||
| -rw-r--r-- | lib/events/stateevent.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/events/roomcreateevent.cpp b/lib/events/roomcreateevent.cpp index c72b5bc2..0fc7d6b9 100644 --- a/lib/events/roomcreateevent.cpp +++ b/lib/events/roomcreateevent.cpp @@ -33,8 +33,8 @@ QString RoomCreateEvent::version() const RoomCreateEvent::Predecessor RoomCreateEvent::predecessor() const { const auto predJson = contentJson()["predecessor"_ls].toObject(); - return { fromJson<QString>(predJson["room_id"_ls]), - fromJson<QString>(predJson["event_id"_ls]) }; + return { fromJson<QString>(predJson[RoomIdKeyL]), + fromJson<QString>(predJson[EventIdKeyL]) }; } bool RoomCreateEvent::isUpgrade() const diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h index 710b4271..400858db 100644 --- a/lib/events/stateevent.h +++ b/lib/events/stateevent.h @@ -23,12 +23,11 @@ namespace Quotient { /// Make a minimal correct Matrix state event JSON -template <typename StrT> -inline QJsonObject basicStateEventJson(StrT matrixType, +inline QJsonObject basicStateEventJson(const QString& matrixTypeId, const QJsonObject& content, const QString& stateKey = {}) { - return { { TypeKey, std::forward<StrT>(matrixType) }, + return { { TypeKey, matrixTypeId }, { StateKeyKey, stateKey }, { ContentKey, content } }; } |