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/identity_server.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/identity_server.cpp')
| -rw-r--r-- | lib/csapi/definitions/wellknown/identity_server.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp index 99f36641..3b2a5720 100644 --- a/lib/csapi/definitions/wellknown/identity_server.cpp +++ b/lib/csapi/definitions/wellknown/identity_server.cpp @@ -4,10 +4,10 @@ #include "identity_server.h" -using namespace QMatrixClient; +using namespace Quotient; void JsonObjectConverter<IdentityServerInformation>::dumpTo( - QJsonObject& jo, const IdentityServerInformation& pod) + QJsonObject& jo, const IdentityServerInformation& pod) { addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl); } @@ -17,4 +17,3 @@ void JsonObjectConverter<IdentityServerInformation>::fillFrom( { fromJson(jo.value("base_url"_ls), result.baseUrl); } - |