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

5 files changed, 87 insertions, 76 deletions

diff --git a/lib/identity/definitions/request_email_validation.cpp b/lib/identity/definitions/request_email_validation.cpp
index a2d0a707..131b9488 100644
--- a/lib/identity/definitions/request_email_validation.cpp
+++ b/lib/identity/definitions/request_email_validation.cpp
@@ -7,7 +7,7 @@
 using namespace QMatrixClient;
 
 void JsonObjectConverter<RequestEmailValidation>::dumpTo(
-        QJsonObject& jo, const RequestEmailValidation& pod)
+    QJsonObject& jo, const RequestEmailValidation& pod)
 {
     addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
     addParam<>(jo, QStringLiteral("email"), pod.email);
@@ -16,7 +16,7 @@ void JsonObjectConverter<RequestEmailValidation>::dumpTo(
 }
 
 void JsonObjectConverter<RequestEmailValidation>::fillFrom(
-        const QJsonObject& jo, RequestEmailValidation& result)
+    const QJsonObject& jo, RequestEmailValidation& result)
 {
     fromJson(jo.value("client_secret"_ls), result.clientSecret);
     fromJson(jo.value("email"_ls), result.email);
diff --git a/lib/identity/definitions/request_email_validation.h b/lib/identity/definitions/request_email_validation.h
index 51369039..2496d7f5 100644
--- a/lib/identity/definitions/request_email_validation.h
+++ b/lib/identity/definitions/request_email_validation.h
@@ -6,35 +6,37 @@
 
 #include "converters.h"
 
-#include "converters.h"
+namespace QMatrixClient
+{
+
+// Data structures
 
-namespace QMatrixClient {
-    // Data structures
+struct RequestEmailValidation
+{
+    /// A unique string generated by the client, and used to identify
+    /// thevalidation attempt. It must be a string consisting of the
+    /// characters``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters
+    /// and itmust not be empty.
+    QString clientSecret;
+    /// The email address to validate.
+    QString email;
+    /// The server will only send an email if the ``send_attempt``is a number
+    /// greater than the most recent one which it has seen,scoped to that
+    /// ``email`` + ``client_secret`` pair. This is toavoid repeatedly sending
+    /// the same email in the case of requestretries between the POSTing user
+    /// and the identity server.The client should increment this value if they
+    /// desire a newemail (e.g. a reminder) to be sent.
+    int sendAttempt;
+    /// Optional. When the validation is completed, the identityserver will
+    /// redirect the user to this URL.
+    QString nextLink;
+};
 
-    struct RequestEmailValidation {
-        /// A unique string generated by the client, and used to identify the
-        /// validation attempt. It must be a string consisting of the characters
-        /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
-        /// it must not be empty.
-        QString clientSecret;
-        /// The email address to validate.
-        QString email;
-        /// The server will only send an email if the ``send_attempt``
-        /// is a number greater than the most recent one which it has seen,
-        /// scoped to that ``email`` + ``client_secret`` pair. This is to
-        /// avoid repeatedly sending the same email in the case of request
-        /// retries between the POSTing user and the identity server.
-        /// The client should increment this value if they desire a new
-        /// email (e.g. a reminder) to be sent.
-        int sendAttempt;
-        /// Optional. When the validation is completed, the identity
-        /// server will redirect the user to this URL.
-        QString nextLink;
-    };
-    template <> struct JsonObjectConverter<RequestEmailValidation> {
-        static void dumpTo(QJsonObject& jo, const RequestEmailValidation& pod);
-        static void fillFrom(const QJsonObject& jo,
-                             RequestEmailValidation& pod);
-    };
+template <>
+struct JsonObjectConverter<RequestEmailValidation>
+{
+    static void dumpTo(QJsonObject& jo, const RequestEmailValidation& pod);
+    static void fillFrom(const QJsonObject& jo, RequestEmailValidation& pod);
+};
 
 } // namespace QMatrixClient
diff --git a/lib/identity/definitions/request_msisdn_validation.cpp b/lib/identity/definitions/request_msisdn_validation.cpp
index 9facbf7e..0087d202 100644
--- a/lib/identity/definitions/request_msisdn_validation.cpp
+++ b/lib/identity/definitions/request_msisdn_validation.cpp
@@ -7,7 +7,7 @@
 using namespace QMatrixClient;
 
 void JsonObjectConverter<RequestMsisdnValidation>::dumpTo(
-        QJsonObject& jo, const RequestMsisdnValidation& pod)
+    QJsonObject& jo, const RequestMsisdnValidation& pod)
 {
     addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
     addParam<>(jo, QStringLiteral("country"), pod.country);
@@ -17,7 +17,7 @@ void JsonObjectConverter<RequestMsisdnValidation>::dumpTo(
 }
 
 void JsonObjectConverter<RequestMsisdnValidation>::fillFrom(
-        const QJsonObject& jo, RequestMsisdnValidation& result)
+    const QJsonObject& jo, RequestMsisdnValidation& result)
 {
     fromJson(jo.value("client_secret"_ls), result.clientSecret);
     fromJson(jo.value("country"_ls), result.country);
diff --git a/lib/identity/definitions/request_msisdn_validation.h b/lib/identity/definitions/request_msisdn_validation.h
index c4fe479e..f8060cfc 100644
--- a/lib/identity/definitions/request_msisdn_validation.h
+++ b/lib/identity/definitions/request_msisdn_validation.h
@@ -6,38 +6,41 @@
 
 #include "converters.h"
 
-#include "converters.h"
+namespace QMatrixClient
+{
+
+// Data structures
 
-namespace QMatrixClient {
-    // Data structures
+struct RequestMsisdnValidation
+{
+    /// A unique string generated by the client, and used to identify
+    /// thevalidation attempt. It must be a string consisting of the
+    /// characters``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters
+    /// and itmust not be empty.
+    QString clientSecret;
+    /// The two-letter uppercase ISO country code that the number
+    /// in``phone_number`` should be parsed as if it were dialled from.
+    QString country;
+    /// The phone number to validate.
+    QString phoneNumber;
+    /// The server will only send an SMS if the ``send_attempt`` is anumber
+    /// greater than the most recent one which it has seen,scoped to that
+    /// ``country`` + ``phone_number`` + ``client_secret``triple. This is to
+    /// avoid repeatedly sending the same SMS inthe case of request retries
+    /// between the POSTing user and theidentity server. The client should
+    /// increment this value ifthey desire a new SMS (e.g. a reminder) to be
+    /// sent.
+    int sendAttempt;
+    /// Optional. When the validation is completed, the identityserver will
+    /// redirect the user to this URL.
+    QString nextLink;
+};
 
-    struct RequestMsisdnValidation {
-        /// A unique string generated by the client, and used to identify the
-        /// validation attempt. It must be a string consisting of the characters
-        /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
-        /// it must not be empty.
-        QString clientSecret;
-        /// The two-letter uppercase ISO country code that the number in
-        /// ``phone_number`` should be parsed as if it were dialled from.
-        QString country;
-        /// The phone number to validate.
-        QString phoneNumber;
-        /// The server will only send an SMS if the ``send_attempt`` is a
-        /// number greater than the most recent one which it has seen,
-        /// scoped to that ``country`` + ``phone_number`` + ``client_secret``
-        /// triple. This is to avoid repeatedly sending the same SMS in
-        /// the case of request retries between the POSTing user and the
-        /// identity server. The client should increment this value if
-        /// they desire a new SMS (e.g. a reminder) to be sent.
-        int sendAttempt;
-        /// Optional. When the validation is completed, the identity
-        /// server will redirect the user to this URL.
-        QString nextLink;
-    };
-    template <> struct JsonObjectConverter<RequestMsisdnValidation> {
-        static void dumpTo(QJsonObject& jo, const RequestMsisdnValidation& pod);
-        static void fillFrom(const QJsonObject& jo,
-                             RequestMsisdnValidation& pod);
-    };
+template <>
+struct JsonObjectConverter<RequestMsisdnValidation>
+{
+    static void dumpTo(QJsonObject& jo, const RequestMsisdnValidation& pod);
+    static void fillFrom(const QJsonObject& jo, RequestMsisdnValidation& pod);
+};
 
 } // namespace QMatrixClient
diff --git a/lib/identity/definitions/sid.h b/lib/identity/definitions/sid.h
index 85462b46..752d62bb 100644
--- a/lib/identity/definitions/sid.h
+++ b/lib/identity/definitions/sid.h
@@ -6,19 +6,25 @@
 
 #include "converters.h"
 
-namespace QMatrixClient {
-    // Data structures
+namespace QMatrixClient
+{
 
-    struct Sid {
-        /// The session ID. Session IDs are opaque strings generated by the
-        /// identity server. They must consist entirely of the characters
-        /// ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255 characters and
-        /// they must not be empty.
-        QString sid;
-    };
-    template <> struct JsonObjectConverter<Sid> {
-        static void dumpTo(QJsonObject& jo, const Sid& pod);
-        static void fillFrom(const QJsonObject& jo, Sid& pod);
-    };
+// Data structures
+
+struct Sid
+{
+    /// The session ID. Session IDs are opaque strings generated by the
+    /// identityserver. They must consist entirely of the
+    /// characters``[0-9a-zA-Z.=_-]``. Their length must not exceed 255
+    /// characters and theymust not be empty.
+    QString sid;
+};
+
+template <>
+struct JsonObjectConverter<Sid>
+{
+    static void dumpTo(QJsonObject& jo, const Sid& pod);
+    static void fillFrom(const QJsonObject& jo, Sid& pod);
+};
 
 } // namespace QMatrixClient