Merge branch 'dev' into pinned

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/csapi/notifications.cpp b/lib/csapi/notifications.cpp
index a479d500..1e523c6f 100644
--- a/lib/csapi/notifications.cpp
+++ b/lib/csapi/notifications.cpp
@@ -4,14 +4,12 @@
 
 #include "notifications.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToGetNotifications(const QString& from, Omittable<int> limit,
                              const QString& only)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("from"), from);
     addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
     addParam<IfNotEmpty>(_q, QStringLiteral("only"), only);
@@ -23,8 +21,8 @@ QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from,
                                          const QString& only)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/notifications",
+                                   makePath("/_matrix/client/r0",
+                                            "/notifications"),
                                    queryToGetNotifications(from, limit, only));
 }
 
@@ -32,7 +30,7 @@ GetNotificationsJob::GetNotificationsJob(const QString& from,
                                          Omittable<int> limit,
                                          const QString& only)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetNotificationsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/notifications",
+              makePath("/_matrix/client/r0", "/notifications"),
               queryToGetNotifications(from, limit, only))
 {
     addExpectedKey("notifications");