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, 17 insertions, 15 deletions

diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index 36f83727..c44b73ac 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -16,23 +16,25 @@ namespace QMatrixClient
 {
     // Converters
 
-    QJsonObject toJson(const CreateRoomJob::Invite3pid& pod)
+    template <> struct JsonObjectConverter<CreateRoomJob::Invite3pid>
     {
-        QJsonObject jo;
-        addParam<>(jo, QStringLiteral("id_server"), pod.idServer);
-        addParam<>(jo, QStringLiteral("medium"), pod.medium);
-        addParam<>(jo, QStringLiteral("address"), pod.address);
-        return jo;
-    }
+        static void dumpTo(QJsonObject& jo, const CreateRoomJob::Invite3pid& pod)
+        {
+            addParam<>(jo, QStringLiteral("id_server"), pod.idServer);
+            addParam<>(jo, QStringLiteral("medium"), pod.medium);
+            addParam<>(jo, QStringLiteral("address"), pod.address);
+        }
+    };
 
-    QJsonObject toJson(const CreateRoomJob::StateEvent& pod)
+    template <> struct JsonObjectConverter<CreateRoomJob::StateEvent>
     {
-        QJsonObject jo;
-        addParam<>(jo, QStringLiteral("type"), pod.type);
-        addParam<IfNotEmpty>(jo, QStringLiteral("state_key"), pod.stateKey);
-        addParam<>(jo, QStringLiteral("content"), pod.content);
-        return jo;
-    }
+        static void dumpTo(QJsonObject& jo, const CreateRoomJob::StateEvent& pod)
+        {
+            addParam<>(jo, QStringLiteral("type"), pod.type);
+            addParam<IfNotEmpty>(jo, QStringLiteral("state_key"), pod.stateKey);
+            addParam<>(jo, QStringLiteral("content"), pod.content);
+        }
+    };
 } // namespace QMatrixClient
 
 class CreateRoomJob::Private
@@ -77,7 +79,7 @@ BaseJob::Status CreateRoomJob::parseJson(const QJsonDocument& data)
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
             "The key 'room_id' not found in the response" };
-    d->roomId = fromJson<QString>(json.value("room_id"_ls));
+    fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }