Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 10 insertions, 17 deletions

diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp
index 4065207b..8a8ec664 100644
--- a/lib/csapi/banning.cpp
+++ b/lib/csapi/banning.cpp
@@ -4,34 +4,27 @@
 
 #include "banning.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-static const auto BanJobName = QStringLiteral("BanJob");
+using namespace Quotient;
 
-BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reason)
-    : BaseJob(HttpVerb::Post, BanJobName,
-        basePath % "/rooms/" % roomId % "/ban")
+BanJob::BanJob(const QString& roomId, const QString& userId,
+               const QString& reason)
+    : BaseJob(HttpVerb::Post, QStringLiteral("BanJob"),
+              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/ban")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
     addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
-    setRequestData(_data);
+    setRequestData(std::move(_data));
 }
 
-static const auto UnbanJobName = QStringLiteral("UnbanJob");
-
 UnbanJob::UnbanJob(const QString& roomId, const QString& userId)
-    : BaseJob(HttpVerb::Post, UnbanJobName,
-        basePath % "/rooms/" % roomId % "/unban")
+    : BaseJob(HttpVerb::Post, QStringLiteral("UnbanJob"),
+              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+                  % "/unban")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
-    setRequestData(_data);
+    setRequestData(std::move(_data));
 }
-