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, 9 insertions, 8 deletions

diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index 2fdb2005..2a0cb0ff 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -43,7 +43,7 @@ const QString& GetRoomVisibilityOnDirectoryJob::visibility() const
 BaseJob::Status GetRoomVisibilityOnDirectoryJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
-    d->visibility = fromJson<QString>(json.value("visibility"_ls));
+    fromJson(json.value("visibility"_ls), d->visibility);
     return Success;
 }
 
@@ -100,7 +100,7 @@ const PublicRoomsResponse& GetPublicRoomsJob::data() const
 
 BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<PublicRoomsResponse>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -108,12 +108,13 @@ namespace QMatrixClient
 {
     // Converters
 
-    QJsonObject toJson(const QueryPublicRoomsJob::Filter& pod)
+    template <> struct JsonObjectConverter<QueryPublicRoomsJob::Filter>
     {
-        QJsonObject jo;
-        addParam<IfNotEmpty>(jo, QStringLiteral("generic_search_term"), pod.genericSearchTerm);
-        return jo;
-    }
+        static void dumpTo(QJsonObject& jo, const QueryPublicRoomsJob::Filter& pod)
+        {
+            addParam<IfNotEmpty>(jo, QStringLiteral("generic_search_term"), pod.genericSearchTerm);
+        }
+    };
 } // namespace QMatrixClient
 
 class QueryPublicRoomsJob::Private
@@ -155,7 +156,7 @@ const PublicRoomsResponse& QueryPublicRoomsJob::data() const
 
 BaseJob::Status QueryPublicRoomsJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<PublicRoomsResponse>(data);
+    fromJson(data, d->data);
     return Success;
 }