aboutsummaryrefslogtreecommitdiff
path: root/lib/csapi/definitions/user_identifier.cpp
diff options
context:
space:
mode:
authorBlack Hat <bhat@encom.eu.org>2019-09-26 22:22:36 -0700
committerBlack Hat <bhat@encom.eu.org>2019-09-26 22:22:36 -0700
commit363cf452bcdbaf6ff1cf94a83ca66cbb31122346 (patch)
treec64c8fda885e4e1785130e8ee3e7c47fd18cbf67 /lib/csapi/definitions/user_identifier.cpp
parent412e2cf19449e73aa7da729e9c5de6502687aade (diff)
parent944653463fe4134c82d85e2d01e2bc0fa43fd727 (diff)
downloadlibquotient-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/user_identifier.cpp')
-rw-r--r--lib/csapi/definitions/user_identifier.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/csapi/definitions/user_identifier.cpp b/lib/csapi/definitions/user_identifier.cpp
index 05a27c1c..9e9b4fe9 100644
--- a/lib/csapi/definitions/user_identifier.cpp
+++ b/lib/csapi/definitions/user_identifier.cpp
@@ -4,20 +4,18 @@
#include "user_identifier.h"
-using namespace QMatrixClient;
+using namespace Quotient;
-void JsonObjectConverter<UserIdentifier>::dumpTo(
- QJsonObject& jo, const UserIdentifier& pod)
+void JsonObjectConverter<UserIdentifier>::dumpTo(QJsonObject& jo,
+ const UserIdentifier& pod)
{
fillJson(jo, pod.additionalProperties);
addParam<>(jo, QStringLiteral("type"), pod.type);
}
-void JsonObjectConverter<UserIdentifier>::fillFrom(
- QJsonObject jo, UserIdentifier& result)
+void JsonObjectConverter<UserIdentifier>::fillFrom(QJsonObject jo,
+ UserIdentifier& result)
{
fromJson(jo.take("type"_ls), result.type);
-
fromJson(jo, result.additionalProperties);
}
-