diff options
author | Josip Delic <delijati@googlemail.com> | 2018-08-29 21:56:21 +0200 |
---|---|---|
committer | Josip Delic <delijati@googlemail.com> | 2018-08-29 21:56:21 +0200 |
commit | 6bb64db38f4a5f47d275a663861fd216f1bcf612 (patch) | |
tree | cf92c21991282852e2ae549cd950984a7ae64fc6 /lib/csapi/definitions/push_rule.cpp | |
parent | 8d07a6bec2689a81c3c3db64e5457143bd671223 (diff) | |
parent | d9ff200ff62fb7f5b6b51082dc3979d5454a1bec (diff) | |
download | libquotient-6bb64db38f4a5f47d275a663861fd216f1bcf612.tar.gz libquotient-6bb64db38f4a5f47d275a663861fd216f1bcf612.zip |
Merge branch 'master' of https://github.com/QMatrixClient/libqmatrixclient
Diffstat (limited to 'lib/csapi/definitions/push_rule.cpp')
-rw-r--r-- | lib/csapi/definitions/push_rule.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/csapi/definitions/push_rule.cpp b/lib/csapi/definitions/push_rule.cpp index 1ee57945..833135ec 100644 --- a/lib/csapi/definitions/push_rule.cpp +++ b/lib/csapi/definitions/push_rule.cpp @@ -6,24 +6,6 @@ using namespace QMatrixClient; -QJsonObject QMatrixClient::toJson(const SetTweakAction& pod) -{ - QJsonObject _json = toJson(pod.additionalProperties); - addParam<>(_json, QStringLiteral("set_tweak"), pod.setTweak); - return _json; -} - -SetTweakAction FromJson<SetTweakAction>::operator()(const QJsonValue& jv) -{ - auto _json = jv.toObject(); - SetTweakAction result; - result.setTweak = - fromJson<QString>(_json.take("set_tweak"_ls)); - - result.additionalProperties = fromJson<QVariantHash>(_json); - return result; -} - QJsonObject QMatrixClient::toJson(const PushRule& pod) { QJsonObject _json; |