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, 54 insertions, 50 deletions

diff --git a/lib/csapi/room_send.h b/lib/csapi/room_send.h
index 38e246e1..aa2efd79 100644
--- a/lib/csapi/room_send.h
+++ b/lib/csapi/room_send.h
@@ -8,54 +8,58 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient {
-    // Operations
-
-    /// Send a message event to the given room.
-    ///
-    /// This endpoint is used to send a message event to a room. Message events
-    /// allow access to historical events and pagination, making them suited
-    /// for "once-off" activity in a room.
-    ///
-    /// The body of the request should be the content object of the event; the
-    /// fields in this object will vary depending on the type of event. See
-    /// `Room Events`_ for the m. event specification.
-    class SendMessageJob : public BaseJob
-    {
-        public:
-        /*! Send a message event to the given room.
-         * \param roomId
-         *   The room to send the event to.
-         * \param eventType
-         *   The type of event to send.
-         * \param txnId
-         *   The transaction ID for this event. Clients should generate an
-         *   ID unique across requests with the same access token; it will be
-         *   used by the server to ensure idempotency of requests.
-         * \param body
-         *   This endpoint is used to send a message event to a room. Message
-         * events allow access to historical events and pagination, making them
-         * suited for "once-off" activity in a room.
-         *
-         *   The body of the request should be the content object of the event;
-         * the fields in this object will vary depending on the type of event.
-         * See `Room Events`_ for the m. event specification.
-         */
-        explicit SendMessageJob(const QString& roomId, const QString& eventType,
-                                const QString& txnId,
-                                const QJsonObject& body = {});
-        ~SendMessageJob() override;
-
-        // Result properties
-
-        /// A unique identifier for the event.
-        const QString& eventId() const;
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
-    };
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Send a message event to the given room.
+/*!
+ * This endpoint is used to send a message event to a room. Message events
+ * allow access to historical events and pagination, making them suited
+ * for "once-off" activity in a room.
+ *
+ * The body of the request should be the content object of the event; the
+ * fields in this object will vary depending on the type of event. See
+ * `Room Events`_ for the m. event specification.
+ */
+class SendMessageJob : public BaseJob
+{
+public:
+    /*! Send a message event to the given room.
+     * \param roomId
+     *   The room to send the event to.
+     * \param eventType
+     *   The type of event to send.
+     * \param txnId
+     *   The transaction ID for this event. Clients should generate an
+     *   ID unique across requests with the same access token; it will be
+     *   used by the server to ensure idempotency of requests.
+     * \param body
+     *   This endpoint is used to send a message event to a room. Message events
+     *   allow access to historical events and pagination, making them suited
+     *   for "once-off" activity in a room.
+     *
+     *   The body of the request should be the content object of the event; the
+     *   fields in this object will vary depending on the type of event. See
+     *   `Room Events`_ for the m. event specification.
+     */
+    explicit SendMessageJob(const QString& roomId, const QString& eventType,
+                            const QString& txnId, const QJsonObject& body = {});
+
+    ~SendMessageJob() override;
+
+    // Result properties
+
+    /// A unique identifier for the event.
+    const QString& eventId() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
 } // namespace QMatrixClient