1 files changed, 15 insertions, 17 deletions
diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 6a40e908..09fc8d40 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -4,31 +4,29 @@
 
 #include "account-data.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 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)
+              makePath("/_matrix/client/r0", "/user/", userId, "/account_data/",
+                       type))
 {
-    setRequestData(Data(toJson(content)));
+    setRequestData(RequestData(toJson(content)));
 }
 
 QUrl GetAccountDataJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
                                        const QString& type)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0") % "/user/"
-                                       % userId % "/account_data/" % type);
+                                   makePath("/_matrix/client/r0", "/user/",
+                                            userId, "/account_data/", type));
 }
 
 GetAccountDataJob::GetAccountDataJob(const QString& userId, const QString& type)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAccountDataJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/account_data/" % type)
+              makePath("/_matrix/client/r0", "/user/", userId, "/account_data/",
+                       type))
 {}
 
 SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
@@ -36,10 +34,10 @@ SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
                                                    const QString& type,
                                                    const QJsonObject& content)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetAccountDataPerRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/rooms/" % roomId % "/account_data/" % type)
+              makePath("/_matrix/client/r0", "/user/", userId, "/rooms/",
+                       roomId, "/account_data/", type))
 {
-    setRequestData(Data(toJson(content)));
+    setRequestData(RequestData(toJson(content)));
 }
 
 QUrl GetAccountDataPerRoomJob::makeRequestUrl(QUrl baseUrl,
@@ -48,15 +46,15 @@ QUrl GetAccountDataPerRoomJob::makeRequestUrl(QUrl baseUrl,
                                               const QString& type)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/user/" % userId % "/rooms/" % roomId
-                                       % "/account_data/" % type);
+                                   makePath("/_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)
+              makePath("/_matrix/client/r0", "/user/", userId, "/rooms/",
+                       roomId, "/account_data/", type))
 {}