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, 22 deletions

diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index b473a037..7c63a9b6 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -4,31 +4,37 @@
 
 #pragma once
 
+
+
 #include "converters.h"
 
 #include "converters.h"
 
-namespace QMatrixClient {
-    // Data structures
-
-    /// A client device
-    struct Device {
-        /// Identifier of this device.
-        QString deviceId;
-        /// Display name set by the user for this device. Absent if no name has
-        /// been set.
-        QString displayName;
-        /// The IP address where this device was last seen. (May be a few
-        /// minutes out of date, for efficiency reasons).
-        QString lastSeenIp;
-        /// The timestamp (in milliseconds since the unix epoch) when this
-        /// devices was last seen. (May be a few minutes out of date, for
-        /// efficiency reasons).
-        Omittable<qint64> lastSeenTs;
-    };
-    template <> struct JsonObjectConverter<Device> {
-        static void dumpTo(QJsonObject& jo, const Device& pod);
-        static void fillFrom(const QJsonObject& jo, Device& pod);
-    };
+namespace QMatrixClient
+{
+
+// Data structures
+
+/// A client device
+struct Device
+{
+    /// Identifier of this device.
+    QString deviceId;
+    /// Display name set by the user for this device. Absent if no name has beenset.
+    QString displayName;
+    /// The IP address where this device was last seen. (May be a few minutes outof date, for efficiency reasons).
+    QString lastSeenIp;
+    /// The timestamp (in milliseconds since the unix epoch) when this deviceswas last seen. (May be a few minutes out of date, for efficiencyreasons).
+    Omittable<qint64> lastSeenTs;
+
+
+};
+
+template <> struct JsonObjectConverter<Device>
+{
+    static void dumpTo(QJsonObject& jo, const Device& pod);
+    static void fillFrom(const QJsonObject& jo, Device& pod);};
+
+
 
 } // namespace QMatrixClient