1 files changed, 14 insertions, 17 deletions

diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp
index fa4f475a..589c9fc1 100644
--- a/lib/csapi/administrative_contact.cpp
+++ b/lib/csapi/administrative_contact.cpp
@@ -4,25 +4,22 @@
 
 #include "administrative_contact.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetAccount3PIDsJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/account/3pid");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/account/3pid"));
 }
 
 GetAccount3PIDsJob::GetAccount3PIDsJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAccount3PIDsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid")
+              makePath("/_matrix/client/r0", "/account/3pid"))
 {}
 
 Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds)
     : BaseJob(HttpVerb::Post, QStringLiteral("Post3PIDsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid")
+              makePath("/_matrix/client/r0", "/account/3pid"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("three_pid_creds"), threePidCreds);
@@ -32,7 +29,7 @@ Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds)
 Add3PIDJob::Add3PIDJob(const QString& clientSecret, const QString& sid,
                        const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("Add3PIDJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/add")
+              makePath("/_matrix/client/r0", "/account/3pid/add"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -44,7 +41,7 @@ Add3PIDJob::Add3PIDJob(const QString& clientSecret, const QString& sid,
 Bind3PIDJob::Bind3PIDJob(const QString& clientSecret, const QString& idServer,
                          const QString& idAccessToken, const QString& sid)
     : BaseJob(HttpVerb::Post, QStringLiteral("Bind3PIDJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/bind")
+              makePath("/_matrix/client/r0", "/account/3pid/bind"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -58,7 +55,7 @@ Delete3pidFromAccountJob::Delete3pidFromAccountJob(const QString& medium,
                                                    const QString& address,
                                                    const QString& idServer)
     : BaseJob(HttpVerb::Post, QStringLiteral("Delete3pidFromAccountJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/delete")
+              makePath("/_matrix/client/r0", "/account/3pid/delete"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("id_server"), idServer);
@@ -72,7 +69,7 @@ Unbind3pidFromAccountJob::Unbind3pidFromAccountJob(const QString& medium,
                                                    const QString& address,
                                                    const QString& idServer)
     : BaseJob(HttpVerb::Post, QStringLiteral("Unbind3pidFromAccountJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/unbind")
+              makePath("/_matrix/client/r0", "/account/3pid/unbind"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("id_server"), idServer);
@@ -85,19 +82,19 @@ Unbind3pidFromAccountJob::Unbind3pidFromAccountJob(const QString& medium,
 RequestTokenTo3PIDEmailJob::RequestTokenTo3PIDEmailJob(
     const EmailValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenTo3PIDEmailJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/account/3pid/email/requestToken",
+              makePath("/_matrix/client/r0",
+                       "/account/3pid/email/requestToken"),
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
 
 RequestTokenTo3PIDMSISDNJob::RequestTokenTo3PIDMSISDNJob(
     const MsisdnValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenTo3PIDMSISDNJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/account/3pid/msisdn/requestToken",
+              makePath("/_matrix/client/r0",
+                       "/account/3pid/msisdn/requestToken"),
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }