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, 28 insertions, 18 deletions

diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
index e25dff7a..689caf49 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/lib/csapi/definitions/auth_data.h
@@ -4,27 +4,37 @@
 
 #pragma once
 
+
+
 #include "converters.h"
 
-#include <QtCore/QHash>
 #include <QtCore/QJsonObject>
+#include <QtCore/QHash>
+
+namespace QMatrixClient
+{
+
+// Data structures
+
+/// Used by clients to submit authentication information to the interactive-authentication API
+struct AuthenticationData
+{
+    /// The login type that the client is attempting to complete.
+    QString type;
+    /// The value of the session key given by the homeserver.
+    QString session;
+
+
+    /// Keys dependent on the login type
+    QHash<QString, QJsonObject> authInfo;
+
+};
+
+template <> struct JsonObjectConverter<AuthenticationData>
+{
+    static void dumpTo(QJsonObject& jo, const AuthenticationData& pod);
+    static void fillFrom(QJsonObject jo, AuthenticationData& pod);};
+
 
-namespace QMatrixClient {
-    // Data structures
-
-    /// Used by clients to submit authentication information to the
-    /// interactive-authentication API
-    struct AuthenticationData {
-        /// The login type that the client is attempting to complete.
-        QString type;
-        /// The value of the session key given by the homeserver.
-        QString session;
-        /// Keys dependent on the login type
-        QHash<QString, QJsonObject> authInfo;
-    };
-    template <> struct JsonObjectConverter<AuthenticationData> {
-        static void dumpTo(QJsonObject& jo, const AuthenticationData& pod);
-        static void fillFrom(QJsonObject jo, AuthenticationData& pod);
-    };
 
 } // namespace QMatrixClient