1 files changed, 8 insertions, 11 deletions
diff --git a/lib/csapi/device_management.cpp b/lib/csapi/device_management.cpp
index eac9a545..da6dbc76 100644
--- a/lib/csapi/device_management.cpp
+++ b/lib/csapi/device_management.cpp
@@ -4,38 +4,35 @@
 
 #include "device_management.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetDevicesJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/devices");
+                                   makePath("/_matrix/client/r0", "/devices"));
 }
 
 GetDevicesJob::GetDevicesJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDevicesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices")
+              makePath("/_matrix/client/r0", "/devices"))
 {}
 
 QUrl GetDeviceJob::makeRequestUrl(QUrl baseUrl, const QString& deviceId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/devices/" % deviceId);
+                                   makePath("/_matrix/client/r0", "/devices/",
+                                            deviceId));
 }
 
 GetDeviceJob::GetDeviceJob(const QString& deviceId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/r0", "/devices/", deviceId))
 {}
 
 UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId,
                                  const QString& displayName)
     : BaseJob(HttpVerb::Put, QStringLiteral("UpdateDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/r0", "/devices/", deviceId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("display_name"), displayName);
@@ -45,7 +42,7 @@ UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId,
 DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId,
                                  const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/r0", "/devices/", deviceId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -55,7 +52,7 @@ DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId,
 DeleteDevicesJob::DeleteDevicesJob(const QStringList& devices,
                                    const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("DeleteDevicesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/delete_devices")
+              makePath("/_matrix/client/r0", "/delete_devices"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("devices"), devices);