Pass matrixType(QString), not Event::Type, to basicJson()

Not that it was very important, as the two are basically the same thing
(and matrixTypeId() is about to be obsoleted); but formally basicJson()
is supposed to get the former, not the latter.

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index ebe72149..707cf4fd 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -105,15 +105,15 @@ QJsonObject CallEventBase::basicJson(const QString& matrixType,
                                      const QString& callId, int version,
                                      QJsonObject content)
 {
-    content.insert(QStringLiteral("call_id"), callId);
-    content.insert(QStringLiteral("version"), version);
-    return RoomEvent::basicJson(matrixType, content);
+    contentJson.insert(QStringLiteral("call_id"), callId);
+    contentJson.insert(QStringLiteral("version"), version);
+    return RoomEvent::basicJson(matrixType, contentJson);
 }
 
 CallEventBase::CallEventBase(Type type, event_mtype_t matrixType,
                              const QString& callId, int version,
                              const QJsonObject& contentJson)
-    : RoomEvent(type, basicJson(type, callId, version, contentJson))
+    : RoomEvent(type, basicJson(matrixType, callId, version, contentJson))
 {}
 
 CallEventBase::CallEventBase(Event::Type type, const QJsonObject& json)
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index cdf3c449..0fd489d1 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -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, basicJson(type, contentJson, stateKey))
+    : RoomEvent(type, basicJson(matrixType, contentJson, stateKey))
 {}
 
 bool StateEventBase::repeatsState() const