Merge branch 'master' of https://github.com/quotient-im/libQuotient into

bhat-libqtolm-update

1 files changed, 32 insertions, 19 deletions

diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 96b32a92..2e466fa3 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -8,53 +8,66 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto SetAccountDataJobName = QStringLiteral("SetAccountDataJob");
 
-SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content)
+SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type,
+                                     const QJsonObject& content)
     : BaseJob(HttpVerb::Put, SetAccountDataJobName,
-        basePath % "/user/" % userId % "/account_data/" % type)
+              basePath % "/user/" % userId % "/account_data/" % type)
 {
     setRequestData(Data(toJson(content)));
 }
 
-QUrl GetAccountDataJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& type)
+QUrl GetAccountDataJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
+                                       const QString& type)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/user/" % userId % "/account_data/" % type);
+                                   basePath % "/user/" % userId
+                                       % "/account_data/" % type);
 }
 
 static const auto GetAccountDataJobName = QStringLiteral("GetAccountDataJob");
 
 GetAccountDataJob::GetAccountDataJob(const QString& userId, const QString& type)
     : BaseJob(HttpVerb::Get, GetAccountDataJobName,
-        basePath % "/user/" % userId % "/account_data/" % type)
-{
-}
+              basePath % "/user/" % userId % "/account_data/" % type)
+{}
 
-static const auto SetAccountDataPerRoomJobName = QStringLiteral("SetAccountDataPerRoomJob");
+static const auto SetAccountDataPerRoomJobName =
+    QStringLiteral("SetAccountDataPerRoomJob");
 
-SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content)
+SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
+                                                   const QString& roomId,
+                                                   const QString& type,
+                                                   const QJsonObject& content)
     : BaseJob(HttpVerb::Put, SetAccountDataPerRoomJobName,
-        basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type)
+              basePath % "/user/" % userId % "/rooms/" % roomId
+                  % "/account_data/" % type)
 {
     setRequestData(Data(toJson(content)));
 }
 
-QUrl GetAccountDataPerRoomJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& type)
+QUrl GetAccountDataPerRoomJob::makeRequestUrl(QUrl baseUrl,
+                                              const QString& userId,
+                                              const QString& roomId,
+                                              const QString& type)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type);
+                                   basePath % "/user/" % userId % "/rooms/"
+                                       % roomId % "/account_data/" % type);
 }
 
-static const auto GetAccountDataPerRoomJobName = QStringLiteral("GetAccountDataPerRoomJob");
+static const auto GetAccountDataPerRoomJobName =
+    QStringLiteral("GetAccountDataPerRoomJob");
 
-GetAccountDataPerRoomJob::GetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type)
+GetAccountDataPerRoomJob::GetAccountDataPerRoomJob(const QString& userId,
+                                                   const QString& roomId,
+                                                   const QString& type)
     : BaseJob(HttpVerb::Get, GetAccountDataPerRoomJobName,
-        basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type)
-{
-}
-
+              basePath % "/user/" % userId % "/rooms/" % roomId
+                  % "/account_data/" % type)
+{}