diff options
| author | arawaaa <77910862+arawaaa@users.noreply.github.com> | 2021-12-27 17:35:28 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 17:35:28 -0600 |
| commit | 7ec3ba834dd313c4408622da30e04cdc6f4cf7c7 (patch) | |
| tree | 679d7dc5939a229ad46676cd1d7aeaea7a25abce /lib/events/encryptedevent.h | |
| parent | 17bf4d180297c7e87363e179b8afa79ddb15dca7 (diff) | |
| parent | 674e984e459375974f619d0e778d43a2cc928dc3 (diff) | |
| download | libquotient-7ec3ba834dd313c4408622da30e04cdc6f4cf7c7.tar.gz libquotient-7ec3ba834dd313c4408622da30e04cdc6f4cf7c7.zip | |
Merge branch 'dev' into pinned
Diffstat (limited to 'lib/events/encryptedevent.h')
| -rw-r--r-- | lib/events/encryptedevent.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h index eb7123eb..de89a7c6 100644 --- a/lib/events/encryptedevent.h +++ b/lib/events/encryptedevent.h @@ -7,7 +7,6 @@ #include "roomevent.h" namespace Quotient { -class Room; /* * While the specification states: * @@ -27,7 +26,6 @@ class Room; * one and doesn't add new restrictions, just provides additional features. */ class EncryptedEvent : public RoomEvent { - Q_GADGET public: DEFINE_EVENT_TYPEID("m.room.encrypted", EncryptedEvent) @@ -43,7 +41,7 @@ public: QString algorithm() const { - QString algo = content<QString>(AlgorithmKeyL); + QString algo = contentPart<QString>(AlgorithmKeyL); if (!SupportedAlgorithms.contains(algo)) { qWarning(MAIN) << "The EncryptedEvent's algorithm" << algo << "is not supported"; @@ -52,17 +50,17 @@ public: } QByteArray ciphertext() const { - return content<QString>(CiphertextKeyL).toLatin1(); + return contentPart<QString>(CiphertextKeyL).toLatin1(); } QJsonObject ciphertext(const QString& identityKey) const { - return content<QJsonObject>(CiphertextKeyL).value(identityKey).toObject(); + return contentPart<QJsonObject>(CiphertextKeyL).value(identityKey).toObject(); } - QString senderKey() const { return content<QString>(SenderKeyKeyL); } + QString senderKey() const { return contentPart<QString>(SenderKeyKeyL); } /* device_id and session_id are required with Megolm */ - QString deviceId() const { return content<QString>(DeviceIdKeyL); } - QString sessionId() const { return content<QString>(SessionIdKeyL); } + QString deviceId() const { return contentPart<QString>(DeviceIdKeyL); } + QString sessionId() const { return contentPart<QString>(SessionIdKeyL); } }; REGISTER_EVENT_TYPE(EncryptedEvent) |