1 files changed, 9 insertions, 13 deletions
diff --git a/lib/events/encryptedevent.cpp b/lib/events/encryptedevent.cpp
index ec00ad4c..c539d5b2 100644
--- a/lib/events/encryptedevent.cpp
+++ b/lib/events/encryptedevent.cpp
@@ -2,33 +2,29 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "encryptedevent.h"
-#include "roommessageevent.h"
-#include "events/eventloader.h"
 
 using namespace Quotient;
 
 EncryptedEvent::EncryptedEvent(const QJsonObject& ciphertext,
                                const QString& senderKey)
-    : RoomEvent(typeId(), matrixTypeId(),
-                { { AlgorithmKeyL, OlmV1Curve25519AesSha2AlgoKey },
+    : RoomEvent({ { AlgorithmKeyL, OlmV1Curve25519AesSha2AlgoKey },
                   { CiphertextKeyL, ciphertext },
                   { SenderKeyKeyL, senderKey } })
 {}
 
 EncryptedEvent::EncryptedEvent(QByteArray ciphertext, const QString& senderKey,
                                const QString& deviceId, const QString& sessionId)
-    : RoomEvent(typeId(), matrixTypeId(),
-                {
-                    { AlgorithmKeyL, MegolmV1AesSha2AlgoKey },
-                    { CiphertextKeyL, QString(ciphertext) },
-                    { DeviceIdKeyL, deviceId },
-                    { SenderKeyKeyL, senderKey },
-                    { SessionIdKeyL, sessionId },
-                })
+    : RoomEvent({
+        { AlgorithmKeyL, MegolmV1AesSha2AlgoKey },
+        { CiphertextKeyL, QString(ciphertext) },
+        { DeviceIdKeyL, deviceId },
+        { SenderKeyKeyL, senderKey },
+        { SessionIdKeyL, sessionId },
+    })
 {}
 
 EncryptedEvent::EncryptedEvent(const QJsonObject& obj)
-    : RoomEvent(typeId(), obj)
+    : RoomEvent(obj)
 {
     qCDebug(E2EE) << "Encrypted event from" << senderId();
 }