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, 95 insertions, 90 deletions

diff --git a/lib/syncdata.h b/lib/syncdata.h
index 139af130..49df8db6 100644
--- a/lib/syncdata.h
+++ b/lib/syncdata.h
@@ -18,97 +18,102 @@
 
 #pragma once
 
-#include "events/stateevent.h"
 #include "joinstate.h"
 
-namespace QMatrixClient {
-    /// Room summary, as defined in MSC688
-    /**
-     * Every member of this structure is an Omittable; as per the MSC, only
-     * changed values are sent from the server so if nothing is in the payload
-     * the respective member will be omitted. In particular, `heroes.omitted()`
-     * 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.
+#include "events/stateevent.h"
+
+namespace QMatrixClient
+{
+/// Room summary, as defined in MSC688
+/**
+ * Every member of this structure is an Omittable; as per the MSC, only
+ * changed values are sent from the server so if nothing is in the payload
+ * the respective member will be omitted. In particular, `heroes.omitted()`
+ * 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
+{
+    Omittable<int> joinedMemberCount;
+    Omittable<int> invitedMemberCount;
+    Omittable<QStringList> heroes; //< mxids of users to take part in the room
+                                   //name
+
+    bool isEmpty() const;
+    /// Merge the contents of another RoomSummary object into this one
+    /// \return true, if the current object has changed; false otherwise
+    bool merge(const RoomSummary& other);
+
+    friend QDebug operator<<(QDebug dbg, const RoomSummary& rs);
+};
+
+template <>
+struct JsonObjectConverter<RoomSummary>
+{
+    static void dumpTo(QJsonObject& jo, const RoomSummary& rs);
+    static void fillFrom(const QJsonObject& jo, RoomSummary& rs);
+};
+
+class SyncRoomData
+{
+public:
+    QString roomId;
+    JoinState joinState;
+    RoomSummary summary;
+    StateEvents state;
+    RoomEvents timeline;
+    Events ephemeral;
+    Events accountData;
+
+    bool timelineLimited;
+    QString timelinePrevBatch;
+    int unreadCount;
+    int highlightCount;
+    int notificationCount;
+
+    SyncRoomData(const QString& roomId, JoinState joinState_,
+                 const QJsonObject& room_);
+    SyncRoomData(SyncRoomData&&) = default;
+    SyncRoomData& operator=(SyncRoomData&&) = default;
+
+    static const QString UnreadCountKey;
+};
+
+// QVector cannot work with non-copiable objects, std::vector can.
+using SyncDataList = std::vector<SyncRoomData>;
+
+class SyncData
+{
+public:
+    SyncData() = default;
+    explicit SyncData(const QString& cacheFileName);
+    /** Parse sync response into room events
+     * \param json response from /sync or a room state cache
+     * \return the list of rooms with missing cache files; always
+     *         empty when parsing response from /sync
      */
-    struct RoomSummary {
-        Omittable<int> joinedMemberCount;
-        Omittable<int> invitedMemberCount;
-        Omittable<QStringList>
-                heroes; //< mxids of users to take part in the room name
-
-        bool isEmpty() const;
-        /// Merge the contents of another RoomSummary object into this one
-        /// \return true, if the current object has changed; false otherwise
-        bool merge(const RoomSummary& other);
-
-        friend QDebug operator<<(QDebug dbg, const RoomSummary& rs);
-    };
-
-    template <> struct JsonObjectConverter<RoomSummary> {
-        static void dumpTo(QJsonObject& jo, const RoomSummary& rs);
-        static void fillFrom(const QJsonObject& jo, RoomSummary& rs);
-    };
-
-    class SyncRoomData
-    {
-        public:
-        QString roomId;
-        JoinState joinState;
-        RoomSummary summary;
-        StateEvents state;
-        RoomEvents timeline;
-        Events ephemeral;
-        Events accountData;
-
-        bool timelineLimited;
-        QString timelinePrevBatch;
-        int unreadCount;
-        int highlightCount;
-        int notificationCount;
-
-        SyncRoomData(const QString& roomId, JoinState joinState_,
-                     const QJsonObject& room_);
-        SyncRoomData(SyncRoomData&&) = default;
-        SyncRoomData& operator=(SyncRoomData&&) = default;
-
-        static const QString UnreadCountKey;
-    };
-
-    // QVector cannot work with non-copiable objects, std::vector can.
-    using SyncDataList = std::vector<SyncRoomData>;
-
-    class SyncData
-    {
-        public:
-        SyncData() = default;
-        explicit SyncData(const QString& cacheFileName);
-        /** Parse sync response into room events
-         * \param json response from /sync or a room state cache
-         * \return the list of rooms with missing cache files; always
-         *         empty when parsing response from /sync
-         */
-        void parseJson(const QJsonObject& json, const QString& baseDir = {});
-
-        Events&& takePresenceData();
-        Events&& takeAccountData();
-        Events&& takeToDeviceEvents();
-        SyncDataList&& takeRoomData();
-
-        QString nextBatch() const { return nextBatch_; }
-
-        QStringList unresolvedRooms() const { return unresolvedRoomIds; }
-
-        static std::pair<int, int> cacheVersion() { return { 10, 0 }; }
-        static QString fileNameForRoom(QString roomId);
-
-        private:
-        QString nextBatch_;
-        Events presenceData;
-        Events accountData;
-        Events toDeviceEvents;
-        SyncDataList roomData;
-        QStringList unresolvedRoomIds;
-
-        static QJsonObject loadJson(const QString& fileName);
-    };
+    void parseJson(const QJsonObject& json, const QString& baseDir = {});
+
+    Events&& takePresenceData();
+    Events&& takeAccountData();
+    Events&& takeToDeviceEvents();
+    SyncDataList&& takeRoomData();
+
+    QString nextBatch() const { return nextBatch_; }
+
+    QStringList unresolvedRooms() const { return unresolvedRoomIds; }
+
+    static std::pair<int, int> cacheVersion() { return { 10, 0 }; }
+    static QString fileNameForRoom(QString roomId);
+
+private:
+    QString nextBatch_;
+    Events presenceData;
+    Events accountData;
+    Events toDeviceEvents;
+    SyncDataList roomData;
+    QStringList unresolvedRoomIds;
+
+    static QJsonObject loadJson(const QString& fileName);
+};
 } // namespace QMatrixClient