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, 70 insertions, 71 deletions

diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index 746e9173..42cd8fe4 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -22,85 +22,84 @@
 
 #include <QtCore/QDateTime>
 
-namespace QMatrixClient {
-    class RedactionEvent;
+namespace QMatrixClient
+{
+class RedactionEvent;
 
-    /** This class corresponds to m.room.* events */
-    class RoomEvent : public Event
-    {
-        Q_GADGET
-        Q_PROPERTY(QString id READ id)
-        Q_PROPERTY(QDateTime timestamp READ timestamp CONSTANT)
-        Q_PROPERTY(QString roomId READ roomId CONSTANT)
-        Q_PROPERTY(QString senderId READ senderId CONSTANT)
-        Q_PROPERTY(QString redactionReason READ redactionReason)
-        Q_PROPERTY(bool isRedacted READ isRedacted)
-        Q_PROPERTY(
-                QString transactionId READ transactionId WRITE setTransactionId)
-        public:
-        using factory_t = EventFactory<RoomEvent>;
+/** This class corresponds to m.room.* events */
+class RoomEvent : public Event
+{
+    Q_GADGET
+    Q_PROPERTY(QString id READ id)
+    Q_PROPERTY(QDateTime timestamp READ timestamp CONSTANT)
+    Q_PROPERTY(QString roomId READ roomId CONSTANT)
+    Q_PROPERTY(QString senderId READ senderId CONSTANT)
+    Q_PROPERTY(QString redactionReason READ redactionReason)
+    Q_PROPERTY(bool isRedacted READ isRedacted)
+    Q_PROPERTY(QString transactionId READ transactionId WRITE setTransactionId)
+public:
+    using factory_t = EventFactory<RoomEvent>;
 
-        // RedactionEvent is an incomplete type here so we cannot inline
-        // constructors and destructors and we cannot use 'using'.
-        RoomEvent(Type type, event_mtype_t matrixType,
-                  const QJsonObject& contentJson = {});
-        RoomEvent(Type type, const QJsonObject& json);
-        ~RoomEvent() override;
+    // RedactionEvent is an incomplete type here so we cannot inline
+    // constructors and destructors and we cannot use 'using'.
+    RoomEvent(Type type, event_mtype_t matrixType,
+              const QJsonObject& contentJson = {});
+    RoomEvent(Type type, const QJsonObject& json);
+    ~RoomEvent() override;
 
-        QString id() const;
-        QDateTime timestamp() const;
-        QString roomId() const;
-        QString senderId() const;
-        bool isRedacted() const { return bool(_redactedBecause); }
-        const event_ptr_tt<RedactionEvent>& redactedBecause() const
-        {
-            return _redactedBecause;
-        }
-        QString redactionReason() const;
-        QString transactionId() const;
-        QString stateKey() const;
+    QString id() const;
+    QDateTime timestamp() const;
+    QString roomId() const;
+    QString senderId() const;
+    bool isRedacted() const { return bool(_redactedBecause); }
+    const event_ptr_tt<RedactionEvent>& redactedBecause() const
+    {
+        return _redactedBecause;
+    }
+    QString redactionReason() const;
+    QString transactionId() const;
+    QString stateKey() const;
 
-        /**
-         * Sets the transaction id for locally created events. This should be
-         * done before the event is exposed to any code using the respective
-         * Q_PROPERTY.
-         *
-         * \param txnId - transaction id, normally obtained from
-         * Connection::generateTxnId()
-         */
-        void setTransactionId(const QString& txnId);
+    /**
+     * Sets the transaction id for locally created events. This should be
+     * done before the event is exposed to any code using the respective
+     * Q_PROPERTY.
+     *
+     * \param txnId - transaction id, normally obtained from
+     * Connection::generateTxnId()
+     */
+    void setTransactionId(const QString& txnId);
 
-        /**
-         * Sets event id for locally created events
-         *
-         * When a new event is created locally, it has no server id yet.
-         * This function allows to add the id once the confirmation from
-         * the server is received. There should be no id set previously
-         * in the event. It's the responsibility of the code calling addId()
-         * to notify clients that use Q_PROPERTY(id) about its change
-         */
-        void addId(const QString& newId);
+    /**
+     * Sets event id for locally created events
+     *
+     * When a new event is created locally, it has no server id yet.
+     * This function allows to add the id once the confirmation from
+     * the server is received. There should be no id set previously
+     * in the event. It's the responsibility of the code calling addId()
+     * to notify clients that use Q_PROPERTY(id) about its change
+     */
+    void addId(const QString& newId);
 
-        private:
-        event_ptr_tt<RedactionEvent> _redactedBecause;
-    };
-    using RoomEventPtr = event_ptr_tt<RoomEvent>;
-    using RoomEvents = EventsArray<RoomEvent>;
-    using RoomEventsRange = Range<RoomEvents>;
+private:
+    event_ptr_tt<RedactionEvent> _redactedBecause;
+};
+using RoomEventPtr = event_ptr_tt<RoomEvent>;
+using RoomEvents = EventsArray<RoomEvent>;
+using RoomEventsRange = Range<RoomEvents>;
 
-    class CallEventBase : public RoomEvent
-    {
-        public:
-        CallEventBase(Type type, event_mtype_t matrixType,
-                      const QString& callId, int version,
-                      const QJsonObject& contentJson = {});
-        CallEventBase(Type type, const QJsonObject& json);
-        ~CallEventBase() override = default;
-        bool isCallEvent() const override { return true; }
+class CallEventBase : public RoomEvent
+{
+public:
+    CallEventBase(Type type, event_mtype_t matrixType, const QString& callId,
+                  int version, const QJsonObject& contentJson = {});
+    CallEventBase(Type type, const QJsonObject& json);
+    ~CallEventBase() override = default;
+    bool isCallEvent() const override { return true; }
 
-        QString callId() const { return content<QString>("call_id"_ls); }
-        int version() const { return content<int>("version"_ls); }
-    };
+    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*)