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/device_keys.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/device_keys.cpp')
| -rw-r--r-- | lib/csapi/definitions/device_keys.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/csapi/definitions/device_keys.cpp b/lib/csapi/definitions/device_keys.cpp index 1e79499f..0583840d 100644 --- a/lib/csapi/definitions/device_keys.cpp +++ b/lib/csapi/definitions/device_keys.cpp @@ -4,10 +4,10 @@ #include "device_keys.h" -using namespace QMatrixClient; +using namespace Quotient; -void JsonObjectConverter<DeviceKeys>::dumpTo( - QJsonObject& jo, const DeviceKeys& pod) +void JsonObjectConverter<DeviceKeys>::dumpTo(QJsonObject& jo, + const DeviceKeys& pod) { addParam<>(jo, QStringLiteral("user_id"), pod.userId); addParam<>(jo, QStringLiteral("device_id"), pod.deviceId); @@ -16,8 +16,8 @@ void JsonObjectConverter<DeviceKeys>::dumpTo( addParam<>(jo, QStringLiteral("signatures"), pod.signatures); } -void JsonObjectConverter<DeviceKeys>::fillFrom( - const QJsonObject& jo, DeviceKeys& result) +void JsonObjectConverter<DeviceKeys>::fillFrom(const QJsonObject& jo, + DeviceKeys& result) { fromJson(jo.value("user_id"_ls), result.userId); fromJson(jo.value("device_id"_ls), result.deviceId); @@ -25,4 +25,3 @@ void JsonObjectConverter<DeviceKeys>::fillFrom( fromJson(jo.value("keys"_ls), result.keys); fromJson(jo.value("signatures"_ls), result.signatures); } - |