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/keys.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index 34ab47c9..ba5d8e12 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -47,7 +47,7 @@ ClaimKeysJob::ClaimKeysJob(
 
 auto queryToGetKeysChanges(const QString& from, const QString& to)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<>(_q, QStringLiteral("from"), from);
     addParam<>(_q, QStringLiteral("to"), to);
     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/keys.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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

diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index ba5d8e12..d6bd2fab 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -4,14 +4,12 @@
 
 #include "keys.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys,
                              const QHash<QString, QVariant>& oneTimeKeys)
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadKeysJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/upload")
+              makePath("/_matrix/client/r0", "/keys/upload"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("device_keys"), deviceKeys);
@@ -23,7 +21,7 @@ UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys,
 QueryKeysJob::QueryKeysJob(const QHash<QString, QStringList>& deviceKeys,
                            Omittable<int> timeout, const QString& token)
     : BaseJob(HttpVerb::Post, QStringLiteral("QueryKeysJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/query")
+              makePath("/_matrix/client/r0", "/keys/query"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -36,7 +34,7 @@ ClaimKeysJob::ClaimKeysJob(
     const QHash<QString, QHash<QString, QString>>& oneTimeKeys,
     Omittable<int> timeout)
     : BaseJob(HttpVerb::Post, QStringLiteral("ClaimKeysJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/claim")
+              makePath("/_matrix/client/r0", "/keys/claim"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -57,13 +55,13 @@ QUrl GetKeysChangesJob::makeRequestUrl(QUrl baseUrl, const QString& from,
                                        const QString& to)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/keys/changes",
+                                   makePath("/_matrix/client/r0",
+                                            "/keys/changes"),
                                    queryToGetKeysChanges(from, to));
 }
 
 GetKeysChangesJob::GetKeysChangesJob(const QString& from, const QString& to)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetKeysChangesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/changes",
+              makePath("/_matrix/client/r0", "/keys/changes"),
               queryToGetKeysChanges(from, to))
 {}
-- 
cgit v1.2.3