Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 36 insertions, 34 deletions

diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 96b32a92..6a40e908 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -4,57 +4,59 @@
 
 #include "account-data.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-static const auto SetAccountDataJobName = QStringLiteral("SetAccountDataJob");
+using namespace Quotient;
 
-SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content)
-    : BaseJob(HttpVerb::Put, SetAccountDataJobName,
-        basePath % "/user/" % userId % "/account_data/" % type)
+SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type,
+                                     const QJsonObject& content)
+    : BaseJob(HttpVerb::Put, QStringLiteral("SetAccountDataJob"),
+              QStringLiteral("/_matrix/client/r0") % "/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);
+                                   QStringLiteral("/_matrix/client/r0") % "/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)
-{
-}
-
-static const auto SetAccountDataPerRoomJobName = QStringLiteral("SetAccountDataPerRoomJob");
-
-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)
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetAccountDataJob"),
+              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
+                  % "/account_data/" % type)
+{}
+
+SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
+                                                   const QString& roomId,
+                                                   const QString& type,
+                                                   const QJsonObject& content)
+    : BaseJob(HttpVerb::Put, QStringLiteral("SetAccountDataPerRoomJob"),
+              QStringLiteral("/_matrix/client/r0") % "/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);
-}
-
-static const auto GetAccountDataPerRoomJobName = QStringLiteral("GetAccountDataPerRoomJob");
-
-GetAccountDataPerRoomJob::GetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type)
-    : BaseJob(HttpVerb::Get, GetAccountDataPerRoomJobName,
-        basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type)
-{
+                                   QStringLiteral("/_matrix/client/r0")
+                                       % "/user/" % userId % "/rooms/" % roomId
+                                       % "/account_data/" % type);
 }
 
+GetAccountDataPerRoomJob::GetAccountDataPerRoomJob(const QString& userId,
+                                                   const QString& roomId,
+                                                   const QString& type)
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetAccountDataPerRoomJob"),
+              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
+                  % "/rooms/" % roomId % "/account_data/" % type)
+{}