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, 67 insertions, 62 deletions

diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index 0cf2dc60..abab9867 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -24,76 +24,81 @@
 #include "event.h"
 #include "eventcontent.h"
 
-namespace QMatrixClient {
-    constexpr const char* FavouriteTag = "m.favourite";
-    constexpr const char* LowPriorityTag = "m.lowpriority";
+namespace QMatrixClient
+{
+constexpr const char* FavouriteTag = "m.favourite";
+constexpr const char* LowPriorityTag = "m.lowpriority";
 
-    struct TagRecord {
-        using order_type = Omittable<float>;
+struct TagRecord
+{
+    using order_type = Omittable<float>;
 
-        order_type order;
+    order_type order;
 
-        TagRecord(order_type order = none) : order(order) {}
+    TagRecord(order_type order = none)
+        : order(order)
+    {}
 
-        bool operator<(const TagRecord& other) const
-        {
-            // Per The Spec, rooms with no order should be after those with
-            // order
-            return !order.omitted()
-                    && (other.order.omitted()
-                        || order.value() < other.order.value());
-        }
-    };
+    bool operator<(const TagRecord& other) const
+    {
+        // Per The Spec, rooms with no order should be after those with order
+        return !order.omitted()
+               && (other.order.omitted() || order.value() < other.order.value());
+    }
+};
 
-    template <> struct JsonObjectConverter<TagRecord> {
-        static void fillFrom(const QJsonObject& jo, TagRecord& rec)
-        {
-            // Parse a float both from JSON double and JSON string because
-            // libqmatrixclient previously used to use strings to store order.
-            const auto orderJv = jo.value("order"_ls);
-            if (orderJv.isDouble())
-                rec.order = fromJson<float>(orderJv);
-            if (orderJv.isString()) {
-                bool ok;
-                rec.order = orderJv.toString().toFloat(&ok);
-                if (!ok)
-                    rec.order = none;
-            }
-        }
-        static void dumpTo(QJsonObject& jo, const TagRecord& rec)
-        {
-            addParam<IfNotEmpty>(jo, QStringLiteral("order"), rec.order);
+template <>
+struct JsonObjectConverter<TagRecord>
+{
+    static void fillFrom(const QJsonObject& jo, TagRecord& rec)
+    {
+        // Parse a float both from JSON double and JSON string because
+        // libqmatrixclient previously used to use strings to store order.
+        const auto orderJv = jo.value("order"_ls);
+        if (orderJv.isDouble())
+            rec.order = fromJson<float>(orderJv);
+        if (orderJv.isString()) {
+            bool ok;
+            rec.order = orderJv.toString().toFloat(&ok);
+            if (!ok)
+                rec.order = none;
         }
-    };
+    }
+    static void dumpTo(QJsonObject& jo, const TagRecord& rec)
+    {
+        addParam<IfNotEmpty>(jo, QStringLiteral("order"), rec.order);
+    }
+};
 
-    using TagsMap = QHash<QString, TagRecord>;
+using TagsMap = QHash<QString, TagRecord>;
 
-#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey)         \
-    class _Name : public Event                                                 \
-    {                                                                          \
-        public:                                                                \
-        using content_type = _ContentType;                                     \
-        DEFINE_EVENT_TYPEID(_TypeId, _Name)                                    \
-        explicit _Name(QJsonObject obj) : Event(typeId(), std::move(obj)) {}   \
-        explicit _Name(_ContentType content)                                   \
-            : Event(typeId(), matrixTypeId(),                                  \
-                    QJsonObject { { QStringLiteral(#_ContentKey),              \
-                                    toJson(std::move(content)) } })            \
-        {                                                                      \
-        }                                                                      \
-        auto _ContentKey() const                                               \
-        {                                                                      \
-            return fromJson<content_type>(contentJson()[#_ContentKey##_ls]);   \
-        }                                                                      \
-    };                                                                         \
-    REGISTER_EVENT_TYPE(_Name)                                                 \
+#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey) \
+    class _Name : public Event                                         \
+    {                                                                  \
+    public:                                                            \
+        using content_type = _ContentType;                             \
+        DEFINE_EVENT_TYPEID(_TypeId, _Name)                            \
+        explicit _Name(QJsonObject obj)                                \
+            : Event(typeId(), std::move(obj))                          \
+        {}                                                             \
+        explicit _Name(_ContentType content)                           \
+            : Event(typeId(), matrixTypeId(),                          \
+                    QJsonObject { { QStringLiteral(#_ContentKey),      \
+                                    toJson(std::move(content)) } })    \
+        {}                                                             \
+        auto _ContentKey() const                                       \
+        {                                                              \
+            return content<content_type>(#_ContentKey##_ls);           \
+        }                                                              \
+    };                                                                 \
+    REGISTER_EVENT_TYPE(_Name)                                         \
     // End of macro
 
-    DEFINE_SIMPLE_EVENT(TagEvent, "m.tag", TagsMap, tags)
-    DEFINE_SIMPLE_EVENT(ReadMarkerEvent, "m.fully_read", QString, event_id)
-    DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list", QSet<QString>,
-                        ignored_users)
+DEFINE_SIMPLE_EVENT(TagEvent, "m.tag", TagsMap, tags)
+DEFINE_SIMPLE_EVENT(ReadMarkerEvent, "m.fully_read", QString, event_id)
+DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list", QSet<QString>,
+                    ignored_users)
 
-    DEFINE_EVENTTYPE_ALIAS(Tag, TagEvent)
-    DEFINE_EVENTTYPE_ALIAS(ReadMarker, ReadMarkerEvent)
-}
+DEFINE_EVENTTYPE_ALIAS(Tag, TagEvent)
+DEFINE_EVENTTYPE_ALIAS(ReadMarker, ReadMarkerEvent)
+} // namespace QMatrixClient