Move PayloadFormatIndicator to dedicated namespace

The PayloadFormatIndicator is used on multiple places.
Consequently, avoid duplication of this enum and move it to
a module namespace. It is not sufficient to have it inside QMqttClient.

Change-Id: I1113de55e69a5f548cdf4feba435b806949a8153
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

4 files changed, 17 insertions, 19 deletions

diff --git a/src/mqtt/qmqttconnection.cpp b/src/mqtt/qmqttconnection.cpp
index d2c6385..254676b 100644
--- a/src/mqtt/qmqttconnection.cpp
+++ b/src/mqtt/qmqttconnection.cpp
@@ -787,7 +787,7 @@ void QMqttConnection::readPublishProperties(QMqttPublishProperties &properties)
             const quint8 format = readBufferTyped<quint8>();
             propertyLength--;
             if (format == 1)
-                properties.setPayloadIndicator(QMqttPublishProperties::UTF8Encoded);
+                properties.setPayloadFormatIndicator(QMqtt::PayloadFormatIndicator::UTF8Encoded);
             break;
         }
         case 0x02: { // 3.3.2.3.3 Message Expiry Interval
@@ -966,12 +966,12 @@ QByteArray QMqttConnection::writePublishProperties(const QMqttPublishProperties
 
     // 3.3.2.3.2 Payload Indicator
     if (properties.availableProperties() & QMqttPublishProperties::PayloadFormatIndicator &&
-            properties.payloadIndicator() != QMqttPublishProperties::Unspecified) {
+            properties.payloadFormatIndicator() != QMqtt::PayloadFormatIndicator::Unspecified) {
         qCDebug(lcMqttConnectionVerbose) << "Publish Properties: Payload Indicator:"
-                                         << properties.payloadIndicator();
+                                         << (properties.payloadFormatIndicator() == QMqtt::PayloadFormatIndicator::UTF8Encoded ? 1 : 0);
         packet.append(char(0x01));
-        switch (properties.payloadIndicator()) {
-        case QMqttPublishProperties::UTF8Encoded:
+        switch (properties.payloadFormatIndicator()) {
+        case QMqtt::PayloadFormatIndicator::UTF8Encoded:
             packet.append(char(0x01));
             break;
         default:
diff --git a/src/mqtt/qmqttglobal.h b/src/mqtt/qmqttglobal.h
index 720531b..1524947 100644
--- a/src/mqtt/qmqttglobal.h
+++ b/src/mqtt/qmqttglobal.h
@@ -44,6 +44,13 @@ QT_BEGIN_NAMESPACE
 #  define Q_MQTT_EXPORT
 #endif
 
+namespace QMqtt
+{
+enum class PayloadFormatIndicator : quint8 {
+    Unspecified = 0,
+    UTF8Encoded = 1
+};
+}
 QT_END_NAMESPACE
 
 #endif //QTQMQTTGLOBAL_H
diff --git a/src/mqtt/qmqttpublishproperties.cpp b/src/mqtt/qmqttpublishproperties.cpp
index 87c7600..77c7fbe 100644
--- a/src/mqtt/qmqttpublishproperties.cpp
+++ b/src/mqtt/qmqttpublishproperties.cpp
@@ -41,7 +41,7 @@ public:
     quint32 messageExpiry{0};
     quint32 subscriptionIdentifier{0}; // Variable Integer
     quint16 topicAlias{0};
-    QMqttPublishProperties::PayloadIndicatorOption payloadIndicator{QMqttPublishProperties::Unspecified};
+    QMqtt::PayloadFormatIndicator payloadIndicator{QMqtt::PayloadFormatIndicator::Unspecified};
     QMqttPublishProperties::PublishPropertyDetails details{0};
     QMqttUserProperties userProperties;
 };
@@ -73,17 +73,13 @@ QMqttPublishProperties::PublishPropertyDetails QMqttPublishProperties::available
     return data->details;
 }
 
-quint8 QMqttPublishProperties::payloadIndicator() const
+QMqtt::PayloadFormatIndicator QMqttPublishProperties::payloadFormatIndicator() const
 {
     return data->payloadIndicator;
 }
 
-void QMqttPublishProperties::setPayloadIndicator(PayloadIndicatorOption indicator)
+void QMqttPublishProperties::setPayloadFormatIndicator(QMqtt::PayloadFormatIndicator indicator)
 {
-    if (indicator > 1) {
-        qWarning("Invalid payload indicator specified");
-        return;
-    }
     data->details |= QMqttPublishProperties::PayloadFormatIndicator;
     data->payloadIndicator = indicator;
 }
diff --git a/src/mqtt/qmqttpublishproperties.h b/src/mqtt/qmqttpublishproperties.h
index addb6f4..cc55560 100644
--- a/src/mqtt/qmqttpublishproperties.h
+++ b/src/mqtt/qmqttpublishproperties.h
@@ -43,11 +43,6 @@ class Q_MQTT_EXPORT QMqttPublishProperties
 {
     Q_GADGET
 public:
-    enum PayloadIndicatorOption : quint8 {
-        Unspecified = 0,
-        UTF8Encoded = 1
-    };
-
     enum PublishPropertyDetail : quint32 {
         PayloadFormatIndicator = 0x00000001,
         MessageExpiryInterval  = 0x00000002,
@@ -68,8 +63,8 @@ public:
 
     PublishPropertyDetails availableProperties() const;
 
-    quint8 payloadIndicator() const;
-    void setPayloadIndicator(PayloadIndicatorOption indicator);
+    QMqtt::PayloadFormatIndicator payloadFormatIndicator() const;
+    void setPayloadFormatIndicator(QMqtt::PayloadFormatIndicator indicator);
 
     quint32 messageExpiryInterval() const;
     void setMessageExpiryInterval(quint32 interval);