diff options
author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2018-09-11 10:30:06 +0200 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2018-09-11 09:25:16 +0000 |
commit | 37353480620d2910c71c678ae0e5dc5754c61e04 (patch) | |
tree | 54193b3305ac20247d97786335fb61b51eb668f9 | |
parent | b67e925690d0422c66fa241c532ff31031badd54 (diff) |
MQTT5: Remove Q_GADGET for property classes
The initial idea was to add them for future usage within QML context.
But right now those are not needed and hence should be removed.
Change-Id: Id041f6933bd25eb5ccd87d8629dfe1d94582b68f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/mqtt/qmqttauthenticationproperties.h | 2 | ||||
-rw-r--r-- | src/mqtt/qmqttconnectionproperties.h | 4 | ||||
-rw-r--r-- | src/mqtt/qmqttpublishproperties.h | 3 | ||||
-rw-r--r-- | src/mqtt/qmqttsubscriptionproperties.h | 4 |
4 files changed, 0 insertions, 13 deletions
diff --git a/src/mqtt/qmqttauthenticationproperties.h b/src/mqtt/qmqttauthenticationproperties.h index b587338..5025995 100644 --- a/src/mqtt/qmqttauthenticationproperties.h +++ b/src/mqtt/qmqttauthenticationproperties.h @@ -44,8 +44,6 @@ class QMqttAuthenticationPropertiesData; class Q_MQTT_EXPORT QMqttAuthenticationProperties { - Q_GADGET - public: QMqttAuthenticationProperties(); QMqttAuthenticationProperties(const QMqttAuthenticationProperties &); diff --git a/src/mqtt/qmqttconnectionproperties.h b/src/mqtt/qmqttconnectionproperties.h index 8741f76..04e9de5 100644 --- a/src/mqtt/qmqttconnectionproperties.h +++ b/src/mqtt/qmqttconnectionproperties.h @@ -44,7 +44,6 @@ class QMqttServerConnectionPropertiesData; class Q_MQTT_EXPORT QMqttLastWillProperties { - Q_GADGET public: QMqttLastWillProperties(); QMqttLastWillProperties(const QMqttLastWillProperties &); @@ -73,7 +72,6 @@ protected: class Q_MQTT_EXPORT QMqttConnectionProperties { - Q_GADGET public: QMqttConnectionProperties(); QMqttConnectionProperties(const QMqttConnectionProperties &); @@ -107,7 +105,6 @@ protected: class Q_MQTT_EXPORT QMqttServerConnectionProperties : public QMqttConnectionProperties { - Q_GADGET public: enum ServerPropertyDetail : quint32 { None = 0x00000000, @@ -129,7 +126,6 @@ public: AuthenticationMethod = 0x00010000, AuthenticationData = 0x00020000 }; - Q_ENUM(ServerPropertyDetail) Q_DECLARE_FLAGS(ServerPropertyDetails, ServerPropertyDetail) QMqttServerConnectionProperties(); diff --git a/src/mqtt/qmqttpublishproperties.h b/src/mqtt/qmqttpublishproperties.h index a239b4d..1c62fc6 100644 --- a/src/mqtt/qmqttpublishproperties.h +++ b/src/mqtt/qmqttpublishproperties.h @@ -42,7 +42,6 @@ class QMqttMessageStatusPropertiesData; class Q_MQTT_EXPORT QMqttPublishProperties { - Q_GADGET public: enum PublishPropertyDetail : quint32 { None = 0x00000000, @@ -55,7 +54,6 @@ public: SubscriptionIdentifier = 0x00000040, ContentType = 0x00000080 }; - Q_ENUM(PublishPropertyDetail) Q_DECLARE_FLAGS(PublishPropertyDetails, PublishPropertyDetail) QMqttPublishProperties(); @@ -96,7 +94,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMqttPublishProperties::PublishPropertyDetails) class Q_MQTT_EXPORT QMqttMessageStatusProperties { - Q_GADGET public: QMqttMessageStatusProperties(); QMqttMessageStatusProperties(const QMqttMessageStatusProperties &); diff --git a/src/mqtt/qmqttsubscriptionproperties.h b/src/mqtt/qmqttsubscriptionproperties.h index 3794609..b5a4864 100644 --- a/src/mqtt/qmqttsubscriptionproperties.h +++ b/src/mqtt/qmqttsubscriptionproperties.h @@ -45,8 +45,6 @@ class QMqttUnsubscriptionPropertiesData; class Q_MQTT_EXPORT QMqttSubscriptionProperties { - Q_GADGET - public: QMqttSubscriptionProperties(); QMqttSubscriptionProperties(const QMqttSubscriptionProperties &); @@ -64,8 +62,6 @@ private: class Q_MQTT_EXPORT QMqttUnsubscriptionProperties { - Q_GADGET - public: QMqttUnsubscriptionProperties(); QMqttUnsubscriptionProperties(const QMqttUnsubscriptionProperties &); |