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, 33 insertions, 25 deletions

diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index d8d2cc0f..98bd904d 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -4,37 +4,45 @@
 
 #pragma once
 
+
+
 #include "converters.h"
 
 #include "converters.h"
+#include <QtCore/QVariant>
 #include "csapi/definitions/push_condition.h"
 #include <QtCore/QJsonObject>
-#include <QtCore/QVariant>
 #include <QtCore/QVector>
 
-namespace QMatrixClient {
-    // Data structures
-
-    struct PushRule {
-        /// The actions to perform when this rule is matched.
-        QVector<QVariant> actions;
-        /// Whether this is a default rule, or has been set explicitly.
-        bool isDefault;
-        /// Whether the push rule is enabled or not.
-        bool enabled;
-        /// The ID of this rule.
-        QString ruleId;
-        /// The conditions that must hold true for an event in order for a rule
-        /// to be applied to an event. A rule with no conditions always matches.
-        /// Only applicable to ``underride`` and ``override`` rules.
-        QVector<PushCondition> conditions;
-        /// The glob-style pattern to match against.  Only applicable to
-        /// ``content`` rules.
-        QString pattern;
-    };
-    template <> struct JsonObjectConverter<PushRule> {
-        static void dumpTo(QJsonObject& jo, const PushRule& pod);
-        static void fillFrom(const QJsonObject& jo, PushRule& pod);
-    };
+namespace QMatrixClient
+{
+
+// Data structures
+
+
+struct PushRule
+{
+    /// The actions to perform when this rule is matched.
+    QVector<QVariant> actions;
+    /// Whether this is a default rule, or has been set explicitly.
+    bool isDefault;
+    /// Whether the push rule is enabled or not.
+    bool enabled;
+    /// The ID of this rule.
+    QString ruleId;
+    /// The conditions that must hold true for an event in order for a rule to beapplied to an event. A rule with no conditions always matches. Onlyapplicable to ``underride`` and ``override`` rules.
+    QVector<PushCondition> conditions;
+    /// The glob-style pattern to match against.  Only applicable to ``content``rules.
+    QString pattern;
+
+
+};
+
+template <> struct JsonObjectConverter<PushRule>
+{
+    static void dumpTo(QJsonObject& jo, const PushRule& pod);
+    static void fillFrom(const QJsonObject& jo, PushRule& pod);};
+
+
 
 } // namespace QMatrixClient