1 files changed, 18 insertions, 23 deletions
diff --git a/lib/csapi/rooms.cpp b/lib/csapi/rooms.cpp
index 3dd87021..5310aa32 100644
--- a/lib/csapi/rooms.cpp
+++ b/lib/csapi/rooms.cpp
@@ -4,24 +4,21 @@
 
 #include "rooms.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetOneRoomEventJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
                                         const QString& eventId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/event/"
-                                       % eventId);
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/event/", eventId));
 }
 
 GetOneRoomEventJob::GetOneRoomEventJob(const QString& roomId,
                                        const QString& eventId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetOneRoomEventJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/event/" % eventId)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/event/",
+                       eventId))
 {}
 
 QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
@@ -29,30 +26,29 @@ QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
                                             const QString& stateKey)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/state/"
-                                       % eventType % "/" % stateKey);
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/state/", eventType, "/",
+                                            stateKey));
 }
 
 GetRoomStateWithKeyJob::GetRoomStateWithKeyJob(const QString& roomId,
                                                const QString& eventType,
                                                const QString& stateKey)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomStateWithKeyJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/state/" % eventType % "/" % stateKey)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/state/",
+                       eventType, "/", stateKey))
 {}
 
 QUrl GetRoomStateJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/state");
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/state"));
 }
 
 GetRoomStateJob::GetRoomStateJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomStateJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/state")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/state"))
 {}
 
 auto queryToGetMembersByRoom(const QString& at, const QString& membership,
@@ -72,7 +68,7 @@ QUrl GetMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
 {
     return BaseJob::makeRequestUrl(
         std::move(baseUrl),
-        QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/members",
+        makePath("/_matrix/client/r0", "/rooms/", roomId, "/members"),
         queryToGetMembersByRoom(at, membership, notMembership));
 }
 
@@ -81,8 +77,7 @@ GetMembersByRoomJob::GetMembersByRoomJob(const QString& roomId,
                                          const QString& membership,
                                          const QString& notMembership)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetMembersByRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/members",
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/members"),
               queryToGetMembersByRoom(at, membership, notMembership))
 {}
 
@@ -90,12 +85,12 @@ QUrl GetJoinedMembersByRoomJob::makeRequestUrl(QUrl baseUrl,
                                                const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/joined_members");
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/joined_members"));
 }
 
 GetJoinedMembersByRoomJob::GetJoinedMembersByRoomJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetJoinedMembersByRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/joined_members")
+              makePath("/_matrix/client/r0", "/rooms/", roomId,
+                       "/joined_members"))
 {}