diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-07-04 21:34:00 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-07-04 21:34:00 +0900 |
commit | 6a9de91752dfe75e185bf90ab856367b2c804582 (patch) | |
tree | 2a12ecc84bf0055e317ef2e4aeec3439d92b2035 /lib/csapi/definitions/push_condition.cpp | |
parent | d5397fe5ae2ca34d5cfb11394dac17728a2b50ce (diff) | |
parent | 5d1dd53890611376873f6f959e206d5a56cfff70 (diff) | |
download | libquotient-6a9de91752dfe75e185bf90ab856367b2c804582.tar.gz libquotient-6a9de91752dfe75e185bf90ab856367b2c804582.zip |
Merge branch 'kitsune-events-rewritten'
Diffstat (limited to 'lib/csapi/definitions/push_condition.cpp')
-rw-r--r-- | lib/csapi/definitions/push_condition.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp index b8595ec6..19351ae1 100644 --- a/lib/csapi/definitions/push_condition.cpp +++ b/lib/csapi/definitions/push_condition.cpp @@ -9,10 +9,10 @@ using namespace QMatrixClient; QJsonObject QMatrixClient::toJson(const PushCondition& pod) { QJsonObject _json; - addParam<>(_json, "kind", pod.kind); - addParam<IfNotEmpty>(_json, "key", pod.key); - addParam<IfNotEmpty>(_json, "pattern", pod.pattern); - addParam<IfNotEmpty>(_json, "is", pod.is); + 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; } @@ -21,13 +21,13 @@ PushCondition FromJson<PushCondition>::operator()(const QJsonValue& jv) const auto& _json = jv.toObject(); PushCondition result; result.kind = - fromJson<QString>(_json.value("kind")); + fromJson<QString>(_json.value("kind"_ls)); result.key = - fromJson<QString>(_json.value("key")); + fromJson<QString>(_json.value("key"_ls)); result.pattern = - fromJson<QString>(_json.value("pattern")); + fromJson<QString>(_json.value("pattern"_ls)); result.is = - fromJson<QString>(_json.value("is")); + fromJson<QString>(_json.value("is"_ls)); return result; } |