Merge branch 'master' of https://github.com/quotient-im/libQuotient into

bhat-libqtolm-update

1 files changed, 25 insertions, 28 deletions

diff --git a/lib/csapi/message_pagination.cpp b/lib/csapi/message_pagination.cpp
index 9aca7ec9..b612ee91 100644
--- a/lib/csapi/message_pagination.cpp
+++ b/lib/csapi/message_pagination.cpp
@@ -8,19 +8,21 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 class GetRoomEventsJob::Private
 {
-    public:
-        QString begin;
-        QString end;
-        RoomEvents chunk;
+public:
+    QString begin;
+    QString end;
+    RoomEvents chunk;
 };
 
-BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to, const QString& dir, Omittable<int> limit, const QString& filter)
+BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to,
+                                    const QString& dir, Omittable<int> limit,
+                                    const QString& filter)
 {
     BaseJob::Query _q;
     addParam<>(_q, QStringLiteral("from"), from);
@@ -31,39 +33,34 @@ BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to, cons
     return _q;
 }
 
-QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to, Omittable<int> limit, const QString& filter)
+QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                      const QString& from, const QString& dir,
+                                      const QString& to, Omittable<int> limit,
+                                      const QString& filter)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/messages",
-            queryToGetRoomEvents(from, to, dir, limit, filter));
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), basePath % "/rooms/" % roomId % "/messages",
+        queryToGetRoomEvents(from, to, dir, limit, filter));
 }
 
 static const auto GetRoomEventsJobName = QStringLiteral("GetRoomEventsJob");
 
-GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to, Omittable<int> limit, const QString& filter)
+GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from,
+                                   const QString& dir, const QString& to,
+                                   Omittable<int> limit, const QString& filter)
     : BaseJob(HttpVerb::Get, GetRoomEventsJobName,
-        basePath % "/rooms/" % roomId % "/messages",
-        queryToGetRoomEvents(from, to, dir, limit, filter))
+              basePath % "/rooms/" % roomId % "/messages",
+              queryToGetRoomEvents(from, to, dir, limit, filter))
     , d(new Private)
-{
-}
+{}
 
 GetRoomEventsJob::~GetRoomEventsJob() = default;
 
-const QString& GetRoomEventsJob::begin() const
-{
-    return d->begin;
-}
+const QString& GetRoomEventsJob::begin() const { return d->begin; }
 
-const QString& GetRoomEventsJob::end() const
-{
-    return d->end;
-}
+const QString& GetRoomEventsJob::end() const { return d->end; }
 
-RoomEvents&& GetRoomEventsJob::chunk()
-{
-    return std::move(d->chunk);
-}
+RoomEvents&& GetRoomEventsJob::chunk() { return std::move(d->chunk); }
 
 BaseJob::Status GetRoomEventsJob::parseJson(const QJsonDocument& data)
 {
@@ -71,6 +68,6 @@ BaseJob::Status GetRoomEventsJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("start"_ls), d->begin);
     fromJson(json.value("end"_ls), d->end);
     fromJson(json.value("chunk"_ls), d->chunk);
+
     return Success;
 }
-