From aacc4bcb4a487871daae6717f77605aaba444341 Mon Sep 17 00:00:00 2001
From: Marc Deop <marc@marcdeop.com>
Date: Sat, 2 Mar 2019 12:26:57 +0100
Subject: style: apply .clang-format to all .cpp and .h files

---
 lib/connection.cpp | 826 ++++++++++++++++++++++++-----------------------------
 1 file changed, 377 insertions(+), 449 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 26b40c03..2b1cc1b9 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -13,39 +13,39 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "connection.h"
 #include "connectiondata.h"
-#include "user.h"
-#include "events/directchatevent.h"
-#include "events/eventloader.h"
-#include "room.h"
-#include "settings.h"
-#include "csapi/login.h"
+#include "csapi/account-data.h"
 #include "csapi/capabilities.h"
+#include "csapi/joining.h"
+#include "csapi/leaving.h"
+#include "csapi/login.h"
 #include "csapi/logout.h"
 #include "csapi/receipts.h"
-#include "csapi/leaving.h"
-#include "csapi/account-data.h"
-#include "csapi/joining.h"
-#include "csapi/to_device.h"
 #include "csapi/room_send.h"
-#include "jobs/syncjob.h"
-#include "jobs/mediathumbnailjob.h"
-#include "jobs/downloadfilejob.h"
+#include "csapi/to_device.h"
 #include "csapi/voip.h"
+#include "events/directchatevent.h"
+#include "events/eventloader.h"
+#include "jobs/downloadfilejob.h"
+#include "jobs/mediathumbnailjob.h"
+#include "jobs/syncjob.h"
+#include "room.h"
+#include "settings.h"
+#include "user.h"
 
-#include <QtNetwork/QDnsLookup>
-#include <QtCore/QFile>
+#include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QStringBuilder>
 #include <QtCore/QElapsedTimer>
-#include <QtCore/QRegularExpression>
+#include <QtCore/QFile>
 #include <QtCore/QMimeDatabase>
-#include <QtCore/QCoreApplication>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QStringBuilder>
+#include <QtNetwork/QDnsLookup>
 
 using namespace QMatrixClient;
 
@@ -54,10 +54,8 @@ template <typename HashT, typename Pred>
 HashT erase_if(HashT& hashMap, Pred pred)
 {
     HashT removals;
-    for (auto it = hashMap.begin(); it != hashMap.end();)
-    {
-        if (pred(it))
-        {
+    for (auto it = hashMap.begin(); it != hashMap.end();) {
+        if (pred(it)) {
             removals.insert(it.key(), it.value());
             it = hashMap.erase(it);
         } else
@@ -69,82 +67,81 @@ HashT erase_if(HashT& hashMap, Pred pred)
 class Connection::Private
 {
     public:
-        explicit Private(std::unique_ptr<ConnectionData>&& connection)
-            : data(move(connection))
-        { }
-        Q_DISABLE_COPY(Private)
-        Private(Private&&) = delete;
-        Private operator=(Private&&) = delete;
-
-        Connection* q = nullptr;
-        std::unique_ptr<ConnectionData> data;
-        // A complex key below is a pair of room name and whether its
-        // state is Invited. The spec mandates to keep Invited room state
-        // separately so we should, e.g., keep objects for Invite and
-        // Leave state of the same room.
-        QHash<QPair<QString, bool>, Room*> roomMap;
-        // Mapping from aliases to room ids, as per the last sync
-        QHash<QString, QString> roomAliasMap;
-        QVector<QString> roomIdsToForget;
-        QVector<Room*> firstTimeRooms;
-        QVector<QString> pendingStateRoomIds;
-        QMap<QString, User*> userMap;
-        DirectChatsMap directChats;
-        DirectChatUsersMap directChatUsers;
-        std::unordered_map<QString, EventPtr> accountData;
-        QString userId;
-        int syncLoopTimeout = -1;
-
-        GetCapabilitiesJob* capabilitiesJob = nullptr;
-        GetCapabilitiesJob::Capabilities capabilities;
-
-        SyncJob* syncJob = nullptr;
-
-        bool cacheState = true;
-        bool cacheToBinary = SettingsGroup("libqmatrixclient")
-                             .value("cache_type").toString() != "json";
-        bool lazyLoading = false;
-
-        void connectWithToken(const QString& user, const QString& accessToken,
-                              const QString& deviceId);
-        void broadcastDirectChatUpdates(const DirectChatsMap& additions,
-                                        const DirectChatsMap& removals);
-
-        template <typename EventT>
-        EventT* unpackAccountData() const
-        {
-            const auto& eventIt = accountData.find(EventT::matrixTypeId());
-            return eventIt == accountData.end()
-                    ? nullptr : weakPtrCast<EventT>(eventIt->second);
-        }
+    explicit Private(std::unique_ptr<ConnectionData>&& connection)
+        : data(move(connection))
+    {
+    }
+    Q_DISABLE_COPY(Private)
+    Private(Private&&) = delete;
+    Private operator=(Private&&) = delete;
+
+    Connection* q = nullptr;
+    std::unique_ptr<ConnectionData> data;
+    // A complex key below is a pair of room name and whether its
+    // state is Invited. The spec mandates to keep Invited room state
+    // separately so we should, e.g., keep objects for Invite and
+    // Leave state of the same room.
+    QHash<QPair<QString, bool>, Room*> roomMap;
+    // Mapping from aliases to room ids, as per the last sync
+    QHash<QString, QString> roomAliasMap;
+    QVector<QString> roomIdsToForget;
+    QVector<Room*> firstTimeRooms;
+    QVector<QString> pendingStateRoomIds;
+    QMap<QString, User*> userMap;
+    DirectChatsMap directChats;
+    DirectChatUsersMap directChatUsers;
+    std::unordered_map<QString, EventPtr> accountData;
+    QString userId;
+    int syncLoopTimeout = -1;
+
+    GetCapabilitiesJob* capabilitiesJob = nullptr;
+    GetCapabilitiesJob::Capabilities capabilities;
+
+    SyncJob* syncJob = nullptr;
+
+    bool cacheState = true;
+    bool cacheToBinary =
+            SettingsGroup("libqmatrixclient").value("cache_type").toString()
+            != "json";
+    bool lazyLoading = false;
+
+    void connectWithToken(const QString& user, const QString& accessToken,
+                          const QString& deviceId);
+    void broadcastDirectChatUpdates(const DirectChatsMap& additions,
+                                    const DirectChatsMap& removals);
+
+    template <typename EventT> EventT* unpackAccountData() const
+    {
+        const auto& eventIt = accountData.find(EventT::matrixTypeId());
+        return eventIt == accountData.end()
+                ? nullptr
+                : weakPtrCast<EventT>(eventIt->second);
+    }
 
-        void packAndSendAccountData(EventPtr&& event)
-        {
-            const auto eventType = event->matrixType();
-            q->callApi<SetAccountDataJob>(userId, eventType,
-                                          event->contentJson());
-            accountData[eventType] = std::move(event);
-            emit q->accountDataChanged(eventType);
-        }
+    void packAndSendAccountData(EventPtr&& event)
+    {
+        const auto eventType = event->matrixType();
+        q->callApi<SetAccountDataJob>(userId, eventType, event->contentJson());
+        accountData[eventType] = std::move(event);
+        emit q->accountDataChanged(eventType);
+    }
 
-        template <typename EventT, typename ContentT>
-        void packAndSendAccountData(ContentT&& content)
-        {
-            packAndSendAccountData(
-                        makeEvent<EventT>(std::forward<ContentT>(content)));
-        }
+    template <typename EventT, typename ContentT>
+    void packAndSendAccountData(ContentT&& content)
+    {
+        packAndSendAccountData(
+                makeEvent<EventT>(std::forward<ContentT>(content)));
+    }
 };
 
 Connection::Connection(const QUrl& server, QObject* parent)
-    : QObject(parent)
-    , d(std::make_unique<Private>(std::make_unique<ConnectionData>(server)))
+    : QObject(parent),
+      d(std::make_unique<Private>(std::make_unique<ConnectionData>(server)))
 {
     d->q = this; // All d initialization should occur before this line
 }
 
-Connection::Connection(QObject* parent)
-    : Connection({}, parent)
-{ }
+Connection::Connection(QObject* parent) : Connection({}, parent) {}
 
 Connection::~Connection()
 {
@@ -159,19 +156,20 @@ void Connection::resolveServer(const QString& mxidOrDomain)
 
     // Try to parse as an FQID; if there's no @ part, assume it's a domain name.
     QRegularExpression parser(
-        "^(@.+?:)?" // Optional username (allow everything for compatibility)
-        "(\\[[^]]+\\]|[^:@]+)" // Either IPv6 address or hostname/IPv4 address
-        "(:\\d{1,5})?$", // Optional port
-        QRegularExpression::UseUnicodePropertiesOption); // Because asian digits
+            "^(@.+?:)?" // Optional username (allow everything for
+                        // compatibility)
+            "(\\[[^]]+\\]|[^:@]+)" // Either IPv6 address or hostname/IPv4
+                                   // address
+            "(:\\d{1,5})?$", // Optional port
+            QRegularExpression::UseUnicodePropertiesOption); // Because asian
+                                                             // digits
     auto match = parser.match(mxidOrDomain);
 
     QUrl maybeBaseUrl = QUrl::fromUserInput(match.captured(2));
     maybeBaseUrl.setScheme("https"); // Instead of the Qt-default "http"
-    if (!match.hasMatch() || !maybeBaseUrl.isValid())
-    {
-        emit resolveError(
-            tr("%1 is not a valid homeserver address")
-                    .arg(maybeBaseUrl.toString()));
+    if (!match.hasMatch() || !maybeBaseUrl.isValid()) {
+        emit resolveError(tr("%1 is not a valid homeserver address")
+                                  .arg(maybeBaseUrl.toString()));
         return;
     }
 
@@ -188,16 +186,15 @@ void Connection::resolveServer(const QString& mxidOrDomain)
     dns->setType(QDnsLookup::SRV);
     dns->setName("_matrix._tcp." + domain);
 
-    connect(dns, &QDnsLookup::finished, [this,dns,maybeBaseUrl]() {
+    connect(dns, &QDnsLookup::finished, [this, dns, maybeBaseUrl]() {
         QUrl baseUrl { maybeBaseUrl };
-        if (dns->error() == QDnsLookup::NoError &&
-                dns->serviceRecords().isEmpty())
-        {
+        if (dns->error() == QDnsLookup::NoError
+            && dns->serviceRecords().isEmpty()) {
             auto record = dns->serviceRecords().front();
             baseUrl.setHost(record.target());
             baseUrl.setPort(record.port());
-            qCDebug(MAIN) << "SRV record for" << maybeBaseUrl.host()
-                          << "is" << baseUrl.authority();
+            qCDebug(MAIN) << "SRV record for" << maybeBaseUrl.host() << "is"
+                          << baseUrl.authority();
         } else {
             qCDebug(MAIN) << baseUrl.host() << "doesn't have SRV record"
                           << dns->name() << "- using the hostname as is";
@@ -213,41 +210,37 @@ void Connection::connectToServer(const QString& user, const QString& password,
                                  const QString& initialDeviceName,
                                  const QString& deviceId)
 {
-    checkAndConnect(user,
-        [=] {
-            doConnectToServer(user, password, initialDeviceName, deviceId);
-        });
+    checkAndConnect(user, [=] {
+        doConnectToServer(user, password, initialDeviceName, deviceId);
+    });
 }
 void Connection::doConnectToServer(const QString& user, const QString& password,
                                    const QString& initialDeviceName,
                                    const QString& deviceId)
 {
-    auto loginJob = callApi<LoginJob>(QStringLiteral("m.login.password"),
+    auto loginJob = callApi<LoginJob>(
+            QStringLiteral("m.login.password"),
             UserIdentifier { QStringLiteral("m.id.user"),
-                             {{ QStringLiteral("user"), user }} },
+                             { { QStringLiteral("user"), user } } },
             password, /*token*/ "", deviceId, initialDeviceName);
-    connect(loginJob, &BaseJob::success, this,
-        [this, loginJob] {
-            d->connectWithToken(loginJob->userId(), loginJob->accessToken(),
-                                loginJob->deviceId());
-        });
-    connect(loginJob, &BaseJob::failure, this,
-        [this, loginJob] {
-            emit loginError(loginJob->errorString(), loginJob->rawDataSample());
-        });
+    connect(loginJob, &BaseJob::success, this, [this, loginJob] {
+        d->connectWithToken(loginJob->userId(), loginJob->accessToken(),
+                            loginJob->deviceId());
+    });
+    connect(loginJob, &BaseJob::failure, this, [this, loginJob] {
+        emit loginError(loginJob->errorString(), loginJob->rawDataSample());
+    });
 }
 
-void Connection::syncLoopIteration()
-{
-    sync(d->syncLoopTimeout);
-}
+void Connection::syncLoopIteration() { sync(d->syncLoopTimeout); }
 
 void Connection::connectWithToken(const QString& userId,
                                   const QString& accessToken,
                                   const QString& deviceId)
 {
-    checkAndConnect(userId,
-        [=] { d->connectWithToken(userId, accessToken, deviceId); });
+    checkAndConnect(userId, [=] {
+        d->connectWithToken(userId, accessToken, deviceId);
+    });
 }
 
 void Connection::reloadCapabilities()
@@ -259,18 +252,17 @@ void Connection::reloadCapabilities()
         else if (d->capabilitiesJob->error() == BaseJob::IncorrectRequestError)
             qCDebug(MAIN) << "Server doesn't support /capabilities";
 
-        if (d->capabilities.roomVersions.omitted())
-        {
+        if (d->capabilities.roomVersions.omitted()) {
             qCWarning(MAIN) << "Pinning supported room version to 1";
-            d->capabilities.roomVersions = { "1", {{ "1", "stable" }} };
+            d->capabilities.roomVersions = { "1", { { "1", "stable" } } };
         } else {
-            qCDebug(MAIN) << "Room versions:"
-                << defaultRoomVersion() << "is default, full list:"
-                << availableRoomVersions();
+            qCDebug(MAIN) << "Room versions:" << defaultRoomVersion()
+                          << "is default, full list:"
+                          << availableRoomVersions();
         }
         Q_ASSERT(!d->capabilities.roomVersions.omitted());
         emit capabilitiesLoaded();
-        for (auto* r: d->roomMap)
+        for (auto* r : d->roomMap)
             if (r->joinState() == JoinState::Join && r->successorId().isEmpty())
                 r->checkVersion();
     });
@@ -301,28 +293,26 @@ void Connection::Private::connectWithToken(const QString& user,
 void Connection::checkAndConnect(const QString& userId,
                                  std::function<void()> connectFn)
 {
-    if (d->data->baseUrl().isValid())
-    {
+    if (d->data->baseUrl().isValid()) {
         connectFn();
         return;
     }
     // Not good to go, try to fix the homeserver URL.
-    if (userId.startsWith('@') && userId.indexOf(':') != -1)
-    {
-        connectSingleShot(this, &Connection::homeserverChanged, this, connectFn);
+    if (userId.startsWith('@') && userId.indexOf(':') != -1) {
+        connectSingleShot(this, &Connection::homeserverChanged, this,
+                          connectFn);
         // NB: doResolveServer can emit resolveError, so this is a part of
         // checkAndConnect function contract.
         resolveServer(userId);
     } else
-        emit resolveError(
-            tr("%1 is an invalid homeserver URL")
-                .arg(d->data->baseUrl().toString()));
+        emit resolveError(tr("%1 is an invalid homeserver URL")
+                                  .arg(d->data->baseUrl().toString()));
 }
 
 void Connection::logout()
 {
     auto job = callApi<LogoutJob>();
-    connect( job, &LogoutJob::success, this, [this] {
+    connect(job, &LogoutJob::success, this, [this] {
         stopSync();
         d->data->setToken({});
         emit stateChanged();
@@ -338,28 +328,25 @@ void Connection::sync(int timeout)
     Filter filter;
     filter.room->timeline->limit = 100;
     filter.room->state->lazyLoadMembers = d->lazyLoading;
-    auto job = d->syncJob = callApi<SyncJob>(BackgroundRequest,
-                                d->data->lastEvent(), filter, timeout);
-    connect( job, &SyncJob::success, this, [this, job] {
+    auto job = d->syncJob = callApi<SyncJob>(
+            BackgroundRequest, d->data->lastEvent(), filter, timeout);
+    connect(job, &SyncJob::success, this, [this, job] {
         onSyncSuccess(job->takeData());
         d->syncJob = nullptr;
         emit syncDone();
     });
-    connect( job, &SyncJob::retryScheduled, this,
-        [this,job] (int retriesTaken, int nextInMilliseconds)
-        {
-            emit networkError(job->errorString(), job->rawDataSample(),
-                              retriesTaken, nextInMilliseconds);
-        });
-    connect( job, &SyncJob::failure, this, [this, job] {
+    connect(job, &SyncJob::retryScheduled, this,
+            [this, job](int retriesTaken, int nextInMilliseconds) {
+                emit networkError(job->errorString(), job->rawDataSample(),
+                                  retriesTaken, nextInMilliseconds);
+            });
+    connect(job, &SyncJob::failure, this, [this, job] {
         d->syncJob = nullptr;
-        if (job->error() == BaseJob::ContentAccessError)
-        {
-            qCWarning(SYNCJOB)
-                << "Sync job failed with ContentAccessError - login expired?";
+        if (job->error() == BaseJob::ContentAccessError) {
+            qCWarning(SYNCJOB) << "Sync job failed with ContentAccessError - "
+                                  "login expired?";
             emit loginError(job->errorString(), job->rawDataSample());
-        }
-        else
+        } else
             emit syncError(job->errorString(), job->rawDataSample());
     });
 }
@@ -371,65 +358,59 @@ void Connection::syncLoop(int timeout)
     syncLoopIteration(); // initial sync to start the loop
 }
 
-void Connection::onSyncSuccess(SyncData &&data, bool fromCache) {
+void Connection::onSyncSuccess(SyncData&& data, bool fromCache)
+{
     d->data->setLastEvent(data.nextBatch());
-    for (auto&& roomData: data.takeRoomData())
-    {
+    for (auto&& roomData : data.takeRoomData()) {
         const auto forgetIdx = d->roomIdsToForget.indexOf(roomData.roomId);
-        if (forgetIdx != -1)
-        {
+        if (forgetIdx != -1) {
             d->roomIdsToForget.removeAt(forgetIdx);
-            if (roomData.joinState == JoinState::Leave)
-            {
-                qDebug(MAIN) << "Room" << roomData.roomId
-                    << "has been forgotten, ignoring /sync response for it";
+            if (roomData.joinState == JoinState::Leave) {
+                qDebug(MAIN)
+                        << "Room" << roomData.roomId
+                        << "has been forgotten, ignoring /sync response for it";
                 continue;
             }
             qWarning(MAIN) << "Room" << roomData.roomId
-                 << "has just been forgotten but /sync returned it in"
-                 << toCString(roomData.joinState)
-                 << "state - suspiciously fast turnaround";
+                           << "has just been forgotten but /sync returned it in"
+                           << toCString(roomData.joinState)
+                           << "state - suspiciously fast turnaround";
         }
-        if ( auto* r = provideRoom(roomData.roomId, roomData.joinState) )
-        {
+        if (auto* r = provideRoom(roomData.roomId, roomData.joinState)) {
             d->pendingStateRoomIds.removeOne(roomData.roomId);
             r->updateData(std::move(roomData), fromCache);
-            if (d->firstTimeRooms.removeOne(r))
-            {
+            if (d->firstTimeRooms.removeOne(r)) {
                 emit loadedRoomState(r);
                 if (!d->capabilities.roomVersions.omitted())
                     r->checkVersion();
-                // Otherwise, the version will be checked in reloadCapabilities()
+                // Otherwise, the version will be checked in
+                // reloadCapabilities()
             }
         }
         // Let UI update itself after updating each room
         QCoreApplication::processEvents();
     }
-    for (auto&& accountEvent: data.takeAccountData())
-    {
-        if (is<DirectChatEvent>(*accountEvent))
-        {
+    for (auto&& accountEvent : data.takeAccountData()) {
+        if (is<DirectChatEvent>(*accountEvent)) {
             const auto usersToDCs = ptrCast<DirectChatEvent>(move(accountEvent))
-                                        ->usersToDirectChats();
+                                            ->usersToDirectChats();
             DirectChatsMap removals =
-                erase_if(d->directChats, [&usersToDCs] (auto it) {
-                    return !usersToDCs.contains(it.key()->id(), it.value());
-                });
-            erase_if(d->directChatUsers, [&usersToDCs] (auto it) {
+                    erase_if(d->directChats, [&usersToDCs](auto it) {
+                        return !usersToDCs.contains(it.key()->id(), it.value());
+                    });
+            erase_if(d->directChatUsers, [&usersToDCs](auto it) {
                 return !usersToDCs.contains(it.value()->id(), it.key());
             });
             if (MAIN().isDebugEnabled())
                 for (auto it = removals.begin(); it != removals.end(); ++it)
-                    qCDebug(MAIN) << it.value()
-                        << "is no more a direct chat with" << it.key()->id();
+                    qCDebug(MAIN)
+                            << it.value() << "is no more a direct chat with"
+                            << it.key()->id();
 
             DirectChatsMap additions;
-            for (auto it = usersToDCs.begin(); it != usersToDCs.end(); ++it)
-            {
-                if (auto* u = user(it.key()))
-                {
-                    if (!d->directChats.contains(u, it.value()))
-                    {
+            for (auto it = usersToDCs.begin(); it != usersToDCs.end(); ++it) {
+                if (auto* u = user(it.key())) {
+                    if (!d->directChats.contains(u, it.value())) {
                         Q_ASSERT(!d->directChatUsers.contains(it.value(), u));
                         additions.insert(u, it.value());
                         d->directChats.insert(u, it.value());
@@ -448,14 +429,13 @@ void Connection::onSyncSuccess(SyncData &&data, bool fromCache) {
         }
         if (is<IgnoredUsersEvent>(*accountEvent))
             qCDebug(MAIN) << "Users ignored by" << d->userId << "updated:"
-                << QStringList::fromSet(ignoredUsers()).join(',');
+                          << QStringList::fromSet(ignoredUsers()).join(',');
 
         auto& currentData = d->accountData[accountEvent->matrixType()];
         // A polymorphic event-specific comparison might be a bit more
         // efficient; maaybe do it another day
-        if (!currentData ||
-                currentData->contentJson() != accountEvent->contentJson())
-        {
+        if (!currentData
+            || currentData->contentJson() != accountEvent->contentJson()) {
             currentData = std::move(accountEvent);
             qCDebug(MAIN) << "Updated account data of type"
                           << currentData->matrixType();
@@ -467,8 +447,8 @@ void Connection::onSyncSuccess(SyncData &&data, bool fromCache) {
 void Connection::stopSync()
 {
     // If there's a sync loop, break it
-    disconnect(this, &Connection::syncDone,
-               this, &Connection::syncLoopIteration);
+    disconnect(this, &Connection::syncDone, this,
+               &Connection::syncLoopIteration);
     if (d->syncJob) // If there's an ongoing sync job, stop it too
     {
         d->syncJob->abandon();
@@ -476,10 +456,7 @@ void Connection::stopSync()
     }
 }
 
-QString Connection::nextBatchToken() const
-{
-    return d->data->lastEvent();
-}
+QString Connection::nextBatchToken() const { return d->data->lastEvent(); }
 
 PostReceiptJob* Connection::postReceipt(Room* room, RoomEvent* event) const
 {
@@ -492,8 +469,8 @@ JoinRoomJob* Connection::joinRoom(const QString& roomAlias,
     auto job = callApi<JoinRoomJob>(roomAlias, serverNames);
     // Upon completion, ensure a room object in Join state is created but only
     // if it's not already there due to a sync completing earlier.
-    connect(job, &JoinRoomJob::success,
-            this, [this, job] { provideRoom(job->roomId()); });
+    connect(job, &JoinRoomJob::success, this,
+            [this, job] { provideRoom(job->roomId()); });
     return job;
 }
 
@@ -501,15 +478,13 @@ LeaveRoomJob* Connection::leaveRoom(Room* room)
 {
     const auto& roomId = room->id();
     const auto job = callApi<LeaveRoomJob>(roomId);
-    if (room->joinState() == JoinState::Invite)
-    {
+    if (room->joinState() == JoinState::Invite) {
         // Workaround matrix-org/synapse#2181 - if the room is in invite state
         // the invite may have been cancelled but Synapse didn't send it in
         // `/sync`. See also #273 for the discussion in the library context.
         d->pendingStateRoomIds.push_back(roomId);
-        connect(job, &LeaveRoomJob::success, this, [this,roomId] {
-            if (d->pendingStateRoomIds.removeOne(roomId))
-            {
+        connect(job, &LeaveRoomJob::success, this, [this, roomId] {
+            if (d->pendingStateRoomIds.removeOne(roomId)) {
                 qCDebug(MAIN) << "Forcing the room to Leave status";
                 provideRoom(roomId, JoinState::Leave);
             }
@@ -522,40 +497,44 @@ inline auto splitMediaId(const QString& mediaId)
 {
     auto idParts = mediaId.split('/');
     Q_ASSERT_X(idParts.size() == 2, __FUNCTION__,
-               ("'" + mediaId +
-                "' doesn't look like 'serverName/localMediaId'").toLatin1());
+               ("'" + mediaId + "' doesn't look like 'serverName/localMediaId'")
+                       .toLatin1());
     return idParts;
 }
 
 MediaThumbnailJob* Connection::getThumbnail(const QString& mediaId,
-    QSize requestedSize, RunningPolicy policy) const
+                                            QSize requestedSize,
+                                            RunningPolicy policy) const
 {
     auto idParts = splitMediaId(mediaId);
-    return callApi<MediaThumbnailJob>(policy,
-        idParts.front(), idParts.back(), requestedSize);
+    return callApi<MediaThumbnailJob>(policy, idParts.front(), idParts.back(),
+                                      requestedSize);
 }
 
 MediaThumbnailJob* Connection::getThumbnail(const QUrl& url,
-    QSize requestedSize, RunningPolicy policy) const
+                                            QSize requestedSize,
+                                            RunningPolicy policy) const
 {
     return getThumbnail(url.authority() + url.path(), requestedSize, policy);
 }
 
-MediaThumbnailJob* Connection::getThumbnail(const QUrl& url,
-    int requestedWidth, int requestedHeight, RunningPolicy policy) const
+MediaThumbnailJob* Connection::getThumbnail(const QUrl& url, int requestedWidth,
+                                            int requestedHeight,
+                                            RunningPolicy policy) const
 {
     return getThumbnail(url, QSize(requestedWidth, requestedHeight), policy);
 }
 
-UploadContentJob* Connection::uploadContent(QIODevice* contentSource,
-        const QString& filename, const QString& overrideContentType) const
+UploadContentJob*
+Connection::uploadContent(QIODevice* contentSource, const QString& filename,
+                          const QString& overrideContentType) const
 {
     auto contentType = overrideContentType;
-    if (contentType.isEmpty())
-    {
+    if (contentType.isEmpty()) {
         contentType =
-            QMimeDatabase().mimeTypeForFileNameAndData(filename, contentSource)
-            .name();
+                QMimeDatabase()
+                        .mimeTypeForFileNameAndData(filename, contentSource)
+                        .name();
         contentSource->open(QIODevice::ReadOnly);
     }
     return callApi<UploadContentJob>(contentSource, filename, contentType);
@@ -565,8 +544,7 @@ UploadContentJob* Connection::uploadFile(const QString& fileName,
                                          const QString& overrideContentType)
 {
     auto sourceFile = new QFile(fileName);
-    if (!sourceFile->open(QIODevice::ReadOnly))
-    {
+    if (!sourceFile->open(QIODevice::ReadOnly)) {
         qCWarning(MAIN) << "Couldn't open" << sourceFile->fileName()
                         << "for reading";
         return nullptr;
@@ -596,13 +574,14 @@ DownloadFileJob* Connection::downloadFile(const QUrl& url,
     return job;
 }
 
-CreateRoomJob* Connection::createRoom(RoomVisibility visibility,
-    const QString& alias, const QString& name, const QString& topic,
-    QStringList invites, const QString& presetName,
-    const QString& roomVersion, bool isDirect,
-    const QVector<CreateRoomJob::StateEvent>& initialState,
-    const QVector<CreateRoomJob::Invite3pid>& invite3pids,
-    const QJsonObject& creationContent)
+CreateRoomJob*
+Connection::createRoom(RoomVisibility visibility, const QString& alias,
+                       const QString& name, const QString& topic,
+                       QStringList invites, const QString& presetName,
+                       const QString& roomVersion, bool isDirect,
+                       const QVector<CreateRoomJob::StateEvent>& initialState,
+                       const QVector<CreateRoomJob::Invite3pid>& invite3pids,
+                       const QJsonObject& creationContent)
 {
     invites.removeOne(d->userId); // The creator is by definition in the room
     auto job = callApi<CreateRoomJob>(
@@ -610,7 +589,7 @@ CreateRoomJob* Connection::createRoom(RoomVisibility visibility,
                                       : QStringLiteral("private"),
             alias, name, topic, invites, invite3pids, roomVersion,
             creationContent, initialState, presetName, isDirect);
-    connect(job, &BaseJob::success, this, [this,job] {
+    connect(job, &BaseJob::success, this, [this, job] {
         emit createdRoom(provideRoom(job->roomId(), JoinState::Join));
     });
     return job;
@@ -621,14 +600,14 @@ void Connection::requestDirectChat(const QString& userId)
     if (auto* u = user(userId))
         requestDirectChat(u);
     else
-        qCCritical(MAIN)
-            << "Connection::requestDirectChat: Couldn't get a user object for"
-            << userId;
+        qCCritical(MAIN) << "Connection::requestDirectChat: Couldn't get a "
+                            "user object for"
+                         << userId;
 }
 
 void Connection::requestDirectChat(User* u)
 {
-    doInDirectChat(u, [this] (Room* r) { emit directChatAvailable(r); });
+    doInDirectChat(u, [this](Room* r) { emit directChatAvailable(r); });
 }
 
 void Connection::doInDirectChat(const QString& userId,
@@ -638,8 +617,8 @@ void Connection::doInDirectChat(const QString& userId,
         doInDirectChat(u, operation);
     else
         qCCritical(MAIN)
-            << "Connection::doInDirectChat: Couldn't get a user object for"
-            << userId;
+                << "Connection::doInDirectChat: Couldn't get a user object for"
+                << userId;
 }
 
 void Connection::doInDirectChat(User* u,
@@ -651,11 +630,9 @@ void Connection::doInDirectChat(User* u,
     // (left/forgotten) ones along the way.
     DirectChatsMap removals;
     for (auto it = d->directChats.find(u);
-         it != d->directChats.end() && it.key() == u; ++it)
-    {
+         it != d->directChats.end() && it.key() == u; ++it) {
         const auto& roomId = *it;
-        if (auto r = room(roomId, JoinState::Join))
-        {
+        if (auto r = room(roomId, JoinState::Join)) {
             Q_ASSERT(r->id() == roomId);
             // A direct chat with yourself should only involve yourself :)
             if (userId == d->userId && r->totalMemberCount() > 1)
@@ -665,15 +642,16 @@ void Connection::doInDirectChat(User* u,
             operation(r);
             return;
         }
-        if (auto ir = invitation(roomId))
-        {
+        if (auto ir = invitation(roomId)) {
             Q_ASSERT(ir->id() == roomId);
             auto j = joinRoom(ir->id());
-            connect(j, &BaseJob::success, this, [this,roomId,userId,operation] {
-                qCDebug(MAIN) << "Joined the already invited direct chat with"
-                              << userId << "as" << roomId;
-                operation(room(roomId, JoinState::Join));
-            });
+            connect(j, &BaseJob::success, this,
+                    [this, roomId, userId, operation] {
+                        qCDebug(MAIN)
+                                << "Joined the already invited direct chat with"
+                                << userId << "as" << roomId;
+                        operation(room(roomId, JoinState::Join));
+                    });
             return;
         }
         // Avoid reusing previously left chats but don't remove them
@@ -686,10 +664,8 @@ void Connection::doInDirectChat(User* u,
         // Postpone actual deletion until we finish iterating d->directChats.
         removals.insert(it.key(), it.value());
     }
-    if (!removals.isEmpty())
-    {
-        for (auto it = removals.cbegin(); it != removals.cend(); ++it)
-        {
+    if (!removals.isEmpty()) {
+        for (auto it = removals.cbegin(); it != removals.cend(); ++it) {
             d->directChats.remove(it.key(), it.value());
             d->directChatUsers.remove(it.value(),
                                       const_cast<User*>(it.key())); // FIXME
@@ -698,18 +674,18 @@ void Connection::doInDirectChat(User* u,
     }
 
     auto j = createDirectChat(userId);
-    connect(j, &BaseJob::success, this, [this,j,userId,operation] {
-        qCDebug(MAIN) << "Direct chat with" << userId
-                      << "has been created as" << j->roomId();
+    connect(j, &BaseJob::success, this, [this, j, userId, operation] {
+        qCDebug(MAIN) << "Direct chat with" << userId << "has been created as"
+                      << j->roomId();
         operation(room(j->roomId(), JoinState::Join));
     });
-
 }
 
 CreateRoomJob* Connection::createDirectChat(const QString& userId,
-    const QString& topic, const QString& name)
+                                            const QString& topic,
+                                            const QString& name)
 {
-    return createRoom(UnpublishRoom, "", name, topic, {userId},
+    return createRoom(UnpublishRoom, "", name, topic, { userId },
                       "trusted_private_chat", {}, true);
 }
 
@@ -723,11 +699,10 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
     // a ForgetRoomJob is created in advance and can be returned in a probably
     // not-yet-started state (it will start once /leave completes).
     auto forgetJob = new ForgetRoomJob(id);
-    auto room = d->roomMap.value({id, false});
+    auto room = d->roomMap.value({ id, false });
     if (!room)
-        room = d->roomMap.value({id, true});
-    if (room && room->joinState() != JoinState::Leave)
-    {
+        room = d->roomMap.value({ id, true });
+    if (room && room->joinState() != JoinState::Leave) {
         auto leaveJob = room->leaveRoom();
         connect(leaveJob, &BaseJob::success, this, [this, forgetJob, room] {
             forgetJob->start(connectionData());
@@ -737,18 +712,14 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
                 d->roomIdsToForget.push_back(room->id());
         });
         connect(leaveJob, &BaseJob::failure, forgetJob, &BaseJob::abandon);
-    }
-    else
+    } else
         forgetJob->start(connectionData());
-    connect(forgetJob, &BaseJob::success, this, [this, id]
-    {
+    connect(forgetJob, &BaseJob::success, this, [this, id] {
         // Delete whatever instances of the room are still in the map.
-        for (auto f: {false, true})
-            if (auto r = d->roomMap.take({ id, f }))
-            {
-                qCDebug(MAIN) << "Room" << r->objectName()
-                              << "in state" << toCString(r->joinState())
-                              << "will be deleted";
+        for (auto f : { false, true })
+            if (auto r = d->roomMap.take({ id, f })) {
+                qCDebug(MAIN) << "Room" << r->objectName() << "in state"
+                              << toCString(r->joinState()) << "will be deleted";
                 emit r->beforeDestruction(r);
                 r->deleteLater();
             }
@@ -756,52 +727,52 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
     return forgetJob;
 }
 
-SendToDeviceJob* Connection::sendToDevices(const QString& eventType,
-        const UsersToDevicesToEvents& eventsMap) const
+SendToDeviceJob*
+Connection::sendToDevices(const QString& eventType,
+                          const UsersToDevicesToEvents& eventsMap) const
 {
     QHash<QString, QHash<QString, QJsonObject>> json;
     json.reserve(int(eventsMap.size()));
-    std::for_each(eventsMap.begin(), eventsMap.end(),
-        [&json] (const auto& userTodevicesToEvents) {
-            auto& jsonUser = json[userTodevicesToEvents.first];
-            const auto& devicesToEvents = userTodevicesToEvents.second;
-            std::for_each(devicesToEvents.begin(), devicesToEvents.end(),
-                [&jsonUser] (const auto& deviceToEvents) {
-                    jsonUser.insert(deviceToEvents.first,
-                                    deviceToEvents.second.contentJson());
-                });
-        });
-    return callApi<SendToDeviceJob>(BackgroundRequest,
-                eventType, generateTxnId(), json);
+    std::for_each(
+            eventsMap.begin(), eventsMap.end(),
+            [&json](const auto& userTodevicesToEvents) {
+                auto& jsonUser = json[userTodevicesToEvents.first];
+                const auto& devicesToEvents = userTodevicesToEvents.second;
+                std::for_each(devicesToEvents.begin(), devicesToEvents.end(),
+                              [&jsonUser](const auto& deviceToEvents) {
+                                  jsonUser.insert(
+                                          deviceToEvents.first,
+                                          deviceToEvents.second.contentJson());
+                              });
+            });
+    return callApi<SendToDeviceJob>(BackgroundRequest, eventType,
+                                    generateTxnId(), json);
 }
 
 SendMessageJob* Connection::sendMessage(const QString& roomId,
                                         const RoomEvent& event) const
 {
-    const auto txnId = event.transactionId().isEmpty()
-                            ? generateTxnId() : event.transactionId();
-    return callApi<SendMessageJob>(roomId, event.matrixType(),
-                                   txnId, event.contentJson());
+    const auto txnId = event.transactionId().isEmpty() ? generateTxnId()
+                                                       : event.transactionId();
+    return callApi<SendMessageJob>(roomId, event.matrixType(), txnId,
+                                   event.contentJson());
 }
 
-QUrl Connection::homeserver() const
-{
-    return d->data->baseUrl();
-}
+QUrl Connection::homeserver() const { return d->data->baseUrl(); }
 
 Room* Connection::room(const QString& roomId, JoinStates states) const
 {
-    Room* room = d->roomMap.value({roomId, false}, nullptr);
-    if (states.testFlag(JoinState::Join) &&
-            room && room->joinState() == JoinState::Join)
+    Room* room = d->roomMap.value({ roomId, false }, nullptr);
+    if (states.testFlag(JoinState::Join) && room
+        && room->joinState() == JoinState::Join)
         return room;
 
     if (states.testFlag(JoinState::Invite))
         if (Room* invRoom = invitation(roomId))
             return invRoom;
 
-    if (states.testFlag(JoinState::Leave) &&
-            room && room->joinState() == JoinState::Leave)
+    if (states.testFlag(JoinState::Leave) && room
+        && room->joinState() == JoinState::Leave)
         return room;
 
     return nullptr;
@@ -821,22 +792,21 @@ void Connection::updateRoomAliases(const QString& roomId,
                                    const QStringList& previousRoomAliases,
                                    const QStringList& roomAliases)
 {
-    for (const auto& a: previousRoomAliases)
+    for (const auto& a : previousRoomAliases)
         if (d->roomAliasMap.remove(a) == 0)
-            qCWarning(MAIN) << "Alias" << a << "is not found (already deleted?)";
+            qCWarning(MAIN)
+                    << "Alias" << a << "is not found (already deleted?)";
 
-    for (const auto& a: roomAliases)
-    {
+    for (const auto& a : roomAliases) {
         auto& mappedId = d->roomAliasMap[a];
-        if (!mappedId.isEmpty())
-        {
+        if (!mappedId.isEmpty()) {
             if (mappedId == roomId)
                 qCDebug(MAIN) << "Alias" << a << "is already mapped to room"
                               << roomId;
             else
-                qCWarning(MAIN) << "Alias" << a
-                                << "will be force-remapped from room"
-                                << mappedId << "to" << roomId;
+                qCWarning(MAIN)
+                        << "Alias" << a << "will be force-remapped from room"
+                        << mappedId << "to" << roomId;
         }
         mappedId = roomId;
     }
@@ -844,19 +814,18 @@ void Connection::updateRoomAliases(const QString& roomId,
 
 Room* Connection::invitation(const QString& roomId) const
 {
-    return d->roomMap.value({roomId, true}, nullptr);
+    return d->roomMap.value({ roomId, true }, nullptr);
 }
 
 User* Connection::user(const QString& userId)
 {
     if (userId.isEmpty())
         return nullptr;
-    if (!userId.startsWith('@') || !userId.contains(':'))
-    {
+    if (!userId.startsWith('@') || !userId.contains(':')) {
         qCCritical(MAIN) << "Malformed userId:" << userId;
         return nullptr;
     }
-    if( d->userMap.contains(userId) )
+    if (d->userMap.contains(userId))
         return d->userMap.value(userId);
     auto* user = userFactory()(this, userId);
     d->userMap.insert(userId, user);
@@ -869,47 +838,29 @@ const User* Connection::user() const
     return d->userMap.value(d->userId, nullptr);
 }
 
-User* Connection::user()
-{
-    return user(d->userId);
-}
+User* Connection::user() { return user(d->userId); }
 
-QString Connection::userId() const
-{
-    return d->userId;
-}
+QString Connection::userId() const { return d->userId; }
 
-QString Connection::deviceId() const
-{
-    return d->data->deviceId();
-}
+QString Connection::deviceId() const { return d->data->deviceId(); }
 
-QString Connection::token() const
-{
-    return accessToken();
-}
+QString Connection::token() const { return accessToken(); }
 
-QByteArray Connection::accessToken() const
-{
-    return d->data->accessToken();
-}
+QByteArray Connection::accessToken() const { return d->data->accessToken(); }
 
-SyncJob* Connection::syncJob() const
-{
-    return d->syncJob;
-}
+SyncJob* Connection::syncJob() const { return d->syncJob; }
 
 int Connection::millisToReconnect() const
 {
     return d->syncJob ? d->syncJob->millisToRetry() : 0;
 }
 
-QHash< QPair<QString, bool>, Room* > Connection::roomMap() const
+QHash<QPair<QString, bool>, Room*> Connection::roomMap() const
 {
-    // Copy-on-write-and-remove-elements is faster than copying elements one by one.
-    QHash< QPair<QString, bool>, Room* > roomMap = d->roomMap;
-    for (auto it = roomMap.begin(); it != roomMap.end(); )
-    {
+    // Copy-on-write-and-remove-elements is faster than copying elements one by
+    // one.
+    QHash<QPair<QString, bool>, Room*> roomMap = d->roomMap;
+    for (auto it = roomMap.begin(); it != roomMap.end();) {
         if (it.value()->joinState() == JoinState::Leave)
             it = roomMap.erase(it);
         else
@@ -949,24 +900,22 @@ void Connection::setAccountData(const QString& type, const QJsonObject& content)
 QHash<QString, QVector<Room*>> Connection::tagsToRooms() const
 {
     QHash<QString, QVector<Room*>> result;
-    for (auto* r: qAsConst(d->roomMap))
-    {
-        for (const auto& tagName: r->tagNames())
+    for (auto* r : qAsConst(d->roomMap)) {
+        for (const auto& tagName : r->tagNames())
             result[tagName].push_back(r);
     }
     for (auto it = result.begin(); it != result.end(); ++it)
-        std::sort(it->begin(), it->end(),
-            [t=it.key()] (Room* r1, Room* r2) {
-                return r1->tags().value(t) < r2->tags().value(t);
-            });
+        std::sort(it->begin(), it->end(), [t = it.key()](Room* r1, Room* r2) {
+            return r1->tags().value(t) < r2->tags().value(t);
+        });
     return result;
 }
 
 QStringList Connection::tagNames() const
 {
-    QStringList tags ({FavouriteTag});
-    for (auto* r: qAsConst(d->roomMap))
-        for (const auto& tag: r->tagNames())
+    QStringList tags({ FavouriteTag });
+    for (auto* r : qAsConst(d->roomMap))
+        for (const auto& tag : r->tagNames())
             if (tag != LowPriorityTag && !tags.contains(tag))
                 tags.push_back(tag);
     tags.push_back(LowPriorityTag);
@@ -976,8 +925,9 @@ QStringList Connection::tagNames() const
 QVector<Room*> Connection::roomsWithTag(const QString& tagName) const
 {
     QVector<Room*> rooms;
-    std::copy_if(d->roomMap.begin(), d->roomMap.end(), std::back_inserter(rooms),
-                 [&tagName] (Room* r) { return r->tags().contains(tagName); });
+    std::copy_if(d->roomMap.begin(), d->roomMap.end(),
+                 std::back_inserter(rooms),
+                 [&tagName](Room* r) { return r->tags().contains(tagName); });
     return rooms;
 }
 
@@ -989,8 +939,7 @@ Connection::DirectChatsMap Connection::directChats() const
 QJsonObject toJson(const Connection::DirectChatsMap& directChats)
 {
     QJsonObject json;
-    for (auto it = directChats.begin(); it != directChats.end();)
-    {
+    for (auto it = directChats.begin(); it != directChats.end();) {
         QJsonArray roomIds;
         const auto* user = it.key();
         for (; it != directChats.end() && it.key() == user; ++it)
@@ -1000,8 +949,8 @@ QJsonObject toJson(const Connection::DirectChatsMap& directChats)
     return json;
 }
 
-void Connection::Private::broadcastDirectChatUpdates(const DirectChatsMap& additions,
-                                                     const DirectChatsMap& removals)
+void Connection::Private::broadcastDirectChatUpdates(
+        const DirectChatsMap& additions, const DirectChatsMap& removals)
 {
     q->callApi<SetAccountDataJob>(userId, QStringLiteral("m.direct"),
                                   toJson(directChats));
@@ -1023,19 +972,19 @@ void Connection::addToDirectChats(const Room* room, User* user)
 void Connection::removeFromDirectChats(const QString& roomId, User* user)
 {
     Q_ASSERT(!roomId.isEmpty());
-    if ((user != nullptr && !d->directChats.contains(user, roomId)) ||
-            d->directChats.key(roomId) == nullptr)
+    if ((user != nullptr && !d->directChats.contains(user, roomId))
+        || d->directChats.key(roomId) == nullptr)
         return;
 
     DirectChatsMap removals;
-    if (user != nullptr)
-    {
+    if (user != nullptr) {
         removals.insert(user, roomId);
         d->directChats.remove(user, roomId);
         d->directChatUsers.remove(roomId, user);
     } else {
-        removals = erase_if(d->directChats,
-                            [&roomId] (auto it) { return it.value() == roomId; });
+        removals = erase_if(d->directChats, [&roomId](auto it) {
+            return it.value() == roomId;
+        });
         d->directChatUsers.remove(roomId);
     }
     d->broadcastDirectChatUpdates({}, removals);
@@ -1068,11 +1017,10 @@ void Connection::addToIgnoredUsers(const User* user)
     Q_ASSERT(user != nullptr);
 
     auto ignoreList = ignoredUsers();
-    if (!ignoreList.contains(user->id()))
-    {
+    if (!ignoreList.contains(user->id())) {
         ignoreList.insert(user->id());
         d->packAndSendAccountData<IgnoredUsersEvent>(ignoreList);
-        emit ignoredUsersListChanged({{ user->id() }}, {});
+        emit ignoredUsersListChanged({ { user->id() } }, {});
     }
 }
 
@@ -1081,17 +1029,13 @@ void Connection::removeFromIgnoredUsers(const User* user)
     Q_ASSERT(user != nullptr);
 
     auto ignoreList = ignoredUsers();
-    if (ignoreList.remove(user->id()) != 0)
-    {
+    if (ignoreList.remove(user->id()) != 0) {
         d->packAndSendAccountData<IgnoredUsersEvent>(ignoreList);
-        emit ignoredUsersListChanged({}, {{ user->id() }});
+        emit ignoredUsersListChanged({}, { { user->id() } });
     }
 }
 
-QMap<QString, User*> Connection::users() const
-{
-    return d->userMap;
-}
+QMap<QString, User*> Connection::users() const { return d->userMap; }
 
 const ConnectionData* Connection::connectionData() const
 {
@@ -1106,58 +1050,52 @@ Room* Connection::provideRoom(const QString& id, Omittable<JoinState> joinState)
     // If joinState.omitted(), all joinState == comparisons below are false.
     const auto roomKey = qMakePair(id, joinState == JoinState::Invite);
     auto* room = d->roomMap.value(roomKey, nullptr);
-    if (room)
-    {
+    if (room) {
         // Leave is a special case because in transition (5a) (see the .h file)
         // joinState == room->joinState but we still have to preempt the Invite
         // and emit a signal. For Invite and Join, there's no such problem.
         if (room->joinState() == joinState && joinState != JoinState::Leave)
             return room;
-    } else if (joinState.omitted())
-    {
+    } else if (joinState.omitted()) {
         // No Join and Leave, maybe Invite?
-        room = d->roomMap.value({id, true}, nullptr);
+        room = d->roomMap.value({ id, true }, nullptr);
         if (room)
             return room;
         // No Invite either, setup a new room object below
     }
 
-    if (!room)
-    {
+    if (!room) {
         room = roomFactory()(this, id,
-                joinState.omitted() ? JoinState::Join : joinState.value());
-        if (!room)
-        {
+                             joinState.omitted() ? JoinState::Join
+                                                 : joinState.value());
+        if (!room) {
             qCCritical(MAIN) << "Failed to create a room" << id;
             return nullptr;
         }
         d->roomMap.insert(roomKey, room);
         d->firstTimeRooms.push_back(room);
-        connect(room, &Room::beforeDestruction,
-                this, &Connection::aboutToDeleteRoom);
+        connect(room, &Room::beforeDestruction, this,
+                &Connection::aboutToDeleteRoom);
         emit newRoom(room);
     }
     if (joinState.omitted())
         return room;
 
-    if (joinState == JoinState::Invite)
-    {
+    if (joinState == JoinState::Invite) {
         // prev is either Leave or nullptr
-        auto* prev = d->roomMap.value({id, false}, nullptr);
+        auto* prev = d->roomMap.value({ id, false }, nullptr);
         emit invitedRoom(room, prev);
-    }
-    else
-    {
+    } else {
         room->setJoinState(joinState.value());
         // Preempt the Invite room (if any) with a room in Join/Leave state.
-        auto* prevInvite = d->roomMap.take({id, true});
+        auto* prevInvite = d->roomMap.take({ id, true });
         if (joinState == JoinState::Join)
             emit joinedRoom(room, prevInvite);
         else if (joinState == JoinState::Leave)
             emit leftRoom(room, prevInvite);
-        if (prevInvite)
-        {
-            qCDebug(MAIN) << "Deleting Invite state for room" << prevInvite->id();
+        if (prevInvite) {
+            qCDebug(MAIN) << "Deleting Invite state for room"
+                          << prevInvite->id();
             emit prevInvite->beforeDestruction(prevInvite);
             prevInvite->deleteLater();
         }
@@ -1176,15 +1114,9 @@ void Connection::setUserFactory(user_factory_t f)
     _userFactory = std::move(f);
 }
 
-room_factory_t Connection::roomFactory()
-{
-    return _roomFactory;
-}
+room_factory_t Connection::roomFactory() { return _roomFactory; }
 
-user_factory_t Connection::userFactory()
-{
-    return _userFactory;
-}
+user_factory_t Connection::userFactory() { return _userFactory; }
 
 room_factory_t Connection::_roomFactory = defaultRoomFactory<>();
 user_factory_t Connection::_userFactory = defaultUserFactory<>();
@@ -1210,16 +1142,15 @@ void Connection::saveRoomState(Room* r) const
         return;
 
     QFile outRoomFile { stateCachePath() % SyncData::fileNameForRoom(r->id()) };
-    if (outRoomFile.open(QFile::WriteOnly))
-    {
+    if (outRoomFile.open(QFile::WriteOnly)) {
         QJsonDocument json { r->toJson() };
         auto data = d->cacheToBinary ? json.toBinaryData()
                                      : json.toJson(QJsonDocument::Compact);
         outRoomFile.write(data.data(), data.size());
         qCDebug(MAIN) << "Room state cache saved to" << outRoomFile.fileName();
     } else {
-        qCWarning(MAIN) << "Error opening" << outRoomFile.fileName()
-                        << ":" << outRoomFile.errorString();
+        qCWarning(MAIN) << "Error opening" << outRoomFile.fileName() << ":"
+                        << outRoomFile.errorString();
     }
 }
 
@@ -1228,29 +1159,31 @@ void Connection::saveState() const
     if (!d->cacheState)
         return;
 
-    QElapsedTimer et; et.start();
+    QElapsedTimer et;
+    et.start();
 
     QFile outFile { stateCachePath() % "state.json" };
-    if (!outFile.open(QFile::WriteOnly))
-    {
-        qCWarning(MAIN) << "Error opening" << outFile.fileName()
-                        << ":" << outFile.errorString();
+    if (!outFile.open(QFile::WriteOnly)) {
+        qCWarning(MAIN) << "Error opening" << outFile.fileName() << ":"
+                        << outFile.errorString();
         qCWarning(MAIN) << "Caching the rooms state disabled";
         d->cacheState = false;
         return;
     }
 
     QJsonObject rootObj {
-        { QStringLiteral("cache_version"), QJsonObject {
-            { QStringLiteral("major"), SyncData::cacheVersion().first },
-            { QStringLiteral("minor"), SyncData::cacheVersion().second }
-    }}};
+        { QStringLiteral("cache_version"),
+          QJsonObject {
+                  { QStringLiteral("major"), SyncData::cacheVersion().first },
+                  { QStringLiteral("minor"),
+                    SyncData::cacheVersion().second } } }
+    };
     {
         QJsonObject rooms;
         QJsonObject inviteRooms;
         for (const auto* i : roomMap()) // Pass on rooms in Leave state
             (i->joinState() == JoinState::Invite ? inviteRooms : rooms)
-            .insert(i->id(), QJsonValue::Null);
+                    .insert(i->id(), QJsonValue::Null);
 
         QJsonObject roomObj;
         if (!rooms.isEmpty())
@@ -1262,20 +1195,20 @@ void Connection::saveState() const
         rootObj.insert("rooms", roomObj);
     }
     {
-        QJsonArray accountDataEvents {
-            basicEventJson(QStringLiteral("m.direct"), toJson(d->directChats))
-        };
-        for (const auto &e : d->accountData)
+        QJsonArray accountDataEvents { basicEventJson(
+                QStringLiteral("m.direct"), toJson(d->directChats)) };
+        for (const auto& e : d->accountData)
             accountDataEvents.append(
-                basicEventJson(e.first, e.second->contentJson()));
+                    basicEventJson(e.first, e.second->contentJson()));
 
         rootObj.insert("account_data",
-            QJsonObject {{ QStringLiteral("events"), accountDataEvents }});
+                       QJsonObject { { QStringLiteral("events"),
+                                       accountDataEvents } });
     }
 
     QJsonDocument json { rootObj };
-    auto data = d->cacheToBinary ? json.toBinaryData() :
-                                   json.toJson(QJsonDocument::Compact);
+    auto data = d->cacheToBinary ? json.toBinaryData()
+                                 : json.toJson(QJsonDocument::Compact);
     qCDebug(PROFILER) << "Cache for" << userId() << "generated in" << et;
 
     outFile.write(data.data(), data.size());
@@ -1287,14 +1220,14 @@ void Connection::loadState()
     if (!d->cacheState)
         return;
 
-    QElapsedTimer et; et.start();
+    QElapsedTimer et;
+    et.start();
 
     SyncData sync { stateCachePath() % "state.json" };
     if (sync.nextBatch().isEmpty()) // No token means no cache by definition
         return;
 
-    if (!sync.unresolvedRooms().isEmpty())
-    {
+    if (!sync.unresolvedRooms().isEmpty()) {
         qCWarning(MAIN) << "State cache incomplete, discarding";
         return;
     }
@@ -1302,7 +1235,8 @@ void Connection::loadState()
     // 1. Do initial sync on failed rooms without saving the nextBatch token
     // 2. Do the sync across all rooms as normal
     onSyncSuccess(std::move(sync), true);
-    qCDebug(PROFILER) << "*** Cached state for" << userId() << "loaded in" << et;
+    qCDebug(PROFILER) << "*** Cached state for" << userId() << "loaded in"
+                      << et;
 }
 
 QString Connection::stateCachePath() const
@@ -1312,29 +1246,21 @@ QString Connection::stateCachePath() const
     return cacheLocation(safeUserId);
 }
 
-bool Connection::cacheState() const
-{
-    return d->cacheState;
-}
+bool Connection::cacheState() const { return d->cacheState; }
 
 void Connection::setCacheState(bool newValue)
 {
-    if (d->cacheState != newValue)
-    {
+    if (d->cacheState != newValue) {
         d->cacheState = newValue;
         emit cacheStateChanged();
     }
 }
 
-bool QMatrixClient::Connection::lazyLoading() const
-{
-    return d->lazyLoading;
-}
+bool QMatrixClient::Connection::lazyLoading() const { return d->lazyLoading; }
 
 void QMatrixClient::Connection::setLazyLoading(bool newValue)
 {
-    if (d->lazyLoading != newValue)
-    {
+    if (d->lazyLoading != newValue) {
         d->lazyLoading = newValue;
         emit lazyLoadingChanged();
     }
@@ -1343,8 +1269,8 @@ void QMatrixClient::Connection::setLazyLoading(bool newValue)
 void Connection::getTurnServers()
 {
     auto job = callApi<GetTurnServerJob>();
-    connect(job, &GetTurnServerJob::success,
-            this, [=] { emit turnServersChanged(job->data()); });
+    connect(job, &GetTurnServerJob::success, this,
+            [=] { emit turnServersChanged(job->data()); });
 }
 
 const QString Connection::SupportedRoomVersion::StableTag =
@@ -1376,7 +1302,8 @@ inline bool roomVersionLess(const Connection::SupportedRoomVersion& v1,
     return ok1 && ok2 ? vNum1 < vNum2 : v1.id < v2.id;
 }
 
-QVector<Connection::SupportedRoomVersion> Connection::availableRoomVersions() const
+QVector<Connection::SupportedRoomVersion>
+Connection::availableRoomVersions() const
 {
     Q_ASSERT(!d->capabilities.roomVersions.omitted());
     QVector<SupportedRoomVersion> result;
@@ -1386,8 +1313,9 @@ QVector<Connection::SupportedRoomVersion> Connection::availableRoomVersions() co
         result.push_back({ it.key(), it.value() });
     // Put stable versions over unstable; within each group,
     // sort numeric versions as numbers, the rest as strings.
-    const auto mid = std::partition(result.begin(), result.end(),
-                                    std::mem_fn(&SupportedRoomVersion::isStable));
+    const auto mid =
+            std::partition(result.begin(), result.end(),
+                           std::mem_fn(&SupportedRoomVersion::isStable));
     std::sort(result.begin(), mid, roomVersionLess);
     std::sort(mid, result.end(), roomVersionLess);
 
-- 
cgit v1.2.3


From c05ade838f0fce81f2bbe80a3295618a8a26ff52 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 2 Aug 2019 19:59:40 +0900
Subject: Apply the new brace wrapping to source files

---
 examples/qmc-example.cpp         |  7 +--
 lib/avatar.cpp                   | 15 ++-----
 lib/avatar.h                     |  6 +--
 lib/connection.cpp               | 79 ++++++++++++++++----------------
 lib/connection.h                 | 21 +++------
 lib/connectiondata.cpp           |  7 +--
 lib/connectiondata.h             |  6 +--
 lib/converters.h                 | 97 ++++++++++++++--------------------------
 lib/e2ee.h                       |  3 +-
 lib/encryptionmanager.cpp        |  3 +-
 lib/encryptionmanager.h          |  9 ++--
 lib/eventitem.h                  | 24 ++++------
 lib/events/accountdataevents.h   | 50 +++++++++------------
 lib/events/callanswerevent.h     |  6 +--
 lib/events/callcandidatesevent.h |  6 +--
 lib/events/callhangupevent.h     |  6 +--
 lib/events/callinviteevent.h     |  6 +--
 lib/events/directchatevent.h     | 10 ++---
 lib/events/encryptedevent.h      |  6 +--
 lib/events/encryptionevent.cpp   |  6 +--
 lib/events/encryptionevent.h     | 15 ++-----
 lib/events/event.cpp             |  4 +-
 lib/events/event.h               | 24 ++++------
 lib/events/eventcontent.cpp      |  3 +-
 lib/events/eventcontent.h        | 46 ++++++-------------
 lib/events/eventloader.h         |  9 ++--
 lib/events/reactionevent.h       | 16 +++----
 lib/events/receiptevent.cpp      |  3 +-
 lib/events/receiptevent.h        | 12 ++---
 lib/events/redactionevent.h      |  9 ++--
 lib/events/roomavatarevent.h     |  9 ++--
 lib/events/roomcreateevent.h     | 13 ++----
 lib/events/roomevent.cpp         |  3 +-
 lib/events/roomevent.h           |  9 ++--
 lib/events/roommemberevent.cpp   |  6 +--
 lib/events/roommemberevent.h     | 22 +++------
 lib/events/roommessageevent.cpp  | 12 ++---
 lib/events/roommessageevent.h    | 24 ++++------
 lib/events/roomtombstoneevent.h  | 10 ++---
 lib/events/simplestateevents.h   | 25 ++++-------
 lib/events/stateevent.h          | 21 +++------
 lib/events/typingevent.cpp       |  3 +-
 lib/events/typingevent.h         |  6 +--
 lib/jobs/basejob.cpp             |  6 +--
 lib/jobs/basejob.h               | 35 ++++-----------
 lib/jobs/downloadfilejob.cpp     |  7 +--
 lib/jobs/downloadfilejob.h       | 11 ++---
 lib/jobs/mediathumbnailjob.h     |  6 +--
 lib/jobs/postreadmarkersjob.h    |  3 +-
 lib/jobs/requestdata.cpp         | 12 ++---
 lib/jobs/requestdata.h           |  9 ++--
 lib/jobs/syncjob.h               |  6 +--
 lib/joinstate.h                  |  6 +--
 lib/logging.h                    |  3 +-
 lib/networkaccessmanager.cpp     |  6 +--
 lib/networkaccessmanager.h       |  6 +--
 lib/networksettings.h            |  6 +--
 lib/qt_connection_util.h         | 12 ++---
 lib/room.cpp                     | 35 ++++++---------
 lib/room.h                       | 28 +++---------
 lib/settings.h                   | 16 +++----
 lib/syncdata.h                   | 15 +++----
 lib/user.cpp                     |  6 +--
 lib/user.h                       |  6 +--
 lib/util.cpp                     | 18 +++-----
 lib/util.h                       | 64 ++++++++------------------
 66 files changed, 335 insertions(+), 664 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/examples/qmc-example.cpp b/examples/qmc-example.cpp
index d6cba76a..f4067009 100644
--- a/examples/qmc-example.cpp
+++ b/examples/qmc-example.cpp
@@ -24,8 +24,7 @@ using std::cout;
 using std::endl;
 using namespace std::placeholders;
 
-class QMCTest : public QObject
-{
+class QMCTest : public QObject {
 public:
     QMCTest(Connection* conn, QString testRoomName, QString source);
 
@@ -92,9 +91,7 @@ bool QMCTest::validatePendingEvent(const QString& txnId)
 }
 
 QMCTest::QMCTest(Connection* conn, QString testRoomName, QString source)
-    : c(conn)
-    , origin(std::move(source))
-    , targetRoomName(std::move(testRoomName))
+    : c(conn), origin(std::move(source)), targetRoomName(std::move(testRoomName))
 {
     if (!origin.isEmpty())
         cout << "Origin for the test message: " << origin.toStdString() << endl;
diff --git a/lib/avatar.cpp b/lib/avatar.cpp
index 0e58a1ce..614f008d 100644
--- a/lib/avatar.cpp
+++ b/lib/avatar.cpp
@@ -32,12 +32,9 @@
 using namespace QMatrixClient;
 using std::move;
 
-class Avatar::Private
-{
+class Avatar::Private {
 public:
-    explicit Private(QUrl url = {})
-        : _url(move(url))
-    {}
+    explicit Private(QUrl url = {}) : _url(move(url)) {}
     ~Private()
     {
         if (isJobRunning(_thumbnailRequest))
@@ -65,13 +62,9 @@ public:
     mutable std::vector<get_callback_t> callbacks;
 };
 
-Avatar::Avatar()
-    : d(std::make_unique<Private>())
-{}
+Avatar::Avatar() : d(std::make_unique<Private>()) {}
 
-Avatar::Avatar(QUrl url)
-    : d(std::make_unique<Private>(std::move(url)))
-{}
+Avatar::Avatar(QUrl url) : d(std::make_unique<Private>(std::move(url))) {}
 
 Avatar::Avatar(Avatar&&) = default;
 
diff --git a/lib/avatar.h b/lib/avatar.h
index 37991192..c33e1982 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -24,12 +24,10 @@
 #include <functional>
 #include <memory>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class Connection;
 
-class Avatar
-{
+class Avatar {
 public:
     explicit Avatar();
     explicit Avatar(QUrl url);
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 6ebe05dc..6cd6ad0b 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -70,8 +70,7 @@ HashT erase_if(HashT& hashMap, Pred pred)
     return removals;
 }
 
-class Connection::Private
-{
+class Connection::Private {
 public:
     explicit Private(std::unique_ptr<ConnectionData>&& connection)
         : data(move(connection))
@@ -151,15 +150,12 @@ public:
 };
 
 Connection::Connection(const QUrl& server, QObject* parent)
-    : QObject(parent)
-    , d(new Private(std::make_unique<ConnectionData>(server)))
+    : QObject(parent), d(new Private(std::make_unique<ConnectionData>(server)))
 {
     d->q = this; // All d initialization should occur before this line
 }
 
-Connection::Connection(QObject* parent)
-    : Connection({}, parent)
-{}
+Connection::Connection(QObject* parent) : Connection({}, parent) {}
 
 Connection::~Connection()
 {
@@ -183,45 +179,47 @@ void Connection::resolveServer(const QString& mxid)
     qCDebug(MAIN) << "Finding the server" << domain;
 
     auto getWellKnownJob = callApi<GetWellknownJob>();
-    connect(getWellKnownJob, &BaseJob::finished,
-            [this, getWellKnownJob, maybeBaseUrl] {
-                if (getWellKnownJob->status() == BaseJob::NotFoundError) {
-                    qCDebug(MAIN) << "No .well-known file, IGNORE";
-                } else if (getWellKnownJob->status() != BaseJob::Success) {
+    connect(
+        getWellKnownJob, &BaseJob::finished,
+        [this, getWellKnownJob, maybeBaseUrl] {
+            if (getWellKnownJob->status() == BaseJob::NotFoundError)
+                qCDebug(MAIN) << "No .well-known file, IGNORE";
+            else {
+                if (getWellKnownJob->status() != BaseJob::Success) {
                     qCDebug(MAIN)
                         << "Fetching .well-known file failed, FAIL_PROMPT";
                     emit resolveError(tr("Fetching .well-known file failed"));
                     return;
-                } else if (getWellKnownJob->data().homeserver.baseUrl.isEmpty()) {
+                }
+                QUrl baseUrl(getWellKnownJob->data().homeserver.baseUrl);
+                if (baseUrl.isEmpty()) {
                     qCDebug(MAIN) << "base_url not provided, FAIL_PROMPT";
                     emit resolveError(tr("base_url not provided"));
                     return;
-                } else if (!QUrl(getWellKnownJob->data().homeserver.baseUrl)
-                                .isValid()) {
+                }
+                if (!baseUrl.isValid()) {
                     qCDebug(MAIN) << "base_url invalid, FAIL_ERROR";
                     emit resolveError(tr("base_url invalid"));
                     return;
-                } else {
-                    QUrl baseUrl(getWellKnownJob->data().homeserver.baseUrl);
-
-                    qCDebug(MAIN) << ".well-known for" << maybeBaseUrl.host()
-                                  << "is" << baseUrl.toString();
-                    setHomeserver(baseUrl);
                 }
 
-                auto getVersionsJob = callApi<GetVersionsJob>();
-
-                connect(getVersionsJob, &BaseJob::finished,
-                        [this, getVersionsJob] {
-                            if (getVersionsJob->status() == BaseJob::Success) {
-                                qCDebug(MAIN) << "homeserver url is valid";
-                                emit resolved();
-                            } else {
-                                qCDebug(MAIN) << "homeserver url invalid";
-                                emit resolveError(tr("homeserver url invalid"));
-                            }
-                        });
+                qCDebug(MAIN) << ".well-known for" << maybeBaseUrl.host()
+                              << "is" << baseUrl.toString();
+                setHomeserver(baseUrl);
+            }
+
+            auto getVersionsJob = callApi<GetVersionsJob>();
+
+            connect(getVersionsJob, &BaseJob::finished, [this, getVersionsJob] {
+                if (getVersionsJob->status() == BaseJob::Success) {
+                    qCDebug(MAIN) << "homeserver url is valid";
+                    emit resolved();
+                } else {
+                    qCDebug(MAIN) << "homeserver url invalid";
+                    emit resolveError(tr("homeserver url invalid"));
+                }
             });
+        });
 }
 
 void Connection::connectToServer(const QString& user, const QString& password,
@@ -372,8 +370,8 @@ void Connection::sync(int timeout)
     connect(job, &SyncJob::failure, this, [this, job] {
         d->syncJob = nullptr;
         if (job->error() == BaseJob::ContentAccessError) {
-            qCWarning(SYNCJOB)
-                << "Sync job failed with ContentAccessError - login expired?";
+            qCWarning(SYNCJOB) << "Sync job failed with ContentAccessError - "
+                                  "login expired?";
             emit loginError(job->errorString(), job->rawDataSample());
         } else
             emit syncError(job->errorString(), job->rawDataSample());
@@ -437,7 +435,6 @@ void Connection::onSyncSuccess(SyncData&& data, bool fromCache)
         visit(
             *eventPtr,
             [this](const DirectChatEvent& dce) {
-                // See
                 // https://github.com/QMatrixClient/libqmatrixclient/wiki/Handling-direct-chat-events
                 const auto& usersToDCs = dce.usersToDirectChats();
                 DirectChatsMap remoteRemovals =
@@ -492,8 +489,8 @@ void Connection::onSyncSuccess(SyncData&& data, bool fromCache)
                         << QStringList::fromSet(ignoredUsers()).join(',');
 
                 auto& currentData = d->accountData[accountEvent.matrixType()];
-                // A polymorphic event-specific comparison might be a bit more
-                // efficient; maaybe do it another day
+                // A polymorphic event-specific comparison might be a bit
+                // more efficient; maaybe do it another day
                 if (!currentData
                     || currentData->contentJson() != accountEvent.contentJson()) {
                     currentData = std::move(eventPtr);
@@ -678,9 +675,9 @@ void Connection::requestDirectChat(const QString& userId)
     if (auto* u = user(userId))
         requestDirectChat(u);
     else
-        qCCritical(MAIN)
-            << "Connection::requestDirectChat: Couldn't get a user object for"
-            << userId;
+        qCCritical(MAIN) << "Connection::requestDirectChat: Couldn't get a "
+                            "user object for"
+                         << userId;
 }
 
 void Connection::requestDirectChat(User* u)
diff --git a/lib/connection.h b/lib/connection.h
index 8d65f0e7..b89c0c65 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -32,13 +32,11 @@
 
 #include <functional>
 
-namespace QtOlm
-{
+namespace QtOlm {
 class Account;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class Room;
 class User;
 class ConnectionData;
@@ -93,14 +91,9 @@ static inline user_factory_t defaultUserFactory()
  *
  * \sa Connection::callApi
  */
-enum RunningPolicy
-{
-    ForegroundRequest = 0x0,
-    BackgroundRequest = 0x1
-};
+enum RunningPolicy { ForegroundRequest = 0x0, BackgroundRequest = 0x1 };
 
-class Connection : public QObject
-{
+class Connection : public QObject {
     Q_OBJECT
 
     Q_PROPERTY(User* localUser READ user NOTIFY stateChanged)
@@ -129,8 +122,7 @@ public:
     using UsersToDevicesToEvents =
         std::unordered_map<QString, std::unordered_map<QString, const Event&>>;
 
-    enum RoomVisibility
-    {
+    enum RoomVisibility {
         PublishRoom,
         UnpublishRoom
     }; // FIXME: Should go inside CreateRoomJob
@@ -285,8 +277,7 @@ public:
 
     Q_INVOKABLE void getTurnServers();
 
-    struct SupportedRoomVersion
-    {
+    struct SupportedRoomVersion {
         QString id;
         QString status;
 
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp
index c157565f..df4cece2 100644
--- a/lib/connectiondata.cpp
+++ b/lib/connectiondata.cpp
@@ -23,11 +23,8 @@
 
 using namespace QMatrixClient;
 
-struct ConnectionData::Private
-{
-    explicit Private(QUrl url)
-        : baseUrl(std::move(url))
-    {}
+struct ConnectionData::Private {
+    explicit Private(QUrl url) : baseUrl(std::move(url)) {}
 
     QUrl baseUrl;
     QByteArray accessToken;
diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index 6f9f090c..9b579b1c 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -24,10 +24,8 @@
 
 class QNetworkAccessManager;
 
-namespace QMatrixClient
-{
-class ConnectionData
-{
+namespace QMatrixClient {
+class ConnectionData {
 public:
     explicit ConnectionData(QUrl baseUrl);
     virtual ~ConnectionData();
diff --git a/lib/converters.h b/lib/converters.h
index aa07261d..0085fa4b 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -38,11 +38,9 @@ using optional = std::experimental::optional<T>;
 #endif
 
 // Enable std::unordered_map<QString, T>
-namespace std
-{
+namespace std {
 template <>
-struct hash<QString>
-{
+struct hash<QString> {
     size_t operator()(const QString& s) const Q_DECL_NOEXCEPT
     {
         return qHash(s
@@ -57,18 +55,15 @@ struct hash<QString>
 
 class QVariant;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 template <typename T>
-struct JsonObjectConverter
-{
+struct JsonObjectConverter {
     static void dumpTo(QJsonObject& jo, const T& pod) { jo = pod.toJson(); }
     static void fillFrom(const QJsonObject& jo, T& pod) { pod = T(jo); }
 };
 
 template <typename T>
-struct JsonConverter
-{
+struct JsonConverter {
     static QJsonObject dump(const T& pod)
     {
         QJsonObject jo;
@@ -139,52 +134,44 @@ inline void fillFromJson(const QJsonValue& jv, T& pod)
 // JsonConverter<> specialisations
 
 template <typename T>
-struct TrivialJsonDumper
-{
+struct TrivialJsonDumper {
     // Works for: QJsonValue (and all things it can consume),
     // QJsonObject, QJsonArray
     static auto dump(const T& val) { return val; }
 };
 
 template <>
-struct JsonConverter<bool> : public TrivialJsonDumper<bool>
-{
+struct JsonConverter<bool> : public TrivialJsonDumper<bool> {
     static auto load(const QJsonValue& jv) { return jv.toBool(); }
 };
 
 template <>
-struct JsonConverter<int> : public TrivialJsonDumper<int>
-{
+struct JsonConverter<int> : public TrivialJsonDumper<int> {
     static auto load(const QJsonValue& jv) { return jv.toInt(); }
 };
 
 template <>
-struct JsonConverter<double> : public TrivialJsonDumper<double>
-{
+struct JsonConverter<double> : public TrivialJsonDumper<double> {
     static auto load(const QJsonValue& jv) { return jv.toDouble(); }
 };
 
 template <>
-struct JsonConverter<float> : public TrivialJsonDumper<float>
-{
+struct JsonConverter<float> : public TrivialJsonDumper<float> {
     static auto load(const QJsonValue& jv) { return float(jv.toDouble()); }
 };
 
 template <>
-struct JsonConverter<qint64> : public TrivialJsonDumper<qint64>
-{
+struct JsonConverter<qint64> : public TrivialJsonDumper<qint64> {
     static auto load(const QJsonValue& jv) { return qint64(jv.toDouble()); }
 };
 
 template <>
-struct JsonConverter<QString> : public TrivialJsonDumper<QString>
-{
+struct JsonConverter<QString> : public TrivialJsonDumper<QString> {
     static auto load(const QJsonValue& jv) { return jv.toString(); }
 };
 
 template <>
-struct JsonConverter<QDateTime>
-{
+struct JsonConverter<QDateTime> {
     static auto dump(const QDateTime& val) = delete; // not provided yet
     static auto load(const QJsonValue& jv)
     {
@@ -193,8 +180,7 @@ struct JsonConverter<QDateTime>
 };
 
 template <>
-struct JsonConverter<QDate>
-{
+struct JsonConverter<QDate> {
     static auto dump(const QDate& val) = delete; // not provided yet
     static auto load(const QJsonValue& jv)
     {
@@ -203,14 +189,12 @@ struct JsonConverter<QDate>
 };
 
 template <>
-struct JsonConverter<QJsonArray> : public TrivialJsonDumper<QJsonArray>
-{
+struct JsonConverter<QJsonArray> : public TrivialJsonDumper<QJsonArray> {
     static auto load(const QJsonValue& jv) { return jv.toArray(); }
 };
 
 template <>
-struct JsonConverter<QByteArray>
-{
+struct JsonConverter<QByteArray> {
     static QString dump(const QByteArray& ba) { return ba.constData(); }
     static auto load(const QJsonValue& jv)
     {
@@ -219,15 +203,13 @@ struct JsonConverter<QByteArray>
 };
 
 template <>
-struct JsonConverter<QVariant>
-{
+struct JsonConverter<QVariant> {
     static QJsonValue dump(const QVariant& v);
     static QVariant load(const QJsonValue& jv);
 };
 
 template <typename T>
-struct JsonConverter<Omittable<T>>
-{
+struct JsonConverter<Omittable<T>> {
     static QJsonValue dump(const Omittable<T>& from)
     {
         return from.omitted() ? QJsonValue() : toJson(from.value());
@@ -241,8 +223,7 @@ struct JsonConverter<Omittable<T>>
 };
 
 template <typename VectorT, typename T = typename VectorT::value_type>
-struct JsonArrayConverter
-{
+struct JsonArrayConverter {
     static void dumpTo(QJsonArray& ar, const VectorT& vals)
     {
         for (const auto& v : vals)
@@ -267,20 +248,17 @@ struct JsonArrayConverter
 };
 
 template <typename T>
-struct JsonConverter<std::vector<T>> : public JsonArrayConverter<std::vector<T>>
-{};
+struct JsonConverter<std::vector<T>>
+    : public JsonArrayConverter<std::vector<T>> {};
 
 template <typename T>
-struct JsonConverter<QVector<T>> : public JsonArrayConverter<QVector<T>>
-{};
+struct JsonConverter<QVector<T>> : public JsonArrayConverter<QVector<T>> {};
 
 template <typename T>
-struct JsonConverter<QList<T>> : public JsonArrayConverter<QList<T>>
-{};
+struct JsonConverter<QList<T>> : public JsonArrayConverter<QList<T>> {};
 
 template <>
-struct JsonConverter<QStringList> : public JsonConverter<QList<QString>>
-{
+struct JsonConverter<QStringList> : public JsonConverter<QList<QString>> {
     static auto dump(const QStringList& sl)
     {
         return QJsonArray::fromStringList(sl);
@@ -288,8 +266,7 @@ struct JsonConverter<QStringList> : public JsonConverter<QList<QString>>
 };
 
 template <>
-struct JsonObjectConverter<QSet<QString>>
-{
+struct JsonObjectConverter<QSet<QString>> {
     static void dumpTo(QJsonObject& json, const QSet<QString>& s)
     {
         for (const auto& e : s)
@@ -305,8 +282,7 @@ struct JsonObjectConverter<QSet<QString>>
 };
 
 template <typename HashMapT>
-struct HashMapFromJson
-{
+struct HashMapFromJson {
     static void dumpTo(QJsonObject& json, const HashMapT& hashMap)
     {
         for (auto it = hashMap.begin(); it != hashMap.end(); ++it)
@@ -322,13 +298,11 @@ struct HashMapFromJson
 
 template <typename T>
 struct JsonObjectConverter<std::unordered_map<QString, T>>
-    : public HashMapFromJson<std::unordered_map<QString, T>>
-{};
+    : public HashMapFromJson<std::unordered_map<QString, T>> {};
 
 template <typename T>
 struct JsonObjectConverter<QHash<QString, T>>
-    : public HashMapFromJson<QHash<QString, T>>
-{};
+    : public HashMapFromJson<QHash<QString, T>> {};
 
 // We could use std::conditional<> below but QT_VERSION* macros in C++ code
 // cause (kinda valid but useless and noisy) compiler warnings about
@@ -340,16 +314,14 @@ using variant_map_t =
     QVariantMap;
 #endif
 template <>
-struct JsonConverter<variant_map_t>
-{
+struct JsonConverter<variant_map_t> {
     static QJsonObject dump(const variant_map_t& vh);
     static QVariantHash load(const QJsonValue& jv);
 };
 
 // Conditional insertion into a QJsonObject
 
-namespace _impl
-{
+namespace _impl {
     template <typename ValT>
     inline void addTo(QJsonObject& o, const QString& k, ValT&& v)
     {
@@ -384,8 +356,7 @@ namespace _impl
     // This one is for types that don't have isEmpty() and for all types
     // when Force is true
     template <typename ValT, bool Force = true, typename = bool>
-    struct AddNode
-    {
+    struct AddNode {
         template <typename ContT, typename ForwardedT>
         static void impl(ContT& container, const QString& key,
                          ForwardedT&& value)
@@ -396,8 +367,7 @@ namespace _impl
 
     // This one is for types that have isEmpty() when Force is false
     template <typename ValT>
-    struct AddNode<ValT, false, decltype(std::declval<ValT>().isEmpty())>
-    {
+    struct AddNode<ValT, false, decltype(std::declval<ValT>().isEmpty())> {
         template <typename ContT, typename ForwardedT>
         static void impl(ContT& container, const QString& key,
                          ForwardedT&& value)
@@ -409,8 +379,7 @@ namespace _impl
 
     // This one unfolds Omittable<> (also only when Force is false)
     template <typename ValT>
-    struct AddNode<Omittable<ValT>, false>
-    {
+    struct AddNode<Omittable<ValT>, false> {
         template <typename ContT, typename OmittableT>
         static void impl(ContT& container, const QString& key,
                          const OmittableT& value)
diff --git a/lib/e2ee.h b/lib/e2ee.h
index d3329def..c85211be 100644
--- a/lib/e2ee.h
+++ b/lib/e2ee.h
@@ -4,8 +4,7 @@
 
 #include <QtCore/QStringList>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 static const auto CiphertextKeyL = "ciphertext"_ls;
 static const auto SenderKeyKeyL = "sender_key"_ls;
 static const auto DeviceIdKeyL = "device_id"_ls;
diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index 46d937b8..15723688 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -16,8 +16,7 @@ using namespace QMatrixClient;
 using namespace QtOlm;
 using std::move;
 
-class EncryptionManager::Private
-{
+class EncryptionManager::Private {
 public:
     explicit Private(const QByteArray& encryptionAccountPickle,
                      float signedKeysProportion, float oneTimeKeyThreshold)
diff --git a/lib/encryptionmanager.h b/lib/encryptionmanager.h
index 02bb882f..79c25a00 100644
--- a/lib/encryptionmanager.h
+++ b/lib/encryptionmanager.h
@@ -5,17 +5,14 @@
 #include <functional>
 #include <memory>
 
-namespace QtOlm
-{
+namespace QtOlm {
 class Account;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class Connection;
 
-class EncryptionManager : public QObject
-{
+class EncryptionManager : public QObject {
     Q_OBJECT
 
 public:
diff --git a/lib/eventitem.h b/lib/eventitem.h
index 58f5479c..68d1ae06 100644
--- a/lib/eventitem.h
+++ b/lib/eventitem.h
@@ -22,12 +22,10 @@
 
 #include <utility>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class StateEventBase;
 
-class EventStatus
-{
+class EventStatus {
     Q_GADGET
 public:
     /** Special marks an event can assume
@@ -35,8 +33,7 @@ public:
      * This is used to hint at a special status of some events in UI.
      * All values except Redacted and Hidden are mutually exclusive.
      */
-    enum Code
-    {
+    enum Code {
         Normal = 0x0, //< No special designation
         Submitted = 0x01, //< The event has just been submitted for sending
         FileUploaded = 0x02, //< The file attached to the event has been
@@ -51,11 +48,9 @@ public:
     Q_FLAG(Status)
 };
 
-class EventItemBase
-{
+class EventItemBase {
 public:
-    explicit EventItemBase(RoomEventPtr&& e)
-        : evt(std::move(e))
+    explicit EventItemBase(RoomEventPtr&& e) : evt(std::move(e))
     {
         Q_ASSERT(evt);
     }
@@ -87,16 +82,14 @@ private:
     RoomEventPtr evt;
 };
 
-class TimelineItem : public EventItemBase
-{
+class TimelineItem : public EventItemBase {
 public:
     // For compatibility with Qt containers, even though we use
     // a std:: container now for the room timeline
     using index_t = int;
 
     TimelineItem(RoomEventPtr&& e, index_t number)
-        : EventItemBase(std::move(e))
-        , idx(number)
+        : EventItemBase(std::move(e)), idx(number)
     {}
 
     index_t index() const { return idx; }
@@ -118,8 +111,7 @@ inline const CallEventBase* EventItemBase::viewAs<CallEventBase>() const
     return evt->isCallEvent() ? weakPtrCast<const CallEventBase>(evt) : nullptr;
 }
 
-class PendingEventItem : public EventItemBase
-{
+class PendingEventItem : public EventItemBase {
     Q_GADGET
 public:
     using EventItemBase::EventItemBase;
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index abab9867..3f519668 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -24,20 +24,16 @@
 #include "event.h"
 #include "eventcontent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 constexpr const char* FavouriteTag = "m.favourite";
 constexpr const char* LowPriorityTag = "m.lowpriority";
 
-struct TagRecord
-{
+struct TagRecord {
     using order_type = Omittable<float>;
 
     order_type order;
 
-    TagRecord(order_type order = none)
-        : order(order)
-    {}
+    TagRecord(order_type order = none) : order(order) {}
 
     bool operator<(const TagRecord& other) const
     {
@@ -48,8 +44,7 @@ struct TagRecord
 };
 
 template <>
-struct JsonObjectConverter<TagRecord>
-{
+struct JsonObjectConverter<TagRecord> {
     static void fillFrom(const QJsonObject& jo, TagRecord& rec)
     {
         // Parse a float both from JSON double and JSON string because
@@ -72,26 +67,23 @@ struct JsonObjectConverter<TagRecord>
 
 using TagsMap = QHash<QString, TagRecord>;
 
-#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey) \
-    class _Name : public Event                                         \
-    {                                                                  \
-    public:                                                            \
-        using content_type = _ContentType;                             \
-        DEFINE_EVENT_TYPEID(_TypeId, _Name)                            \
-        explicit _Name(QJsonObject obj)                                \
-            : Event(typeId(), std::move(obj))                          \
-        {}                                                             \
-        explicit _Name(_ContentType content)                           \
-            : Event(typeId(), matrixTypeId(),                          \
-                    QJsonObject { { QStringLiteral(#_ContentKey),      \
-                                    toJson(std::move(content)) } })    \
-        {}                                                             \
-        auto _ContentKey() const                                       \
-        {                                                              \
-            return content<content_type>(#_ContentKey##_ls);           \
-        }                                                              \
-    };                                                                 \
-    REGISTER_EVENT_TYPE(_Name)                                         \
+#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey)       \
+    class _Name : public Event {                                             \
+    public:                                                                  \
+        using content_type = _ContentType;                                   \
+        DEFINE_EVENT_TYPEID(_TypeId, _Name)                                  \
+        explicit _Name(QJsonObject obj) : Event(typeId(), std::move(obj)) {} \
+        explicit _Name(_ContentType content)                                 \
+            : Event(typeId(), matrixTypeId(),                                \
+                    QJsonObject { { QStringLiteral(#_ContentKey),            \
+                                    toJson(std::move(content)) } })          \
+        {}                                                                   \
+        auto _ContentKey() const                                             \
+        {                                                                    \
+            return content<content_type>(#_ContentKey##_ls);                 \
+        }                                                                    \
+    };                                                                       \
+    REGISTER_EVENT_TYPE(_Name)                                               \
     // End of macro
 
 DEFINE_SIMPLE_EVENT(TagEvent, "m.tag", TagsMap, tags)
diff --git a/lib/events/callanswerevent.h b/lib/events/callanswerevent.h
index 69662eb9..052f732d 100644
--- a/lib/events/callanswerevent.h
+++ b/lib/events/callanswerevent.h
@@ -20,10 +20,8 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-class CallAnswerEvent : public CallEventBase
-{
+namespace QMatrixClient {
+class CallAnswerEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.answer", CallAnswerEvent)
 
diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 1c12b800..2a915a43 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -20,10 +20,8 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-class CallCandidatesEvent : public CallEventBase
-{
+namespace QMatrixClient {
+class CallCandidatesEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
 
diff --git a/lib/events/callhangupevent.h b/lib/events/callhangupevent.h
index 0a5a3283..97fa2f52 100644
--- a/lib/events/callhangupevent.h
+++ b/lib/events/callhangupevent.h
@@ -20,10 +20,8 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-class CallHangupEvent : public CallEventBase
-{
+namespace QMatrixClient {
+class CallHangupEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.hangup", CallHangupEvent)
 
diff --git a/lib/events/callinviteevent.h b/lib/events/callinviteevent.h
index 4334ca5b..9b9d0ae5 100644
--- a/lib/events/callinviteevent.h
+++ b/lib/events/callinviteevent.h
@@ -20,10 +20,8 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-class CallInviteEvent : public CallEventBase
-{
+namespace QMatrixClient {
+class CallInviteEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.invite", CallInviteEvent)
 
diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index 6b4a08ee..94857a93 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -20,16 +20,12 @@
 
 #include "event.h"
 
-namespace QMatrixClient
-{
-class DirectChatEvent : public Event
-{
+namespace QMatrixClient {
+class DirectChatEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.direct", DirectChatEvent)
 
-    explicit DirectChatEvent(const QJsonObject& obj)
-        : Event(typeId(), obj)
-    {}
+    explicit DirectChatEvent(const QJsonObject& obj) : Event(typeId(), obj) {}
 
     QMultiHash<QString, QString> usersToDirectChats() const;
 };
diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h
index 0dbce25c..67298a27 100644
--- a/lib/events/encryptedevent.h
+++ b/lib/events/encryptedevent.h
@@ -3,8 +3,7 @@
 #include "e2ee.h"
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class Room;
 /*
  * While the specification states:
@@ -24,8 +23,7 @@ class Room;
  * in general. It's possible, because RoomEvent interface is similar to Event's
  * one and doesn't add new restrictions, just provides additional features.
  */
-class EncryptedEvent : public RoomEvent
-{
+class EncryptedEvent : public RoomEvent {
     Q_GADGET
 public:
     DEFINE_EVENT_TYPEID("m.room.encrypted", EncryptedEvent)
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index 995c8dad..0c732a51 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -15,11 +15,9 @@ static const std::array<QString, 1> encryptionStrings = {
     { QMatrixClient::MegolmV1AesSha2AlgoKey }
 };
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 template <>
-struct JsonConverter<EncryptionType>
-{
+struct JsonConverter<EncryptionType> {
     static EncryptionType load(const QJsonValue& jv)
     {
         const auto& encryptionString = jv.toString();
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index 97119c8d..debabcae 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -21,16 +21,10 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
-class EncryptionEventContent : public EventContent::Base
-{
+namespace QMatrixClient {
+class EncryptionEventContent : public EventContent::Base {
 public:
-    enum EncryptionType : size_t
-    {
-        MegolmV1AesSha2 = 0,
-        Undefined
-    };
+    enum EncryptionType : size_t { MegolmV1AesSha2 = 0, Undefined };
 
     explicit EncryptionEventContent(EncryptionType et = Undefined)
         : encryption(et)
@@ -48,8 +42,7 @@ protected:
 
 using EncryptionType = EncryptionEventContent::EncryptionType;
 
-class EncryptionEvent : public StateEvent<EncryptionEventContent>
-{
+class EncryptionEvent : public StateEvent<EncryptionEventContent> {
     Q_GADGET
 public:
     DEFINE_EVENT_TYPEID("m.room.encryption", EncryptionEvent)
diff --git a/lib/events/event.cpp b/lib/events/event.cpp
index 718a6602..694254fe 100644
--- a/lib/events/event.cpp
+++ b/lib/events/event.cpp
@@ -42,9 +42,7 @@ QString EventTypeRegistry::getMatrixType(event_type_t typeId)
                                             : QString();
 }
 
-Event::Event(Type type, const QJsonObject& json)
-    : _type(type)
-    , _json(json)
+Event::Event(Type type, const QJsonObject& json) : _type(type), _json(json)
 {
     if (!json.contains(ContentKeyL)
         && !json.value(UnsignedKeyL).toObject().contains(RedactedCauseKeyL)) {
diff --git a/lib/events/event.h b/lib/events/event.h
index d6525281..686bd8e0 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -25,8 +25,7 @@
 #    define USE_EVENTTYPE_ALIAS 1
 #endif
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 // === event_ptr_tt<> and type casting facilities ===
 
 template <typename EventT>
@@ -85,8 +84,7 @@ inline QJsonObject basicEventJson(StrT matrixType, const QJsonObject& content)
 using event_type_t = size_t;
 using event_mtype_t = const char*;
 
-class EventTypeRegistry
-{
+class EventTypeRegistry {
 public:
     ~EventTypeRegistry() = default;
 
@@ -121,8 +119,7 @@ inline event_type_t EventTypeRegistry::initializeTypeId<void>()
 }
 
 template <typename EventT>
-struct EventTypeTraits
-{
+struct EventTypeTraits {
     static event_type_t id()
     {
         static const auto id = EventTypeRegistry::initializeTypeId<EventT>();
@@ -148,8 +145,7 @@ inline event_ptr_tt<EventT> makeEvent(ArgTs&&... args)
 }
 
 template <typename BaseEventT>
-class EventFactory
-{
+class EventFactory {
 public:
     template <typename FnT>
     static auto addMethod(FnT&& method)
@@ -223,8 +219,7 @@ inline auto registerEventType()
 
 // === Event ===
 
-class Event
-{
+class Event {
     Q_GADGET
     Q_PROPERTY(Type type READ type CONSTANT)
     Q_PROPERTY(QJsonObject contentJson READ contentJson CONSTANT)
@@ -304,16 +299,14 @@ using Events = EventsArray<Event>;
 // to enable its deserialisation from a /sync and other
 // polymorphic event arrays
 #define REGISTER_EVENT_TYPE(_Type)                               \
-    namespace                                                    \
-    {                                                            \
+    namespace {                                                  \
         [[gnu::unused]] static const auto _factoryAdded##_Type = \
             registerEventType<_Type>();                          \
     }                                                            \
     // End of macro
 
 #ifdef USE_EVENTTYPE_ALIAS
-namespace EventType
-{
+namespace EventType {
     inline event_type_t logEventType(event_type_t id, const char* idName)
     {
         qDebug(EVENTS) << "Using id" << id << "for" << idName;
@@ -324,8 +317,7 @@ namespace EventType
 // This macro provides constants in EventType:: namespace for
 // back-compatibility with libQMatrixClient 0.3 event type system.
 #    define DEFINE_EVENTTYPE_ALIAS(_Id, _Type)                  \
-        namespace EventType                                     \
-        {                                                       \
+        namespace EventType {                                   \
             [[deprecated("Use is<>(), eventCast<>() or "        \
                          "visit<>()")]] static const auto _Id = \
                 logEventType(typeId<_Type>(), #_Id);            \
diff --git a/lib/events/eventcontent.cpp b/lib/events/eventcontent.cpp
index 2b84c2b7..814f2787 100644
--- a/lib/events/eventcontent.cpp
+++ b/lib/events/eventcontent.cpp
@@ -70,8 +70,7 @@ void FileInfo::fillInfoJson(QJsonObject* infoJson) const
 
 ImageInfo::ImageInfo(const QUrl& u, qint64 fileSize, QMimeType mimeType,
                      const QSize& imageSize, const QString& originalFilename)
-    : FileInfo(u, fileSize, mimeType, originalFilename)
-    , imageSize(imageSize)
+    : FileInfo(u, fileSize, mimeType, originalFilename), imageSize(imageSize)
 {}
 
 ImageInfo::ImageInfo(const QUrl& u, const QJsonObject& infoJson,
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index 7a3db1fc..5c0f92d1 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -26,10 +26,8 @@
 #include <QtCore/QSize>
 #include <QtCore/QUrl>
 
-namespace QMatrixClient
-{
-namespace EventContent
-{
+namespace QMatrixClient {
+namespace EventContent {
     /**
      * A base class for all content types that can be stored
      * in a RoomMessageEvent
@@ -40,12 +38,9 @@ namespace EventContent
      * assumed but not required that a content object can also be created
      * from plain data.
      */
-    class Base
-    {
+    class Base {
     public:
-        explicit Base(QJsonObject o = {})
-            : originalJson(std::move(o))
-        {}
+        explicit Base(QJsonObject o = {}) : originalJson(std::move(o)) {}
         virtual ~Base() = default;
 
         // FIXME: make toJson() from converters.* work on base classes
@@ -90,8 +85,7 @@ namespace EventContent
      *
      * This class is not polymorphic.
      */
-    class FileInfo
-    {
+    class FileInfo {
     public:
         explicit FileInfo(const QUrl& u, qint64 payloadSize = -1,
                           const QMimeType& mimeType = {},
@@ -131,8 +125,7 @@ namespace EventContent
     /**
      * A content info class for image content types: image, thumbnail, video
      */
-    class ImageInfo : public FileInfo
-    {
+    class ImageInfo : public FileInfo {
     public:
         explicit ImageInfo(const QUrl& u, qint64 fileSize = -1,
                            QMimeType mimeType = {}, const QSize& imageSize = {},
@@ -153,16 +146,11 @@ namespace EventContent
      * the JSON representation of event content; namely,
      * "info/thumbnail_url" and "info/thumbnail_info" fields are used.
      */
-    class Thumbnail : public ImageInfo
-    {
+    class Thumbnail : public ImageInfo {
     public:
-        Thumbnail()
-            : ImageInfo(QUrl())
-        {} // To allow empty thumbnails
+        Thumbnail() : ImageInfo(QUrl()) {} // To allow empty thumbnails
         Thumbnail(const QJsonObject& infoJson);
-        Thumbnail(const ImageInfo& info)
-            : ImageInfo(info)
-        {}
+        Thumbnail(const ImageInfo& info) : ImageInfo(info) {}
         using ImageInfo::ImageInfo;
 
         /**
@@ -172,12 +160,9 @@ namespace EventContent
         void fillInfoJson(QJsonObject* infoJson) const;
     };
 
-    class TypedBase : public Base
-    {
+    class TypedBase : public Base {
     public:
-        explicit TypedBase(QJsonObject o = {})
-            : Base(std::move(o))
-        {}
+        explicit TypedBase(QJsonObject o = {}) : Base(std::move(o)) {}
         virtual QMimeType type() const = 0;
         virtual const FileInfo* fileInfo() const { return nullptr; }
         virtual FileInfo* fileInfo() { return nullptr; }
@@ -198,8 +183,7 @@ namespace EventContent
      * \tparam InfoT base info class
      */
     template <class InfoT>
-    class UrlBasedContent : public TypedBase, public InfoT
-    {
+    class UrlBasedContent : public TypedBase, public InfoT {
     public:
         using InfoT::InfoT;
         explicit UrlBasedContent(const QJsonObject& json)
@@ -227,13 +211,11 @@ namespace EventContent
     };
 
     template <typename InfoT>
-    class UrlWithThumbnailContent : public UrlBasedContent<InfoT>
-    {
+    class UrlWithThumbnailContent : public UrlBasedContent<InfoT> {
     public:
         using UrlBasedContent<InfoT>::UrlBasedContent;
         explicit UrlWithThumbnailContent(const QJsonObject& json)
-            : UrlBasedContent<InfoT>(json)
-            , thumbnail(InfoT::originalInfoJson)
+            : UrlBasedContent<InfoT>(json), thumbnail(InfoT::originalInfoJson)
         {
             // Another small hack, to simplify making a thumbnail link
             UrlBasedContent<InfoT>::originalJson.insert("thumbnailMediaId",
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h
index a203eaa3..9e8bb410 100644
--- a/lib/events/eventloader.h
+++ b/lib/events/eventloader.h
@@ -20,10 +20,8 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
-namespace _impl
-{
+namespace QMatrixClient {
+namespace _impl {
     template <typename BaseEventT>
     static inline auto loadEvent(const QJsonObject& json,
                                  const QString& matrixType)
@@ -75,8 +73,7 @@ inline StateEventPtr loadStateEvent(const QString& matrixType,
 }
 
 template <typename EventT>
-struct JsonConverter<event_ptr_tt<EventT>>
-{
+struct JsonConverter<event_ptr_tt<EventT>> {
     static auto load(const QJsonValue& jv)
     {
         return loadEvent<EventT>(jv.toObject());
diff --git a/lib/events/reactionevent.h b/lib/events/reactionevent.h
index d524b549..b1e04561 100644
--- a/lib/events/reactionevent.h
+++ b/lib/events/reactionevent.h
@@ -20,11 +20,9 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 
-struct EventRelation
-{
+struct EventRelation {
     using reltypeid_t = const char*;
     static constexpr reltypeid_t Reply() { return "m.in_reply_to"; }
     static constexpr reltypeid_t Annotation() { return "m.annotation"; }
@@ -48,14 +46,12 @@ struct EventRelation
     }
 };
 template <>
-struct JsonObjectConverter<EventRelation>
-{
+struct JsonObjectConverter<EventRelation> {
     static void dumpTo(QJsonObject& jo, const EventRelation& pod);
     static void fillFrom(const QJsonObject& jo, EventRelation& pod);
 };
 
-class ReactionEvent : public RoomEvent
-{
+class ReactionEvent : public RoomEvent {
 public:
     DEFINE_EVENT_TYPEID("m.reaction", ReactionEvent)
 
@@ -63,9 +59,7 @@ public:
         : RoomEvent(typeId(), matrixTypeId(),
                     { { QStringLiteral("m.relates_to"), toJson(value) } })
     {}
-    explicit ReactionEvent(const QJsonObject& obj)
-        : RoomEvent(typeId(), obj)
-    {}
+    explicit ReactionEvent(const QJsonObject& obj) : RoomEvent(typeId(), obj) {}
     EventRelation relation() const
     {
         return content<EventRelation>(QStringLiteral("m.relates_to"));
diff --git a/lib/events/receiptevent.cpp b/lib/events/receiptevent.cpp
index fcb8431b..4a54b744 100644
--- a/lib/events/receiptevent.cpp
+++ b/lib/events/receiptevent.cpp
@@ -40,8 +40,7 @@ Example of a Receipt Event:
 
 using namespace QMatrixClient;
 
-ReceiptEvent::ReceiptEvent(const QJsonObject& obj)
-    : Event(typeId(), obj)
+ReceiptEvent::ReceiptEvent(const QJsonObject& obj) : Event(typeId(), obj)
 {
     const auto& contents = contentJson();
     _eventsWithReceipts.reserve(contents.size());
diff --git a/lib/events/receiptevent.h b/lib/events/receiptevent.h
index e8396670..c32e0543 100644
--- a/lib/events/receiptevent.h
+++ b/lib/events/receiptevent.h
@@ -23,22 +23,18 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
-{
-struct Receipt
-{
+namespace QMatrixClient {
+struct Receipt {
     QString userId;
     QDateTime timestamp;
 };
-struct ReceiptsForEvent
-{
+struct ReceiptsForEvent {
     QString evtId;
     QVector<Receipt> receipts;
 };
 using EventsWithReceipts = QVector<ReceiptsForEvent>;
 
-class ReceiptEvent : public Event
-{
+class ReceiptEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.receipt", ReceiptEvent)
     explicit ReceiptEvent(const QJsonObject& obj);
diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h
index a7dd9705..3628fb33 100644
--- a/lib/events/redactionevent.h
+++ b/lib/events/redactionevent.h
@@ -20,15 +20,12 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-class RedactionEvent : public RoomEvent
-{
+namespace QMatrixClient {
+class RedactionEvent : public RoomEvent {
 public:
     DEFINE_EVENT_TYPEID("m.room.redaction", RedactionEvent)
 
-    explicit RedactionEvent(const QJsonObject& obj)
-        : RoomEvent(typeId(), obj)
+    explicit RedactionEvent(const QJsonObject& obj) : RoomEvent(typeId(), obj)
     {}
 
     QString redactedEvent() const
diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index ee460339..16aeb070 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -21,18 +21,15 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
-class RoomAvatarEvent : public StateEvent<EventContent::ImageContent>
-{
+namespace QMatrixClient {
+class RoomAvatarEvent : public StateEvent<EventContent::ImageContent> {
     // It's a bit of an overkill to use a full-fledged ImageContent
     // because in reality m.room.avatar usually only has a single URL,
     // without a thumbnail. But The Spec says there be thumbnails, and
     // we follow The Spec.
 public:
     DEFINE_EVENT_TYPEID("m.room.avatar", RoomAvatarEvent)
-    explicit RoomAvatarEvent(const QJsonObject& obj)
-        : StateEvent(typeId(), obj)
+    explicit RoomAvatarEvent(const QJsonObject& obj) : StateEvent(typeId(), obj)
     {}
     QUrl url() const { return content().url; }
 };
diff --git a/lib/events/roomcreateevent.h b/lib/events/roomcreateevent.h
index 17b86388..c8ba8c40 100644
--- a/lib/events/roomcreateevent.h
+++ b/lib/events/roomcreateevent.h
@@ -20,22 +20,17 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
-class RoomCreateEvent : public StateEventBase
-{
+namespace QMatrixClient {
+class RoomCreateEvent : public StateEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.room.create", RoomCreateEvent)
 
-    explicit RoomCreateEvent()
-        : StateEventBase(typeId(), matrixTypeId())
-    {}
+    explicit RoomCreateEvent() : StateEventBase(typeId(), matrixTypeId()) {}
     explicit RoomCreateEvent(const QJsonObject& obj)
         : StateEventBase(typeId(), obj)
     {}
 
-    struct Predecessor
-    {
+    struct Predecessor {
         QString roomId;
         QString eventId;
     };
diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index fb715473..543640ca 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -32,8 +32,7 @@ RoomEvent::RoomEvent(Type type, event_mtype_t matrixType,
     : Event(type, matrixType, contentJson)
 {}
 
-RoomEvent::RoomEvent(Type type, const QJsonObject& json)
-    : Event(type, json)
+RoomEvent::RoomEvent(Type type, const QJsonObject& json) : Event(type, json)
 {
     const auto unsignedData = json[UnsignedKeyL].toObject();
     const auto redaction = unsignedData[RedactedCauseKeyL];
diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index 8edb397c..155d4600 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -22,13 +22,11 @@
 
 #include <QtCore/QDateTime>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class RedactionEvent;
 
 /** This class corresponds to m.room.* events */
-class RoomEvent : public Event
-{
+class RoomEvent : public Event {
     Q_GADGET
     Q_PROPERTY(QString id READ id)
     Q_PROPERTY(QDateTime timestamp READ timestamp CONSTANT)
@@ -93,8 +91,7 @@ using RoomEventPtr = event_ptr_tt<RoomEvent>;
 using RoomEvents = EventsArray<RoomEvent>;
 using RoomEventsRange = Range<RoomEvents>;
 
-class CallEventBase : public RoomEvent
-{
+class CallEventBase : public RoomEvent {
 public:
     CallEventBase(Type type, event_mtype_t matrixType, const QString& callId,
                   int version, const QJsonObject& contentJson = {});
diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index e6292b73..3cbf6685 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -28,11 +28,9 @@ static const std::array<QString, 5> membershipStrings = {
       QStringLiteral("leave"), QStringLiteral("ban") }
 };
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 template <>
-struct JsonConverter<MembershipType>
-{
+struct JsonConverter<MembershipType> {
     static MembershipType load(const QJsonValue& jv)
     {
         const auto& membershipString = jv.toString();
diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index c1015df2..59d59e3a 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -21,13 +21,10 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
-class MemberEventContent : public EventContent::Base
-{
+namespace QMatrixClient {
+class MemberEventContent : public EventContent::Base {
 public:
-    enum MembershipType : size_t
-    {
+    enum MembershipType : size_t {
         Invite = 0,
         Join,
         Knock,
@@ -36,9 +33,7 @@ public:
         Undefined
     };
 
-    explicit MemberEventContent(MembershipType mt = Join)
-        : membership(mt)
-    {}
+    explicit MemberEventContent(MembershipType mt = Join) : membership(mt) {}
     explicit MemberEventContent(const QJsonObject& json);
 
     MembershipType membership;
@@ -52,16 +47,14 @@ protected:
 
 using MembershipType = MemberEventContent::MembershipType;
 
-class RoomMemberEvent : public StateEvent<MemberEventContent>
-{
+class RoomMemberEvent : public StateEvent<MemberEventContent> {
     Q_GADGET
 public:
     DEFINE_EVENT_TYPEID("m.room.member", RoomMemberEvent)
 
     using MembershipType = MemberEventContent::MembershipType;
 
-    explicit RoomMemberEvent(const QJsonObject& obj)
-        : StateEvent(typeId(), obj)
+    explicit RoomMemberEvent(const QJsonObject& obj) : StateEvent(typeId(), obj)
     {}
     [[deprecated("Use RoomMemberEvent(userId, contentArgs) "
                  "instead")]] RoomMemberEvent(MemberEventContent&& c)
@@ -103,8 +96,7 @@ private:
 };
 
 template <>
-class EventFactory<RoomMemberEvent>
-{
+class EventFactory<RoomMemberEvent> {
 public:
     static event_ptr_tt<RoomMemberEvent> make(const QJsonObject& json,
                                               const QString&)
diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp
index da8d59ca..991931de 100644
--- a/lib/events/roommessageevent.cpp
+++ b/lib/events/roommessageevent.cpp
@@ -54,8 +54,7 @@ TypedBase* make<TextContent>(const QJsonObject& json)
                : nullptr;
 }
 
-struct MsgTypeDesc
-{
+struct MsgTypeDesc {
     QString matrixType;
     MsgType enumType;
     TypedBase* (*maker)(const QJsonObject&);
@@ -174,8 +173,7 @@ RoomMessageEvent::RoomMessageEvent(const QString& plainBody,
 {}
 
 RoomMessageEvent::RoomMessageEvent(const QJsonObject& obj)
-    : RoomEvent(typeId(), obj)
-    , _content(nullptr)
+    : RoomEvent(typeId(), obj), _content(nullptr)
 {
     if (isRedacted())
         return;
@@ -281,8 +279,7 @@ TextContent::TextContent(const QString& text, const QString& contentType,
         mimeType = QMimeDatabase().mimeTypeForName("text/html");
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 // Overload the default fromJson<> logic that defined in converters.h
 // as we want
 template <>
@@ -350,8 +347,7 @@ void TextContent::fillJson(QJsonObject* json) const
 
 LocationContent::LocationContent(const QString& geoUri,
                                  const Thumbnail& thumbnail)
-    : geoUri(geoUri)
-    , thumbnail(thumbnail)
+    : geoUri(geoUri), thumbnail(thumbnail)
 {}
 
 LocationContent::LocationContent(const QJsonObject& json)
diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h
index 1f1fde41..c7a5cb47 100644
--- a/lib/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
@@ -23,15 +23,13 @@
 
 class QFileInfo;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 namespace MessageEventContent = EventContent; // Back-compatibility
 
 /**
  * The event class corresponding to m.room.message events
  */
-class RoomMessageEvent : public RoomEvent
-{
+class RoomMessageEvent : public RoomEvent {
     Q_GADGET
     Q_PROPERTY(QString msgType READ rawMsgtype CONSTANT)
     Q_PROPERTY(QString plainBody READ plainBody CONSTANT)
@@ -40,8 +38,7 @@ class RoomMessageEvent : public RoomEvent
 public:
     DEFINE_EVENT_TYPEID("m.room.message", RoomMessageEvent)
 
-    enum class MsgType
-    {
+    enum class MsgType {
         Text,
         Emote,
         Notice,
@@ -96,12 +93,10 @@ REGISTER_EVENT_TYPE(RoomMessageEvent)
 DEFINE_EVENTTYPE_ALIAS(RoomMessage, RoomMessageEvent)
 using MessageEventType = RoomMessageEvent::MsgType;
 
-namespace EventContent
-{
+namespace EventContent {
     // Additional event content types
 
-    struct RelatesTo
-    {
+    struct RelatesTo {
         static constexpr const char* ReplyTypeId() { return "m.in_reply_to"; }
         static constexpr const char* ReplacementTypeId() { return "m.replace"; }
         QString type; // The only supported relation so far
@@ -118,8 +113,7 @@ namespace EventContent
      * Available fields: mimeType, body. The body can be either rich text
      * or plain text, depending on what mimeType specifies.
      */
-    class TextContent : public TypedBase
-    {
+    class TextContent : public TypedBase {
     public:
         TextContent(const QString& text, const QString& contentType,
                     Omittable<RelatesTo> relatesTo = none);
@@ -148,8 +142,7 @@ namespace EventContent
      *   - thumbnail.mimeType
      *   - thumbnail.imageSize
      */
-    class LocationContent : public TypedBase
-    {
+    class LocationContent : public TypedBase {
     public:
         LocationContent(const QString& geoUri, const Thumbnail& thumbnail = {});
         explicit LocationContent(const QJsonObject& json);
@@ -168,8 +161,7 @@ namespace EventContent
      * A base class for info types that include duration: audio and video
      */
     template <typename ContentT>
-    class PlayableContent : public ContentT
-    {
+    class PlayableContent : public ContentT {
     public:
         using ContentT::ContentT;
         PlayableContent(const QJsonObject& json)
diff --git a/lib/events/roomtombstoneevent.h b/lib/events/roomtombstoneevent.h
index aa9cb766..95fed998 100644
--- a/lib/events/roomtombstoneevent.h
+++ b/lib/events/roomtombstoneevent.h
@@ -20,16 +20,12 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
-class RoomTombstoneEvent : public StateEventBase
-{
+namespace QMatrixClient {
+class RoomTombstoneEvent : public StateEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.room.tombstone", RoomTombstoneEvent)
 
-    explicit RoomTombstoneEvent()
-        : StateEventBase(typeId(), matrixTypeId())
-    {}
+    explicit RoomTombstoneEvent() : StateEventBase(typeId(), matrixTypeId()) {}
     explicit RoomTombstoneEvent(const QJsonObject& obj)
         : StateEventBase(typeId(), obj)
     {}
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index 0078c44d..6dad8020 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -20,25 +20,20 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
-namespace EventContent
-{
+namespace QMatrixClient {
+namespace EventContent {
     template <typename T>
-    class SimpleContent
-    {
+    class SimpleContent {
     public:
         using value_type = T;
 
         // The constructor is templated to enable perfect forwarding
         template <typename TT>
         SimpleContent(QString keyName, TT&& value)
-            : value(std::forward<TT>(value))
-            , key(std::move(keyName))
+            : value(std::forward<TT>(value)), key(std::move(keyName))
         {}
         SimpleContent(const QJsonObject& json, QString keyName)
-            : value(fromJson<T>(json[keyName]))
-            , key(std::move(keyName))
+            : value(fromJson<T>(json[keyName])), key(std::move(keyName))
         {}
         QJsonObject toJson() const
         {
@@ -54,14 +49,11 @@ namespace EventContent
 } // namespace EventContent
 
 #define DEFINE_SIMPLE_STATE_EVENT(_Name, _TypeId, _ValueType, _ContentKey)     \
-    class _Name : public StateEvent<EventContent::SimpleContent<_ValueType>>   \
-    {                                                                          \
+    class _Name : public StateEvent<EventContent::SimpleContent<_ValueType>> { \
     public:                                                                    \
         using value_type = content_type::value_type;                           \
         DEFINE_EVENT_TYPEID(_TypeId, _Name)                                    \
-        explicit _Name()                                                       \
-            : _Name(value_type())                                              \
-        {}                                                                     \
+        explicit _Name() : _Name(value_type()) {}                              \
         template <typename T>                                                  \
         explicit _Name(T&& value)                                              \
             : StateEvent(typeId(), matrixTypeId(), QString(),                  \
@@ -86,8 +78,7 @@ DEFINE_EVENTTYPE_ALIAS(RoomTopic, RoomTopicEvent)
 DEFINE_EVENTTYPE_ALIAS(RoomEncryption, EncryptionEvent)
 
 class RoomAliasesEvent
-    : public StateEvent<EventContent::SimpleContent<QStringList>>
-{
+    : public StateEvent<EventContent::SimpleContent<QStringList>> {
 public:
     DEFINE_EVENT_TYPEID("m.room.aliases", RoomAliasesEvent)
     explicit RoomAliasesEvent(const QJsonObject& obj)
diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index d1b742ba..757c94ee 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -20,8 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 
 /// Make a minimal correct Matrix state event JSON
 template <typename StrT>
@@ -34,13 +33,11 @@ inline QJsonObject basicStateEventJson(StrT matrixType,
              { ContentKey, content } };
 }
 
-class StateEventBase : public RoomEvent
-{
+class StateEventBase : public RoomEvent {
 public:
     using factory_t = EventFactory<StateEventBase>;
 
-    StateEventBase(Type type, const QJsonObject& json)
-        : RoomEvent(type, json)
+    StateEventBase(Type type, const QJsonObject& json) : RoomEvent(type, json)
     {}
     StateEventBase(Type type, event_mtype_t matrixType,
                    const QString& stateKey = {},
@@ -71,8 +68,7 @@ inline bool is<StateEventBase>(const Event& e)
 using StateEventKey = QPair<QString, QString>;
 
 template <typename ContentT>
-struct Prev
-{
+struct Prev {
     template <typename... ContentParamTs>
     explicit Prev(const QJsonObject& unsignedJson,
                   ContentParamTs&&... contentParams)
@@ -86,8 +82,7 @@ struct Prev
 };
 
 template <typename ContentT>
-class StateEvent : public StateEventBase
-{
+class StateEvent : public StateEventBase {
 public:
     using content_type = ContentT;
 
@@ -135,11 +130,9 @@ private:
 };
 } // namespace QMatrixClient
 
-namespace std
-{
+namespace std {
 template <>
-struct hash<QMatrixClient::StateEventKey>
-{
+struct hash<QMatrixClient::StateEventKey> {
     size_t operator()(const QMatrixClient::StateEventKey& k) const Q_DECL_NOEXCEPT
     {
         return qHash(k);
diff --git a/lib/events/typingevent.cpp b/lib/events/typingevent.cpp
index 128a206a..ee3d6b67 100644
--- a/lib/events/typingevent.cpp
+++ b/lib/events/typingevent.cpp
@@ -22,8 +22,7 @@
 
 using namespace QMatrixClient;
 
-TypingEvent::TypingEvent(const QJsonObject& obj)
-    : Event(typeId(), obj)
+TypingEvent::TypingEvent(const QJsonObject& obj) : Event(typeId(), obj)
 {
     const auto& array = contentJson()["user_ids"_ls].toArray();
     for (const auto& user : array)
diff --git a/lib/events/typingevent.h b/lib/events/typingevent.h
index 241359b4..c8170865 100644
--- a/lib/events/typingevent.h
+++ b/lib/events/typingevent.h
@@ -20,10 +20,8 @@
 
 #include "event.h"
 
-namespace QMatrixClient
-{
-class TypingEvent : public Event
-{
+namespace QMatrixClient {
+class TypingEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.typing", TypingEvent)
 
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index e4a74954..a6471ece 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -32,8 +32,7 @@
 
 using namespace QMatrixClient;
 
-struct NetworkReplyDeleter : public QScopedPointerDeleteLater
-{
+struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
     static inline void cleanup(QNetworkReply* reply)
     {
         if (reply && reply->isRunning())
@@ -42,8 +41,7 @@ struct NetworkReplyDeleter : public QScopedPointerDeleteLater
     }
 };
 
-class BaseJob::Private
-{
+class BaseJob::Private {
 public:
     // Using an idiom from clang-tidy:
     // http://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index f445d087..c85d2d90 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -28,32 +28,22 @@
 class QNetworkReply;
 class QSslError;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class ConnectionData;
 
-enum class HttpVerb
-{
-    Get,
-    Put,
-    Post,
-    Delete
-};
+enum class HttpVerb { Get, Put, Post, Delete };
 
-struct JobTimeoutConfig
-{
+struct JobTimeoutConfig {
     int jobTimeout;
     int nextRetryInterval;
 };
 
-class BaseJob : public QObject
-{
+class BaseJob : public QObject {
     Q_OBJECT
     Q_PROPERTY(QUrl requestUrl READ requestUrl CONSTANT)
     Q_PROPERTY(int maxRetries READ maxRetries WRITE setMaxRetries)
 public:
-    enum StatusCode
-    {
+    enum StatusCode {
         NoError = 0 // To be compatible with Qt conventions
         ,
         Success = 0,
@@ -93,8 +83,7 @@ public:
      * A simple wrapper around QUrlQuery that allows its creation from
      * a list of string pairs
      */
-    class Query : public QUrlQuery
-    {
+    class Query : public QUrlQuery {
     public:
         using QUrlQuery::QUrlQuery;
         Query() = default;
@@ -115,16 +104,10 @@ public:
      * along the lines of StatusCode, with additional values
      * starting at UserDefinedError
      */
-    class Status
-    {
+    class Status {
     public:
-        Status(StatusCode c)
-            : code(c)
-        {}
-        Status(int c, QString m)
-            : code(c)
-            , message(std::move(m))
-        {}
+        Status(StatusCode c) : code(c) {}
+        Status(int c, QString m) : code(c), message(std::move(m)) {}
 
         bool good() const { return code < ErrorLevel; }
         friend QDebug operator<<(QDebug dbg, const Status& s)
diff --git a/lib/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 3dff5a68..9722186c 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
@@ -6,12 +6,9 @@
 
 using namespace QMatrixClient;
 
-class DownloadFileJob::Private
-{
+class DownloadFileJob::Private {
 public:
-    Private()
-        : tempFile(new QTemporaryFile())
-    {}
+    Private() : tempFile(new QTemporaryFile()) {}
 
     explicit Private(const QString& localFilename)
         : targetFile(new QFile(localFilename))
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index 58858448..ebfe5a0d 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -2,15 +2,10 @@
 
 #include "csapi/content-repo.h"
 
-namespace QMatrixClient
-{
-class DownloadFileJob : public GetContentJob
-{
+namespace QMatrixClient {
+class DownloadFileJob : public GetContentJob {
 public:
-    enum
-    {
-        FileError = BaseJob::UserDefinedError + 1
-    };
+    enum { FileError = BaseJob::UserDefinedError + 1 };
 
     using GetContentJob::makeRequestUrl;
     static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri);
diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index eeabe7a9..df0a7f31 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -22,10 +22,8 @@
 
 #include <QtGui/QPixmap>
 
-namespace QMatrixClient
-{
-class MediaThumbnailJob : public GetContentThumbnailJob
-{
+namespace QMatrixClient {
+class MediaThumbnailJob : public GetContentThumbnailJob {
 public:
     using GetContentThumbnailJob::makeRequestUrl;
     static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri,
diff --git a/lib/jobs/postreadmarkersjob.h b/lib/jobs/postreadmarkersjob.h
index d53ae66c..cf482a9a 100644
--- a/lib/jobs/postreadmarkersjob.h
+++ b/lib/jobs/postreadmarkersjob.h
@@ -24,8 +24,7 @@
 
 using namespace QMatrixClient;
 
-class PostReadMarkersJob : public BaseJob
-{
+class PostReadMarkersJob : public BaseJob {
 public:
     explicit PostReadMarkersJob(const QString& roomId,
                                 const QString& readUpToEventId)
diff --git a/lib/jobs/requestdata.cpp b/lib/jobs/requestdata.cpp
index 8248d6b1..6ad7c007 100644
--- a/lib/jobs/requestdata.cpp
+++ b/lib/jobs/requestdata.cpp
@@ -23,16 +23,10 @@ inline auto fromJson(const JsonDataT& jdata)
     return fromData(QJsonDocument(jdata).toJson(QJsonDocument::Compact));
 }
 
-RequestData::RequestData(const QByteArray& a)
-    : _source(fromData(a))
-{}
+RequestData::RequestData(const QByteArray& a) : _source(fromData(a)) {}
 
-RequestData::RequestData(const QJsonObject& jo)
-    : _source(fromJson(jo))
-{}
+RequestData::RequestData(const QJsonObject& jo) : _source(fromJson(jo)) {}
 
-RequestData::RequestData(const QJsonArray& ja)
-    : _source(fromJson(ja))
-{}
+RequestData::RequestData(const QJsonArray& ja) : _source(fromJson(ja)) {}
 
 RequestData::~RequestData() = default;
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 974a9ddf..55987a3b 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -26,23 +26,20 @@ class QJsonArray;
 class QJsonDocument;
 class QIODevice;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 /**
  * A simple wrapper that represents the request body.
  * Provides a unified interface to dump an unstructured byte stream
  * as well as JSON (and possibly other structures in the future) to
  * a QByteArray consumed by QNetworkAccessManager request methods.
  */
-class RequestData
-{
+class RequestData {
 public:
     RequestData() = default;
     RequestData(const QByteArray& a);
     RequestData(const QJsonObject& jo);
     RequestData(const QJsonArray& ja);
-    RequestData(QIODevice* source)
-        : _source(std::unique_ptr<QIODevice>(source))
+    RequestData(QIODevice* source) : _source(std::unique_ptr<QIODevice>(source))
     {}
     RequestData(const RequestData&) = delete;
     RequestData& operator=(const RequestData&) = delete;
diff --git a/lib/jobs/syncjob.h b/lib/jobs/syncjob.h
index e2cec8f7..8f925414 100644
--- a/lib/jobs/syncjob.h
+++ b/lib/jobs/syncjob.h
@@ -22,10 +22,8 @@
 #include "../syncdata.h"
 #include "basejob.h"
 
-namespace QMatrixClient
-{
-class SyncJob : public BaseJob
-{
+namespace QMatrixClient {
+class SyncJob : public BaseJob {
 public:
     explicit SyncJob(const QString& since = {}, const QString& filter = {},
                      int timeout = -1, const QString& presence = {});
diff --git a/lib/joinstate.h b/lib/joinstate.h
index e4dc679a..fcf840ae 100644
--- a/lib/joinstate.h
+++ b/lib/joinstate.h
@@ -22,10 +22,8 @@
 
 #include <array>
 
-namespace QMatrixClient
-{
-enum class JoinState : unsigned int
-{
+namespace QMatrixClient {
+enum class JoinState : unsigned int {
     Join = 0x1,
     Invite = 0x2,
     Leave = 0x4,
diff --git a/lib/logging.h b/lib/logging.h
index a50c1795..24799752 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -28,8 +28,7 @@ Q_DECLARE_LOGGING_CATEGORY(EPHEMERAL)
 Q_DECLARE_LOGGING_CATEGORY(JOBS)
 Q_DECLARE_LOGGING_CATEGORY(SYNCJOB)
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 // QDebug manipulators
 
 using QDebugManip = QDebug (*)(QDebug);
diff --git a/lib/networkaccessmanager.cpp b/lib/networkaccessmanager.cpp
index 9ac589b8..7bff654c 100644
--- a/lib/networkaccessmanager.cpp
+++ b/lib/networkaccessmanager.cpp
@@ -23,15 +23,13 @@
 
 using namespace QMatrixClient;
 
-class NetworkAccessManager::Private
-{
+class NetworkAccessManager::Private {
 public:
     QList<QSslError> ignoredSslErrors;
 };
 
 NetworkAccessManager::NetworkAccessManager(QObject* parent)
-    : QNetworkAccessManager(parent)
-    , d(std::make_unique<Private>())
+    : QNetworkAccessManager(parent), d(std::make_unique<Private>())
 {}
 
 QList<QSslError> NetworkAccessManager::ignoredSslErrors() const
diff --git a/lib/networkaccessmanager.h b/lib/networkaccessmanager.h
index bf8f0cbc..dfa388f0 100644
--- a/lib/networkaccessmanager.h
+++ b/lib/networkaccessmanager.h
@@ -22,10 +22,8 @@
 
 #include <memory>
 
-namespace QMatrixClient
-{
-class NetworkAccessManager : public QNetworkAccessManager
-{
+namespace QMatrixClient {
+class NetworkAccessManager : public QNetworkAccessManager {
     Q_OBJECT
 public:
     NetworkAccessManager(QObject* parent = nullptr);
diff --git a/lib/networksettings.h b/lib/networksettings.h
index 0c21a9fe..75bf726d 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -24,10 +24,8 @@
 
 Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
 
-namespace QMatrixClient
-{
-class NetworkSettings : public SettingsGroup
-{
+namespace QMatrixClient {
+class NetworkSettings : public SettingsGroup {
     Q_OBJECT
     QMC_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
     QMC_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h
index 1b3229d4..94c1ec60 100644
--- a/lib/qt_connection_util.h
+++ b/lib/qt_connection_util.h
@@ -22,10 +22,8 @@
 
 #include <QtCore/QPointer>
 
-namespace QMatrixClient
-{
-namespace _impl
-{
+namespace QMatrixClient {
+namespace _impl {
     template <typename SenderT, typename SignalT, typename ContextT, typename... ArgTs>
     inline QMetaObject::Connection
     connectUntil(SenderT* sender, SignalT signal, ContextT* context,
@@ -86,12 +84,10 @@ inline auto connectSingleShot(SenderT* sender, SignalT signal,
  * destruction.
  */
 template <typename T>
-class ConnectionsGuard : public QPointer<T>
-{
+class ConnectionsGuard : public QPointer<T> {
 public:
     ConnectionsGuard(T* publisher, QObject* subscriber)
-        : QPointer<T>(publisher)
-        , subscriber(subscriber)
+        : QPointer<T>(publisher), subscriber(subscriber)
     {}
     ~ConnectionsGuard()
     {
diff --git a/lib/room.cpp b/lib/room.cpp
index cf58f3c0..b32d3492 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -78,24 +78,16 @@ using std::move;
 using std::llround;
 #endif
 
-enum EventsPlacement : int
-{
-    Older = -1,
-    Newer = 1
-};
+enum EventsPlacement : int { Older = -1, Newer = 1 };
 
-class Room::Private
-{
+class Room::Private {
 public:
     /// Map of user names to users
     /** User names potentially duplicate, hence QMultiHash. */
     using members_map_t = QMultiHash<QString, User*>;
 
     Private(Connection* c, QString id_, JoinState initialJoinState)
-        : q(nullptr)
-        , connection(c)
-        , id(move(id_))
-        , joinState(initialJoinState)
+        : q(nullptr), connection(c), id(move(id_)), joinState(initialJoinState)
     {}
 
     Room* q;
@@ -144,8 +136,7 @@ public:
     QPointer<GetRoomEventsJob> eventsHistoryJob;
     QPointer<GetMembersByRoomJob> allMembersJob;
 
-    struct FileTransferPrivateInfo
-    {
+    struct FileTransferPrivateInfo {
         FileTransferPrivateInfo() = default;
         FileTransferPrivateInfo(BaseJob* j, const QString& fileName,
                                 bool isUploading = false)
@@ -354,8 +345,7 @@ private:
 decltype(Room::Private::baseState) Room::Private::stubbedState {};
 
 Room::Room(Connection* connection, QString id, JoinState initialJoinState)
-    : QObject(connection)
-    , d(new Private(connection, id, initialJoinState))
+    : QObject(connection), d(new Private(connection, id, initialJoinState))
 {
     setObjectName(id);
     // See "Accessing the Public Class" section in
@@ -1617,9 +1607,9 @@ QString Room::postFile(const QString& plainText, const QUrl& localPath,
                         // Normally in this situation we should instruct
                         // the media server to delete the file; alas, there's no
                         // API specced for that.
-                        qCWarning(MAIN)
-                            << "File uploaded to" << mxcUri
-                            << "but the event referring to it was cancelled";
+                        qCWarning(MAIN) << "File uploaded to" << mxcUri
+                                        << "but the event referring to it was "
+                                           "cancelled";
                     }
                     context->deleteLater();
                 }
@@ -2382,9 +2372,9 @@ Room::Changes Room::processStateEvent(const RoomEvent& e)
                 break;
             case MembershipType::Join:
                 if (evt.membership() == MembershipType::Invite)
-                    qCWarning(MAIN)
-                        << "Invalid membership change from Join to Invite:"
-                        << evt;
+                    qCWarning(MAIN) << "Invalid membership change from "
+                                       "Join to Invite:"
+                                    << evt;
                 if (evt.membership() != prevMembership) {
                     disconnect(u, &User::nameAboutToChange, this, nullptr);
                     disconnect(u, &User::nameChanged, this, nullptr);
@@ -2564,7 +2554,8 @@ Room::Private::buildShortlist(const ContT& users) const
     std::partial_sort_copy(
         users.begin(), users.end(), shortlist.begin(), shortlist.end(),
         [this](const User* u1, const User* u2) {
-            // localUser(), if it's in the list, is sorted below all others
+            // localUser(), if it's in the list, is sorted
+            // below all others
             return isLocalUser(u2) || (!isLocalUser(u1) && u1->id() < u2->id());
         });
     return shortlist;
diff --git a/lib/room.h b/lib/room.h
index f5433fb6..d6fb8a61 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -35,8 +35,7 @@
 #include <memory>
 #include <utility>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class Event;
 class Avatar;
 class SyncRoomData;
@@ -52,8 +51,7 @@ class RedactEventJob;
  * This is specifically tuned to work with QML exposing all traits as
  * Q_PROPERTY values.
  */
-class FileTransferInfo
-{
+class FileTransferInfo {
     Q_GADGET
     Q_PROPERTY(bool isUpload MEMBER isUpload CONSTANT)
     Q_PROPERTY(bool active READ active CONSTANT)
@@ -65,14 +63,7 @@ class FileTransferInfo
     Q_PROPERTY(QUrl localDir MEMBER localDir CONSTANT)
     Q_PROPERTY(QUrl localPath MEMBER localPath CONSTANT)
 public:
-    enum Status
-    {
-        None,
-        Started,
-        Completed,
-        Failed,
-        Cancelled
-    };
+    enum Status { None, Started, Completed, Failed, Cancelled };
     Status status = None;
     bool isUpload = false;
     int progress = 0;
@@ -86,8 +77,7 @@ public:
     bool failed() const { return status == Failed; }
 };
 
-class Room : public QObject
-{
+class Room : public QObject {
     Q_OBJECT
     Q_PROPERTY(Connection* connection READ connection CONSTANT)
     Q_PROPERTY(User* localUser READ localUser CONSTANT)
@@ -146,8 +136,7 @@ public:
     using rev_iter_t = Timeline::const_reverse_iterator;
     using timeline_iter_t = Timeline::const_iterator;
 
-    enum Change : uint
-    {
+    enum Change : uint {
         NoChange = 0x0,
         NameChange = 0x1,
         CanonicalAliasChange = 0x2,
@@ -663,12 +652,9 @@ private:
     void setJoinState(JoinState state);
 };
 
-class MemberSorter
-{
+class MemberSorter {
 public:
-    explicit MemberSorter(const Room* r)
-        : room(r)
-    {}
+    explicit MemberSorter(const Room* r) : room(r) {}
 
     bool operator()(User* u1, User* u2) const;
     bool operator()(User* u1, const QString& u2name) const;
diff --git a/lib/settings.h b/lib/settings.h
index e1ca0866..6747631e 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -24,10 +24,8 @@
 
 class QVariant;
 
-namespace QMatrixClient
-{
-class Settings : public QSettings
-{
+namespace QMatrixClient {
+class Settings : public QSettings {
     Q_OBJECT
 public:
     /**
@@ -42,9 +40,7 @@ public:
 #if defined(_MSC_VER) && _MSC_VER < 1900
     // VS 2013 (and probably older) aren't friends with 'using' statements
     // that involve private constructors
-    explicit Settings(QObject* parent = 0)
-        : QSettings(parent)
-    {}
+    explicit Settings(QObject* parent = 0) : QSettings(parent) {}
 #else
     using QSettings::QSettings;
 #endif
@@ -71,8 +67,7 @@ protected:
     QSettings legacySettings { legacyOrganizationName, legacyApplicationName };
 };
 
-class SettingsGroup : public Settings
-{
+class SettingsGroup : public Settings {
 public:
     template <typename... ArgTs>
     explicit SettingsGroup(QString path, ArgTs&&... qsettingsArgs)
@@ -121,8 +116,7 @@ private:
         setValue(QStringLiteral(qsettingname), std::move(newValue));  \
     }
 
-class AccountSettings : public SettingsGroup
-{
+class AccountSettings : public SettingsGroup {
     Q_OBJECT
     Q_PROPERTY(QString userId READ userId CONSTANT)
     QMC_DECLARE_SETTING(QString, deviceId, setDeviceId)
diff --git a/lib/syncdata.h b/lib/syncdata.h
index 6932878d..ad9902e4 100644
--- a/lib/syncdata.h
+++ b/lib/syncdata.h
@@ -22,8 +22,7 @@
 
 #include "events/stateevent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 /// Room summary, as defined in MSC688
 /**
  * Every member of this structure is an Omittable; as per the MSC, only
@@ -32,8 +31,7 @@ namespace QMatrixClient
  * means that nothing has come from the server; heroes.value().isEmpty()
  * means a peculiar case of a room with the only member - the current user.
  */
-struct RoomSummary
-{
+struct RoomSummary {
     Omittable<int> joinedMemberCount;
     Omittable<int> invitedMemberCount;
     Omittable<QStringList> heroes; //< mxids of users to take part in the room
@@ -48,14 +46,12 @@ struct RoomSummary
 };
 
 template <>
-struct JsonObjectConverter<RoomSummary>
-{
+struct JsonObjectConverter<RoomSummary> {
     static void dumpTo(QJsonObject& jo, const RoomSummary& rs);
     static void fillFrom(const QJsonObject& jo, RoomSummary& rs);
 };
 
-class SyncRoomData
-{
+class SyncRoomData {
 public:
     QString roomId;
     JoinState joinState;
@@ -82,8 +78,7 @@ public:
 // QVector cannot work with non-copiable objects, std::vector can.
 using SyncDataList = std::vector<SyncRoomData>;
 
-class SyncData
-{
+class SyncData {
 public:
     SyncData() = default;
     explicit SyncData(const QString& cacheFileName);
diff --git a/lib/user.cpp b/lib/user.cpp
index f0216454..0705aee7 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -41,8 +41,7 @@ using namespace QMatrixClient;
 using namespace std::placeholders;
 using std::move;
 
-class User::Private
-{
+class User::Private {
 public:
     static Avatar makeAvatar(QUrl url) { return Avatar(move(url)); }
 
@@ -184,8 +183,7 @@ void User::Private::setAvatarForRoom(const Room* r, const QUrl& newUrl,
 }
 
 User::User(QString userId, Connection* connection)
-    : QObject(connection)
-    , d(new Private(move(userId), connection))
+    : QObject(connection), d(new Private(move(userId), connection))
 {
     setObjectName(userId);
 }
diff --git a/lib/user.h b/lib/user.h
index f4d7cff3..779efb34 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -23,14 +23,12 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 class Connection;
 class Room;
 class RoomMemberEvent;
 
-class User : public QObject
-{
+class User : public QObject {
     Q_OBJECT
     Q_PROPERTY(QString id READ id CONSTANT)
     Q_PROPERTY(bool isGuest READ isGuest CONSTANT)
diff --git a/lib/util.cpp b/lib/util.cpp
index 9e0807c6..1919e811 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -124,7 +124,8 @@ QString QMatrixClient::serverPart(const QString& mxId)
                         % ServerPartRegEx % ")$";
     static QRegularExpression parser(
         re,
-        QRegularExpression::UseUnicodePropertiesOption); // Because Asian digits
+        QRegularExpression::UseUnicodePropertiesOption); // Because Asian
+                                                         // digits
     return parser.match(mxId).captured(1);
 }
 
@@ -148,16 +149,14 @@ void f2(int, QString);
 static_assert(std::is_same<fn_arg_t<decltype(f2), 1>, QString>::value,
               "Test fn_arg_t<>");
 
-struct S
-{
+struct S {
     int mf();
 };
 static_assert(is_callable_v<decltype(&S::mf)>, "Test member function");
 static_assert(returns<int, decltype(&S::mf)>(),
               "Test returns<> with member function");
 
-struct Fo
-{
+struct Fo {
     int operator()();
 };
 static_assert(is_callable_v<Fo>, "Test is_callable<> with function object");
@@ -165,8 +164,7 @@ static_assert(function_traits<Fo>::arg_number == 0, "Test function object");
 static_assert(std::is_same<fn_return_t<Fo>, int>::value,
               "Test return type of function object");
 
-struct Fo1
-{
+struct Fo1 {
     void operator()(int);
 };
 static_assert(function_traits<Fo1>::arg_number == 1, "Test function object 1");
@@ -182,13 +180,11 @@ static_assert(std::is_same<fn_return_t<decltype(l)>, int>::value,
 #endif
 
 template <typename T>
-struct fn_object
-{
+struct fn_object {
     static int smf(double) { return 0; }
 };
 template <>
-struct fn_object<QString>
-{
+struct fn_object<QString> {
     void operator()(QString);
 };
 static_assert(is_callable_v<fn_object<QString>>, "Test function object");
diff --git a/lib/util.h b/lib/util.h
index a29f6253..d055fa46 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -63,8 +63,7 @@ static void qAsConst(const T&&) Q_DECL_EQ_DELETE;
 #    define BROKEN_INITIALIZER_LISTS
 #endif
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 // The below enables pretty-printing of enums in logs
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
 #    define REGISTER_ENUM(EnumName) Q_ENUM(EnumName)
@@ -88,8 +87,7 @@ inline auto unique_ptr_cast(PtrT2&& p)
     return std::unique_ptr<T1>(static_cast<T1*>(p.release()));
 }
 
-struct NoneTag
-{};
+struct NoneTag {};
 constexpr NoneTag none {};
 
 /** A crude substitute for `optional` while we're not C++17
@@ -97,27 +95,17 @@ constexpr NoneTag none {};
  * Only works with default-constructible types.
  */
 template <typename T>
-class Omittable
-{
+class Omittable {
     static_assert(!std::is_reference<T>::value,
                   "You cannot make an Omittable<> with a reference type");
 
 public:
     using value_type = std::decay_t<T>;
 
-    explicit Omittable()
-        : Omittable(none)
-    {}
-    Omittable(NoneTag)
-        : _value(value_type())
-        , _omitted(true)
-    {}
-    Omittable(const value_type& val)
-        : _value(val)
-    {}
-    Omittable(value_type&& val)
-        : _value(std::move(val))
-    {}
+    explicit Omittable() : Omittable(none) {}
+    Omittable(NoneTag) : _value(value_type()), _omitted(true) {}
+    Omittable(const value_type& val) : _value(val) {}
+    Omittable(value_type&& val) : _value(std::move(val)) {}
     Omittable<T>& operator=(const value_type& val)
     {
         _value = val;
@@ -192,8 +180,7 @@ private:
     bool _omitted = false;
 };
 
-namespace _impl
-{
+namespace _impl {
     template <typename AlwaysVoid, typename>
     struct fn_traits;
 }
@@ -205,13 +192,11 @@ namespace _impl
  * https://stackoverflow.com/questions/7943525/is-it-possible-to-figure-out-the-parameter-type-and-return-type-of-a-lambda#7943765
  */
 template <typename T>
-struct function_traits : public _impl::fn_traits<void, T>
-{};
+struct function_traits : public _impl::fn_traits<void, T> {};
 
 // Specialisation for a function
 template <typename ReturnT, typename... ArgTs>
-struct function_traits<ReturnT(ArgTs...)>
-{
+struct function_traits<ReturnT(ArgTs...)> {
     static constexpr auto is_callable = true;
     using return_type = ReturnT;
     using arg_types = std::tuple<ArgTs...>;
@@ -219,30 +204,26 @@ struct function_traits<ReturnT(ArgTs...)>
     static constexpr auto arg_number = std::tuple_size<arg_types>::value;
 };
 
-namespace _impl
-{
+namespace _impl {
     template <typename AlwaysVoid, typename T>
-    struct fn_traits
-    {
+    struct fn_traits {
         static constexpr auto is_callable = false;
     };
 
     template <typename T>
     struct fn_traits<decltype(void(&T::operator())), T>
-        : public fn_traits<void, decltype(&T::operator())>
-    {}; // A generic function object that has (non-overloaded) operator()
+        : public fn_traits<void, decltype(&T::operator())> {
+    }; // A generic function object that has (non-overloaded) operator()
 
     // Specialisation for a member function
     template <typename ReturnT, typename ClassT, typename... ArgTs>
     struct fn_traits<void, ReturnT (ClassT::*)(ArgTs...)>
-        : function_traits<ReturnT(ArgTs...)>
-    {};
+        : function_traits<ReturnT(ArgTs...)> {};
 
     // Specialisation for a const member function
     template <typename ReturnT, typename ClassT, typename... ArgTs>
     struct fn_traits<void, ReturnT (ClassT::*)(ArgTs...) const>
-        : function_traits<ReturnT(ArgTs...)>
-    {};
+        : function_traits<ReturnT(ArgTs...)> {};
 } // namespace _impl
 
 template <typename FnT>
@@ -272,22 +253,15 @@ inline auto operator"" _ls(const char* s, std::size_t size)
  * are at least ForwardIterators. Inspired by Ranges TS.
  */
 template <typename ArrayT>
-class Range
-{
+class Range {
     // Looking forward for Ranges TS to produce something (in C++23?..)
     using iterator = typename ArrayT::iterator;
     using const_iterator = typename ArrayT::const_iterator;
     using size_type = typename ArrayT::size_type;
 
 public:
-    Range(ArrayT& arr)
-        : from(std::begin(arr))
-        , to(std::end(arr))
-    {}
-    Range(iterator from, iterator to)
-        : from(from)
-        , to(to)
-    {}
+    Range(ArrayT& arr) : from(std::begin(arr)), to(std::end(arr)) {}
+    Range(iterator from, iterator to) : from(from), to(to) {}
 
     size_type size() const
     {
-- 
cgit v1.2.3


From 7a5b359b8823646ce97cbaf05c251cb04c291466 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 7 Jul 2019 18:16:30 +0900
Subject: Rename zero-impact strings

---
 .travis.yml              | 2 +-
 CMakeLists.txt           | 2 +-
 examples/qmc-example.cpp | 2 +-
 lib/connection.cpp       | 5 ++---
 lib/jobs/basejob.cpp     | 4 ++--
 lib/settings.h           | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/.travis.yml b/.travis.yml
index d02c5058..6c8d8ceb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ install:
 - pushd 3rdparty/libQtOlm
 - git clone https://gitlab.matrix.org/matrix-org/olm.git
 - popd
-- git clone https://github.com/QMatrixClient/matrix-doc.git
+- git clone https://github.com/quotient-im/matrix-doc.git
 - git clone --recursive https://github.com/KitsuneRal/gtad.git
 - pushd gtad
 - cmake $USE_NINJA -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} .
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 996e76d4..44f4df9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ endif()
 
 message( STATUS )
 message( STATUS "=============================================================================" )
-message( STATUS "                       libqmatrixclient Build Information" )
+message( STATUS "                       libQuotient Build Information" )
 message( STATUS "=============================================================================" )
 message( STATUS "Version: ${PROJECT_VERSION}, API version: ${API_VERSION}")
 if (CMAKE_BUILD_TYPE)
diff --git a/examples/qmc-example.cpp b/examples/qmc-example.cpp
index f649ac3f..4a06d9b8 100644
--- a/examples/qmc-example.cpp
+++ b/examples/qmc-example.cpp
@@ -435,7 +435,7 @@ void QMCTest::setTopic()
 void QMCTest::addAndRemoveTag()
 {
     running.push_back("Tagging test");
-    static const auto TestTag = QStringLiteral("org.qmatrixclient.test");
+    static const auto TestTag = QStringLiteral("org.quotient.test");
     // Pre-requisite
     if (targetRoom->tags().contains(TestTag))
         targetRoom->removeTag(TestTag);
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 6cd6ad0b..58d2e01a 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -95,8 +95,7 @@ public:
     DirectChatsMap directChats;
     DirectChatUsersMap directChatUsers;
     // The below two variables track local changes between sync completions.
-    // See also:
-    // https://github.com/QMatrixClient/libqmatrixclient/wiki/Handling-direct-chat-events
+    // See https://github.com/quotient-im/libQuotient/wiki/Handling-direct-chat-events
     DirectChatsMap dcLocalAdditions;
     DirectChatsMap dcLocalRemovals;
     std::unordered_map<QString, EventPtr> accountData;
@@ -435,7 +434,7 @@ void Connection::onSyncSuccess(SyncData&& data, bool fromCache)
         visit(
             *eventPtr,
             [this](const DirectChatEvent& dce) {
-                // https://github.com/QMatrixClient/libqmatrixclient/wiki/Handling-direct-chat-events
+                // https://github.com/quotient-im/libQuotient/wiki/Handling-direct-chat-events
                 const auto& usersToDCs = dce.usersToDirectChats();
                 DirectChatsMap remoteRemovals =
                     erase_if(d->directChats, [&usersToDCs, this](auto it) {
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index a6471ece..5615736e 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -321,7 +321,7 @@ bool checkContentType(const QByteArray& type, const QByteArrayList& patterns)
 BaseJob::Status BaseJob::doCheckReply(QNetworkReply* reply) const
 {
     // QNetworkReply error codes seem to be flawed when it comes to HTTP;
-    // see, e.g., https://github.com/QMatrixClient/libqmatrixclient/issues/200
+    // see, e.g., https://github.com/quotient-im/libQuotient/issues/200
     // so check genuine HTTP codes. The below processing is based on
     // https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
     const auto httpCodeHeader =
@@ -576,7 +576,7 @@ QUrl BaseJob::errorUrl() const { return d->errorUrl; }
 void BaseJob::setStatus(Status s)
 {
     // The crash that led to this code has been reported in
-    // https://github.com/QMatrixClient/Quaternion/issues/566 - basically,
+    // https://github.com/quotient-im/Quaternion/issues/566 - basically,
     // when cleaning up childrent of a deleted Connection, there's a chance
     // of pending jobs being abandoned, calling setStatus(Abandoned).
     // There's nothing wrong with this; however, the safety check for
diff --git a/lib/settings.h b/lib/settings.h
index 6747631e..427f5494 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -140,7 +140,7 @@ public:
     /** \deprecated \sa setToken */
     QString accessToken() const;
     /** \deprecated Storing accessToken in QSettings is unsafe,
-     * see QMatrixClient/Quaternion#181 */
+     * see quotient-im/Quaternion#181 */
     void setAccessToken(const QString& accessToken);
     Q_INVOKABLE void clearAccessToken();
 
-- 
cgit v1.2.3


From 27ca32a1e5a56e09b9cc1d94224d2831004dcf3d Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 7 Jul 2019 19:32:34 +0900
Subject: Namespace: QMatrixClient -> Quotient (with back comp alias)

---
 examples/qmc-example.cpp                               |  2 +-
 lib/application-service/definitions/location.cpp       |  2 +-
 lib/application-service/definitions/location.h         |  4 ++--
 lib/application-service/definitions/protocol.cpp       |  2 +-
 lib/application-service/definitions/protocol.h         |  4 ++--
 lib/application-service/definitions/user.cpp           |  2 +-
 lib/application-service/definitions/user.h             |  4 ++--
 lib/avatar.cpp                                         |  2 +-
 lib/avatar.h                                           |  6 ++++--
 lib/connection.cpp                                     |  6 +++---
 lib/connection.h                                       |  6 +++---
 lib/connectiondata.cpp                                 |  2 +-
 lib/connectiondata.h                                   |  4 ++--
 lib/converters.cpp                                     |  2 +-
 lib/converters.h                                       |  4 ++--
 lib/csapi/account-data.cpp                             |  2 +-
 lib/csapi/account-data.h                               |  4 ++--
 lib/csapi/admin.cpp                                    |  6 +++---
 lib/csapi/admin.h                                      |  4 ++--
 lib/csapi/administrative_contact.cpp                   | 10 +++++-----
 lib/csapi/administrative_contact.h                     |  4 ++--
 lib/csapi/appservice_room_directory.cpp                |  2 +-
 lib/csapi/appservice_room_directory.h                  |  4 ++--
 lib/csapi/banning.cpp                                  |  2 +-
 lib/csapi/banning.h                                    |  4 ++--
 lib/csapi/capabilities.cpp                             |  6 +++---
 lib/csapi/capabilities.h                               |  4 ++--
 lib/csapi/content-repo.cpp                             |  2 +-
 lib/csapi/content-repo.h                               |  4 ++--
 lib/csapi/create_room.cpp                              |  6 +++---
 lib/csapi/create_room.h                                |  4 ++--
 lib/csapi/definitions/auth_data.cpp                    |  2 +-
 lib/csapi/definitions/auth_data.h                      |  4 ++--
 lib/csapi/definitions/client_device.cpp                |  2 +-
 lib/csapi/definitions/client_device.h                  |  4 ++--
 lib/csapi/definitions/device_keys.cpp                  |  2 +-
 lib/csapi/definitions/device_keys.h                    |  4 ++--
 lib/csapi/definitions/event_filter.cpp                 |  2 +-
 lib/csapi/definitions/event_filter.h                   |  4 ++--
 lib/csapi/definitions/public_rooms_response.cpp        |  2 +-
 lib/csapi/definitions/public_rooms_response.h          |  4 ++--
 lib/csapi/definitions/push_condition.cpp               |  2 +-
 lib/csapi/definitions/push_condition.h                 |  4 ++--
 lib/csapi/definitions/push_rule.cpp                    |  2 +-
 lib/csapi/definitions/push_rule.h                      |  4 ++--
 lib/csapi/definitions/push_ruleset.cpp                 |  2 +-
 lib/csapi/definitions/push_ruleset.h                   |  4 ++--
 lib/csapi/definitions/room_event_filter.cpp            |  2 +-
 lib/csapi/definitions/room_event_filter.h              |  4 ++--
 lib/csapi/definitions/sync_filter.cpp                  |  2 +-
 lib/csapi/definitions/sync_filter.h                    |  4 ++--
 lib/csapi/definitions/user_identifier.cpp              |  2 +-
 lib/csapi/definitions/user_identifier.h                |  4 ++--
 lib/csapi/definitions/wellknown/full.cpp               |  2 +-
 lib/csapi/definitions/wellknown/full.h                 |  4 ++--
 lib/csapi/definitions/wellknown/homeserver.cpp         |  2 +-
 lib/csapi/definitions/wellknown/homeserver.h           |  4 ++--
 lib/csapi/definitions/wellknown/identity_server.cpp    |  2 +-
 lib/csapi/definitions/wellknown/identity_server.h      |  4 ++--
 lib/csapi/device_management.cpp                        |  2 +-
 lib/csapi/device_management.h                          |  4 ++--
 lib/csapi/directory.cpp                                |  2 +-
 lib/csapi/directory.h                                  |  4 ++--
 lib/csapi/event_context.cpp                            |  2 +-
 lib/csapi/event_context.h                              |  4 ++--
 lib/csapi/filter.cpp                                   |  2 +-
 lib/csapi/filter.h                                     |  4 ++--
 lib/csapi/inviting.cpp                                 |  2 +-
 lib/csapi/inviting.h                                   |  4 ++--
 lib/csapi/joining.cpp                                  | 10 +++++-----
 lib/csapi/joining.h                                    |  4 ++--
 lib/csapi/keys.cpp                                     |  6 +++---
 lib/csapi/keys.h                                       |  4 ++--
 lib/csapi/kicking.cpp                                  |  2 +-
 lib/csapi/kicking.h                                    |  4 ++--
 lib/csapi/leaving.cpp                                  |  2 +-
 lib/csapi/leaving.h                                    |  4 ++--
 lib/csapi/list_joined_rooms.cpp                        |  2 +-
 lib/csapi/list_joined_rooms.h                          |  4 ++--
 lib/csapi/list_public_rooms.cpp                        |  6 +++---
 lib/csapi/list_public_rooms.h                          |  4 ++--
 lib/csapi/login.cpp                                    |  6 +++---
 lib/csapi/login.h                                      |  4 ++--
 lib/csapi/logout.cpp                                   |  2 +-
 lib/csapi/logout.h                                     |  4 ++--
 lib/csapi/message_pagination.cpp                       |  2 +-
 lib/csapi/message_pagination.h                         |  4 ++--
 lib/csapi/notifications.cpp                            |  6 +++---
 lib/csapi/notifications.h                              |  4 ++--
 lib/csapi/openid.cpp                                   |  2 +-
 lib/csapi/openid.h                                     |  4 ++--
 lib/csapi/peeking_events.cpp                           |  2 +-
 lib/csapi/peeking_events.h                             |  4 ++--
 lib/csapi/presence.cpp                                 |  2 +-
 lib/csapi/presence.h                                   |  4 ++--
 lib/csapi/profile.cpp                                  |  2 +-
 lib/csapi/profile.h                                    |  4 ++--
 lib/csapi/pusher.cpp                                   | 10 +++++-----
 lib/csapi/pusher.h                                     |  4 ++--
 lib/csapi/pushrules.cpp                                |  2 +-
 lib/csapi/pushrules.h                                  |  4 ++--
 lib/csapi/read_markers.cpp                             |  2 +-
 lib/csapi/read_markers.h                               |  4 ++--
 lib/csapi/receipts.cpp                                 |  2 +-
 lib/csapi/receipts.h                                   |  4 ++--
 lib/csapi/redaction.cpp                                |  2 +-
 lib/csapi/redaction.h                                  |  4 ++--
 lib/csapi/registration.cpp                             |  2 +-
 lib/csapi/registration.h                               |  4 ++--
 lib/csapi/report_content.cpp                           |  2 +-
 lib/csapi/report_content.h                             |  4 ++--
 lib/csapi/room_send.cpp                                |  2 +-
 lib/csapi/room_send.h                                  |  4 ++--
 lib/csapi/room_state.cpp                               |  2 +-
 lib/csapi/room_state.h                                 |  4 ++--
 lib/csapi/room_upgrades.cpp                            |  2 +-
 lib/csapi/room_upgrades.h                              |  4 ++--
 lib/csapi/rooms.cpp                                    |  6 +++---
 lib/csapi/rooms.h                                      |  4 ++--
 lib/csapi/search.cpp                                   |  6 +++---
 lib/csapi/search.h                                     |  4 ++--
 lib/csapi/sso_login_redirect.cpp                       |  2 +-
 lib/csapi/sso_login_redirect.h                         |  4 ++--
 lib/csapi/tags.cpp                                     |  6 +++---
 lib/csapi/tags.h                                       |  4 ++--
 lib/csapi/third_party_lookup.cpp                       |  2 +-
 lib/csapi/third_party_lookup.h                         |  4 ++--
 lib/csapi/third_party_membership.cpp                   |  2 +-
 lib/csapi/third_party_membership.h                     |  4 ++--
 lib/csapi/to_device.cpp                                |  2 +-
 lib/csapi/to_device.h                                  |  4 ++--
 lib/csapi/typing.cpp                                   |  2 +-
 lib/csapi/typing.h                                     |  4 ++--
 lib/csapi/users.cpp                                    |  6 +++---
 lib/csapi/users.h                                      |  4 ++--
 lib/csapi/versions.cpp                                 |  2 +-
 lib/csapi/versions.h                                   |  4 ++--
 lib/csapi/voip.cpp                                     |  2 +-
 lib/csapi/voip.h                                       |  4 ++--
 lib/csapi/wellknown.cpp                                |  2 +-
 lib/csapi/wellknown.h                                  |  4 ++--
 lib/csapi/whoami.cpp                                   |  2 +-
 lib/csapi/whoami.h                                     |  4 ++--
 lib/csapi/{{base}}.cpp.mustache                        |  4 ++--
 lib/csapi/{{base}}.h.mustache                          |  4 ++--
 lib/e2ee.h                                             |  4 ++--
 lib/encryptionmanager.cpp                              |  2 +-
 lib/encryptionmanager.h                                |  4 ++--
 lib/eventitem.cpp                                      |  2 +-
 lib/eventitem.h                                        |  6 +++---
 lib/events/accountdataevents.h                         |  4 ++--
 lib/events/callanswerevent.cpp                         |  2 +-
 lib/events/callanswerevent.h                           |  4 ++--
 lib/events/callcandidatesevent.h                       |  4 ++--
 lib/events/callhangupevent.cpp                         |  2 +-
 lib/events/callhangupevent.h                           |  4 ++--
 lib/events/callinviteevent.cpp                         |  2 +-
 lib/events/callinviteevent.h                           |  4 ++--
 lib/events/directchatevent.cpp                         |  2 +-
 lib/events/directchatevent.h                           |  4 ++--
 lib/events/encryptedevent.h                            |  4 ++--
 lib/events/encryptionevent.cpp                         |  6 +++---
 lib/events/encryptionevent.h                           |  4 ++--
 lib/events/event.cpp                                   |  2 +-
 lib/events/event.h                                     | 10 +++++-----
 lib/events/eventcontent.cpp                            |  2 +-
 lib/events/eventcontent.h                              |  4 ++--
 lib/events/eventloader.h                               |  4 ++--
 lib/events/reactionevent.cpp                           |  4 ++--
 lib/events/reactionevent.h                             |  4 ++--
 lib/events/receiptevent.cpp                            |  2 +-
 lib/events/receiptevent.h                              |  4 ++--
 lib/events/redactionevent.h                            |  4 ++--
 lib/events/roomavatarevent.h                           |  4 ++--
 lib/events/roomcreateevent.cpp                         |  2 +-
 lib/events/roomcreateevent.h                           |  4 ++--
 lib/events/roomevent.cpp                               |  4 ++--
 lib/events/roomevent.h                                 |  8 ++++----
 lib/events/roommemberevent.cpp                         |  6 +++---
 lib/events/roommemberevent.h                           |  4 ++--
 lib/events/roommessageevent.cpp                        |  6 +++---
 lib/events/roommessageevent.h                          |  4 ++--
 lib/events/roomtombstoneevent.cpp                      |  2 +-
 lib/events/roomtombstoneevent.h                        |  4 ++--
 lib/events/simplestateevents.h                         |  6 +++---
 lib/events/stateevent.cpp                              |  2 +-
 lib/events/stateevent.h                                |  8 ++++----
 lib/events/typingevent.cpp                             |  2 +-
 lib/events/typingevent.h                               |  4 ++--
 lib/identity/definitions/request_email_validation.cpp  |  2 +-
 lib/identity/definitions/request_email_validation.h    |  4 ++--
 lib/identity/definitions/request_msisdn_validation.cpp |  2 +-
 lib/identity/definitions/request_msisdn_validation.h   |  4 ++--
 lib/identity/definitions/sid.cpp                       |  2 +-
 lib/identity/definitions/sid.h                         |  4 ++--
 lib/jobs/basejob.cpp                                   |  2 +-
 lib/jobs/basejob.h                                     |  4 ++--
 lib/jobs/downloadfilejob.cpp                           |  2 +-
 lib/jobs/downloadfilejob.h                             |  4 ++--
 lib/jobs/mediathumbnailjob.cpp                         |  2 +-
 lib/jobs/mediathumbnailjob.h                           |  4 ++--
 lib/jobs/postreadmarkersjob.h                          |  2 +-
 lib/jobs/requestdata.cpp                               |  2 +-
 lib/jobs/requestdata.h                                 |  6 ++++--
 lib/jobs/syncjob.cpp                                   |  2 +-
 lib/jobs/syncjob.h                                     |  4 ++--
 lib/joinstate.h                                        |  6 +++---
 lib/logging.h                                          |  6 ++++--
 lib/networkaccessmanager.cpp                           |  2 +-
 lib/networkaccessmanager.h                             |  4 ++--
 lib/networksettings.cpp                                |  2 +-
 lib/networksettings.h                                  |  2 +-
 lib/qt_connection_util.h                               |  4 ++--
 lib/room.cpp                                           |  4 ++--
 lib/room.h                                             | 10 +++++-----
 lib/settings.cpp                                       |  2 +-
 lib/settings.h                                         |  4 ++--
 lib/syncdata.cpp                                       |  4 ++--
 lib/syncdata.h                                         |  4 ++--
 lib/user.cpp                                           |  2 +-
 lib/user.h                                             |  6 +++---
 lib/util.cpp                                           | 14 +++++++-------
 lib/util.h                                             |  6 ++++--
 223 files changed, 414 insertions(+), 406 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/examples/qmc-example.cpp b/examples/qmc-example.cpp
index 4a06d9b8..bf4d04c7 100644
--- a/examples/qmc-example.cpp
+++ b/examples/qmc-example.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <iostream>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 using std::cout;
 using std::endl;
 using namespace std::placeholders;
diff --git a/lib/application-service/definitions/location.cpp b/lib/application-service/definitions/location.cpp
index 2ab83ae9..0a054029 100644
--- a/lib/application-service/definitions/location.cpp
+++ b/lib/application-service/definitions/location.cpp
@@ -4,7 +4,7 @@
 
 #include "location.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<ThirdPartyLocation>::dumpTo(
     QJsonObject& jo, const ThirdPartyLocation& pod)
diff --git a/lib/application-service/definitions/location.h b/lib/application-service/definitions/location.h
index caf28615..77512514 100644
--- a/lib/application-service/definitions/location.h
+++ b/lib/application-service/definitions/location.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -30,4 +30,4 @@ struct JsonObjectConverter<ThirdPartyLocation>
     static void fillFrom(const QJsonObject& jo, ThirdPartyLocation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/application-service/definitions/protocol.cpp b/lib/application-service/definitions/protocol.cpp
index e87001fb..8c66aa4d 100644
--- a/lib/application-service/definitions/protocol.cpp
+++ b/lib/application-service/definitions/protocol.cpp
@@ -4,7 +4,7 @@
 
 #include "protocol.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<FieldType>::dumpTo(QJsonObject& jo,
                                             const FieldType& pod)
diff --git a/lib/application-service/definitions/protocol.h b/lib/application-service/definitions/protocol.h
index 0d227851..ab99264f 100644
--- a/lib/application-service/definitions/protocol.h
+++ b/lib/application-service/definitions/protocol.h
@@ -10,7 +10,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -85,4 +85,4 @@ struct JsonObjectConverter<ThirdPartyProtocol>
     static void fillFrom(const QJsonObject& jo, ThirdPartyProtocol& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/application-service/definitions/user.cpp b/lib/application-service/definitions/user.cpp
index 0f3c3130..17d15a20 100644
--- a/lib/application-service/definitions/user.cpp
+++ b/lib/application-service/definitions/user.cpp
@@ -4,7 +4,7 @@
 
 #include "user.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<ThirdPartyUser>::dumpTo(QJsonObject& jo,
                                                  const ThirdPartyUser& pod)
diff --git a/lib/application-service/definitions/user.h b/lib/application-service/definitions/user.h
index 3fd099d0..34c6829c 100644
--- a/lib/application-service/definitions/user.h
+++ b/lib/application-service/definitions/user.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -30,4 +30,4 @@ struct JsonObjectConverter<ThirdPartyUser>
     static void fillFrom(const QJsonObject& jo, ThirdPartyUser& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/avatar.cpp b/lib/avatar.cpp
index 614f008d..cb734984 100644
--- a/lib/avatar.cpp
+++ b/lib/avatar.cpp
@@ -29,7 +29,7 @@
 #include <QtCore/QStringBuilder>
 #include <QtGui/QPainter>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 using std::move;
 
 class Avatar::Private {
diff --git a/lib/avatar.h b/lib/avatar.h
index c33e1982..7a566bfa 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -24,7 +24,7 @@
 #include <functional>
 #include <memory>
 
-namespace QMatrixClient {
+namespace Quotient {
 class Connection;
 
 class Avatar {
@@ -56,4 +56,6 @@ private:
     class Private;
     std::unique_ptr<Private> d;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
+/// \deprecated Use namespace Quotient instead
+namespace QMatrixClient = Quotient;
\ No newline at end of file
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 58d2e01a..22db8e3d 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -53,7 +53,7 @@
 #include <QtCore/QStringBuilder>
 #include <QtNetwork/QDnsLookup>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 // This is very much Qt-specific; STL iterators don't have key() and value()
 template <typename HashT, typename Pred>
@@ -1349,9 +1349,9 @@ void Connection::setCacheState(bool newValue)
     }
 }
 
-bool QMatrixClient::Connection::lazyLoading() const { return d->lazyLoading; }
+bool Connection::lazyLoading() const { return d->lazyLoading; }
 
-void QMatrixClient::Connection::setLazyLoading(bool newValue)
+void Connection::setLazyLoading(bool newValue)
 {
     if (d->lazyLoading != newValue) {
         d->lazyLoading = newValue;
diff --git a/lib/connection.h b/lib/connection.h
index b89c0c65..c807b827 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -36,7 +36,7 @@ namespace QtOlm {
 class Account;
 }
 
-namespace QMatrixClient {
+namespace Quotient {
 class Room;
 class User;
 class ConnectionData;
@@ -778,5 +778,5 @@ private:
     static room_factory_t _roomFactory;
     static user_factory_t _userFactory;
 };
-} // namespace QMatrixClient
-Q_DECLARE_METATYPE(QMatrixClient::Connection*)
+} // namespace Quotient
+Q_DECLARE_METATYPE(Quotient::Connection*)
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp
index df4cece2..486de03d 100644
--- a/lib/connectiondata.cpp
+++ b/lib/connectiondata.cpp
@@ -21,7 +21,7 @@
 #include "logging.h"
 #include "networkaccessmanager.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 struct ConnectionData::Private {
     explicit Private(QUrl url) : baseUrl(std::move(url)) {}
diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index 9b579b1c..80ace08c 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -24,7 +24,7 @@
 
 class QNetworkAccessManager;
 
-namespace QMatrixClient {
+namespace Quotient {
 class ConnectionData {
 public:
     explicit ConnectionData(QUrl baseUrl);
@@ -50,4 +50,4 @@ private:
     struct Private;
     std::unique_ptr<Private> d;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/converters.cpp b/lib/converters.cpp
index ef58c85e..9f4b9360 100644
--- a/lib/converters.cpp
+++ b/lib/converters.cpp
@@ -20,7 +20,7 @@
 
 #include <QtCore/QVariant>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 QJsonValue JsonConverter<QVariant>::dump(const QVariant& v)
 {
diff --git a/lib/converters.h b/lib/converters.h
index 0085fa4b..587e4544 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -55,7 +55,7 @@ struct hash<QString> {
 
 class QVariant;
 
-namespace QMatrixClient {
+namespace Quotient {
 template <typename T>
 struct JsonObjectConverter {
     static void dumpTo(QJsonObject& jo, const T& pod) { jo = pod.toJson(); }
@@ -439,4 +439,4 @@ inline void addParam(ContT& container, const QString& key, ValT&& value)
     _impl::AddNode<std::decay_t<ValT>, Force>::impl(container, key,
                                                     std::forward<ValT>(value));
 }
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 7d4f1ad7..2e466fa3 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/account-data.h b/lib/csapi/account-data.h
index 75bb9ce3..7417da0d 100644
--- a/lib/csapi/account-data.h
+++ b/lib/csapi/account-data.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -122,4 +122,4 @@ public:
                                const QString& roomId, const QString& type);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/admin.cpp b/lib/csapi/admin.cpp
index 58334118..d2c20ba8 100644
--- a/lib/csapi/admin.cpp
+++ b/lib/csapi/admin.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -46,7 +46,7 @@ struct JsonObjectConverter<GetWhoIsJob::DeviceInfo>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetWhoIsJob::Private
 {
diff --git a/lib/csapi/admin.h b/lib/csapi/admin.h
index bc27c025..472ccf72 100644
--- a/lib/csapi/admin.h
+++ b/lib/csapi/admin.h
@@ -11,7 +11,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -94,4 +94,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp
index 067fb68a..32bc8c86 100644
--- a/lib/csapi/administrative_contact.cpp
+++ b/lib/csapi/administrative_contact.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -29,7 +29,7 @@ struct JsonObjectConverter<GetAccount3PIDsJob::ThirdPartyIdentifier>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetAccount3PIDsJob::Private
 {
@@ -67,7 +67,7 @@ BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -82,7 +82,7 @@ struct JsonObjectConverter<Post3PIDsJob::ThreePidCredentials>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 static const auto Post3PIDsJobName = QStringLiteral("Post3PIDsJob");
 
diff --git a/lib/csapi/administrative_contact.h b/lib/csapi/administrative_contact.h
index 7f2d0cdc..4ccd7596 100644
--- a/lib/csapi/administrative_contact.h
+++ b/lib/csapi/administrative_contact.h
@@ -12,7 +12,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -256,4 +256,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/appservice_room_directory.cpp b/lib/csapi/appservice_room_directory.cpp
index 74e037cd..87221aa4 100644
--- a/lib/csapi/appservice_room_directory.cpp
+++ b/lib/csapi/appservice_room_directory.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/appservice_room_directory.h b/lib/csapi/appservice_room_directory.h
index d1c3f89f..e19bf320 100644
--- a/lib/csapi/appservice_room_directory.h
+++ b/lib/csapi/appservice_room_directory.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -42,4 +42,4 @@ public:
                                                        const QString& visibility);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp
index a46e78f1..eac09d5a 100644
--- a/lib/csapi/banning.cpp
+++ b/lib/csapi/banning.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/banning.h b/lib/csapi/banning.h
index 0aa5785b..5df878a8 100644
--- a/lib/csapi/banning.h
+++ b/lib/csapi/banning.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -58,4 +58,4 @@ public:
     explicit UnbanJob(const QString& roomId, const QString& userId);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/capabilities.cpp b/lib/csapi/capabilities.cpp
index 9a054fe9..6a544a1e 100644
--- a/lib/csapi/capabilities.cpp
+++ b/lib/csapi/capabilities.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -49,7 +49,7 @@ struct JsonObjectConverter<GetCapabilitiesJob::Capabilities>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetCapabilitiesJob::Private
 {
diff --git a/lib/csapi/capabilities.h b/lib/csapi/capabilities.h
index f6e7ad06..b608a2f2 100644
--- a/lib/csapi/capabilities.h
+++ b/lib/csapi/capabilities.h
@@ -11,7 +11,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -84,4 +84,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index c2720d63..395337f3 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -9,7 +9,7 @@
 #include <QtCore/QStringBuilder>
 #include <QtNetwork/QNetworkReply>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/media/r0");
 
diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h
index 9f267f6c..83069490 100644
--- a/lib/csapi/content-repo.h
+++ b/lib/csapi/content-repo.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QIODevice>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -282,4 +282,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index e94cb008..68741f13 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -38,7 +38,7 @@ struct JsonObjectConverter<CreateRoomJob::StateEvent>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class CreateRoomJob::Private
 {
diff --git a/lib/csapi/create_room.h b/lib/csapi/create_room.h
index a066a3f3..e7000155 100644
--- a/lib/csapi/create_room.h
+++ b/lib/csapi/create_room.h
@@ -11,7 +11,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -235,4 +235,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/auth_data.cpp b/lib/csapi/definitions/auth_data.cpp
index 3bb51626..edeb7111 100644
--- a/lib/csapi/definitions/auth_data.cpp
+++ b/lib/csapi/definitions/auth_data.cpp
@@ -4,7 +4,7 @@
 
 #include "auth_data.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<AuthenticationData>::dumpTo(
     QJsonObject& jo, const AuthenticationData& pod)
diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
index 9e46812c..1aeea6c2 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/lib/csapi/definitions/auth_data.h
@@ -9,7 +9,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -34,4 +34,4 @@ struct JsonObjectConverter<AuthenticationData>
     static void fillFrom(QJsonObject jo, AuthenticationData& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/client_device.cpp b/lib/csapi/definitions/client_device.cpp
index c9e6a223..09544138 100644
--- a/lib/csapi/definitions/client_device.cpp
+++ b/lib/csapi/definitions/client_device.cpp
@@ -4,7 +4,7 @@
 
 #include "client_device.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<Device>::dumpTo(QJsonObject& jo, const Device& pod)
 {
diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index e4accc35..f076c4da 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -34,4 +34,4 @@ struct JsonObjectConverter<Device>
     static void fillFrom(const QJsonObject& jo, Device& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/device_keys.cpp b/lib/csapi/definitions/device_keys.cpp
index cc5262b7..0583840d 100644
--- a/lib/csapi/definitions/device_keys.cpp
+++ b/lib/csapi/definitions/device_keys.cpp
@@ -4,7 +4,7 @@
 
 #include "device_keys.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<DeviceKeys>::dumpTo(QJsonObject& jo,
                                              const DeviceKeys& pod)
diff --git a/lib/csapi/definitions/device_keys.h b/lib/csapi/definitions/device_keys.h
index 6bd96584..d1d8abef 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/lib/csapi/definitions/device_keys.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QHash>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -41,4 +41,4 @@ struct JsonObjectConverter<DeviceKeys>
     static void fillFrom(const QJsonObject& jo, DeviceKeys& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/event_filter.cpp b/lib/csapi/definitions/event_filter.cpp
index 9b2c7a33..b21e08b5 100644
--- a/lib/csapi/definitions/event_filter.cpp
+++ b/lib/csapi/definitions/event_filter.cpp
@@ -4,7 +4,7 @@
 
 #include "event_filter.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<EventFilter>::dumpTo(QJsonObject& jo,
                                               const EventFilter& pod)
diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h
index 9b9b3fa3..b41e2e9e 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/lib/csapi/definitions/event_filter.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -40,4 +40,4 @@ struct JsonObjectConverter<EventFilter>
     static void fillFrom(const QJsonObject& jo, EventFilter& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/public_rooms_response.cpp b/lib/csapi/definitions/public_rooms_response.cpp
index d07b1494..b6009718 100644
--- a/lib/csapi/definitions/public_rooms_response.cpp
+++ b/lib/csapi/definitions/public_rooms_response.cpp
@@ -4,7 +4,7 @@
 
 #include "public_rooms_response.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PublicRoomsChunk>::dumpTo(QJsonObject& jo,
                                                    const PublicRoomsChunk& pod)
diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h
index e86e306f..1cb3aad5 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/lib/csapi/definitions/public_rooms_response.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -67,4 +67,4 @@ struct JsonObjectConverter<PublicRoomsResponse>
     static void fillFrom(const QJsonObject& jo, PublicRoomsResponse& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp
index 5bcb845e..343b4f1a 100644
--- a/lib/csapi/definitions/push_condition.cpp
+++ b/lib/csapi/definitions/push_condition.cpp
@@ -4,7 +4,7 @@
 
 #include "push_condition.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo,
                                                 const PushCondition& pod)
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index 2c17023e..34a183de 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -36,4 +36,4 @@ struct JsonObjectConverter<PushCondition>
     static void fillFrom(const QJsonObject& jo, PushCondition& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/push_rule.cpp b/lib/csapi/definitions/push_rule.cpp
index fc2be2c7..eae7e446 100644
--- a/lib/csapi/definitions/push_rule.cpp
+++ b/lib/csapi/definitions/push_rule.cpp
@@ -4,7 +4,7 @@
 
 #include "push_rule.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PushRule>::dumpTo(QJsonObject& jo, const PushRule& pod)
 {
diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index fe6eb0e6..e64d6ba8 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -12,7 +12,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -43,4 +43,4 @@ struct JsonObjectConverter<PushRule>
     static void fillFrom(const QJsonObject& jo, PushRule& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/push_ruleset.cpp b/lib/csapi/definitions/push_ruleset.cpp
index 6f48d27b..a2db35d9 100644
--- a/lib/csapi/definitions/push_ruleset.cpp
+++ b/lib/csapi/definitions/push_ruleset.cpp
@@ -4,7 +4,7 @@
 
 #include "push_ruleset.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PushRuleset>::dumpTo(QJsonObject& jo,
                                               const PushRuleset& pod)
diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h
index f9aedad8..b6b9670e 100644
--- a/lib/csapi/definitions/push_ruleset.h
+++ b/lib/csapi/definitions/push_ruleset.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -36,4 +36,4 @@ struct JsonObjectConverter<PushRuleset>
     static void fillFrom(const QJsonObject& jo, PushRuleset& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/room_event_filter.cpp b/lib/csapi/definitions/room_event_filter.cpp
index bd38ebc7..5613d8d2 100644
--- a/lib/csapi/definitions/room_event_filter.cpp
+++ b/lib/csapi/definitions/room_event_filter.cpp
@@ -4,7 +4,7 @@
 
 #include "room_event_filter.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<RoomEventFilter>::dumpTo(QJsonObject& jo,
                                                   const RoomEventFilter& pod)
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 72bf34d3..ae06a615 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -8,7 +8,7 @@
 
 #include "csapi/definitions/event_filter.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -35,4 +35,4 @@ struct JsonObjectConverter<RoomEventFilter>
     static void fillFrom(const QJsonObject& jo, RoomEventFilter& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/sync_filter.cpp b/lib/csapi/definitions/sync_filter.cpp
index 87274a06..15c4bdc1 100644
--- a/lib/csapi/definitions/sync_filter.cpp
+++ b/lib/csapi/definitions/sync_filter.cpp
@@ -4,7 +4,7 @@
 
 #include "sync_filter.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<StateFilter>::dumpTo(QJsonObject& jo,
                                               const StateFilter& pod)
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index 1d6a845c..9ea39a65 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -9,7 +9,7 @@
 #include "csapi/definitions/event_filter.h"
 #include "csapi/definitions/room_event_filter.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -104,4 +104,4 @@ struct JsonObjectConverter<Filter>
     static void fillFrom(const QJsonObject& jo, Filter& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/user_identifier.cpp b/lib/csapi/definitions/user_identifier.cpp
index 52bb1ae6..9e9b4fe9 100644
--- a/lib/csapi/definitions/user_identifier.cpp
+++ b/lib/csapi/definitions/user_identifier.cpp
@@ -4,7 +4,7 @@
 
 #include "user_identifier.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<UserIdentifier>::dumpTo(QJsonObject& jo,
                                                  const UserIdentifier& pod)
diff --git a/lib/csapi/definitions/user_identifier.h b/lib/csapi/definitions/user_identifier.h
index 51c47cca..74e6ce2b 100644
--- a/lib/csapi/definitions/user_identifier.h
+++ b/lib/csapi/definitions/user_identifier.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -31,4 +31,4 @@ struct JsonObjectConverter<UserIdentifier>
     static void fillFrom(QJsonObject jo, UserIdentifier& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
index 34d3bfbe..595db0e5 100644
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ b/lib/csapi/definitions/wellknown/full.cpp
@@ -4,7 +4,7 @@
 
 #include "full.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<DiscoveryInformation>::dumpTo(
     QJsonObject& jo, const DiscoveryInformation& pod)
diff --git a/lib/csapi/definitions/wellknown/full.h b/lib/csapi/definitions/wellknown/full.h
index ddc06653..92c8afff 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -12,7 +12,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -39,4 +39,4 @@ struct JsonObjectConverter<DiscoveryInformation>
     static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
index f5746ede..7b87aa95 100644
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ b/lib/csapi/definitions/wellknown/homeserver.cpp
@@ -4,7 +4,7 @@
 
 #include "homeserver.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<HomeserverInformation>::dumpTo(
     QJsonObject& jo, const HomeserverInformation& pod)
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h
index b73cee17..606df88b 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -25,4 +25,4 @@ struct JsonObjectConverter<HomeserverInformation>
     static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
index 922d4665..3b2a5720 100644
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ b/lib/csapi/definitions/wellknown/identity_server.cpp
@@ -4,7 +4,7 @@
 
 #include "identity_server.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<IdentityServerInformation>::dumpTo(
     QJsonObject& jo, const IdentityServerInformation& pod)
diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h
index a35644fc..b4304ef7 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -25,4 +25,4 @@ struct JsonObjectConverter<IdentityServerInformation>
     static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/device_management.cpp b/lib/csapi/device_management.cpp
index 9135c22d..0889089e 100644
--- a/lib/csapi/device_management.cpp
+++ b/lib/csapi/device_management.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/device_management.h b/lib/csapi/device_management.h
index 01838c6f..d380a44f 100644
--- a/lib/csapi/device_management.h
+++ b/lib/csapi/device_management.h
@@ -13,7 +13,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -145,4 +145,4 @@ public:
                               const Omittable<AuthenticationData>& auth = none);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/directory.cpp b/lib/csapi/directory.cpp
index 992d1da5..b2689d1e 100644
--- a/lib/csapi/directory.cpp
+++ b/lib/csapi/directory.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0/directory");
 
diff --git a/lib/csapi/directory.h b/lib/csapi/directory.h
index f5331db8..7863aa1a 100644
--- a/lib/csapi/directory.h
+++ b/lib/csapi/directory.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -93,4 +93,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/event_context.cpp b/lib/csapi/event_context.cpp
index 936b2430..d233eedb 100644
--- a/lib/csapi/event_context.cpp
+++ b/lib/csapi/event_context.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h
index ca06f4b9..755fc662 100644
--- a/lib/csapi/event_context.h
+++ b/lib/csapi/event_context.h
@@ -9,7 +9,7 @@
 #include "events/eventloader.h"
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -71,4 +71,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/filter.cpp b/lib/csapi/filter.cpp
index 79dd5ea5..b4160ba4 100644
--- a/lib/csapi/filter.cpp
+++ b/lib/csapi/filter.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/filter.h b/lib/csapi/filter.h
index 0a5a98ae..5001a492 100644
--- a/lib/csapi/filter.h
+++ b/lib/csapi/filter.h
@@ -10,7 +10,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -88,4 +88,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/inviting.cpp b/lib/csapi/inviting.cpp
index 4ddbe5d0..b60df6f8 100644
--- a/lib/csapi/inviting.cpp
+++ b/lib/csapi/inviting.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/inviting.h b/lib/csapi/inviting.h
index b0911ea8..faf315b1 100644
--- a/lib/csapi/inviting.h
+++ b/lib/csapi/inviting.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -44,4 +44,4 @@ public:
     explicit InviteUserJob(const QString& roomId, const QString& userId);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index cb40cb96..2dd617bb 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -29,7 +29,7 @@ struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class JoinRoomByIdJob::Private
 {
@@ -67,7 +67,7 @@ BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -91,7 +91,7 @@ struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class JoinRoomJob::Private
 {
diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h
index a96f323d..cf456da9 100644
--- a/lib/csapi/joining.h
+++ b/lib/csapi/joining.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -165,4 +165,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index 1752b865..cd33ad19 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
@@ -50,7 +50,7 @@ BaseJob::Status UploadKeysJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -74,7 +74,7 @@ struct JsonObjectConverter<QueryKeysJob::DeviceInformation>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class QueryKeysJob::Private
 {
diff --git a/lib/csapi/keys.h b/lib/csapi/keys.h
index f69028fd..27867b8c 100644
--- a/lib/csapi/keys.h
+++ b/lib/csapi/keys.h
@@ -14,7 +14,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -231,4 +231,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/kicking.cpp b/lib/csapi/kicking.cpp
index 05c4c581..ce7fcdad 100644
--- a/lib/csapi/kicking.cpp
+++ b/lib/csapi/kicking.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/kicking.h b/lib/csapi/kicking.h
index 9566a9a4..d51edb47 100644
--- a/lib/csapi/kicking.h
+++ b/lib/csapi/kicking.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -39,4 +39,4 @@ public:
                      const QString& reason = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/leaving.cpp b/lib/csapi/leaving.cpp
index 325b1e04..abf04888 100644
--- a/lib/csapi/leaving.cpp
+++ b/lib/csapi/leaving.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/leaving.h b/lib/csapi/leaving.h
index 2ed6c8e7..280545b0 100644
--- a/lib/csapi/leaving.h
+++ b/lib/csapi/leaving.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -73,4 +73,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/list_joined_rooms.cpp b/lib/csapi/list_joined_rooms.cpp
index 43c948f7..1260499a 100644
--- a/lib/csapi/list_joined_rooms.cpp
+++ b/lib/csapi/list_joined_rooms.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/list_joined_rooms.h b/lib/csapi/list_joined_rooms.h
index 1b64a004..5dab9dfc 100644
--- a/lib/csapi/list_joined_rooms.h
+++ b/lib/csapi/list_joined_rooms.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -43,4 +43,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index 4d96dac3..0e065440 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
@@ -108,7 +108,7 @@ BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -121,7 +121,7 @@ struct JsonObjectConverter<QueryPublicRoomsJob::Filter>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class QueryPublicRoomsJob::Private
 {
diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h
index da68416d..e68030ad 100644
--- a/lib/csapi/list_public_rooms.h
+++ b/lib/csapi/list_public_rooms.h
@@ -10,7 +10,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -189,4 +189,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp
index 29ee4ab5..02730ff0 100644
--- a/lib/csapi/login.cpp
+++ b/lib/csapi/login.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -26,7 +26,7 @@ struct JsonObjectConverter<GetLoginFlowsJob::LoginFlow>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetLoginFlowsJob::Private
 {
diff --git a/lib/csapi/login.h b/lib/csapi/login.h
index 3ab0648f..dc944782 100644
--- a/lib/csapi/login.h
+++ b/lib/csapi/login.h
@@ -13,7 +13,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -143,4 +143,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/logout.cpp b/lib/csapi/logout.cpp
index d0bef20e..4b391967 100644
--- a/lib/csapi/logout.cpp
+++ b/lib/csapi/logout.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h
index c03af180..34d5a441 100644
--- a/lib/csapi/logout.h
+++ b/lib/csapi/logout.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -55,4 +55,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/message_pagination.cpp b/lib/csapi/message_pagination.cpp
index 3f09bd85..b612ee91 100644
--- a/lib/csapi/message_pagination.cpp
+++ b/lib/csapi/message_pagination.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/message_pagination.h b/lib/csapi/message_pagination.h
index 03b3d42a..271e1dd9 100644
--- a/lib/csapi/message_pagination.h
+++ b/lib/csapi/message_pagination.h
@@ -9,7 +9,7 @@
 #include "events/eventloader.h"
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -80,4 +80,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/notifications.cpp b/lib/csapi/notifications.cpp
index 3a05a0b2..da568a0f 100644
--- a/lib/csapi/notifications.cpp
+++ b/lib/csapi/notifications.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -31,7 +31,7 @@ struct JsonObjectConverter<GetNotificationsJob::Notification>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetNotificationsJob::Private
 {
diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h
index 4170d539..eeec5d4e 100644
--- a/lib/csapi/notifications.h
+++ b/lib/csapi/notifications.h
@@ -13,7 +13,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -94,4 +94,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index 39ba3b9e..8c00df97 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/openid.h b/lib/csapi/openid.h
index 40f1bc40..b2f003e5 100644
--- a/lib/csapi/openid.h
+++ b/lib/csapi/openid.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -64,4 +64,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/peeking_events.cpp b/lib/csapi/peeking_events.cpp
index 6962d363..bc29b682 100644
--- a/lib/csapi/peeking_events.cpp
+++ b/lib/csapi/peeking_events.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/peeking_events.h b/lib/csapi/peeking_events.h
index 1fe63c4d..c5cc07f6 100644
--- a/lib/csapi/peeking_events.h
+++ b/lib/csapi/peeking_events.h
@@ -9,7 +9,7 @@
 #include "events/eventloader.h"
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -74,4 +74,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index b6e8caf2..0f019026 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
index 82c3a300..c5ecb987 100644
--- a/lib/csapi/presence.h
+++ b/lib/csapi/presence.h
@@ -8,7 +8,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -78,4 +78,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/profile.cpp b/lib/csapi/profile.cpp
index 630452f6..27168f77 100644
--- a/lib/csapi/profile.cpp
+++ b/lib/csapi/profile.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/profile.h b/lib/csapi/profile.h
index 95d3ec97..54dc53aa 100644
--- a/lib/csapi/profile.h
+++ b/lib/csapi/profile.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -164,4 +164,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index 41a0cffe..90877a95 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -43,7 +43,7 @@ struct JsonObjectConverter<GetPushersJob::Pusher>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetPushersJob::Private
 {
@@ -79,7 +79,7 @@ BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -92,7 +92,7 @@ struct JsonObjectConverter<PostPusherJob::PusherData>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
 
diff --git a/lib/csapi/pusher.h b/lib/csapi/pusher.h
index a909b9a0..65f8aa15 100644
--- a/lib/csapi/pusher.h
+++ b/lib/csapi/pusher.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -169,4 +169,4 @@ public:
                            Omittable<bool> append = none);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index 5842369f..eae5445f 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/pushrules.h b/lib/csapi/pushrules.h
index 9074addb..cb94fe7b 100644
--- a/lib/csapi/pushrules.h
+++ b/lib/csapi/pushrules.h
@@ -14,7 +14,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -297,4 +297,4 @@ public:
                                    const QStringList& actions);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/read_markers.cpp b/lib/csapi/read_markers.cpp
index 5ea45f88..a07d09ce 100644
--- a/lib/csapi/read_markers.cpp
+++ b/lib/csapi/read_markers.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/read_markers.h b/lib/csapi/read_markers.h
index e1fbc263..35c428b2 100644
--- a/lib/csapi/read_markers.h
+++ b/lib/csapi/read_markers.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -34,4 +34,4 @@ public:
                               const QString& mRead = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/receipts.cpp b/lib/csapi/receipts.cpp
index 28d7032f..f9a45912 100644
--- a/lib/csapi/receipts.cpp
+++ b/lib/csapi/receipts.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/receipts.h b/lib/csapi/receipts.h
index bb037c08..376d4006 100644
--- a/lib/csapi/receipts.h
+++ b/lib/csapi/receipts.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -37,4 +37,4 @@ public:
                             const QJsonObject& receipt = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/redaction.cpp b/lib/csapi/redaction.cpp
index f944cdd4..d2dbe19b 100644
--- a/lib/csapi/redaction.cpp
+++ b/lib/csapi/redaction.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/redaction.h b/lib/csapi/redaction.h
index c75421cb..42022930 100644
--- a/lib/csapi/redaction.h
+++ b/lib/csapi/redaction.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -53,4 +53,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 52b4098d..270011e1 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/registration.h b/lib/csapi/registration.h
index 40f1caa6..89aecb80 100644
--- a/lib/csapi/registration.h
+++ b/lib/csapi/registration.h
@@ -11,7 +11,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -480,4 +480,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/report_content.cpp b/lib/csapi/report_content.cpp
index eb62cd12..352f52c9 100644
--- a/lib/csapi/report_content.cpp
+++ b/lib/csapi/report_content.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/report_content.h b/lib/csapi/report_content.h
index c545d800..c86a4301 100644
--- a/lib/csapi/report_content.h
+++ b/lib/csapi/report_content.h
@@ -8,7 +8,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -36,4 +36,4 @@ public:
                               int score, const QString& reason);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/room_send.cpp b/lib/csapi/room_send.cpp
index a29dd99a..5e970d65 100644
--- a/lib/csapi/room_send.cpp
+++ b/lib/csapi/room_send.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/room_send.h b/lib/csapi/room_send.h
index aa2efd79..110fc83b 100644
--- a/lib/csapi/room_send.h
+++ b/lib/csapi/room_send.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -62,4 +62,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp
index ef4afcd0..bfcd6e17 100644
--- a/lib/csapi/room_state.cpp
+++ b/lib/csapi/room_state.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/room_state.h b/lib/csapi/room_state.h
index 6ddd5594..80619d63 100644
--- a/lib/csapi/room_state.h
+++ b/lib/csapi/room_state.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -126,4 +126,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/room_upgrades.cpp b/lib/csapi/room_upgrades.cpp
index a72304d1..1d6006ef 100644
--- a/lib/csapi/room_upgrades.cpp
+++ b/lib/csapi/room_upgrades.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/room_upgrades.h b/lib/csapi/room_upgrades.h
index 94520aca..5f9262f1 100644
--- a/lib/csapi/room_upgrades.h
+++ b/lib/csapi/room_upgrades.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -41,4 +41,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/rooms.cpp b/lib/csapi/rooms.cpp
index 280e8d59..5bfbe44d 100644
--- a/lib/csapi/rooms.cpp
+++ b/lib/csapi/rooms.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
@@ -168,7 +168,7 @@ BaseJob::Status GetMembersByRoomJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -182,7 +182,7 @@ struct JsonObjectConverter<GetJoinedMembersByRoomJob::RoomMember>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetJoinedMembersByRoomJob::Private
 {
diff --git a/lib/csapi/rooms.h b/lib/csapi/rooms.h
index 29d7808e..1020fdb1 100644
--- a/lib/csapi/rooms.h
+++ b/lib/csapi/rooms.h
@@ -12,7 +12,7 @@
 
 #include <QtCore/QHash>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -269,4 +269,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/search.cpp b/lib/csapi/search.cpp
index ee1fa70c..9619f340 100644
--- a/lib/csapi/search.cpp
+++ b/lib/csapi/search.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -144,7 +144,7 @@ struct JsonObjectConverter<SearchJob::ResultCategories>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class SearchJob::Private
 {
diff --git a/lib/csapi/search.h b/lib/csapi/search.h
index f965a72a..079ac8e9 100644
--- a/lib/csapi/search.h
+++ b/lib/csapi/search.h
@@ -16,7 +16,7 @@
 
 #include <unordered_map>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -200,4 +200,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/sso_login_redirect.cpp b/lib/csapi/sso_login_redirect.cpp
index b1dc3674..c2cc81cf 100644
--- a/lib/csapi/sso_login_redirect.cpp
+++ b/lib/csapi/sso_login_redirect.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/sso_login_redirect.h b/lib/csapi/sso_login_redirect.h
index af9e7780..b932a15e 100644
--- a/lib/csapi/sso_login_redirect.h
+++ b/lib/csapi/sso_login_redirect.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -37,4 +37,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& redirectUrl);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/tags.cpp b/lib/csapi/tags.cpp
index 13c933e5..3df38074 100644
--- a/lib/csapi/tags.cpp
+++ b/lib/csapi/tags.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -26,7 +26,7 @@ struct JsonObjectConverter<GetRoomTagsJob::Tag>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetRoomTagsJob::Private
 {
diff --git a/lib/csapi/tags.h b/lib/csapi/tags.h
index dc20cd3d..8ddebd6b 100644
--- a/lib/csapi/tags.h
+++ b/lib/csapi/tags.h
@@ -11,7 +11,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -123,4 +123,4 @@ public:
                                const QString& roomId, const QString& tag);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/third_party_lookup.cpp b/lib/csapi/third_party_lookup.cpp
index 986ead01..678f6b3c 100644
--- a/lib/csapi/third_party_lookup.cpp
+++ b/lib/csapi/third_party_lookup.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/third_party_lookup.h b/lib/csapi/third_party_lookup.h
index d25c1cf3..63607549 100644
--- a/lib/csapi/third_party_lookup.h
+++ b/lib/csapi/third_party_lookup.h
@@ -15,7 +15,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -253,4 +253,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/third_party_membership.cpp b/lib/csapi/third_party_membership.cpp
index 9fe702aa..7e401163 100644
--- a/lib/csapi/third_party_membership.cpp
+++ b/lib/csapi/third_party_membership.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/third_party_membership.h b/lib/csapi/third_party_membership.h
index 36622c94..bd4c6896 100644
--- a/lib/csapi/third_party_membership.h
+++ b/lib/csapi/third_party_membership.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -74,4 +74,4 @@ public:
                              const QString& medium, const QString& address);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/to_device.cpp b/lib/csapi/to_device.cpp
index 3fb17109..3f6e8097 100644
--- a/lib/csapi/to_device.cpp
+++ b/lib/csapi/to_device.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/to_device.h b/lib/csapi/to_device.h
index e0bbbe28..14445439 100644
--- a/lib/csapi/to_device.h
+++ b/lib/csapi/to_device.h
@@ -9,7 +9,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -39,4 +39,4 @@ public:
         const QHash<QString, QHash<QString, QJsonObject>>& messages = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/typing.cpp b/lib/csapi/typing.cpp
index 03499c76..064ebe39 100644
--- a/lib/csapi/typing.cpp
+++ b/lib/csapi/typing.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/typing.h b/lib/csapi/typing.h
index 0c3f75a8..350c209d 100644
--- a/lib/csapi/typing.h
+++ b/lib/csapi/typing.h
@@ -8,7 +8,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -38,4 +38,4 @@ public:
                           bool typing, Omittable<int> timeout = none);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/users.cpp b/lib/csapi/users.cpp
index 39b05a77..77c297dd 100644
--- a/lib/csapi/users.cpp
+++ b/lib/csapi/users.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -28,7 +28,7 @@ struct JsonObjectConverter<SearchUserDirectoryJob::User>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class SearchUserDirectoryJob::Private
 {
diff --git a/lib/csapi/users.h b/lib/csapi/users.h
index 2e86c009..d9a16a9d 100644
--- a/lib/csapi/users.h
+++ b/lib/csapi/users.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -80,4 +80,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/versions.cpp b/lib/csapi/versions.cpp
index 1d66b94f..9607a1b6 100644
--- a/lib/csapi/versions.cpp
+++ b/lib/csapi/versions.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client");
 
diff --git a/lib/csapi/versions.h b/lib/csapi/versions.h
index 513e7f27..aa8cbac6 100644
--- a/lib/csapi/versions.h
+++ b/lib/csapi/versions.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QHash>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -70,4 +70,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/voip.cpp b/lib/csapi/voip.cpp
index 0e83c915..c95afe16 100644
--- a/lib/csapi/voip.cpp
+++ b/lib/csapi/voip.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/voip.h b/lib/csapi/voip.h
index ab34dcad..38abfa27 100644
--- a/lib/csapi/voip.h
+++ b/lib/csapi/voip.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -46,4 +46,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/wellknown.cpp b/lib/csapi/wellknown.cpp
index c2bd7822..9a52a2a5 100644
--- a/lib/csapi/wellknown.cpp
+++ b/lib/csapi/wellknown.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/.well-known");
 
diff --git a/lib/csapi/wellknown.h b/lib/csapi/wellknown.h
index 66917806..bce67d00 100644
--- a/lib/csapi/wellknown.h
+++ b/lib/csapi/wellknown.h
@@ -10,7 +10,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -54,4 +54,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/whoami.cpp b/lib/csapi/whoami.cpp
index 2ca9c435..fb7f54dc 100644
--- a/lib/csapi/whoami.cpp
+++ b/lib/csapi/whoami.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/whoami.h b/lib/csapi/whoami.h
index e62b7dad..bbbb3899 100644
--- a/lib/csapi/whoami.h
+++ b/lib/csapi/whoami.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -50,4 +50,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/{{base}}.cpp.mustache b/lib/csapi/{{base}}.cpp.mustache
index 8ebac6ef..6cbd1b65 100644
--- a/lib/csapi/{{base}}.cpp.mustache
+++ b/lib/csapi/{{base}}.cpp.mustache
@@ -8,7 +8,7 @@
 {{/producesNonJson?}}
 #include <QtCore/QStringBuilder>
 {{/operations}}
-using namespace QMatrixClient;
+using namespace Quotient;
 {{#models.model}}
     {{#in?}}
 void JsonObjectConverter<{{qualifiedName}}>::dumpTo(QJsonObject& jo, const {{qualifiedName}}& pod)
@@ -38,7 +38,7 @@ void JsonObjectConverter<{{qualifiedName}}>::fillFrom({{>maybeCrefJsonObject}} j
 static const auto basePath = QStringLiteral("{{basePathWithoutHost}}");
     {{#operation}}{{#models}}
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
         {{#model}}
 template <> struct JsonObjectConverter<{{qualifiedName}}>
diff --git a/lib/csapi/{{base}}.h.mustache b/lib/csapi/{{base}}.h.mustache
index 61380ec6..56044e7d 100644
--- a/lib/csapi/{{base}}.h.mustache
+++ b/lib/csapi/{{base}}.h.mustache
@@ -8,7 +8,7 @@
 {{#imports}}
 #include {{_}}{{/imports}}
 
-namespace QMatrixClient
+namespace Quotient
 {
 {{#models}}
 // Data structures
@@ -92,4 +92,4 @@ private:
 };
 {{/    operation}}
 {{/operations}}
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/e2ee.h b/lib/e2ee.h
index c85211be..5a9b83c5 100644
--- a/lib/e2ee.h
+++ b/lib/e2ee.h
@@ -4,7 +4,7 @@
 
 #include <QtCore/QStringList>
 
-namespace QMatrixClient {
+namespace Quotient {
 static const auto CiphertextKeyL = "ciphertext"_ls;
 static const auto SenderKeyKeyL = "sender_key"_ls;
 static const auto DeviceIdKeyL = "device_id"_ls;
@@ -28,4 +28,4 @@ static const auto MegolmV1AesSha2AlgoKey =
     QStringLiteral("m.megolm.v1.aes-sha2");
 static const QStringList SupportedAlgorithms = { OlmV1Curve25519AesSha2AlgoKey,
                                                  MegolmV1AesSha2AlgoKey };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index 15723688..22387cf9 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -12,7 +12,7 @@
 #include <functional>
 #include <memory>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 using namespace QtOlm;
 using std::move;
 
diff --git a/lib/encryptionmanager.h b/lib/encryptionmanager.h
index 79c25a00..b210a85a 100644
--- a/lib/encryptionmanager.h
+++ b/lib/encryptionmanager.h
@@ -9,7 +9,7 @@ namespace QtOlm {
 class Account;
 }
 
-namespace QMatrixClient {
+namespace Quotient {
 class Connection;
 
 class EncryptionManager : public QObject {
@@ -35,4 +35,4 @@ private:
     std::unique_ptr<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/eventitem.cpp b/lib/eventitem.cpp
index de0a5c9f..2e2b11c0 100644
--- a/lib/eventitem.cpp
+++ b/lib/eventitem.cpp
@@ -21,7 +21,7 @@
 #include "events/roomavatarevent.h"
 #include "events/roommessageevent.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void PendingEventItem::setFileUploaded(const QUrl& remoteUrl)
 {
diff --git a/lib/eventitem.h b/lib/eventitem.h
index 68d1ae06..3a7061d3 100644
--- a/lib/eventitem.h
+++ b/lib/eventitem.h
@@ -22,7 +22,7 @@
 
 #include <utility>
 
-namespace QMatrixClient {
+namespace Quotient {
 class StateEventBase;
 
 class EventStatus {
@@ -153,5 +153,5 @@ inline QDebug& operator<<(QDebug& d, const TimelineItem& ti)
     d.nospace() << "(" << ti.index() << "|" << ti->id() << ")";
     return d;
 }
-} // namespace QMatrixClient
-Q_DECLARE_METATYPE(QMatrixClient::EventStatus)
+} // namespace Quotient
+Q_DECLARE_METATYPE(Quotient::EventStatus)
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index 3f519668..600fa5be 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -24,7 +24,7 @@
 #include "event.h"
 #include "eventcontent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 constexpr const char* FavouriteTag = "m.favourite";
 constexpr const char* LowPriorityTag = "m.lowpriority";
 
@@ -93,4 +93,4 @@ DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list", QSet<QString>,
 
 DEFINE_EVENTTYPE_ALIAS(Tag, TagEvent)
 DEFINE_EVENTTYPE_ALIAS(ReadMarker, ReadMarkerEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/callanswerevent.cpp b/lib/events/callanswerevent.cpp
index 7ab4a6fb..d6622b30 100644
--- a/lib/events/callanswerevent.cpp
+++ b/lib/events/callanswerevent.cpp
@@ -44,7 +44,7 @@ m.call.answer
 }
 */
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 CallAnswerEvent::CallAnswerEvent(const QJsonObject& obj)
     : CallEventBase(typeId(), obj)
diff --git a/lib/events/callanswerevent.h b/lib/events/callanswerevent.h
index 052f732d..e01b39db 100644
--- a/lib/events/callanswerevent.h
+++ b/lib/events/callanswerevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class CallAnswerEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.answer", CallAnswerEvent)
@@ -43,4 +43,4 @@ public:
 
 REGISTER_EVENT_TYPE(CallAnswerEvent)
 DEFINE_EVENTTYPE_ALIAS(CallAnswer, CallAnswerEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 2a915a43..3d13ba8a 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class CallCandidatesEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
@@ -43,4 +43,4 @@ public:
 
 REGISTER_EVENT_TYPE(CallCandidatesEvent)
 DEFINE_EVENTTYPE_ALIAS(CallCandidates, CallCandidatesEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/callhangupevent.cpp b/lib/events/callhangupevent.cpp
index 2a4fd3da..d41849c3 100644
--- a/lib/events/callhangupevent.cpp
+++ b/lib/events/callhangupevent.cpp
@@ -39,7 +39,7 @@ m.call.hangup
 }
 */
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 CallHangupEvent::CallHangupEvent(const QJsonObject& obj)
     : CallEventBase(typeId(), obj)
diff --git a/lib/events/callhangupevent.h b/lib/events/callhangupevent.h
index 97fa2f52..d23e29db 100644
--- a/lib/events/callhangupevent.h
+++ b/lib/events/callhangupevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class CallHangupEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.hangup", CallHangupEvent)
@@ -31,4 +31,4 @@ public:
 
 REGISTER_EVENT_TYPE(CallHangupEvent)
 DEFINE_EVENTTYPE_ALIAS(CallHangup, CallHangupEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/callinviteevent.cpp b/lib/events/callinviteevent.cpp
index f565fc3e..54faac8d 100644
--- a/lib/events/callinviteevent.cpp
+++ b/lib/events/callinviteevent.cpp
@@ -44,7 +44,7 @@ m.call.invite
 }
 */
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 CallInviteEvent::CallInviteEvent(const QJsonObject& obj)
     : CallEventBase(typeId(), obj)
diff --git a/lib/events/callinviteevent.h b/lib/events/callinviteevent.h
index 9b9d0ae5..3e39e0ba 100644
--- a/lib/events/callinviteevent.h
+++ b/lib/events/callinviteevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class CallInviteEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.invite", CallInviteEvent)
@@ -42,4 +42,4 @@ public:
 
 REGISTER_EVENT_TYPE(CallInviteEvent)
 DEFINE_EVENTTYPE_ALIAS(CallInvite, CallInviteEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/directchatevent.cpp b/lib/events/directchatevent.cpp
index 4ba098c2..b4027e16 100644
--- a/lib/events/directchatevent.cpp
+++ b/lib/events/directchatevent.cpp
@@ -20,7 +20,7 @@
 
 #include <QtCore/QJsonArray>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 QMultiHash<QString, QString> DirectChatEvent::usersToDirectChats() const
 {
diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index 94857a93..b4981f2e 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -20,7 +20,7 @@
 
 #include "event.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class DirectChatEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.direct", DirectChatEvent)
@@ -31,4 +31,4 @@ public:
 };
 REGISTER_EVENT_TYPE(DirectChatEvent)
 DEFINE_EVENTTYPE_ALIAS(DirectChat, DirectChatEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h
index 67298a27..235b2aa4 100644
--- a/lib/events/encryptedevent.h
+++ b/lib/events/encryptedevent.h
@@ -3,7 +3,7 @@
 #include "e2ee.h"
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class Room;
 /*
  * While the specification states:
@@ -63,4 +63,4 @@ public:
 };
 REGISTER_EVENT_TYPE(EncryptedEvent)
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index 0c732a51..945e6696 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -12,10 +12,10 @@
 #include <array>
 
 static const std::array<QString, 1> encryptionStrings = {
-    { QMatrixClient::MegolmV1AesSha2AlgoKey }
+    { Quotient::MegolmV1AesSha2AlgoKey }
 };
 
-namespace QMatrixClient {
+namespace Quotient {
 template <>
 struct JsonConverter<EncryptionType> {
     static EncryptionType load(const QJsonValue& jv)
@@ -32,7 +32,7 @@ struct JsonConverter<EncryptionType> {
 };
 } // namespace QMatrixClient
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 EncryptionEventContent::EncryptionEventContent(const QJsonObject& json)
     : encryption(fromJson<EncryptionType>(json["algorithm"_ls]))
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index debabcae..68e41719 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -21,7 +21,7 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class EncryptionEventContent : public EventContent::Base {
 public:
     enum EncryptionType : size_t { MegolmV1AesSha2 = 0, Undefined };
@@ -71,4 +71,4 @@ private:
 
 REGISTER_EVENT_TYPE(EncryptionEvent)
 DEFINE_EVENTTYPE_ALIAS(Encryption, EncryptionEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/event.cpp b/lib/events/event.cpp
index 694254fe..96e33864 100644
--- a/lib/events/event.cpp
+++ b/lib/events/event.cpp
@@ -22,7 +22,7 @@
 
 #include <QtCore/QJsonDocument>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 event_type_t EventTypeRegistry::initializeTypeId(event_mtype_t matrixTypeId)
 {
diff --git a/lib/events/event.h b/lib/events/event.h
index 686bd8e0..e96d6897 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -25,7 +25,7 @@
 #    define USE_EVENTTYPE_ALIAS 1
 #endif
 
-namespace QMatrixClient {
+namespace Quotient {
 // === event_ptr_tt<> and type casting facilities ===
 
 template <typename EventT>
@@ -292,7 +292,7 @@ using Events = EventsArray<Event>;
 // provide matrixTypeId() and typeId().
 #define DEFINE_EVENT_TYPEID(_Id, _Type)                             \
     static constexpr event_mtype_t matrixTypeId() { return _Id; }   \
-    static auto typeId() { return QMatrixClient::typeId<_Type>(); } \
+    static auto typeId() { return Quotient::typeId<_Type>(); } \
     // End of macro
 
 // This macro should be put after an event class definition (in .h or .cpp)
@@ -406,6 +406,6 @@ visit(const BaseEventT& event, FnT1&& visitor1, FnT2&& visitor2,
     return visit(event, std::forward<FnT2>(visitor2),
                  std::forward<FnTs>(visitors)...);
 }
-} // namespace QMatrixClient
-Q_DECLARE_METATYPE(QMatrixClient::Event*)
-Q_DECLARE_METATYPE(const QMatrixClient::Event*)
+} // namespace Quotient
+Q_DECLARE_METATYPE(Quotient::Event*)
+Q_DECLARE_METATYPE(const Quotient::Event*)
diff --git a/lib/events/eventcontent.cpp b/lib/events/eventcontent.cpp
index 814f2787..802d8176 100644
--- a/lib/events/eventcontent.cpp
+++ b/lib/events/eventcontent.cpp
@@ -23,7 +23,7 @@
 
 #include <QtCore/QMimeDatabase>
 
-using namespace QMatrixClient::EventContent;
+using namespace Quotient::EventContent;
 
 QJsonObject Base::toJson() const
 {
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index 5c0f92d1..c26cb931 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -26,7 +26,7 @@
 #include <QtCore/QSize>
 #include <QtCore/QUrl>
 
-namespace QMatrixClient {
+namespace Quotient {
 namespace EventContent {
     /**
      * A base class for all content types that can be stored
@@ -275,4 +275,4 @@ namespace EventContent {
      */
     using FileContent = UrlWithThumbnailContent<FileInfo>;
 } // namespace EventContent
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h
index 9e8bb410..ebb96441 100644
--- a/lib/events/eventloader.h
+++ b/lib/events/eventloader.h
@@ -20,7 +20,7 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 namespace _impl {
     template <typename BaseEventT>
     static inline auto loadEvent(const QJsonObject& json,
@@ -83,4 +83,4 @@ struct JsonConverter<event_ptr_tt<EventT>> {
         return loadEvent<EventT>(jd.object());
     }
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/reactionevent.cpp b/lib/events/reactionevent.cpp
index 0a080607..df8910fe 100644
--- a/lib/events/reactionevent.cpp
+++ b/lib/events/reactionevent.cpp
@@ -20,7 +20,7 @@
 
 using namespace QMatrixClient;
 
-void QMatrixClient::JsonObjectConverter<EventRelation>::dumpTo(
+void JsonObjectConverter<EventRelation>::dumpTo(
     QJsonObject& jo, const EventRelation& pod)
 {
     if (pod.type.isEmpty()) {
@@ -33,7 +33,7 @@ void QMatrixClient::JsonObjectConverter<EventRelation>::dumpTo(
         jo.insert(QStringLiteral("key"), pod.key);
 }
 
-void QMatrixClient::JsonObjectConverter<EventRelation>::fillFrom(
+void JsonObjectConverter<EventRelation>::fillFrom(
     const QJsonObject& jo, EventRelation& pod)
 {
     // The experimental logic for generic relationships (MSC1849)
diff --git a/lib/events/reactionevent.h b/lib/events/reactionevent.h
index b1e04561..75c6528c 100644
--- a/lib/events/reactionevent.h
+++ b/lib/events/reactionevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 
 struct EventRelation {
     using reltypeid_t = const char*;
@@ -70,4 +70,4 @@ private:
 };
 REGISTER_EVENT_TYPE(ReactionEvent)
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/receiptevent.cpp b/lib/events/receiptevent.cpp
index 4a54b744..bf050cb2 100644
--- a/lib/events/receiptevent.cpp
+++ b/lib/events/receiptevent.cpp
@@ -38,7 +38,7 @@ Example of a Receipt Event:
 #include "converters.h"
 #include "logging.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 ReceiptEvent::ReceiptEvent(const QJsonObject& obj) : Event(typeId(), obj)
 {
diff --git a/lib/events/receiptevent.h b/lib/events/receiptevent.h
index c32e0543..71cd5de0 100644
--- a/lib/events/receiptevent.h
+++ b/lib/events/receiptevent.h
@@ -23,7 +23,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QVector>
 
-namespace QMatrixClient {
+namespace Quotient {
 struct Receipt {
     QString userId;
     QDateTime timestamp;
@@ -49,4 +49,4 @@ private:
 };
 REGISTER_EVENT_TYPE(ReceiptEvent)
 DEFINE_EVENTTYPE_ALIAS(Receipt, ReceiptEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h
index 3628fb33..eac627d5 100644
--- a/lib/events/redactionevent.h
+++ b/lib/events/redactionevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class RedactionEvent : public RoomEvent {
 public:
     DEFINE_EVENT_TYPEID("m.room.redaction", RedactionEvent)
@@ -36,4 +36,4 @@ public:
 };
 REGISTER_EVENT_TYPE(RedactionEvent)
 DEFINE_EVENTTYPE_ALIAS(Redaction, RedactionEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index 16aeb070..109f4014 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -21,7 +21,7 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class RoomAvatarEvent : public StateEvent<EventContent::ImageContent> {
     // It's a bit of an overkill to use a full-fledged ImageContent
     // because in reality m.room.avatar usually only has a single URL,
@@ -35,4 +35,4 @@ public:
 };
 REGISTER_EVENT_TYPE(RoomAvatarEvent)
 DEFINE_EVENTTYPE_ALIAS(RoomAvatar, RoomAvatarEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/roomcreateevent.cpp b/lib/events/roomcreateevent.cpp
index cb575f24..c72b5bc2 100644
--- a/lib/events/roomcreateevent.cpp
+++ b/lib/events/roomcreateevent.cpp
@@ -18,7 +18,7 @@
 
 #include "roomcreateevent.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 bool RoomCreateEvent::isFederated() const
 {
diff --git a/lib/events/roomcreateevent.h b/lib/events/roomcreateevent.h
index c8ba8c40..91aefe9e 100644
--- a/lib/events/roomcreateevent.h
+++ b/lib/events/roomcreateevent.h
@@ -20,7 +20,7 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class RoomCreateEvent : public StateEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.room.create", RoomCreateEvent)
@@ -41,4 +41,4 @@ public:
     bool isUpgrade() const;
 };
 REGISTER_EVENT_TYPE(RoomCreateEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 543640ca..e19c03ce 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -22,7 +22,7 @@
 #include "logging.h"
 #include "redactionevent.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 [[gnu::unused]] static auto roomEventTypeInitialised =
     Event::factory_t::chainFactory<RoomEvent>();
@@ -48,7 +48,7 @@ QString RoomEvent::id() const { return fullJson()[EventIdKeyL].toString(); }
 
 QDateTime RoomEvent::timestamp() const
 {
-    return QMatrixClient::fromJson<QDateTime>(fullJson()["origin_server_ts"_ls]);
+    return Quotient::fromJson<QDateTime>(fullJson()["origin_server_ts"_ls]);
 }
 
 QString RoomEvent::roomId() const
diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index 155d4600..f943bce4 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -22,7 +22,7 @@
 
 #include <QtCore/QDateTime>
 
-namespace QMatrixClient {
+namespace Quotient {
 class RedactionEvent;
 
 /** This class corresponds to m.room.* events */
@@ -102,6 +102,6 @@ public:
     QString callId() const { return content<QString>("call_id"_ls); }
     int version() const { return content<int>("version"_ls); }
 };
-} // namespace QMatrixClient
-Q_DECLARE_METATYPE(QMatrixClient::RoomEvent*)
-Q_DECLARE_METATYPE(const QMatrixClient::RoomEvent*)
+} // namespace Quotient
+Q_DECLARE_METATYPE(Quotient::RoomEvent*)
+Q_DECLARE_METATYPE(const Quotient::RoomEvent*)
diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index 3cbf6685..d0787170 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -28,7 +28,7 @@ static const std::array<QString, 5> membershipStrings = {
       QStringLiteral("leave"), QStringLiteral("ban") }
 };
 
-namespace QMatrixClient {
+namespace Quotient {
 template <>
 struct JsonConverter<MembershipType> {
     static MembershipType load(const QJsonValue& jv)
@@ -43,9 +43,9 @@ struct JsonConverter<MembershipType> {
         return MembershipType::Undefined;
     }
 };
-} // namespace QMatrixClient
+} // namespace Quotient
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 MemberEventContent::MemberEventContent(const QJsonObject& json)
     : membership(fromJson<MembershipType>(json["membership"_ls]))
diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index 59d59e3a..2a16617a 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -21,7 +21,7 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class MemberEventContent : public EventContent::Base {
 public:
     enum MembershipType : size_t {
@@ -107,4 +107,4 @@ public:
 
 REGISTER_EVENT_TYPE(RoomMemberEvent)
 DEFINE_EVENTTYPE_ALIAS(RoomMember, RoomMemberEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp
index 991931de..09562d65 100644
--- a/lib/events/roommessageevent.cpp
+++ b/lib/events/roommessageevent.cpp
@@ -25,7 +25,7 @@
 #include <QtGui/QImageReader>
 #include <QtMultimedia/QMediaResource>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 using namespace EventContent;
 
 using MsgType = RoomMessageEvent::MsgType;
@@ -279,7 +279,7 @@ TextContent::TextContent(const QString& text, const QString& contentType,
         mimeType = QMimeDatabase().mimeTypeForName("text/html");
 }
 
-namespace QMatrixClient {
+namespace Quotient {
 // Overload the default fromJson<> logic that defined in converters.h
 // as we want
 template <>
@@ -295,7 +295,7 @@ Omittable<RelatesTo> fromJson(const QJsonValue& jv)
     return RelatesTo { jo.value("rel_type"_ls).toString(),
                        jo.value(EventIdKeyL).toString() };
 }
-} // namespace QMatrixClient
+} // namespace Quotient
 
 TextContent::TextContent(const QJsonObject& json)
     : relatesTo(fromJson<Omittable<RelatesTo>>(json[RelatesToKeyL]))
diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h
index c7a5cb47..aa515c71 100644
--- a/lib/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
@@ -23,7 +23,7 @@
 
 class QFileInfo;
 
-namespace QMatrixClient {
+namespace Quotient {
 namespace MessageEventContent = EventContent; // Back-compatibility
 
 /**
@@ -217,4 +217,4 @@ namespace EventContent {
      */
     using AudioContent = PlayableContent<UrlBasedContent<FileInfo>>;
 } // namespace EventContent
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/roomtombstoneevent.cpp b/lib/events/roomtombstoneevent.cpp
index a74bb367..f93eb60d 100644
--- a/lib/events/roomtombstoneevent.cpp
+++ b/lib/events/roomtombstoneevent.cpp
@@ -18,7 +18,7 @@
 
 #include "roomtombstoneevent.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 QString RoomTombstoneEvent::serverMessage() const
 {
diff --git a/lib/events/roomtombstoneevent.h b/lib/events/roomtombstoneevent.h
index 95fed998..2c2f0663 100644
--- a/lib/events/roomtombstoneevent.h
+++ b/lib/events/roomtombstoneevent.h
@@ -20,7 +20,7 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class RoomTombstoneEvent : public StateEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.room.tombstone", RoomTombstoneEvent)
@@ -34,4 +34,4 @@ public:
     QString successorRoomId() const;
 };
 REGISTER_EVENT_TYPE(RoomTombstoneEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index 6dad8020..520f6b4b 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -20,7 +20,7 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 namespace EventContent {
     template <typename T>
     class SimpleContent {
@@ -37,7 +37,7 @@ namespace EventContent {
         {}
         QJsonObject toJson() const
         {
-            return { { key, QMatrixClient::toJson(value) } };
+            return { { key, Quotient::toJson(value) } };
         }
 
     public:
@@ -92,4 +92,4 @@ public:
     QStringList aliases() const { return content().value; }
 };
 REGISTER_EVENT_TYPE(RoomAliasesEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index bd228abd..c0bb0794 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -18,7 +18,7 @@
 
 #include "stateevent.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 // Aside from the normal factory to instantiate StateEventBase inheritors
 // StateEventBase itself can be instantiated if there's a state_key JSON key
diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index 757c94ee..74e36e74 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 
 /// Make a minimal correct Matrix state event JSON
 template <typename StrT>
@@ -128,12 +128,12 @@ private:
     ContentT _content;
     std::unique_ptr<Prev<ContentT>> _prev;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
 
 namespace std {
 template <>
-struct hash<QMatrixClient::StateEventKey> {
-    size_t operator()(const QMatrixClient::StateEventKey& k) const Q_DECL_NOEXCEPT
+struct hash<Quotient::StateEventKey> {
+    size_t operator()(const Quotient::StateEventKey& k) const Q_DECL_NOEXCEPT
     {
         return qHash(k);
     }
diff --git a/lib/events/typingevent.cpp b/lib/events/typingevent.cpp
index ee3d6b67..0c5fc6ba 100644
--- a/lib/events/typingevent.cpp
+++ b/lib/events/typingevent.cpp
@@ -20,7 +20,7 @@
 
 #include <QtCore/QJsonArray>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 TypingEvent::TypingEvent(const QJsonObject& obj) : Event(typeId(), obj)
 {
diff --git a/lib/events/typingevent.h b/lib/events/typingevent.h
index c8170865..d659c597 100644
--- a/lib/events/typingevent.h
+++ b/lib/events/typingevent.h
@@ -20,7 +20,7 @@
 
 #include "event.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class TypingEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.typing", TypingEvent)
@@ -34,4 +34,4 @@ private:
 };
 REGISTER_EVENT_TYPE(TypingEvent)
 DEFINE_EVENTTYPE_ALIAS(Typing, TypingEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/identity/definitions/request_email_validation.cpp b/lib/identity/definitions/request_email_validation.cpp
index 131b9488..22cb0072 100644
--- a/lib/identity/definitions/request_email_validation.cpp
+++ b/lib/identity/definitions/request_email_validation.cpp
@@ -4,7 +4,7 @@
 
 #include "request_email_validation.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<RequestEmailValidation>::dumpTo(
     QJsonObject& jo, const RequestEmailValidation& pod)
diff --git a/lib/identity/definitions/request_email_validation.h b/lib/identity/definitions/request_email_validation.h
index 2496d7f5..99487073 100644
--- a/lib/identity/definitions/request_email_validation.h
+++ b/lib/identity/definitions/request_email_validation.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -39,4 +39,4 @@ struct JsonObjectConverter<RequestEmailValidation>
     static void fillFrom(const QJsonObject& jo, RequestEmailValidation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/identity/definitions/request_msisdn_validation.cpp b/lib/identity/definitions/request_msisdn_validation.cpp
index 0087d202..6024bf61 100644
--- a/lib/identity/definitions/request_msisdn_validation.cpp
+++ b/lib/identity/definitions/request_msisdn_validation.cpp
@@ -4,7 +4,7 @@
 
 #include "request_msisdn_validation.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<RequestMsisdnValidation>::dumpTo(
     QJsonObject& jo, const RequestMsisdnValidation& pod)
diff --git a/lib/identity/definitions/request_msisdn_validation.h b/lib/identity/definitions/request_msisdn_validation.h
index f8060cfc..ecccf567 100644
--- a/lib/identity/definitions/request_msisdn_validation.h
+++ b/lib/identity/definitions/request_msisdn_validation.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -43,4 +43,4 @@ struct JsonObjectConverter<RequestMsisdnValidation>
     static void fillFrom(const QJsonObject& jo, RequestMsisdnValidation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/identity/definitions/sid.cpp b/lib/identity/definitions/sid.cpp
index cc6973f2..99fe9b59 100644
--- a/lib/identity/definitions/sid.cpp
+++ b/lib/identity/definitions/sid.cpp
@@ -4,7 +4,7 @@
 
 #include "sid.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<Sid>::dumpTo(QJsonObject& jo, const Sid& pod)
 {
diff --git a/lib/identity/definitions/sid.h b/lib/identity/definitions/sid.h
index 752d62bb..0f7ce58a 100644
--- a/lib/identity/definitions/sid.h
+++ b/lib/identity/definitions/sid.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -27,4 +27,4 @@ struct JsonObjectConverter<Sid>
     static void fillFrom(const QJsonObject& jo, Sid& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index 5615736e..ec6b8375 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -30,7 +30,7 @@
 
 #include <array>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
     static inline void cleanup(QNetworkReply* reply)
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index c85d2d90..90c20c37 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -28,7 +28,7 @@
 class QNetworkReply;
 class QSslError;
 
-namespace QMatrixClient {
+namespace Quotient {
 class ConnectionData;
 
 enum class HttpVerb { Get, Put, Post, Delete };
@@ -364,4 +364,4 @@ inline bool isJobRunning(BaseJob* job)
 {
     return job && job->error() == BaseJob::Pending;
 }
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 9722186c..3a03efde 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
@@ -4,7 +4,7 @@
 #include <QtCore/QTemporaryFile>
 #include <QtNetwork/QNetworkReply>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 class DownloadFileJob::Private {
 public:
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index ebfe5a0d..fa697219 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -2,7 +2,7 @@
 
 #include "csapi/content-repo.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class DownloadFileJob : public GetContentJob {
 public:
     enum { FileError = BaseJob::UserDefinedError + 1 };
@@ -24,4 +24,4 @@ private:
     void beforeAbandon(QNetworkReply*) override;
     Status parseReply(QNetworkReply*) override;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/jobs/mediathumbnailjob.cpp b/lib/jobs/mediathumbnailjob.cpp
index db2bbc13..0a346392 100644
--- a/lib/jobs/mediathumbnailjob.cpp
+++ b/lib/jobs/mediathumbnailjob.cpp
@@ -18,7 +18,7 @@
 
 #include "mediathumbnailjob.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 QUrl MediaThumbnailJob::makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri,
                                        QSize requestedSize)
diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index df0a7f31..75e2e55a 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QPixmap>
 
-namespace QMatrixClient {
+namespace Quotient {
 class MediaThumbnailJob : public GetContentThumbnailJob {
 public:
     using GetContentThumbnailJob::makeRequestUrl;
@@ -42,4 +42,4 @@ protected:
 private:
     QImage _thumbnail;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/jobs/postreadmarkersjob.h b/lib/jobs/postreadmarkersjob.h
index cf482a9a..5a4d942c 100644
--- a/lib/jobs/postreadmarkersjob.h
+++ b/lib/jobs/postreadmarkersjob.h
@@ -22,7 +22,7 @@
 
 #include <QtCore/QJsonObject>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 class PostReadMarkersJob : public BaseJob {
 public:
diff --git a/lib/jobs/requestdata.cpp b/lib/jobs/requestdata.cpp
index 6ad7c007..0c70f085 100644
--- a/lib/jobs/requestdata.cpp
+++ b/lib/jobs/requestdata.cpp
@@ -6,7 +6,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 auto fromData(const QByteArray& data)
 {
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 55987a3b..020d5ef2 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -26,7 +26,7 @@ class QJsonArray;
 class QJsonDocument;
 class QIODevice;
 
-namespace QMatrixClient {
+namespace Quotient {
 /**
  * A simple wrapper that represents the request body.
  * Provides a unified interface to dump an unstructured byte stream
@@ -52,4 +52,6 @@ public:
 private:
     std::unique_ptr<QIODevice> _source;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
+/// \deprecated Use namespace Quotient instead
+namespace QMatrixClient = Quotient;
diff --git a/lib/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp
index f660e1b6..cd7709e1 100644
--- a/lib/jobs/syncjob.cpp
+++ b/lib/jobs/syncjob.cpp
@@ -18,7 +18,7 @@
 
 #include "syncjob.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static size_t jobId = 0;
 
diff --git a/lib/jobs/syncjob.h b/lib/jobs/syncjob.h
index 8f925414..df419ba8 100644
--- a/lib/jobs/syncjob.h
+++ b/lib/jobs/syncjob.h
@@ -22,7 +22,7 @@
 #include "../syncdata.h"
 #include "basejob.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class SyncJob : public BaseJob {
 public:
     explicit SyncJob(const QString& since = {}, const QString& filter = {},
@@ -38,4 +38,4 @@ protected:
 private:
     SyncData d;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/joinstate.h b/lib/joinstate.h
index fcf840ae..718ae3fd 100644
--- a/lib/joinstate.h
+++ b/lib/joinstate.h
@@ -22,7 +22,7 @@
 
 #include <array>
 
-namespace QMatrixClient {
+namespace Quotient {
 enum class JoinState : unsigned int {
     Join = 0x1,
     Invite = 0x2,
@@ -43,5 +43,5 @@ inline const char* toCString(JoinState js)
         ++index;
     return JoinStateStrings[index];
 }
-} // namespace QMatrixClient
-Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrixClient::JoinStates)
+} // namespace Quotient
+Q_DECLARE_OPERATORS_FOR_FLAGS(Quotient::JoinStates)
diff --git a/lib/logging.h b/lib/logging.h
index 24799752..3d13569a 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -28,7 +28,7 @@ Q_DECLARE_LOGGING_CATEGORY(EPHEMERAL)
 Q_DECLARE_LOGGING_CATEGORY(JOBS)
 Q_DECLARE_LOGGING_CATEGORY(SYNCJOB)
 
-namespace QMatrixClient {
+namespace Quotient {
 // QDebug manipulators
 
 using QDebugManip = QDebug (*)(QDebug);
@@ -75,7 +75,9 @@ inline qint64 profilerMinNsecs()
 #endif
         * 1000;
 }
-} // namespace QMatrixClient
+} // namespace Quotient
+/// \deprecated Use namespace Quotient instead
+namespace QMatrixClient = Quotient;
 
 inline QDebug operator<<(QDebug debug_object, const QElapsedTimer& et)
 {
diff --git a/lib/networkaccessmanager.cpp b/lib/networkaccessmanager.cpp
index 7bff654c..8ee080bf 100644
--- a/lib/networkaccessmanager.cpp
+++ b/lib/networkaccessmanager.cpp
@@ -21,7 +21,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtNetwork/QNetworkReply>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 class NetworkAccessManager::Private {
 public:
diff --git a/lib/networkaccessmanager.h b/lib/networkaccessmanager.h
index dfa388f0..a678b80f 100644
--- a/lib/networkaccessmanager.h
+++ b/lib/networkaccessmanager.h
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-namespace QMatrixClient {
+namespace Quotient {
 class NetworkAccessManager : public QNetworkAccessManager {
     Q_OBJECT
 public:
@@ -43,4 +43,4 @@ private:
     class Private;
     std::unique_ptr<Private> d;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/networksettings.cpp b/lib/networksettings.cpp
index f5655975..cb071483 100644
--- a/lib/networksettings.cpp
+++ b/lib/networksettings.cpp
@@ -18,7 +18,7 @@
 
 #include "networksettings.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void NetworkSettings::setupApplicationProxy() const
 {
diff --git a/lib/networksettings.h b/lib/networksettings.h
index 75bf726d..a82a44d0 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -24,7 +24,7 @@
 
 Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
 
-namespace QMatrixClient {
+namespace Quotient {
 class NetworkSettings : public SettingsGroup {
     Q_OBJECT
     QMC_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h
index 94c1ec60..159e7522 100644
--- a/lib/qt_connection_util.h
+++ b/lib/qt_connection_util.h
@@ -22,7 +22,7 @@
 
 #include <QtCore/QPointer>
 
-namespace QMatrixClient {
+namespace Quotient {
 namespace _impl {
     template <typename SenderT, typename SignalT, typename ContextT, typename... ArgTs>
     inline QMetaObject::Connection
@@ -102,4 +102,4 @@ public:
 private:
     QObject* subscriber;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/room.cpp b/lib/room.cpp
index 52f86616..d8fee5aa 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -71,7 +71,7 @@
 #include <message.h> // QtOlm
 #include <session.h> // QtOlm
 
-using namespace QMatrixClient;
+using namespace Quotient;
 using namespace std::placeholders;
 using std::move;
 #if !(defined __GLIBCXX__ && __GLIBCXX__ <= 20150123)
@@ -1085,7 +1085,7 @@ QUrl Room::fileSource(const QString& id) const
 
 QString Room::prettyPrint(const QString& plainText) const
 {
-    return QMatrixClient::prettyPrint(plainText);
+    return Quotient::prettyPrint(plainText);
 }
 
 QList<User*> Room::usersTyping() const { return d->usersTyping; }
diff --git a/lib/room.h b/lib/room.h
index d6fb8a61..8448815d 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -35,7 +35,7 @@
 #include <memory>
 #include <utility>
 
-namespace QMatrixClient {
+namespace Quotient {
 class Event;
 class Avatar;
 class SyncRoomData;
@@ -423,7 +423,7 @@ public:
     Q_INVOKABLE QUrl fileSource(const QString& id) const;
 
     /** Pretty-prints plain text into HTML
-     * As of now, it's exactly the same as QMatrixClient::prettyPrint();
+     * As of now, it's exactly the same as Quotient::prettyPrint();
      * in the future, it will also linkify room aliases, mxids etc.
      * using the room context.
      */
@@ -668,6 +668,6 @@ public:
 private:
     const Room* room;
 };
-} // namespace QMatrixClient
-Q_DECLARE_METATYPE(QMatrixClient::FileTransferInfo)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrixClient::Room::Changes)
+} // namespace Quotient
+Q_DECLARE_METATYPE(Quotient::FileTransferInfo)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Quotient::Room::Changes)
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 1278fe33..9c61ab5e 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -4,7 +4,7 @@
 
 #include <QtCore/QUrl>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 QString Settings::legacyOrganizationName {};
 QString Settings::legacyApplicationName {};
diff --git a/lib/settings.h b/lib/settings.h
index 427f5494..4dcbbea0 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -24,7 +24,7 @@
 
 class QVariant;
 
-namespace QMatrixClient {
+namespace Quotient {
 class Settings : public QSettings {
     Q_OBJECT
 public:
@@ -148,4 +148,4 @@ public:
     void setEncryptionAccountPickle(const QByteArray& encryptionAccountPickle);
     Q_INVOKABLE void clearEncryptionAccountPickle();
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/syncdata.cpp b/lib/syncdata.cpp
index 0c39b438..c784cd7d 100644
--- a/lib/syncdata.cpp
+++ b/lib/syncdata.cpp
@@ -23,7 +23,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 const QString SyncRoomData::UnreadCountKey =
     QStringLiteral("x-qmatrixclient.unread_count");
@@ -42,7 +42,7 @@ bool RoomSummary::merge(const RoomSummary& other)
            | heroes.merge(other.heroes);
 }
 
-QDebug QMatrixClient::operator<<(QDebug dbg, const RoomSummary& rs)
+QDebug Quotient::operator<<(QDebug dbg, const RoomSummary& rs)
 {
     QDebugStateSaver _(dbg);
     QStringList sl;
diff --git a/lib/syncdata.h b/lib/syncdata.h
index ad9902e4..d55438d7 100644
--- a/lib/syncdata.h
+++ b/lib/syncdata.h
@@ -22,7 +22,7 @@
 
 #include "events/stateevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 /// Room summary, as defined in MSC688
 /**
  * Every member of this structure is an Omittable; as per the MSC, only
@@ -111,4 +111,4 @@ private:
 
     static QJsonObject loadJson(const QString& fileName);
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/user.cpp b/lib/user.cpp
index 0705aee7..5dea3942 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -37,7 +37,7 @@
 
 #include <functional>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 using namespace std::placeholders;
 using std::move;
 
diff --git a/lib/user.h b/lib/user.h
index 779efb34..c9e3dbc1 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -23,7 +23,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 
-namespace QMatrixClient {
+namespace Quotient {
 class Connection;
 class Room;
 class RoomMemberEvent;
@@ -160,5 +160,5 @@ private:
     class Private;
     QScopedPointer<Private> d;
 };
-} // namespace QMatrixClient
-Q_DECLARE_METATYPE(QMatrixClient::User*)
+} // namespace Quotient
+Q_DECLARE_METATYPE(Quotient::User*)
diff --git a/lib/util.cpp b/lib/util.cpp
index 1919e811..be9656f8 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -32,7 +32,7 @@ static const auto RegExpOptions =
     | QRegularExpression::UseUnicodePropertiesOption;
 
 // Converts all that looks like a URL into HTML links
-void QMatrixClient::linkifyUrls(QString& htmlEscapedText)
+void Quotient::linkifyUrls(QString& htmlEscapedText)
 {
     // Note: outer parentheses are a part of C++ raw string delimiters, not of
     // the regex (see http://en.cppreference.com/w/cpp/language/string_literal).
@@ -70,7 +70,7 @@ void QMatrixClient::linkifyUrls(QString& htmlEscapedText)
         QStringLiteral(R"(\1<a href="https://matrix.to/#/\2">\2</a>)"));
 }
 
-QString QMatrixClient::sanitized(const QString& plainText)
+QString Quotient::sanitized(const QString& plainText)
 {
     auto text = plainText;
     text.remove(QChar(0x202e)); // RLO
@@ -79,7 +79,7 @@ QString QMatrixClient::sanitized(const QString& plainText)
     return text;
 }
 
-QString QMatrixClient::prettyPrint(const QString& plainText)
+QString Quotient::prettyPrint(const QString& plainText)
 {
     auto pt = plainText.toHtmlEscaped();
     linkifyUrls(pt);
@@ -88,7 +88,7 @@ QString QMatrixClient::prettyPrint(const QString& plainText)
            + QStringLiteral("</span>");
 }
 
-QString QMatrixClient::cacheLocation(const QString& dirName)
+QString Quotient::cacheLocation(const QString& dirName)
 {
     const QString cachePath =
         QStandardPaths::writableLocation(QStandardPaths::CacheLocation) % '/'
@@ -99,7 +99,7 @@ QString QMatrixClient::cacheLocation(const QString& dirName)
     return cachePath;
 }
 
-qreal QMatrixClient::stringToHueF(const QString& string)
+qreal Quotient::stringToHueF(const QString& string)
 {
     Q_ASSERT(!string.isEmpty());
     QByteArray hash = QCryptographicHash::hash(string.toUtf8(),
@@ -118,7 +118,7 @@ static const auto ServerPartRegEx = QStringLiteral(
     "(?::(\\d{1,5}))?" // Optional port
 );
 
-QString QMatrixClient::serverPart(const QString& mxId)
+QString Quotient::serverPart(const QString& mxId)
 {
     static QString re = "^[@!#$+].+?:(" // Localpart and colon
                         % ServerPartRegEx % ")$";
@@ -135,7 +135,7 @@ QString QMatrixClient::serverPart(const QString& mxId)
 #    pragma clang diagnostic push
 #    pragma ide diagnostic ignored "OCSimplifyInspection"
 #endif
-using namespace QMatrixClient;
+using namespace Quotient;
 
 int f();
 static_assert(std::is_same<fn_return_t<decltype(f)>, int>::value,
diff --git a/lib/util.h b/lib/util.h
index d055fa46..d94c7321 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -63,7 +63,7 @@ static void qAsConst(const T&&) Q_DECL_EQ_DELETE;
 #    define BROKEN_INITIALIZER_LISTS
 #endif
 
-namespace QMatrixClient {
+namespace Quotient {
 // The below enables pretty-printing of enums in logs
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
 #    define REGISTER_ENUM(EnumName) Q_ENUM(EnumName)
@@ -330,4 +330,6 @@ qreal stringToHueF(const QString& string);
 
 /** Extract the serverpart from MXID */
 QString serverPart(const QString& mxId);
-} // namespace QMatrixClient
+} // namespace Quotient
+/// \deprecated Use namespace Quotient instead
+namespace QMatrixClient = Quotient;
\ No newline at end of file
-- 
cgit v1.2.3


From 64d096d3f8cdf93216ab138ea0378ae60a19b7d2 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 11 Aug 2019 12:33:52 +0900
Subject: Connection: check for cache_type setting in libQuotient group

The fallback to libQMatrixClient still remains.
---
 lib/connection.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/connection.cpp')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 22db8e3d..56613857 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -111,7 +111,8 @@ public:
 
     bool cacheState = true;
     bool cacheToBinary =
-        SettingsGroup("libqmatrixclient").value("cache_type").toString()
+        SettingsGroup("libQuotient").get("cache_type",
+                 SettingsGroup("libQMatrixClient").get<QString>("cache_type"))
         != "json";
     bool lazyLoading = false;
 
-- 
cgit v1.2.3


From 8629748c5c609882486d25d989becfe0ae2352ed Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 20 Aug 2019 17:59:27 +0900
Subject: Store userId in ConnectionData instead of Connection

To collect all connection-identifying information in a single place.
---
 lib/connection.cpp     | 87 ++++++++++++++++++++++++--------------------------
 lib/connectiondata.cpp | 11 +++++--
 lib/connectiondata.h   |  6 +++-
 3 files changed, 54 insertions(+), 50 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 56613857..c9623729 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -99,7 +99,6 @@ public:
     DirectChatsMap dcLocalAdditions;
     DirectChatsMap dcLocalRemovals;
     std::unordered_map<QString, EventPtr> accountData;
-    QString userId;
     int syncLoopTimeout = -1;
 
     GetCapabilitiesJob* capabilitiesJob = nullptr;
@@ -116,7 +115,7 @@ public:
         != "json";
     bool lazyLoading = false;
 
-    void connectWithToken(const QString& user, const QString& accessToken,
+    void connectWithToken(const QString& userId, const QString& accessToken,
                           const QString& deviceId);
     void removeRoom(const QString& roomId);
 
@@ -132,7 +131,8 @@ public:
     void packAndSendAccountData(EventPtr&& event)
     {
         const auto eventType = event->matrixType();
-        q->callApi<SetAccountDataJob>(userId, eventType, event->contentJson());
+        q->callApi<SetAccountDataJob>(data->userId(), eventType,
+                                      event->contentJson());
         accountData[eventType] = std::move(event);
         emit q->accountDataChanged(eventType);
     }
@@ -159,7 +159,7 @@ Connection::Connection(QObject* parent) : Connection({}, parent) {}
 
 Connection::~Connection()
 {
-    qCDebug(MAIN) << "deconstructing connection object for" << d->userId;
+    qCDebug(MAIN) << "deconstructing connection object for" << userId();
     stopSync();
 }
 
@@ -234,11 +234,11 @@ void Connection::doConnectToServer(const QString& user, const QString& password,
                                    const QString& initialDeviceName,
                                    const QString& deviceId)
 {
-    auto loginJob = callApi<LoginJob>(
-        QStringLiteral("m.login.password"),
-        UserIdentifier { QStringLiteral("m.id.user"),
-                         { { QStringLiteral("user"), user } } },
-        password, /*token*/ "", deviceId, initialDeviceName);
+    auto loginJob =
+        callApi<LoginJob>(QStringLiteral("m.login.password"),
+                          UserIdentifier { QStringLiteral("m.id.user"),
+                                           { { QStringLiteral("user"), user } } },
+                          password, /*token*/ "", deviceId, initialDeviceName);
     connect(loginJob, &BaseJob::success, this, [this, loginJob] {
         d->connectWithToken(loginJob->userId(), loginJob->accessToken(),
                             loginJob->deviceId());
@@ -299,11 +299,11 @@ bool Connection::loadingCapabilities() const
     return d->capabilities.roomVersions.omitted();
 }
 
-void Connection::Private::connectWithToken(const QString& user,
+void Connection::Private::connectWithToken(const QString& userId,
                                            const QString& accessToken,
                                            const QString& deviceId)
 {
-    userId = user;
+    data->setUserId(userId);
     q->user(); // Creates a User object for the local user
     data->setToken(accessToken.toLatin1());
     data->setDeviceId(deviceId);
@@ -354,9 +354,9 @@ void Connection::sync(int timeout)
     Filter filter;
     filter.room->timeline->limit = 100;
     filter.room->state->lazyLoadMembers = d->lazyLoading;
-    auto job = d->syncJob = callApi<SyncJob>(BackgroundRequest,
-                                             d->data->lastEvent(), filter,
-                                             timeout);
+    auto job = d->syncJob =
+        callApi<SyncJob>(BackgroundRequest, d->data->lastEvent(), filter,
+                         timeout);
     connect(job, &SyncJob::success, this, [this, job] {
         onSyncSuccess(job->takeData());
         d->syncJob = nullptr;
@@ -485,7 +485,7 @@ void Connection::onSyncSuccess(SyncData&& data, bool fromCache)
             [this, &eventPtr](const Event& accountEvent) {
                 if (is<IgnoredUsersEvent>(accountEvent))
                     qCDebug(MAIN)
-                        << "Users ignored by" << d->userId << "updated:"
+                        << "Users ignored by" << userId() << "updated:"
                         << QStringList::fromSet(ignoredUsers()).join(',');
 
                 auto& currentData = d->accountData[accountEvent.matrixType()];
@@ -504,7 +504,7 @@ void Connection::onSyncSuccess(SyncData&& data, bool fromCache)
         qDebug(MAIN) << "Sending updated direct chats to the server:"
                      << d->dcLocalRemovals.size() << "removal(s),"
                      << d->dcLocalAdditions.size() << "addition(s)";
-        callApi<SetAccountDataJob>(d->userId, QStringLiteral("m.direct"),
+        callApi<SetAccountDataJob>(userId(), QStringLiteral("m.direct"),
                                    toJson(d->directChats));
         d->dcLocalAdditions.clear();
         d->dcLocalRemovals.clear();
@@ -634,8 +634,8 @@ DownloadFileJob* Connection::downloadFile(const QUrl& url,
 {
     auto mediaId = url.authority() + url.path();
     auto idParts = splitMediaId(mediaId);
-    auto* job = callApi<DownloadFileJob>(idParts.front(), idParts.back(),
-                                         localFilename);
+    auto* job =
+        callApi<DownloadFileJob>(idParts.front(), idParts.back(), localFilename);
     return job;
 }
 
@@ -648,7 +648,7 @@ Connection::createRoom(RoomVisibility visibility, const QString& alias,
                        const QVector<CreateRoomJob::Invite3pid>& invite3pids,
                        const QJsonObject& creationContent)
 {
-    invites.removeOne(d->userId); // The creator is by definition in the room
+    invites.removeOne(userId()); // The creator is by definition in the room
     auto job = callApi<CreateRoomJob>(visibility == PublishRoom
                                           ? QStringLiteral("public")
                                           : QStringLiteral("private"),
@@ -672,12 +672,7 @@ Connection::createRoom(RoomVisibility visibility, const QString& alias,
 
 void Connection::requestDirectChat(const QString& userId)
 {
-    if (auto* u = user(userId))
-        requestDirectChat(u);
-    else
-        qCCritical(MAIN) << "Connection::requestDirectChat: Couldn't get a "
-                            "user object for"
-                         << userId;
+    doInDirectChat(userId, [this](Room* r) { emit directChatAvailable(r); });
 }
 
 void Connection::requestDirectChat(User* u)
@@ -700,7 +695,7 @@ void Connection::doInDirectChat(User* u,
                                 const std::function<void(Room*)>& operation)
 {
     Q_ASSERT(u);
-    const auto& userId = u->id();
+    const auto& otherUserId = u->id();
     // There can be more than one DC; find the first valid (existing and
     // not left), and delete inexistent (forgotten?) ones along the way.
     DirectChatsMap removals;
@@ -710,9 +705,9 @@ void Connection::doInDirectChat(User* u,
         if (auto r = room(roomId, JoinState::Join)) {
             Q_ASSERT(r->id() == roomId);
             // A direct chat with yourself should only involve yourself :)
-            if (userId == d->userId && r->totalMemberCount() > 1)
+            if (otherUserId == userId() && r->totalMemberCount() > 1)
                 continue;
-            qCDebug(MAIN) << "Requested direct chat with" << userId
+            qCDebug(MAIN) << "Requested direct chat with" << otherUserId
                           << "is already available as" << r->id();
             operation(r);
             return;
@@ -721,10 +716,10 @@ void Connection::doInDirectChat(User* u,
             Q_ASSERT(ir->id() == roomId);
             auto j = joinRoom(ir->id());
             connect(j, &BaseJob::success, this,
-                    [this, roomId, userId, operation] {
+                    [this, roomId, otherUserId, operation] {
                         qCDebug(MAIN)
                             << "Joined the already invited direct chat with"
-                            << userId << "as" << roomId;
+                            << otherUserId << "as" << roomId;
                         operation(room(roomId, JoinState::Join));
                     });
             return;
@@ -734,7 +729,7 @@ void Connection::doInDirectChat(User* u,
         if (room(roomId, JoinState::Leave))
             continue;
 
-        qCWarning(MAIN) << "Direct chat with" << userId << "known as room"
+        qCWarning(MAIN) << "Direct chat with" << otherUserId << "known as room"
                         << roomId << "is not valid and will be discarded";
         // Postpone actual deletion until we finish iterating d->directChats.
         removals.insert(it.key(), it.value());
@@ -750,9 +745,9 @@ void Connection::doInDirectChat(User* u,
         emit directChatsListChanged({}, removals);
     }
 
-    auto j = createDirectChat(userId);
-    connect(j, &BaseJob::success, this, [this, j, userId, operation] {
-        qCDebug(MAIN) << "Direct chat with" << userId << "has been created as"
+    auto j = createDirectChat(otherUserId);
+    connect(j, &BaseJob::success, this, [this, j, otherUserId, operation] {
+        qCDebug(MAIN) << "Direct chat with" << otherUserId << "has been created as"
                       << j->roomId();
         operation(room(j->roomId(), JoinState::Join));
     });
@@ -845,7 +840,7 @@ SendMessageJob* Connection::sendMessage(const QString& roomId,
 
 QUrl Connection::homeserver() const { return d->data->baseUrl(); }
 
-QString Connection::domain() const { return d->userId.section(':', 1); }
+QString Connection::domain() const { return userId().section(':', 1); }
 
 Room* Connection::room(const QString& roomId, JoinStates states) const
 {
@@ -905,30 +900,30 @@ Room* Connection::invitation(const QString& roomId) const
     return d->roomMap.value({ roomId, true }, nullptr);
 }
 
-User* Connection::user(const QString& userId)
+User* Connection::user(const QString& uId)
 {
-    if (userId.isEmpty())
+    if (uId.isEmpty())
         return nullptr;
-    if (!userId.startsWith('@') || !userId.contains(':')) {
-        qCCritical(MAIN) << "Malformed userId:" << userId;
+    if (!uId.startsWith('@') || !uId.contains(':')) {
+        qCCritical(MAIN) << "Malformed userId:" << uId;
         return nullptr;
     }
-    if (d->userMap.contains(userId))
-        return d->userMap.value(userId);
-    auto* user = userFactory()(this, userId);
-    d->userMap.insert(userId, user);
+    if (d->userMap.contains(uId))
+        return d->userMap.value(uId);
+    auto* user = userFactory()(this, uId);
+    d->userMap.insert(uId, user);
     emit newUser(user);
     return user;
 }
 
 const User* Connection::user() const
 {
-    return d->userMap.value(d->userId, nullptr);
+    return d->userMap.value(userId(), nullptr);
 }
 
-User* Connection::user() { return user(d->userId); }
+User* Connection::user() { return user(userId()); }
 
-QString Connection::userId() const { return d->userId; }
+QString Connection::userId() const { return d->data->userId(); }
 
 QString Connection::deviceId() const { return d->data->deviceId(); }
 
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp
index 486de03d..41d97b87 100644
--- a/lib/connectiondata.cpp
+++ b/lib/connectiondata.cpp
@@ -29,10 +29,11 @@ struct ConnectionData::Private {
     QUrl baseUrl;
     QByteArray accessToken;
     QString lastEvent;
+    QString userId;
     QString deviceId;
 
     mutable unsigned int txnCounter = 0;
-    const qint64 id = QDateTime::currentMSecsSinceEpoch();
+    const qint64 txnBase = QDateTime::currentMSecsSinceEpoch();
 };
 
 ConnectionData::ConnectionData(QUrl baseUrl)
@@ -75,12 +76,15 @@ void ConnectionData::setPort(int port)
 
 const QString& ConnectionData::deviceId() const { return d->deviceId; }
 
+const QString& ConnectionData::userId() const { return d->userId; }
+
 void ConnectionData::setDeviceId(const QString& deviceId)
 {
     d->deviceId = deviceId;
-    qCDebug(MAIN) << "updated deviceId to" << d->deviceId;
 }
 
+void ConnectionData::setUserId(const QString& userId) { d->userId = userId; }
+
 QString ConnectionData::lastEvent() const { return d->lastEvent; }
 
 void ConnectionData::setLastEvent(QString identifier)
@@ -90,5 +94,6 @@ void ConnectionData::setLastEvent(QString identifier)
 
 QByteArray ConnectionData::generateTxnId() const
 {
-    return QByteArray::number(d->id) + 'q' + QByteArray::number(++d->txnCounter);
+    return d->deviceId.toLatin1() + QByteArray::number(d->txnBase)
+           + QByteArray::number(++d->txnCounter);
 }
diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index 80ace08c..561893df 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -33,13 +33,17 @@ public:
     QByteArray accessToken() const;
     QUrl baseUrl() const;
     const QString& deviceId() const;
-
+    const QString& userId() const;
     QNetworkAccessManager* nam() const;
+
     void setBaseUrl(QUrl baseUrl);
     void setToken(QByteArray accessToken);
+    [[deprecated("Use setBaseUrl() instead")]]
     void setHost(QString host);
+    [[deprecated("Use setBaseUrl() instead")]]
     void setPort(int port);
     void setDeviceId(const QString& deviceId);
+    void setUserId(const QString& userId);
 
     QString lastEvent() const;
     void setLastEvent(QString identifier);
-- 
cgit v1.2.3


From 92614294a89c1f450b82c2b6e35614cf124dc344 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 20 Aug 2019 18:10:46 +0900
Subject: Connection::run()

Finally, clients can pre-create job objects and then separately submit
them for execution on a given connection - previously such separation
was a privilege of Connection (others had to use Connection::callApi<>,
which invoked jobs right away).
---
 lib/connection.cpp | 11 +++++++++--
 lib/connection.h   | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index c9623729..5f90ed55 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -780,7 +780,7 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
                 [this, leaveJob, forgetJob, room] {
                     if (leaveJob->error() == BaseJob::Success
                         || leaveJob->error() == BaseJob::NotFoundError) {
-                        forgetJob->start(connectionData());
+                        run(forgetJob);
                         // If the matching /sync response hasn't arrived yet,
                         // mark the room for explicit deletion
                         if (room->joinState() != JoinState::Leave)
@@ -794,7 +794,7 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
                 });
         connect(leaveJob, &BaseJob::failure, forgetJob, &BaseJob::abandon);
     } else
-        forgetJob->start(connectionData());
+        run(forgetJob);
     connect(forgetJob, &BaseJob::result, this, [this, id, forgetJob] {
         // Leave room in case of success, or room not known by server
         if (forgetJob->error() == BaseJob::Success
@@ -1355,6 +1355,13 @@ void Connection::setLazyLoading(bool newValue)
     }
 }
 
+void Connection::run(BaseJob* job, RunningPolicy runningPolicy) const
+{
+    connect(job, &BaseJob::failure, this, &Connection::requestFailed);
+    job->start(d->data.get(), runningPolicy & BackgroundRequest);
+    d->data->submit(job);
+}
+
 void Connection::getTurnServers()
 {
     auto job = callApi<GetTurnServerJob>();
diff --git a/lib/connection.h b/lib/connection.h
index c807b827..7e32e5c9 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -37,6 +37,8 @@ class Account;
 }
 
 namespace Quotient {
+Q_NAMESPACE
+
 class Room;
 class User;
 class ConnectionData;
@@ -89,10 +91,12 @@ static inline user_factory_t defaultUserFactory()
 /** Enumeration with flags defining the network job running policy
  * So far only background/foreground flags are available.
  *
- * \sa Connection::callApi
+ * \sa Connection::callApi, Connection::run
  */
 enum RunningPolicy { ForegroundRequest = 0x0, BackgroundRequest = 0x1 };
 
+Q_ENUM_NS(RunningPolicy)
+
 class Connection : public QObject {
     Q_OBJECT
 
@@ -352,9 +356,12 @@ public:
     bool lazyLoading() const;
     void setLazyLoading(bool newValue);
 
-    /** Start a job of a specified type with specified arguments and policy
+    /*! Start a pre-created job object on this connection */
+    void run(BaseJob* job, RunningPolicy runningPolicy = ForegroundRequest) const;
+
+    /*! Start a job of a specified type with specified arguments and policy
      *
-     * This is a universal method to start a job of a type passed
+     * This is a universal method to create and start a job of a type passed
      * as a template parameter. The policy allows to fine-tune the way
      * the job is executed - as of this writing it means a choice
      * between "foreground" and "background".
@@ -368,14 +375,13 @@ public:
     JobT* callApi(RunningPolicy runningPolicy, JobArgTs&&... jobArgs) const
     {
         auto job = new JobT(std::forward<JobArgTs>(jobArgs)...);
-        connect(job, &BaseJob::failure, this, &Connection::requestFailed);
-        job->start(connectionData(), runningPolicy & BackgroundRequest);
+        run(job, runningPolicy);
         return job;
     }
 
-    /** Start a job of a specified type with specified arguments
+    /*! Start a job of a specified type with specified arguments
      *
-     * This is an overload that calls the job with "foreground" policy.
+     * This is an overload that runs the job with "foreground" policy.
      */
     template <typename JobT, typename... JobArgTs>
     JobT* callApi(JobArgTs&&... jobArgs) const
-- 
cgit v1.2.3


From 59c4996a602e9eeae4e3bfc0210ff15f957df38f Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 20 Aug 2019 20:09:09 +0900
Subject: BaseJob/ConnectionData: connection-wide rate-limiting

As before, completely transparent for clients, driven by 529 errors from
the server (but cases of rate limiting are signalled by
BaseJob::rateLimited). That brings changes to BaseJob API: timeouts now
use int64_t and also can be handled in std::chrono terms; aboutToStart()
-> aboutToSendRequest(); started() -> sentRequest(). Closes #292.
---
 lib/connection.cpp           |   2 +-
 lib/connectiondata.cpp       |  70 ++++++++++++++++++-
 lib/connectiondata.h         |   6 ++
 lib/jobs/basejob.cpp         | 159 ++++++++++++++++++++++++-------------------
 lib/jobs/basejob.h           |  63 +++++++++++------
 lib/jobs/downloadfilejob.cpp |   4 +-
 lib/jobs/downloadfilejob.h   |   4 +-
 lib/room.cpp                 |   2 +-
 8 files changed, 212 insertions(+), 98 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 5f90ed55..5ebdcf6c 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -1358,7 +1358,7 @@ void Connection::setLazyLoading(bool newValue)
 void Connection::run(BaseJob* job, RunningPolicy runningPolicy) const
 {
     connect(job, &BaseJob::failure, this, &Connection::requestFailed);
-    job->start(d->data.get(), runningPolicy & BackgroundRequest);
+    job->prepare(d->data.get(), runningPolicy & BackgroundRequest);
     d->data->submit(job);
 }
 
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp
index 41d97b87..e241e376 100644
--- a/lib/connectiondata.cpp
+++ b/lib/connectiondata.cpp
@@ -20,11 +20,21 @@
 
 #include "logging.h"
 #include "networkaccessmanager.h"
+#include "jobs/basejob.h"
+
+#include <QtCore/QTimer>
+#include <QtCore/QPointer>
+
+#include <queue>
 
 using namespace Quotient;
 
-struct ConnectionData::Private {
-    explicit Private(QUrl url) : baseUrl(std::move(url)) {}
+class ConnectionData::Private {
+public:
+    explicit Private(QUrl url) : baseUrl(std::move(url))
+    {
+        rateLimiter.setSingleShot(true);
+    }
 
     QUrl baseUrl;
     QByteArray accessToken;
@@ -34,14 +44,68 @@ struct ConnectionData::Private {
 
     mutable unsigned int txnCounter = 0;
     const qint64 txnBase = QDateTime::currentMSecsSinceEpoch();
+
+    QString id() const { return userId + '/' + deviceId; }
+
+    using job_queue_t = std::queue<QPointer<BaseJob>>;
+    std::array<job_queue_t, 2> jobs; // 0 - foreground, 1 - background
+    QTimer rateLimiter;
 };
 
 ConnectionData::ConnectionData(QUrl baseUrl)
     : d(std::make_unique<Private>(std::move(baseUrl)))
-{}
+{
+    // Each lambda invocation below takes no more than one job from the
+    // queues (first foreground, then background) and resumes it; then
+    // restarts the rate limiter timer with duration 0, effectively yielding
+    // to the event loop and then resuming until both queues are empty.
+    QObject::connect(&d->rateLimiter, &QTimer::timeout, [this] {
+        // TODO: Consider moving out all job->sendRequest() invocations to
+        // a dedicated thread
+        d->rateLimiter.setInterval(0);
+        for (auto& q : d->jobs)
+            while (!q.empty()) {
+                auto& job = q.front();
+                q.pop();
+                if (!job || job->error() == BaseJob::Abandoned)
+                    continue;
+                if (job->error() != BaseJob::Pending) {
+                    qCCritical(MAIN)
+                        << "Job" << job
+                        << "is in the wrong status:" << job->status();
+                    Q_ASSERT(false);
+                    job->setStatus(BaseJob::Pending);
+                }
+                job->sendRequest();
+                d->rateLimiter.start();
+                return;
+            }
+        qCDebug(MAIN) << d->id() << "job queues are empty";
+    });
+}
 
 ConnectionData::~ConnectionData() = default;
 
+void ConnectionData::submit(BaseJob* job)
+{
+    Q_ASSERT(job->error() == BaseJob::Pending);
+    if (!d->rateLimiter.isActive()) {
+        job->sendRequest();
+        return;
+    }
+    d->jobs[size_t(job->isBackground())].emplace(job);
+    qCDebug(MAIN) << job << "queued," << d->jobs.front().size() << "+"
+                  << d->jobs.back().size() << "total jobs in" << d->id()
+                  << "queues";
+}
+
+void ConnectionData::limitRate(std::chrono::milliseconds nextCallAfter)
+{
+    qCDebug(MAIN) << "Jobs for" << (d->userId + "/" + d->deviceId)
+                  << "suspended for" << nextCallAfter.count() << "ms";
+    d->rateLimiter.start(nextCallAfter);
+}
+
 QByteArray ConnectionData::accessToken() const { return d->accessToken; }
 
 QUrl ConnectionData::baseUrl() const { return d->baseUrl; }
diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index 561893df..5cd7c3c7 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -21,15 +21,21 @@
 #include <QtCore/QUrl>
 
 #include <memory>
+#include <chrono>
 
 class QNetworkAccessManager;
 
 namespace Quotient {
+class BaseJob;
+
 class ConnectionData {
 public:
     explicit ConnectionData(QUrl baseUrl);
     virtual ~ConnectionData();
 
+    void submit(BaseJob* job);
+    void limitRate(std::chrono::milliseconds nextCallAfter);
+
     QByteArray accessToken() const;
     QUrl baseUrl() const;
     const QString& deviceId() const;
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index 621762be..0a17431c 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -31,6 +31,8 @@
 #include <array>
 
 using namespace Quotient;
+using std::chrono::seconds, std::chrono::milliseconds;
+using std::chrono_literals::operator""s;
 
 struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
     static inline void cleanup(QNetworkReply* reply)
@@ -43,6 +45,11 @@ struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
 
 class BaseJob::Private {
 public:
+    struct JobTimeoutConfig {
+        seconds jobTimeout;
+        seconds nextRetryInterval;
+    };
+
     // Using an idiom from clang-tidy:
     // http://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html
     Private(HttpVerb v, QString endpoint, const QUrlQuery& q, Data&& data,
@@ -52,12 +59,14 @@ public:
         , requestQuery(q)
         , requestData(std::move(data))
         , needsToken(nt)
-    {}
+    {
+        timer.setSingleShot(true);
+        retryTimer.setSingleShot(true);
+    }
 
-    void sendRequest(bool inBackground);
-    const JobTimeoutConfig& getCurrentTimeoutConfig() const;
+    void sendRequest();
 
-    const ConnectionData* connection = nullptr;
+    ConnectionData* connection = nullptr;
 
     // Contents for the network request
     HttpVerb verb;
@@ -67,13 +76,15 @@ public:
     Data requestData;
     bool needsToken;
 
+    bool inBackground = false;
+
     // There's no use of QMimeType here because we don't want to match
     // content types against the known MIME type hierarchy; and at the same
     // type QMimeType is of little help with MIME type globs (`text/*` etc.)
-    QByteArrayList expectedContentTypes;
+    QByteArrayList expectedContentTypes { "application/json" };
 
     QScopedPointer<QNetworkReply, NetworkReplyDeleter> reply;
-    Status status = Pending;
+    Status status = Unprepared;
     QByteArray rawResponse;
     QUrl errorUrl; //< May contain a URL to help with some errors
 
@@ -82,12 +93,18 @@ public:
     QTimer timer;
     QTimer retryTimer;
 
-    QVector<JobTimeoutConfig> errorStrategy = { { 90, 5 },
-                                                { 90, 10 },
-                                                { 120, 30 } };
-    int maxRetries = errorStrategy.size();
+    static constexpr std::array<const JobTimeoutConfig, 3> errorStrategy {
+        { { 90s, 5s }, { 90s, 10s }, { 120s, 30s } }
+    };
+    int maxRetries = int(errorStrategy.size());
     int retriesTaken = 0;
 
+    const JobTimeoutConfig& getCurrentTimeoutConfig() const
+    {
+        return errorStrategy[std::min(size_t(retriesTaken),
+                                      errorStrategy.size() - 1)];
+    }
+
     QString urlForLog() const
     {
         return reply
@@ -106,9 +123,11 @@ BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
     : d(new Private(verb, endpoint, query, std::move(data), needsToken))
 {
     setObjectName(name);
-    setExpectedContentTypes({ "application/json" });
-    d->timer.setSingleShot(true);
     connect(&d->timer, &QTimer::timeout, this, &BaseJob::timeout);
+    connect(&d->retryTimer, &QTimer::timeout, this, [this] {
+        setStatus(Pending);
+        sendRequest();
+    });
 }
 
 BaseJob::~BaseJob()
@@ -124,10 +143,7 @@ QUrl BaseJob::requestUrl() const
 
 bool BaseJob::isBackground() const
 {
-    return d->reply
-           && d->reply->request()
-                  .attribute(QNetworkRequest::BackgroundRequestAttribute)
-                  .toBool();
+    return d->inBackground;
 }
 
 const QString& BaseJob::apiEndpoint() const { return d->apiEndpoint; }
@@ -191,7 +207,7 @@ QUrl BaseJob::makeRequestUrl(QUrl baseUrl, const QString& path,
     return baseUrl;
 }
 
-void BaseJob::Private::sendRequest(bool inBackground)
+void BaseJob::Private::sendRequest()
 {
     QNetworkRequest req { makeRequestUrl(connection->baseUrl(), apiEndpoint,
                                          requestQuery) };
@@ -223,36 +239,31 @@ void BaseJob::Private::sendRequest(bool inBackground)
     }
 }
 
-void BaseJob::beforeStart(const ConnectionData*) {}
+void BaseJob::doPrepare() {}
 
-void BaseJob::afterStart(const ConnectionData*, QNetworkReply*) {}
+void BaseJob::onSentRequest(QNetworkReply*) {}
 
 void BaseJob::beforeAbandon(QNetworkReply*) {}
 
-void BaseJob::start(const ConnectionData* connData, bool inBackground)
+void BaseJob::prepare(ConnectionData* connData, bool inBackground)
 {
+    d->inBackground = inBackground;
     d->connection = connData;
-    d->retryTimer.setSingleShot(true);
-    connect(&d->retryTimer, &QTimer::timeout, this,
-            [this, inBackground] { sendRequest(inBackground); });
-
-    beforeStart(connData);
-    if (status().good())
-        sendRequest(inBackground);
-    if (status().good())
-        afterStart(connData, d->reply.data());
-    if (!status().good())
+    doPrepare();
+    if (status().code != Unprepared && status().code != Pending)
         QTimer::singleShot(0, this, &BaseJob::finishJob);
+    setStatus(Pending);
 }
 
-void BaseJob::sendRequest(bool inBackground)
+void BaseJob::sendRequest()
 {
-    emit aboutToStart();
-    d->retryTimer.stop(); // In case we were counting down at the moment
-    qCDebug(d->logCat) << this << "sending request to" << d->apiEndpoint;
-    if (!d->requestQuery.isEmpty())
-        qCDebug(d->logCat) << "  query:" << d->requestQuery.toString();
-    d->sendRequest(inBackground);
+    if (status().code == Abandoned)
+        return;
+    Q_ASSERT(d->connection && status().code == Pending);
+    qCDebug(d->logCat) << "Making request to" << d->urlForLog();
+    emit aboutToSendRequest();
+    d->sendRequest();
+    Q_ASSERT(d->reply);
     connect(d->reply.data(), &QNetworkReply::finished, this, &BaseJob::gotReply);
     if (d->reply->isRunning()) {
         connect(d->reply.data(), &QNetworkReply::metaDataChanged, this,
@@ -262,10 +273,12 @@ void BaseJob::sendRequest(bool inBackground)
         connect(d->reply.data(), &QNetworkReply::downloadProgress, this,
                 &BaseJob::downloadProgress);
         d->timer.start(getCurrentTimeout());
-        qCDebug(d->logCat) << this << "request has been sent";
-        emit started();
+        qCInfo(d->logCat).noquote() << "Request sent to" << d->urlForLog();
+        onSentRequest(d->reply.data());
+        emit sentRequest();
     } else
-        qCWarning(d->logCat) << this << "request could not start";
+        qCWarning(d->logCat).noquote()
+            << "Request could not start:" << d->urlForLog();
 }
 
 void BaseJob::checkReply() { setStatus(doCheckReply(d->reply.data())); }
@@ -286,13 +299,7 @@ void BaseJob::gotReply()
                 parseError(d->reply.data(),
                            QJsonDocument::fromJson(d->rawResponse).object()));
     }
-
-    if (status().code != TooManyRequestsError)
-        finishJob();
-    else {
-        stop();
-        emit retryScheduled(d->retriesTaken, d->retryTimer.interval());
-    }
+    finishJob();
 }
 
 bool checkContentType(const QByteArray& type, const QByteArrayList& patterns)
@@ -416,14 +423,13 @@ BaseJob::Status BaseJob::parseError(QNetworkReply*  /*reply*/,
     const auto errCode = errorJson.value("errcode"_ls).toString();
     if (error() == TooManyRequestsError || errCode == "M_LIMIT_EXCEEDED") {
         QString msg = tr("Too many requests");
-        auto retryInterval = errorJson.value("retry_after_ms"_ls).toInt(-1);
-        if (retryInterval != -1)
-            msg += tr(", next retry advised after %1 ms").arg(retryInterval);
+        int64_t retryAfterMs = errorJson.value("retry_after_ms"_ls).toInt(-1);
+        if (retryAfterMs >= 0)
+            msg += tr(", next retry advised after %1 ms").arg(retryAfterMs);
         else // We still have to figure some reasonable interval
-            retryInterval = getNextRetryInterval();
+            retryAfterMs = getNextRetryMs();
 
-        qCWarning(d->logCat) << this << "will retry in" << retryInterval << "ms";
-        d->retryTimer.start(retryInterval);
+        d->connection->limitRate(milliseconds(retryAfterMs));
 
         return { TooManyRequestsError, msg };
     }
@@ -470,19 +476,23 @@ void BaseJob::stop()
 void BaseJob::finishJob()
 {
     stop();
-    if ((error() == NetworkError || error() == TimeoutError)
+    if (error() == TooManyRequests) {
+        emit rateLimited();
+        setStatus(Pending);
+        d->connection->submit(this);
+        return;
+    }
+    if ((error() == NetworkError || error() == Timeout)
         && d->retriesTaken < d->maxRetries) {
-        // TODO: The whole retrying thing should be put to ConnectionManager
+        // TODO: The whole retrying thing should be put to Connection(Manager)
         // otherwise independently retrying jobs make a bit of notification
         // storm towards the UI.
-        const auto retryInterval = error() == TimeoutError
-                                       ? 0
-                                       : getNextRetryInterval();
+        const seconds retryIn = error() == Timeout ? 0s : getNextRetryInterval();
         ++d->retriesTaken;
         qCWarning(d->logCat).nospace() << this << ": retry #" << d->retriesTaken
-                                       << " in " << retryInterval / 1000 << " s";
-        d->retryTimer.start(retryInterval);
-        emit retryScheduled(d->retriesTaken, retryInterval);
+                                       << " in " << retryIn.count() << " s";
+        d->retryTimer.start(retryIn);
+        emit retryScheduled(d->retriesTaken, milliseconds(retryIn).count());
         return;
     }
 
@@ -498,24 +508,35 @@ void BaseJob::finishJob()
     deleteLater();
 }
 
-const JobTimeoutConfig& BaseJob::Private::getCurrentTimeoutConfig() const
+seconds BaseJob::getCurrentTimeout() const
+{
+    return d->getCurrentTimeoutConfig().jobTimeout;
+}
+
+BaseJob::duration_ms_t BaseJob::getCurrentTimeoutMs() const
+{
+    return milliseconds(getCurrentTimeout()).count();
+}
+
+seconds BaseJob::getNextRetryInterval() const
 {
-    return errorStrategy[std::min(retriesTaken, errorStrategy.size() - 1)];
+    return d->getCurrentTimeoutConfig().nextRetryInterval;
 }
 
-BaseJob::duration_t BaseJob::getCurrentTimeout() const
+BaseJob::duration_ms_t BaseJob::getNextRetryMs() const
 {
-    return d->getCurrentTimeoutConfig().jobTimeout * 1000;
+    return milliseconds(getNextRetryInterval()).count();
 }
 
-BaseJob::duration_t BaseJob::getNextRetryInterval() const
+milliseconds BaseJob::timeToRetry() const
 {
-    return d->getCurrentTimeoutConfig().nextRetryInterval * 1000;
+    return d->retryTimer.isActive() ? d->retryTimer.remainingTimeAsDuration()
+                                    : 0s;
 }
 
-BaseJob::duration_t BaseJob::millisToRetry() const
+BaseJob::duration_ms_t BaseJob::millisToRetry() const
 {
-    return d->retryTimer.isActive() ? d->retryTimer.remainingTime() : 0;
+    return timeToRetry().count();
 }
 
 int BaseJob::maxRetries() const { return d->maxRetries; }
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index 9de7b49d..4dc287f8 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -34,11 +34,6 @@ class ConnectionData;
 
 enum class HttpVerb { Get, Put, Post, Delete };
 
-struct JobTimeoutConfig {
-    int jobTimeout;
-    int nextRetryInterval;
-};
-
 class BaseJob : public QObject {
     Q_OBJECT
     Q_PROPERTY(QUrl requestUrl READ requestUrl CONSTANT)
@@ -59,6 +54,7 @@ public:
         WarningLevel = 20, //< Warnings have codes starting from this
         UnexpectedResponseType = 21,
         UnexpectedResponseTypeWarning = UnexpectedResponseType,
+        Unprepared = 25, //< Initial job state is incomplete, hence warning level
         Abandoned = 50, //< A tiny period between abandoning and object deletion
         ErrorLevel = 100, //< Errors have codes starting from this
         NetworkError = 100,
@@ -140,8 +136,6 @@ public:
         QString message;
     };
 
-    using duration_t = int; // milliseconds
-
 public:
     BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
             bool needsToken = true);
@@ -153,13 +147,16 @@ public:
 
     /** Current status of the job */
     Status status() const;
+
     /** Short human-friendly message on the job status */
     QString statusCaption() const;
+
     /** Get raw response body as received from the server
      * \param bytesAtMost return this number of leftmost bytes, or -1
      *                    to return the entire response
      */
     QByteArray rawData(int bytesAtMost = -1) const;
+
     /** Get UI-friendly sample of raw data
      *
      * This is almost the same as rawData but appends the "truncated"
@@ -175,17 +172,24 @@ public:
      * \sa status
      */
     int error() const;
+
     /** Error-specific message, as returned by the server */
     virtual QString errorString() const;
+
     /** A URL to help/clarify the error, if provided by the server */
     QUrl errorUrl() const;
 
     int maxRetries() const;
     void setMaxRetries(int newMaxRetries);
 
-    Q_INVOKABLE duration_t getCurrentTimeout() const;
-    Q_INVOKABLE duration_t getNextRetryInterval() const;
-    Q_INVOKABLE duration_t millisToRetry() const;
+    using duration_ms_t = std::chrono::milliseconds::rep; // normally int64_t
+
+    std::chrono::seconds getCurrentTimeout() const;
+    Q_INVOKABLE duration_ms_t getCurrentTimeoutMs() const;
+    std::chrono::seconds getNextRetryInterval() const;
+    Q_INVOKABLE duration_ms_t getNextRetryMs() const;
+    std::chrono::milliseconds timeToRetry() const;
+    Q_INVOKABLE duration_ms_t millisToRetry() const;
 
     friend QDebug operator<<(QDebug dbg, const BaseJob* j)
     {
@@ -193,7 +197,7 @@ public:
     }
 
 public slots:
-    void start(const ConnectionData* connData, bool inBackground = false);
+    void prepare(ConnectionData* connData, bool inBackground);
 
     /**
      * Abandons the result of this job, arrived or unarrived.
@@ -206,10 +210,10 @@ public slots:
 
 signals:
     /** The job is about to send a network request */
-    void aboutToStart();
+    void aboutToSendRequest();
 
     /** The job has sent a network request */
-    void started();
+    void sentRequest();
 
     /** The job has changed its status */
     void statusChanged(Status newStatus);
@@ -222,7 +226,14 @@ signals:
      * @param inMilliseconds the interval after which the next attempt will be
      * taken
      */
-    void retryScheduled(int nextAttempt, int inMilliseconds);
+    void retryScheduled(int nextAttempt, duration_ms_t inMilliseconds);
+
+    /**
+     * The previous network request has been rate-limited; the next attempt
+     * will be queued and run sometime later. Since other jobs may already
+     * wait in the queue, it's not possible to predict the wait time.
+     */
+    void rateLimited();
 
     /**
      * Emitted when the job is finished, in any case. It is used to notify
@@ -297,9 +308,20 @@ protected:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& path,
                                const QUrlQuery& query = {});
 
-    virtual void beforeStart(const ConnectionData* connData);
-    virtual void afterStart(const ConnectionData* connData,
-                            QNetworkReply* reply);
+    /*! Prepares the job for execution
+     *
+     * This method is called no more than once per job lifecycle,
+     * when it's first scheduled for execution; in particular, it is not called
+     * on retries.
+     */
+    virtual void doPrepare();
+    /*! Postprocessing after the network request has been sent
+     *
+     * This method is called every time the job receives a running
+     * QNetworkReply object from NetworkAccessManager - basically, after
+     * successfully sending a network request (including retries).
+     */
+    virtual void onSentRequest(QNetworkReply*);
     virtual void beforeAbandon(QNetworkReply*);
 
     /**
@@ -341,8 +363,7 @@ protected:
      * @param reply the HTTP reply from the server
      * @param errorJson the JSON payload describing the error
      */
-    virtual Status parseError(QNetworkReply* reply,
-                              const QJsonObject& errorJson);
+    virtual Status parseError(QNetworkReply*, const QJsonObject& errorJson);
 
     void setStatus(Status s);
     void setStatus(int code, QString message);
@@ -359,10 +380,12 @@ protected slots:
     void timeout();
 
 private slots:
-    void sendRequest(bool inBackground);
+    void sendRequest();
     void checkReply();
     void gotReply();
 
+    friend class ConnectionData; // to provide access to sendRequest()
+
 private:
     void stop();
     void finishJob();
diff --git a/lib/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 3a03efde..4e997326 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
@@ -39,7 +39,7 @@ QString DownloadFileJob::targetFileName() const
     return (d->targetFile ? d->targetFile : d->tempFile)->fileName();
 }
 
-void DownloadFileJob::beforeStart(const ConnectionData*)
+void DownloadFileJob::doPrepare()
 {
     if (d->targetFile && !d->targetFile->isReadable()
         && !d->targetFile->open(QIODevice::WriteOnly)) {
@@ -57,7 +57,7 @@ void DownloadFileJob::beforeStart(const ConnectionData*)
     qCDebug(JOBS) << "Downloading to" << d->tempFile->fileName();
 }
 
-void DownloadFileJob::afterStart(const ConnectionData*, QNetworkReply* reply)
+void DownloadFileJob::onSentRequest(QNetworkReply* reply)
 {
     connect(reply, &QNetworkReply::metaDataChanged, this, [this, reply] {
         if (!status().good())
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index fa697219..b7d2d75b 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -19,8 +19,8 @@ private:
     class Private;
     QScopedPointer<Private> d;
 
-    void beforeStart(const ConnectionData*) override;
-    void afterStart(const ConnectionData*, QNetworkReply* reply) override;
+    void doPrepare() override;
+    void onSentRequest(QNetworkReply* reply) override;
     void beforeAbandon(QNetworkReply*) override;
     Status parseReply(QNetworkReply*) override;
 };
diff --git a/lib/room.cpp b/lib/room.cpp
index 2e2f73c4..b0829252 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -1440,7 +1440,7 @@ QString Room::Private::doSendEvent(const RoomEvent* pEvent)
             connection->callApi<SendMessageJob>(BackgroundRequest, id,
                                                 pEvent->matrixType(), txnId,
                                                 pEvent->contentJson())) {
-        Room::connect(call, &BaseJob::started, q, [this, txnId] {
+        Room::connect(call, &BaseJob::sentRequest, q, [this, txnId] {
             auto it = q->findPendingEvent(txnId);
             if (it == unsyncedEvents.end()) {
                 qWarning(EVENTS) << "Pending event for transaction" << txnId
-- 
cgit v1.2.3


From 944653463fe4134c82d85e2d01e2bc0fa43fd727 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 12 Sep 2019 11:12:37 +0900
Subject: Introduce HashQ<> and UnorderedMap<>

Invading into std:: is frowned upon, even though legitimate from the C++ standard perspective. Given that it's possible to pass a hash object to unordered_map, it only takes an alias for std::unordered_map to avoid having to specialize std::hash. And besides, a generic compatibility bridge between qHash and std::hash has been long needed.

std::hash<QString> in converters.h remains for now; it will be dropped separately when the API files get regenerated to use UnorderedMap.
---
 lib/connection.cpp      |  2 +-
 lib/connection.h        |  2 +-
 lib/converters.h        | 14 ++++----------
 lib/events/stateevent.h | 10 ----------
 lib/room.cpp            |  4 ++--
 lib/util.h              | 14 ++++++++++++++
 6 files changed, 22 insertions(+), 24 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 5ebdcf6c..c3e46356 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -98,7 +98,7 @@ public:
     // See https://github.com/quotient-im/libQuotient/wiki/Handling-direct-chat-events
     DirectChatsMap dcLocalAdditions;
     DirectChatsMap dcLocalRemovals;
-    std::unordered_map<QString, EventPtr> accountData;
+    UnorderedMap<QString, EventPtr> accountData;
     int syncLoopTimeout = -1;
 
     GetCapabilitiesJob* capabilitiesJob = nullptr;
diff --git a/lib/connection.h b/lib/connection.h
index 7e32e5c9..b4b16679 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -124,7 +124,7 @@ public:
     using IgnoredUsersList = IgnoredUsersEvent::content_type;
 
     using UsersToDevicesToEvents =
-        std::unordered_map<QString, std::unordered_map<QString, const Event&>>;
+        UnorderedMap<QString, UnorderedMap<QString, const Event&>>;
 
     enum RoomVisibility {
         PublishRoom,
diff --git a/lib/converters.h b/lib/converters.h
index 587e4544..b753a80b 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -28,16 +28,10 @@
 #include <QtCore/QUrlQuery>
 #include <QtCore/QVector>
 
-#include <unordered_map>
 #include <vector>
-#if 0 // Waiting for C++17
-#    include <experimental/optional>
-
-template <typename T>
-using optional = std::experimental::optional<T>;
-#endif
 
 // Enable std::unordered_map<QString, T>
+// REMOVEME in favor of UnorderedMap, once we regenerate API files
 namespace std {
 template <>
 struct hash<QString> {
@@ -296,9 +290,9 @@ struct HashMapFromJson {
     }
 };
 
-template <typename T>
-struct JsonObjectConverter<std::unordered_map<QString, T>>
-    : public HashMapFromJson<std::unordered_map<QString, T>> {};
+template <typename T, typename HashT>
+struct JsonObjectConverter<std::unordered_map<QString, T, HashT>>
+    : public HashMapFromJson<std::unordered_map<QString, T, HashT>> {};
 
 template <typename T>
 struct JsonObjectConverter<QHash<QString, T>>
diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index 74e36e74..710b4271 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -129,13 +129,3 @@ private:
     std::unique_ptr<Prev<ContentT>> _prev;
 };
 } // namespace Quotient
-
-namespace std {
-template <>
-struct hash<Quotient::StateEventKey> {
-    size_t operator()(const Quotient::StateEventKey& k) const Q_DECL_NOEXCEPT
-    {
-        return qHash(k);
-    }
-};
-} // namespace std
diff --git a/lib/room.cpp b/lib/room.cpp
index 2c9fca63..2f697589 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -98,7 +98,7 @@ public:
     RoomSummary summary = { none, 0, none };
     /// The state of the room at timeline position before-0
     /// \sa timelineBase
-    std::unordered_map<StateEventKey, StateEventPtr> baseState;
+    UnorderedMap<StateEventKey, StateEventPtr> baseState;
     /// State event stubs - events without content, just type and state key
     static decltype(baseState) stubbedState;
     /// The state of the room at timeline position after-maxTimelineIndex()
@@ -131,7 +131,7 @@ public:
     QHash<const User*, QString> lastReadEventIds;
     QString serverReadMarker;
     TagsMap tags;
-    std::unordered_map<QString, EventPtr> accountData;
+    UnorderedMap<QString, EventPtr> accountData;
     QString prevBatch;
     QPointer<GetRoomEventsJob> eventsHistoryJob;
     QPointer<GetMembersByRoomJob> allMembersJob;
diff --git a/lib/util.h b/lib/util.h
index 7c79804b..788ce5bc 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -19,9 +19,11 @@
 #pragma once
 
 #include <QtCore/QLatin1String>
+#include <QtCore/QHashFunctions>
 
 #include <functional>
 #include <memory>
+#include <unordered_map>
 
 // Along the lines of Q_DISABLE_COPY - the upstream version comes in Qt 5.13
 #define DISABLE_MOVE(_ClassName)               \
@@ -29,6 +31,18 @@
     _ClassName& operator=(_ClassName&&) Q_DECL_EQ_DELETE;
 
 namespace Quotient {
+/// An equivalent of std::hash for QTypes to enable std::unordered_map<QType, ...>
+template <typename T>
+struct HashQ {
+    size_t operator()(const T& s) const Q_DECL_NOEXCEPT
+    {
+        return qHash(s, uint(qGlobalQHashSeed()));
+    }
+};
+/// A wrapper around std::unordered_map compatible with types that have qHash
+template <typename KeyT, typename ValT>
+using UnorderedMap = std::unordered_map<KeyT, ValT, HashQ<KeyT>>;
+
 struct NoneTag {};
 constexpr NoneTag none {};
 
-- 
cgit v1.2.3