Update upstream source from tag 'upstream/0.7.0'

Update to upstream version '0.7.0'
with Debian dir 30dcb77a77433e4a54eab77c0b82ae925dead2d8

1 files changed, 18 insertions, 21 deletions

diff --git a/lib/csapi/device_management.cpp b/lib/csapi/device_management.cpp
index eac9a545..6f2badee 100644
--- a/lib/csapi/device_management.cpp
+++ b/lib/csapi/device_management.cpp
@@ -4,61 +4,58 @@
 
 #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/v3", "/devices"));
 }
 
 GetDevicesJob::GetDevicesJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDevicesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices")
+              makePath("/_matrix/client/v3", "/devices"))
 {}
 
 QUrl GetDeviceJob::makeRequestUrl(QUrl baseUrl, const QString& deviceId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/devices/" % deviceId);
+                                   makePath("/_matrix/client/v3", "/devices/",
+                                            deviceId));
 }
 
 GetDeviceJob::GetDeviceJob(const QString& deviceId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/v3", "/devices/", deviceId))
 {}
 
 UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId,
                                  const QString& displayName)
     : BaseJob(HttpVerb::Put, QStringLiteral("UpdateDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/v3", "/devices/", deviceId))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("display_name"), displayName);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("display_name"), displayName);
+    setRequestData({ _dataJson });
 }
 
 DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId,
                                  const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/v3", "/devices/", deviceId))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("auth"), auth);
+    setRequestData({ _dataJson });
 }
 
 DeleteDevicesJob::DeleteDevicesJob(const QStringList& devices,
                                    const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("DeleteDevicesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/delete_devices")
+              makePath("/_matrix/client/v3", "/delete_devices"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("devices"), devices);
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("devices"), devices);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("auth"), auth);
+    setRequestData({ _dataJson });
 }