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, 69 insertions, 60 deletions

diff --git a/lib/csapi/capabilities.h b/lib/csapi/capabilities.h
index 6282c2fd..f6e7ad06 100644
--- a/lib/csapi/capabilities.h
+++ b/lib/csapi/capabilities.h
@@ -4,75 +4,84 @@
 
 #pragma once
 
+#include "converters.h"
+
 #include "jobs/basejob.h"
 
-#include "converters.h"
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient {
-    // Operations
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Gets information about the server's capabilities.
+/*!
+ * Gets information about the server's supported feature set
+ * and other relevant capabilities.
+ */
+class GetCapabilitiesJob : public BaseJob
+{
+public:
+    // Inner data structures
 
-    /// Gets information about the server's capabilities.
-    ///
-    /// Gets information about the server's supported feature set
-    /// and other relevant capabilities.
-    class GetCapabilitiesJob : public BaseJob
+    /// Capability to indicate if the user can change their password.
+    struct ChangePasswordCapability
     {
-        public:
-        // Inner data structures
+        /// True if the user can change their password, false otherwise.
+        bool enabled;
+    };
 
-        /// Capability to indicate if the user can change their password.
-        struct ChangePasswordCapability {
-            /// True if the user can change their password, false otherwise.
-            bool enabled;
-        };
+    /// The room versions the server supports.
+    struct RoomVersionsCapability
+    {
+        /// The default room version the server is using for new rooms.
+        QString defaultVersion;
+        /// A detailed description of the room versions the server supports.
+        QHash<QString, QString> available;
+    };
 
+    /// The custom capabilities the server supports, using theJava package
+    /// naming convention.
+    struct Capabilities
+    {
+        /// Capability to indicate if the user can change their password.
+        Omittable<ChangePasswordCapability> changePassword;
         /// The room versions the server supports.
-        struct RoomVersionsCapability {
-            /// The default room version the server is using for new rooms.
-            QString defaultVersion;
-            /// A detailed description of the room versions the server supports.
-            QHash<QString, QString> available;
-        };
-
-        /// Gets information about the server's supported feature set
-        /// and other relevant capabilities.
-        struct Capabilities {
-            /// Capability to indicate if the user can change their password.
-            Omittable<ChangePasswordCapability> changePassword;
-            /// The room versions the server supports.
-            Omittable<RoomVersionsCapability> roomVersions;
-            /// The custom capabilities the server supports, using the
-            /// Java package naming convention.
-            QHash<QString, QJsonObject> additionalProperties;
-        };
-
-        // Construction/destruction
-
-        explicit GetCapabilitiesJob();
-
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * GetCapabilitiesJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl);
-
-        ~GetCapabilitiesJob() override;
-
-        // Result properties
-
-        /// Gets information about the server's supported feature set
-        /// and other relevant capabilities.
-        const Capabilities& capabilities() const;
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
+        Omittable<RoomVersionsCapability> roomVersions;
+
+        /// The custom capabilities the server supports, using theJava package
+        /// naming convention.
+        QHash<QString, QJsonObject> additionalProperties;
     };
+
+    // Construction/destruction
+
+    explicit GetCapabilitiesJob();
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * GetCapabilitiesJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl);
+
+    ~GetCapabilitiesJob() override;
+
+    // Result properties
+
+    /// The custom capabilities the server supports, using the
+    /// Java package naming convention.
+    const Capabilities& capabilities() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
 } // namespace QMatrixClient