diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-08-03 17:29:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-03 17:29:52 +0900 |
| commit | 66e116b7b1e848e80577a0229c8995db0a54932e (patch) | |
| tree | 763340439a0f4034e9c829d76cb1ffe9766b83c5 /lib/csapi/definitions/wellknown/full.cpp | |
| parent | 5b236dfe895c7766002559570aa29c9033009228 (diff) | |
| parent | c05ade838f0fce81f2bbe80a3295618a8a26ff52 (diff) | |
| download | libquotient-66e116b7b1e848e80577a0229c8995db0a54932e.tar.gz libquotient-66e116b7b1e848e80577a0229c8995db0a54932e.zip | |
Merge pull request #295 from marcdeop/140_impose_coding_standard
140 impose coding standard
Diffstat (limited to 'lib/csapi/definitions/wellknown/full.cpp')
| -rw-r--r-- | lib/csapi/definitions/wellknown/full.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp index 5ecef34f..34d3bfbe 100644 --- a/lib/csapi/definitions/wellknown/full.cpp +++ b/lib/csapi/definitions/wellknown/full.cpp @@ -7,11 +7,12 @@ using namespace QMatrixClient; void JsonObjectConverter<DiscoveryInformation>::dumpTo( - QJsonObject& jo, const DiscoveryInformation& pod) + QJsonObject& jo, const DiscoveryInformation& pod) { fillJson(jo, pod.additionalProperties); addParam<>(jo, QStringLiteral("m.homeserver"), pod.homeserver); - addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"), pod.identityServer); + addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"), + pod.identityServer); } void JsonObjectConverter<DiscoveryInformation>::fillFrom( @@ -19,7 +20,5 @@ void JsonObjectConverter<DiscoveryInformation>::fillFrom( { fromJson(jo.take("m.homeserver"_ls), result.homeserver); fromJson(jo.take("m.identity_server"_ls), result.identityServer); - fromJson(jo, result.additionalProperties); } - |