1 files changed, 11 insertions, 17 deletions
diff --git a/lib/csapi/profile.cpp b/lib/csapi/profile.cpp
index 745fa488..64ac84ca 100644
--- a/lib/csapi/profile.cpp
+++ b/lib/csapi/profile.cpp
@@ -4,15 +4,12 @@
 
 #include "profile.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetDisplayNameJob::SetDisplayNameJob(const QString& userId,
                                      const QString& displayname)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetDisplayNameJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/displayname")
+              makePath("/_matrix/client/r0", "/profile/", userId, "/displayname"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("displayname"), displayname);
@@ -22,21 +19,19 @@ SetDisplayNameJob::SetDisplayNameJob(const QString& userId,
 QUrl GetDisplayNameJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/profile/" % userId % "/displayname");
+                                   makePath("/_matrix/client/r0", "/profile/",
+                                            userId, "/displayname"));
 }
 
 GetDisplayNameJob::GetDisplayNameJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDisplayNameJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/displayname",
+              makePath("/_matrix/client/r0", "/profile/", userId, "/displayname"),
               false)
 {}
 
 SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QUrl& avatarUrl)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetAvatarUrlJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/avatar_url")
+              makePath("/_matrix/client/r0", "/profile/", userId, "/avatar_url"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("avatar_url"), avatarUrl);
@@ -46,25 +41,24 @@ SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QUrl& avatarUrl)
 QUrl GetAvatarUrlJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/profile/" % userId % "/avatar_url");
+                                   makePath("/_matrix/client/r0", "/profile/",
+                                            userId, "/avatar_url"));
 }
 
 GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAvatarUrlJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/avatar_url",
+              makePath("/_matrix/client/r0", "/profile/", userId, "/avatar_url"),
               false)
 {}
 
 QUrl GetUserProfileJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/profile/" % userId);
+                                   makePath("/_matrix/client/r0", "/profile/",
+                                            userId));
 }
 
 GetUserProfileJob::GetUserProfileJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetUserProfileJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId, false)
+              makePath("/_matrix/client/r0", "/profile/", userId), false)
 {}