diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-29 22:22:49 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-29 22:22:49 +0900 |
| commit | b55334ac0fe89f780776bc4eab90ffe1ca3c57bb (patch) | |
| tree | 1a45c0ccfec8f5f7ba37eb4385cdc7f61afa0c97 /lib/csapi/joining.cpp | |
| parent | f5c2e47fa1ab84fdaffe03c30ba973d7dea5ac05 (diff) | |
| parent | 1e6510790dab6b9141ae52993987b406399668cd (diff) | |
| download | libquotient-b55334ac0fe89f780776bc4eab90ffe1ca3c57bb.tar.gz libquotient-b55334ac0fe89f780776bc4eab90ffe1ca3c57bb.zip | |
Merge branch 'cs-api-0.4.0'
Diffstat (limited to 'lib/csapi/joining.cpp')
| -rw-r--r-- | lib/csapi/joining.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp index 1a29ac62..71781154 100644 --- a/lib/csapi/joining.cpp +++ b/lib/csapi/joining.cpp @@ -18,12 +18,12 @@ namespace QMatrixClient QJsonObject toJson(const JoinRoomByIdJob::ThirdPartySigned& pod) { - QJsonObject _json; - addParam<>(_json, QStringLiteral("sender"), pod.sender); - addParam<>(_json, QStringLiteral("mxid"), pod.mxid); - addParam<>(_json, QStringLiteral("token"), pod.token); - addParam<>(_json, QStringLiteral("signatures"), pod.signatures); - return _json; + QJsonObject jo; + addParam<>(jo, QStringLiteral("sender"), pod.sender); + addParam<>(jo, QStringLiteral("mxid"), pod.mxid); + addParam<>(jo, QStringLiteral("token"), pod.token); + addParam<>(jo, QStringLiteral("signatures"), pod.signatures); + return jo; } } // namespace QMatrixClient @@ -68,19 +68,19 @@ namespace QMatrixClient QJsonObject toJson(const JoinRoomJob::Signed& pod) { - QJsonObject _json; - addParam<>(_json, QStringLiteral("sender"), pod.sender); - addParam<>(_json, QStringLiteral("mxid"), pod.mxid); - addParam<>(_json, QStringLiteral("token"), pod.token); - addParam<>(_json, QStringLiteral("signatures"), pod.signatures); - return _json; + QJsonObject jo; + addParam<>(jo, QStringLiteral("sender"), pod.sender); + addParam<>(jo, QStringLiteral("mxid"), pod.mxid); + addParam<>(jo, QStringLiteral("token"), pod.token); + addParam<>(jo, QStringLiteral("signatures"), pod.signatures); + return jo; } QJsonObject toJson(const JoinRoomJob::ThirdPartySigned& pod) { - QJsonObject _json; - addParam<>(_json, QStringLiteral("signed"), pod.signedData); - return _json; + QJsonObject jo; + addParam<>(jo, QStringLiteral("signed"), pod.signedData); + return jo; } } // namespace QMatrixClient |