1 files changed, 31 insertions, 24 deletions
diff --git a/events/event.cpp b/events/event.cpp
index 11ed1cc9..0c7700ee 100644
--- a/events/event.cpp
+++ b/events/event.cpp
@@ -82,33 +82,40 @@ QString Event::originalJson() const
     return d->originalJson;
 }
 
-template <typename T>
-Event* make(const QJsonObject& obj)
-{
-    return T::fromJson(obj);
-}
-
 Event* Event::fromJson(const QJsonObject& obj)
 {
-    struct Factory {
-        QString type;
-        Event* (*make)(const QJsonObject& obj);
-    };
-    const Factory evTypes[] {
-        { "m.room.message", make<RoomMessageEvent> },
-        { "m.room.name", make<RoomNameEvent> },
-        { "m.room.aliases", make<RoomAliasesEvent> },
-        { "m.room.canonical_alias", make<RoomCanonicalAliasEvent> },
-        { "m.room.member", make<RoomMemberEvent> },
-        { "m.room.topic", make<RoomTopicEvent> },
-        { "m.room.typing", make<TypingEvent> },
-        { "m.room.receipt", make<ReceiptEvent> },
-        // Insert new types before this line
-    };
-    for (auto e: evTypes)
+    //qDebug() << obj.value("type").toString();
+    if( obj.value("type").toString() == "m.room.message" )
+    {
+        return RoomMessageEvent::fromJson(obj);
+    }
+    if( obj.value("type").toString() == "m.room.name" )
+    {
+        return RoomNameEvent::fromJson(obj);
+    }
+    if( obj.value("type").toString() == "m.room.aliases" )
+    {
+        return RoomAliasesEvent::fromJson(obj);
+    }
+    if( obj.value("type").toString() == "m.room.canonical_alias" )
+    {
+        return RoomCanonicalAliasEvent::fromJson(obj);
+    }
+    if( obj.value("type").toString() == "m.room.member" )
+    {
+        return RoomMemberEvent::fromJson(obj);
+    }
+    if( obj.value("type").toString() == "m.room.topic" )
+    {
+        return RoomTopicEvent::fromJson(obj);
+    }
+    if( obj.value("type").toString() == "m.typing" )
+    {
+        return TypingEvent::fromJson(obj);
+    }
+    if( obj.value("type").toString() == "m.receipt" )
     {
-        if (obj["type"].toString() == e.type)
-            return e.make(obj);
+        return ReceiptEvent::fromJson(obj);
     }
     return UnknownEvent::fromJson(obj);
 }