From 7aa6e7c300779f652558397bcb7bb3b726d30cb9 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Fri, 2 Jul 2021 10:34:16 +0200
Subject: Abandon BaseJob::Query - generated API files

---
 lib/csapi/list_public_rooms.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/csapi/list_public_rooms.cpp')

diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index 415d816c..a4bcb934 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -38,7 +38,7 @@ SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(
 auto queryToGetPublicRooms(Omittable<int> limit, const QString& since,
                            const QString& server)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
     addParam<IfNotEmpty>(_q, QStringLiteral("since"), since);
     addParam<IfNotEmpty>(_q, QStringLiteral("server"), server);
@@ -66,7 +66,7 @@ GetPublicRoomsJob::GetPublicRoomsJob(Omittable<int> limit, const QString& since,
 
 auto queryToQueryPublicRooms(const QString& server)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("server"), server);
     return _q;
 }
-- 
cgit v1.2.3


From 1fd25fe944b67c55435ed4d4d8fd1cbb0989bb5f Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Mon, 4 Oct 2021 18:40:48 +0200
Subject: Regenerate CS API files upon the previous commit

---
 lib/csapi/list_public_rooms.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'lib/csapi/list_public_rooms.cpp')

diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index a4bcb934..25f8da5c 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -4,31 +4,27 @@
 
 #include "list_public_rooms.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl,
                                                      const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/directory/list/room/" % roomId);
+                                   makePath("/_matrix/client/r0",
+                                            "/directory/list/room/", roomId));
 }
 
 GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(
     const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomVisibilityOnDirectoryJob"),
-              QStringLiteral("/_matrix/client/r0") % "/directory/list/room/"
-                  % roomId,
+              makePath("/_matrix/client/r0", "/directory/list/room/", roomId),
               false)
 {}
 
 SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(
     const QString& roomId, const QString& visibility)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomVisibilityOnDirectoryJob"),
-              QStringLiteral("/_matrix/client/r0") % "/directory/list/room/"
-                  % roomId)
+              makePath("/_matrix/client/r0", "/directory/list/room/", roomId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("visibility"), visibility);
@@ -50,15 +46,15 @@ QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, Omittable<int> limit,
                                        const QString& server)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/publicRooms",
+                                   makePath("/_matrix/client/r0",
+                                            "/publicRooms"),
                                    queryToGetPublicRooms(limit, since, server));
 }
 
 GetPublicRoomsJob::GetPublicRoomsJob(Omittable<int> limit, const QString& since,
                                      const QString& server)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPublicRoomsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/publicRooms",
+              makePath("/_matrix/client/r0", "/publicRooms"),
               queryToGetPublicRooms(limit, since, server), {}, false)
 {
     addExpectedKey("chunk");
@@ -78,7 +74,7 @@ QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server,
                                          Omittable<bool> includeAllNetworks,
                                          const QString& thirdPartyInstanceId)
     : BaseJob(HttpVerb::Post, QStringLiteral("QueryPublicRoomsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/publicRooms",
+              makePath("/_matrix/client/r0", "/publicRooms"),
               queryToQueryPublicRooms(server))
 {
     QJsonObject _data;
-- 
cgit v1.2.3