1 files changed, 14 insertions, 17 deletions

diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index 56be947c..2c23d9ca 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include "stateevent.h"
-#include "eventcontent.h"
 
 #include "converters.h"
 
@@ -28,7 +27,7 @@ namespace QMatrixClient
     namespace EventContent
     {
         template <typename T>
-        class SimpleContent: public Base
+        class SimpleContent
         {
             public:
                 using value_type = T;
@@ -39,41 +38,39 @@ namespace QMatrixClient
                     : value(std::forward<TT>(value)), key(std::move(keyName))
                 { }
                 SimpleContent(const QJsonObject& json, QString keyName)
-                    : Base(json)
-                    , value(QMatrixClient::fromJson<T>(json[keyName]))
+                    : value(fromJson<T>(json[keyName]))
                     , key(std::move(keyName))
                 { }
+                QJsonObject toJson() const
+                {
+                    return { { key, QMatrixClient::toJson(value) } };
+                }
 
             public:
                 T value;
 
             protected:
                 QString key;
-
-            private:
-                void fillJson(QJsonObject* json) const override
-                {
-                    Q_ASSERT(json);
-                    json->insert(key, QMatrixClient::toJson(value));
-                }
         };
     } // namespace EventContent
 
-#define DEFINE_SIMPLE_STATE_EVENT(_Name, _TypeId, _ContentType, _ContentKey) \
-    class _Name : public StateEvent<EventContent::SimpleContent<_ContentType>> \
+#define DEFINE_SIMPLE_STATE_EVENT(_Name, _TypeId, _ValueType, _ContentKey) \
+    class _Name : public StateEvent<EventContent::SimpleContent<_ValueType>> \
     { \
         public: \
-            using content_type = _ContentType; \
+            using value_type = content_type::value_type; \
             DEFINE_EVENT_TYPEID(_TypeId, _Name) \
-            explicit _Name(const QJsonObject& obj) \
-                : StateEvent(typeId(), obj, QStringLiteral(#_ContentKey)) \
-            { } \
+            explicit _Name() : _Name(value_type()) { } \
             template <typename T> \
             explicit _Name(T&& value) \
                 : StateEvent(typeId(), matrixTypeId(), \
                              QStringLiteral(#_ContentKey), \
                              std::forward<T>(value)) \
             { } \
+            explicit _Name(QJsonObject obj) \
+                : StateEvent(typeId(), std::move(obj), \
+                             QStringLiteral(#_ContentKey)) \
+            { } \
             auto _ContentKey() const { return content().value; } \
     }; \
     REGISTER_EVENT_TYPE(_Name) \