diff options
| author | Black Hat <bhat@encom.eu.org> | 2019-09-26 22:22:36 -0700 |
|---|---|---|
| committer | Black Hat <bhat@encom.eu.org> | 2019-09-26 22:22:36 -0700 |
| commit | 363cf452bcdbaf6ff1cf94a83ca66cbb31122346 (patch) | |
| tree | c64c8fda885e4e1785130e8ee3e7c47fd18cbf67 /lib/csapi/definitions/wellknown/full.cpp | |
| parent | 412e2cf19449e73aa7da729e9c5de6502687aade (diff) | |
| parent | 944653463fe4134c82d85e2d01e2bc0fa43fd727 (diff) | |
| download | libquotient-363cf452bcdbaf6ff1cf94a83ca66cbb31122346.tar.gz libquotient-363cf452bcdbaf6ff1cf94a83ca66cbb31122346.zip | |
Merge branch 'master' of https://github.com/quotient-im/libQuotient into
bhat-libqtolm-update
Diffstat (limited to 'lib/csapi/definitions/wellknown/full.cpp')
| -rw-r--r-- | lib/csapi/definitions/wellknown/full.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp index 5ecef34f..595db0e5 100644 --- a/lib/csapi/definitions/wellknown/full.cpp +++ b/lib/csapi/definitions/wellknown/full.cpp @@ -4,14 +4,15 @@ #include "full.h" -using namespace QMatrixClient; +using namespace Quotient; 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); } - |