Merge branch 'master' into clang-format

# Conflicts:
#	CMakeLists.txt
#	lib/avatar.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/connectiondata.cpp
#	lib/csapi/account-data.cpp
#	lib/csapi/account-data.h
#	lib/csapi/capabilities.cpp
#	lib/csapi/capabilities.h
#	lib/csapi/content-repo.cpp
#	lib/csapi/create_room.cpp
#	lib/csapi/filter.cpp
#	lib/csapi/joining.cpp
#	lib/csapi/keys.cpp
#	lib/csapi/list_joined_rooms.cpp
#	lib/csapi/notifications.cpp
#	lib/csapi/openid.cpp
#	lib/csapi/presence.cpp
#	lib/csapi/pushrules.cpp
#	lib/csapi/registration.cpp
#	lib/csapi/room_upgrades.cpp
#	lib/csapi/room_upgrades.h
#	lib/csapi/search.cpp
#	lib/csapi/users.cpp
#	lib/csapi/versions.cpp
#	lib/csapi/whoami.cpp
#	lib/csapi/{{base}}.cpp.mustache
#	lib/events/accountdataevents.h
#	lib/events/eventcontent.h
#	lib/events/roommemberevent.cpp
#	lib/events/stateevent.cpp
#	lib/jobs/basejob.cpp
#	lib/jobs/basejob.h
#	lib/networkaccessmanager.cpp
#	lib/networksettings.cpp
#	lib/room.cpp
#	lib/room.h
#	lib/settings.cpp
#	lib/settings.h
#	lib/syncdata.cpp
#	lib/user.cpp
#	lib/user.h
#	lib/util.cpp

1 files changed, 76 insertions, 79 deletions

diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h
index 0f36424f..1b3229d4 100644
--- a/lib/qt_connection_util.h
+++ b/lib/qt_connection_util.h
@@ -22,91 +22,88 @@
 
 #include <QtCore/QPointer>
 
-namespace QMatrixClient {
-    namespace _impl {
-        template <typename SenderT, typename SignalT, typename ContextT,
-                  typename... ArgTs>
-        inline QMetaObject::Connection
-        connectUntil(SenderT* sender, SignalT signal, ContextT* context,
-                     std::function<bool(ArgTs...)> slot,
-                     Qt::ConnectionType connType)
-        {
-            // See https://bugreports.qt.io/browse/QTBUG-60339
+namespace QMatrixClient
+{
+namespace _impl
+{
+    template <typename SenderT, typename SignalT, typename ContextT, typename... ArgTs>
+    inline QMetaObject::Connection
+    connectUntil(SenderT* sender, SignalT signal, ContextT* context,
+                 std::function<bool(ArgTs...)> slot, Qt::ConnectionType connType)
+    {
+        // See https://bugreports.qt.io/browse/QTBUG-60339
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-            auto pc = std::make_shared<QMetaObject::Connection>();
+        auto pc = std::make_shared<QMetaObject::Connection>();
 #else
-            auto pc = std::make_unique<QMetaObject::Connection>();
+        auto pc = std::make_unique<QMetaObject::Connection>();
 #endif
-            auto& c = *pc; // Resolve a reference before pc is moved to lambda
-            c = QObject::connect(
-                    sender, signal, context,
-                    [pc = std::move(pc), slot](ArgTs... args) {
-                        Q_ASSERT(
-                                *pc); // If it's been triggered, it should exist
-                        if (slot(std::forward<ArgTs>(args)...))
-                            QObject::disconnect(*pc);
-                    },
-                    connType);
-            return c;
-        }
+        auto& c = *pc; // Resolve a reference before pc is moved to lambda
+        c = QObject::connect(
+            sender, signal, context,
+            [pc = std::move(pc), slot](ArgTs... args) {
+                Q_ASSERT(*pc); // If it's been triggered, it should exist
+                if (slot(std::forward<ArgTs>(args)...))
+                    QObject::disconnect(*pc);
+            },
+            connType);
+        return c;
     }
+} // namespace _impl
 
-    template <typename SenderT, typename SignalT, typename ContextT,
-              typename FunctorT>
-    inline auto connectUntil(SenderT* sender, SignalT signal, ContextT* context,
-                             const FunctorT& slot,
-                             Qt::ConnectionType connType = Qt::AutoConnection)
-    {
-        return _impl::connectUntil(
-                sender, signal, context,
-                typename function_traits<FunctorT>::function_type(slot),
-                connType);
-    }
+template <typename SenderT, typename SignalT, typename ContextT, typename FunctorT>
+inline auto connectUntil(SenderT* sender, SignalT signal, ContextT* context,
+                         const FunctorT& slot,
+                         Qt::ConnectionType connType = Qt::AutoConnection)
+{
+    return _impl::connectUntil(
+        sender, signal, context,
+        typename function_traits<FunctorT>::function_type(slot), connType);
+}
 
-    /** Create a single-shot connection that triggers on the signal and
-     * then self-disconnects
-     *
-     * Only supports DirectConnection type.
-     */
-    template <typename SenderT, typename SignalT, typename ReceiverT,
-              typename SlotT>
-    inline auto connectSingleShot(SenderT* sender, SignalT signal,
-                                  ReceiverT* receiver, SlotT slot)
-    {
-        QMetaObject::Connection connection;
-        connection = QObject::connect(sender, signal, receiver, slot,
-                                      Qt::DirectConnection);
-        Q_ASSERT(connection);
-        QObject::connect(sender, signal, receiver,
-                         [connection] { QObject::disconnect(connection); },
-                         Qt::DirectConnection);
-        return connection;
-    }
+/** Create a single-shot connection that triggers on the signal and
+ * then self-disconnects
+ *
+ * Only supports DirectConnection type.
+ */
+template <typename SenderT, typename SignalT, typename ReceiverT, typename SlotT>
+inline auto connectSingleShot(SenderT* sender, SignalT signal,
+                              ReceiverT* receiver, SlotT slot)
+{
+    QMetaObject::Connection connection;
+    connection = QObject::connect(sender, signal, receiver, slot,
+                                  Qt::DirectConnection);
+    Q_ASSERT(connection);
+    QObject::connect(
+        sender, signal, receiver,
+        [connection] { QObject::disconnect(connection); }, Qt::DirectConnection);
+    return connection;
+}
 
-    /** A guard pointer that disconnects an interested object upon destruction
-     * It's almost QPointer<> except that you have to initialise it with one
-     * more additional parameter - a pointer to a QObject that will be
-     * disconnected from signals of the underlying pointer upon the guard's
-     * destruction.
-     */
-    template <typename T> class ConnectionsGuard : public QPointer<T>
+/** A guard pointer that disconnects an interested object upon destruction
+ * It's almost QPointer<> except that you have to initialise it with one
+ * more additional parameter - a pointer to a QObject that will be
+ * disconnected from signals of the underlying pointer upon the guard's
+ * destruction.
+ */
+template <typename T>
+class ConnectionsGuard : public QPointer<T>
+{
+public:
+    ConnectionsGuard(T* publisher, QObject* subscriber)
+        : QPointer<T>(publisher)
+        , subscriber(subscriber)
+    {}
+    ~ConnectionsGuard()
     {
-        public:
-        ConnectionsGuard(T* publisher, QObject* subscriber)
-            : QPointer<T>(publisher), subscriber(subscriber)
-        {
-        }
-        ~ConnectionsGuard()
-        {
-            if (*this)
-                (*this)->disconnect(subscriber);
-        }
-        ConnectionsGuard(ConnectionsGuard&&) = default;
-        ConnectionsGuard& operator=(ConnectionsGuard&&) = default;
-        Q_DISABLE_COPY(ConnectionsGuard)
-        using QPointer<T>::operator=;
+        if (*this)
+            (*this)->disconnect(subscriber);
+    }
+    ConnectionsGuard(ConnectionsGuard&&) = default;
+    ConnectionsGuard& operator=(ConnectionsGuard&&) = default;
+    Q_DISABLE_COPY(ConnectionsGuard)
+    using QPointer<T>::operator=;
 
-        private:
-        QObject* subscriber;
-    };
-}
+private:
+    QObject* subscriber;
+};
+} // namespace QMatrixClient