1 files changed, 5 insertions, 7 deletions
diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index eaa3302c..a5ac3c5f 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -23,20 +23,17 @@
 
 #include <array>
 
-using namespace QMatrixClient;
-
 static const std::array<QString, 5> membershipStrings = { {
     QStringLiteral("invite"), QStringLiteral("join"),
     QStringLiteral("knock"), QStringLiteral("leave"),
     QStringLiteral("ban")
 } };
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     template <>
-    struct FromJson<MembershipType>
+    struct JsonConverter<MembershipType>
     {
-        MembershipType operator()(const QJsonValue& jv) const
+        static MembershipType load(const QJsonValue& jv)
         {
             const auto& membershipString = jv.toString();
             for (auto it = membershipStrings.begin();
@@ -48,9 +45,10 @@ namespace QMatrixClient
             return MembershipType::Undefined;
         }
     };
-
 }
 
+using namespace QMatrixClient;
+
 MemberEventContent::MemberEventContent(const QJsonObject& json)
     : membership(fromJson<MembershipType>(json["membership"_ls]))
     , isDirect(json["is_direct"_ls].toBool())