Refactor toJson/fillJson

Both now use through a common JsonConverter<> template class with its
base definition tuned for structs/QJsonObjects and specialisations for
non-object types. This new implementation doesn't work with virtual
fillJson functions yet (so EventContent classes still use toJson as a
member function) and does not cope quite well with non-constructible
objects (you have to specialise JsonConverter<> rather than, more
intuitively, JsonObjectConverter<>), but overall is more streamlined
compared to the previous implementation. It also fixes one important
issue that pushed for a rewrite: the previous implementation was not
working with structure hierarchies at all so (in particular) the Filter
part of CS API was totally disfunctional.

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h
index cd2f9149..da663392 100644
--- a/lib/events/eventloader.h
+++ b/lib/events/eventloader.h
@@ -57,11 +57,15 @@ namespace QMatrixClient {
                                             matrixType);
     }
 
-    template <typename EventT> struct FromJsonObject<event_ptr_tt<EventT>>
+    template <typename EventT> struct JsonConverter<event_ptr_tt<EventT>>
     {
-        auto operator()(const QJsonObject& jo) const
+        static auto load(const QJsonValue& jv)
         {
-            return loadEvent<EventT>(jo);
+            return loadEvent<EventT>(jv.toObject());
+        }
+        static auto load(const QJsonDocument& jd)
+        {
+            return loadEvent<EventT>(jd.object());
         }
     };
 } // namespace QMatrixClient