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, 4 insertions, 4 deletions

diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index 2547f0c8..b27fe0b8 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -59,19 +59,19 @@ BaseJob::Status RequestOpenIdTokenJob::parseJson(const QJsonDocument& data)
     if (!json.contains("access_token"_ls))
         return { JsonParseError,
             "The key 'access_token' not found in the response" };
-    d->accessToken = fromJson<QString>(json.value("access_token"_ls));
+    fromJson(json.value("access_token"_ls), d->accessToken);
     if (!json.contains("token_type"_ls))
         return { JsonParseError,
             "The key 'token_type' not found in the response" };
-    d->tokenType = fromJson<QString>(json.value("token_type"_ls));
+    fromJson(json.value("token_type"_ls), d->tokenType);
     if (!json.contains("matrix_server_name"_ls))
         return { JsonParseError,
             "The key 'matrix_server_name' not found in the response" };
-    d->matrixServerName = fromJson<QString>(json.value("matrix_server_name"_ls));
+    fromJson(json.value("matrix_server_name"_ls), d->matrixServerName);
     if (!json.contains("expires_in"_ls))
         return { JsonParseError,
             "The key 'expires_in' not found in the response" };
-    d->expiresIn = fromJson<int>(json.value("expires_in"_ls));
+    fromJson(json.value("expires_in"_ls), d->expiresIn);
     return Success;
 }