Merge branch 'master' of https://github.com/QMatrixClient/libqmatrixclient

1 files changed, 2 insertions, 25 deletions

diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index 6959e9d1..c6542aa6 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -7,38 +7,15 @@
 #include "converters.h"
 
 #include "csapi/definitions/push_condition.h"
+#include "converters.h"
 #include <QtCore/QVector>
 #include <QtCore/QVariant>
-#include "converters.h"
+#include <QtCore/QJsonObject>
 
 namespace QMatrixClient
 {
     // Data structures
 
-    /// Specifies an entry to the 'tweaks' dictionary sent in
-    /// the notification request to the Push Gateway.
-    /// Tweak parameters, if any, are provided as additional
-    /// key-value pairs in this structure.
-    struct SetTweakAction
-    {
-        /// The tweak type. Two predefined types are `sound`
-        /// and `highlight`; client applications and Push Gateways
-        /// may agree on additional tweak types.
-        QString setTweak;
-        /// Specifies an entry to the 'tweaks' dictionary sent in
-        /// the notification request to the Push Gateway.
-        /// Tweak parameters, if any, are provided as additional
-        /// key-value pairs in this structure.
-        QVariantHash additionalProperties;
-    };
-
-    QJsonObject toJson(const SetTweakAction& pod);
-
-    template <> struct FromJson<SetTweakAction>
-    {
-        SetTweakAction operator()(const QJsonValue& jv);
-    };
-
     struct PushRule
     {
         /// The actions to perform when this rule is matched.