Merge branch 'upstream' (v0.5.2)

1 files changed, 9 insertions, 17 deletions

diff --git a/lib/identity/definitions/request_msisdn_validation.cpp b/lib/identity/definitions/request_msisdn_validation.cpp
index 125baa9c..a123d326 100644
--- a/lib/identity/definitions/request_msisdn_validation.cpp
+++ b/lib/identity/definitions/request_msisdn_validation.cpp
@@ -6,31 +6,23 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const RequestMsisdnValidation& pod)
+void JsonObjectConverter<RequestMsisdnValidation>::dumpTo(
+        QJsonObject& jo, const RequestMsisdnValidation& pod)
 {
-    QJsonObject jo;
     addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
     addParam<>(jo, QStringLiteral("country"), pod.country);
     addParam<>(jo, QStringLiteral("phone_number"), pod.phoneNumber);
     addParam<>(jo, QStringLiteral("send_attempt"), pod.sendAttempt);
     addParam<IfNotEmpty>(jo, QStringLiteral("next_link"), pod.nextLink);
-    return jo;
 }
 
-RequestMsisdnValidation FromJsonObject<RequestMsisdnValidation>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<RequestMsisdnValidation>::fillFrom(
+    const QJsonObject& jo, RequestMsisdnValidation& result)
 {
-    RequestMsisdnValidation result;
-    result.clientSecret =
-        fromJson<QString>(jo.value("client_secret"_ls));
-    result.country =
-        fromJson<QString>(jo.value("country"_ls));
-    result.phoneNumber =
-        fromJson<QString>(jo.value("phone_number"_ls));
-    result.sendAttempt =
-        fromJson<int>(jo.value("send_attempt"_ls));
-    result.nextLink =
-        fromJson<QString>(jo.value("next_link"_ls));
-
-    return result;
+    fromJson(jo.value("client_secret"_ls), result.clientSecret);
+    fromJson(jo.value("country"_ls), result.country);
+    fromJson(jo.value("phone_number"_ls), result.phoneNumber);
+    fromJson(jo.value("send_attempt"_ls), result.sendAttempt);
+    fromJson(jo.value("next_link"_ls), result.nextLink);
 }