From 3392e66fd015e191b01f6e3fc6839edc3948e31f Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 8 Dec 2018 15:36:04 +0900
Subject: 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.
---
 lib/csapi/third_party_lookup.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/csapi/third_party_lookup.cpp')

diff --git a/lib/csapi/third_party_lookup.cpp b/lib/csapi/third_party_lookup.cpp
index 3ba1a5ad..12cb7c59 100644
--- a/lib/csapi/third_party_lookup.cpp
+++ b/lib/csapi/third_party_lookup.cpp
@@ -42,7 +42,7 @@ const QHash<QString, ThirdPartyProtocol>& GetProtocolsJob::data() const
 
 BaseJob::Status GetProtocolsJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<QHash<QString, ThirdPartyProtocol>>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -76,7 +76,7 @@ const ThirdPartyProtocol& GetProtocolMetadataJob::data() const
 
 BaseJob::Status GetProtocolMetadataJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<ThirdPartyProtocol>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -119,7 +119,7 @@ const QVector<ThirdPartyLocation>& QueryLocationByProtocolJob::data() const
 
 BaseJob::Status QueryLocationByProtocolJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<QVector<ThirdPartyLocation>>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -162,7 +162,7 @@ const QVector<ThirdPartyUser>& QueryUserByProtocolJob::data() const
 
 BaseJob::Status QueryUserByProtocolJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<QVector<ThirdPartyUser>>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -205,7 +205,7 @@ const QVector<ThirdPartyLocation>& QueryLocationByAliasJob::data() const
 
 BaseJob::Status QueryLocationByAliasJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<QVector<ThirdPartyLocation>>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -248,7 +248,7 @@ const QVector<ThirdPartyUser>& QueryUserByIDJob::data() const
 
 BaseJob::Status QueryUserByIDJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<QVector<ThirdPartyUser>>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
-- 
cgit v1.2.3