Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 7 insertions, 12 deletions

diff --git a/lib/csapi/typing.cpp b/lib/csapi/typing.cpp
index bf10912b..8e214053 100644
--- a/lib/csapi/typing.cpp
+++ b/lib/csapi/typing.cpp
@@ -4,23 +4,18 @@
 
 #include "typing.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
+using namespace Quotient;
 
-static const auto SetTypingJobName = QStringLiteral("SetTypingJob");
-
-SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool typing, Omittable<int> timeout)
-    : BaseJob(HttpVerb::Put, SetTypingJobName,
-        basePath % "/rooms/" % roomId % "/typing/" % userId)
+SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId,
+                           bool typing, Omittable<int> timeout)
+    : BaseJob(HttpVerb::Put, QStringLiteral("SetTypingJob"),
+              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+                  % "/typing/" % userId)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("typing"), typing);
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
-    setRequestData(_data);
+    setRequestData(std::move(_data));
 }
-