diff options
Diffstat (limited to 'lib/csapi/definitions/push_condition.cpp')
| -rw-r--r-- | lib/csapi/definitions/push_condition.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp index 19351ae1..045094bc 100644 --- a/lib/csapi/definitions/push_condition.cpp +++ b/lib/csapi/definitions/push_condition.cpp @@ -8,27 +8,26 @@ using namespace QMatrixClient; QJsonObject QMatrixClient::toJson(const PushCondition& pod) { - QJsonObject _json; - addParam<>(_json, QStringLiteral("kind"), pod.kind); - addParam<IfNotEmpty>(_json, QStringLiteral("key"), pod.key); - addParam<IfNotEmpty>(_json, QStringLiteral("pattern"), pod.pattern); - addParam<IfNotEmpty>(_json, QStringLiteral("is"), pod.is); - return _json; + QJsonObject jo; + addParam<>(jo, QStringLiteral("kind"), pod.kind); + addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key); + addParam<IfNotEmpty>(jo, QStringLiteral("pattern"), pod.pattern); + addParam<IfNotEmpty>(jo, QStringLiteral("is"), pod.is); + return jo; } -PushCondition FromJson<PushCondition>::operator()(const QJsonValue& jv) +PushCondition FromJsonObject<PushCondition>::operator()(const QJsonObject& jo) const { - const auto& _json = jv.toObject(); PushCondition result; result.kind = - fromJson<QString>(_json.value("kind"_ls)); + fromJson<QString>(jo.value("kind"_ls)); result.key = - fromJson<QString>(_json.value("key"_ls)); + fromJson<QString>(jo.value("key"_ls)); result.pattern = - fromJson<QString>(_json.value("pattern"_ls)); + fromJson<QString>(jo.value("pattern"_ls)); result.is = - fromJson<QString>(_json.value("is"_ls)); - + fromJson<QString>(jo.value("is"_ls)); + return result; } |