Refactor using Q_ENUM instead of deprecated Q_ENUMS

Task-number: QTBUG-99742
Change-Id: I9f3fc10b562d5cf25b366cca9f299cc53bb0f9f5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 5ef7499de54fead8fe468b30c4c93235829a3b3c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

14 files changed, 155 insertions, 130 deletions

diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.cpp b/src/networksettings/connman/qnetworksettingsinterface_p.cpp
index 5f008ff..98f66a7 100644
--- a/src/networksettings/connman/qnetworksettingsinterface_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsinterface_p.cpp
@@ -83,7 +83,7 @@ void QNetworkSettingsInterfacePrivate::updateProperty(const QString &name, const
     }
 }
 
-void QNetworkSettingsInterfacePrivate::setState(QNetworkSettingsState::States aState)
+void QNetworkSettingsInterfacePrivate::setState(QNetworkSettingsState::State aState)
 {
     Q_Q(QNetworkSettingsInterface);
     m_state.setState(aState);
diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h
index d85712a..483e736 100644
--- a/src/networksettings/connman/qnetworksettingsinterface_p.h
+++ b/src/networksettings/connman/qnetworksettingsinterface_p.h
@@ -57,11 +57,11 @@ public:
     explicit QNetworkSettingsInterfacePrivate(QNetworkSettingsInterface* parent);
     void initialize(const QString& path, const QVariantMap& properties);
     void setPowered(const bool power);
-    void setState(QNetworkSettingsState::States aState);
+    void setState(QNetworkSettingsState::State aState);
     void scan();
     QString name() const {return m_name;}
-    QNetworkSettingsType::Types type() const {return m_type.type();}
-    QNetworkSettingsState::States state() const {return m_state.state();}
+    QNetworkSettingsType::Type type() const {return m_type.type();}
+    QNetworkSettingsState::State state() const {return m_state.state();}
     bool powered() const {return m_powered;}
     QString path() const;
 
@@ -91,7 +91,7 @@ public:
             d_ptr->initialize(path, properties);
     }
 
-    void setState(QNetworkSettingsState::States aState) {
+    void setState(QNetworkSettingsState::State aState) {
         Q_D(QNetworkSettingsInterface);
         d->setState(aState);
     }
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp
index 2523e81..dce48d9 100644
--- a/src/networksettings/connman/qnetworksettingsservice_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp
@@ -438,20 +438,22 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV
     }
     else if (key == PropertySecurity) {
         QStringList value = qdbus_cast<QStringList>(val);
+        QNetworkSettingsWireless::Securities securities;
         foreach (const QString str, value) {
             if (str ==  AttributeNone || str == AttributeWps) {
-                m_wifiConfig.setSecurity(QNetworkSettingsWireless::None);
+                securities |= QNetworkSettingsWireless::Security::None;
             }
             else if (str == AttributeWep) {
-                m_wifiConfig.setSecurity(QNetworkSettingsWireless::WEP);
+                securities |= QNetworkSettingsWireless::Security::WEP;
             }
             else if (str == AttributePsk) {
-                m_wifiConfig.setSecurity(QNetworkSettingsWireless::WPA);
+                securities |=QNetworkSettingsWireless::Security::WPA;
             }
             else if (str == AttributeIeee) {
-                m_wifiConfig.setSecurity(QNetworkSettingsWireless::WPA2);
+                securities |=QNetworkSettingsWireless::Security::WPA2;
             }
         }
+        m_wifiConfig.setSecurity(securities);
     }
     else if (key == PropertyAutoConnect) {
         m_autoConnect = qdbus_cast<bool>(val);
diff --git a/src/networksettings/qnetworksettings.cpp b/src/networksettings/qnetworksettings.cpp
index 79ec2d4..97314d7 100644
--- a/src/networksettings/qnetworksettings.cpp
+++ b/src/networksettings/qnetworksettings.cpp
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \enum QNetworkSettingsState::States
+    \enum QNetworkSettingsState::State
 
     This enum type holds the state of the network interface.
 
@@ -95,21 +95,21 @@ QT_BEGIN_NAMESPACE
     \property QNetworkSettingsState::state
     \brief The state of the network interface.
 
-    \sa QNetworkSettingsState::States
+    \sa QNetworkSettingsState::State
 */
 
 /*!
     \fn QNetworkSettingsState::stateChanged()
     This signal is emitted when the state of the network interface changes.
 
-    \sa QNetworkSettingsState::States
+    \sa QNetworkSettingsState::State
 */
 
 /*!
     Creates a new network interface state object with the state \a state and the
     parent \a parent.
 */
-QNetworkSettingsState::QNetworkSettingsState(States state, QObject *parent)
+QNetworkSettingsState::QNetworkSettingsState(State state, QObject *parent)
     : QObject(parent)
     , m_state(state)
 {
@@ -127,14 +127,14 @@ QNetworkSettingsState::QNetworkSettingsState(QObject *parent)
 /*!
     Returns the network interface state.
 */
-QNetworkSettingsState::States QNetworkSettingsState::state() const {
+QNetworkSettingsState::State QNetworkSettingsState::state() const {
     return m_state;
 }
 
 /*!
     Sets the network interface state to \a state.
 */
-void QNetworkSettingsState::setState(const States state) {
+void QNetworkSettingsState::setState(const State state) {
     m_state = state;
     emit stateChanged();
 }
@@ -150,7 +150,7 @@ void QNetworkSettingsState::setState(const States state) {
 */
 
 /*!
-    \enum QNetworkSettingsType::Types
+    \enum QNetworkSettingsType::Type
 
     This enum type holds the type of the network interface.
 
@@ -168,21 +168,21 @@ void QNetworkSettingsState::setState(const States state) {
     \property QNetworkSettingsType::type
     \brief The type of the network interface.
 
-    \sa QNetworkSettingsType::Types
+    \sa QNetworkSettingsType::Type
 */
 
 /*!
     \fn QNetworkSettingsType::typeChanged()
     This signal is emitted when the type of the network interface changes.
 
-    \sa QNetworkSettingsType::Types
+    \sa QNetworkSettingsType::Type
 */
 
 /*!
     Creates a new network interface type object with the type \a type and
     parent \a parent.
 */
-QNetworkSettingsType::QNetworkSettingsType(Types type, QObject *parent)
+QNetworkSettingsType::QNetworkSettingsType(Type type, QObject *parent)
     : QObject(parent)
     , m_type(type)
 {
@@ -201,14 +201,14 @@ QNetworkSettingsType::QNetworkSettingsType(QObject *parent)
 /*!
     Returns the network interface type.
 */
-QNetworkSettingsType::Types QNetworkSettingsType::type() const {
+QNetworkSettingsType::Type QNetworkSettingsType::type() const {
     return m_type;
 }
 
 /*!
     Sets the network interface type to \a type.
 */
-void QNetworkSettingsType::setType(const Types type) {
+void QNetworkSettingsType::setType(const Type type) {
     m_type = type;
     emit typeChanged();
 }
@@ -222,7 +222,7 @@ void QNetworkSettingsType::setType(const Types type) {
 */
 
 /*!
-    \enum QNetworkSettingsIPv4::MethodType
+    \enum QNetworkSettingsIPv4::Method
 
     This enum type holds the method used for IPv4 configuration.
 
@@ -248,7 +248,7 @@ void QNetworkSettingsType::setType(const Types type) {
     \property QNetworkSettingsIPv4::method
     \brief Holds the method of IPv4 configuration.
 
-    \sa QNetworkSettingsIPv4::MethodType
+    \sa QNetworkSettingsIPv4::Method
 */
 
 /*!
@@ -282,11 +282,11 @@ void QNetworkSettingsIPv4::setGateway(const QString& gateway) {
     emit gatewayChanged();
 }
 
-QNetworkSettingsIPv4::MethodType QNetworkSettingsIPv4::method() const {
+QNetworkSettingsIPv4::Method QNetworkSettingsIPv4::method() const {
     return m_method;
 }
 
-void QNetworkSettingsIPv4::setMethod(const MethodType method) {
+void QNetworkSettingsIPv4::setMethod(const Method method) {
     m_method = method;
     emit methodChanged();
 }
@@ -309,7 +309,7 @@ void QNetworkSettingsIPv4::setMask(const QString& mask) {
 */
 
 /*!
-    \enum QNetworkSettingsIPv6::MethodType
+    \enum QNetworkSettingsIPv6::Method
 
     This enum type holds the method used for IPv6 configuration.
 
@@ -322,7 +322,7 @@ void QNetworkSettingsIPv4::setMask(const QString& mask) {
 */
 
 /*!
-    \enum QNetworkSettingsIPv6::PrivacyType
+    \enum QNetworkSettingsIPv6::Privacy
     \brief Holds the method of applying the privacy extensions in IPv6.
 
     \value  Disabled
@@ -349,14 +349,14 @@ void QNetworkSettingsIPv4::setMask(const QString& mask) {
     \property QNetworkSettingsIPv6::method
     \brief Holds the method of IPv6 configuration.
 
-    \sa QNetworkSettingsIPv6::MethodType
+    \sa QNetworkSettingsIPv6::Method
 */
 
 /*!
     \property QNetworkSettingsIPv6::privacy
     \brief Holds the method of applying privacy extensions for IPv6.
 
-    \sa QNetworkSettingsIPv6::PrivacyType
+    \sa QNetworkSettingsIPv6::Privacy
 */
 
 /*!
@@ -391,20 +391,20 @@ void QNetworkSettingsIPv6::setGateway(const QString& gateway) {
     emit gatewayChanged();
 }
 
-QNetworkSettingsIPv6::MethodType QNetworkSettingsIPv6::method() const {
+QNetworkSettingsIPv6::Method QNetworkSettingsIPv6::method() const {
     return m_method;
 }
 
-void QNetworkSettingsIPv6::setMethod(const MethodType method) {
+void QNetworkSettingsIPv6::setMethod(const Method method) {
     m_method = method;
     emit methodChanged();
 }
 
-QNetworkSettingsIPv6::PrivacyType QNetworkSettingsIPv6::privacy() const {
+QNetworkSettingsIPv6::Privacy QNetworkSettingsIPv6::privacy() const {
     return m_privacy;
 }
 
-void QNetworkSettingsIPv6::setPrivacy(const PrivacyType privacy) {
+void QNetworkSettingsIPv6::setPrivacy(const Privacy privacy) {
     m_privacy = privacy;
     emit privacyChanged();
 }
@@ -427,7 +427,7 @@ void QNetworkSettingsIPv6::setPrefixLength(const int& prefixLength) {
 */
 
 /*!
-    \enum QNetworkSettingsProxy::MethodType
+    \enum QNetworkSettingsProxy::Method
     \brief Holds the network proxy configuration method.
 
     \value  Direct
@@ -444,7 +444,7 @@ void QNetworkSettingsIPv6::setPrefixLength(const int& prefixLength) {
     \property QNetworkSettingsProxy::method
     \brief Holds the network proxy configuration method.
 
-    \sa MethodType
+    \sa QNetworkSettingsProxy::Method
 */
 
 /*!
@@ -454,7 +454,7 @@ void QNetworkSettingsIPv6::setPrefixLength(const int& prefixLength) {
     For manual proxy configuration, this property holds the proxy server
     address. For automatic configuration, it holds the proxy auto-config URL.
 
-    \sa MethodType
+    \sa QNetworkSettingsProxy::Method
 */
 
 /*!
@@ -537,11 +537,11 @@ void QNetworkSettingsProxy::setExcludes(const QStringList& excludes) {
     emit excludesChanged();
 }
 
-QNetworkSettingsProxy::MethodType QNetworkSettingsProxy::method(void) const {
+QNetworkSettingsProxy::Method QNetworkSettingsProxy::method(void) const {
     return m_method;
 }
 
-void QNetworkSettingsProxy::setMethod(const MethodType& method) {
+void QNetworkSettingsProxy::setMethod(const Method& method) {
     m_method = method;
     emit methodChanged();
 }
@@ -554,7 +554,7 @@ void QNetworkSettingsProxy::setMethod(const MethodType& method) {
 */
 
 /*!
-    \enum QNetworkSettingsWireless::SecurityFlags
+    \enum QNetworkSettingsWireless::Security
     \brief This enum type holds the wireless security protocol used to
     protect the connection.
 
@@ -599,15 +599,12 @@ QNetworkSettingsWireless::QNetworkSettingsWireless(QObject* parent)
 
 /*!
     Returns whether the Wifi network supports the wireless security
-    protocols specified in \a security.
+    protocol specified in \a security.
 
-    \sa QNetworkSettingsWireless::SecurityFlags
+    \sa QNetworkSettingsWireless::Security
 */
-bool QNetworkSettingsWireless::supportsSecurity(SecurityFlags security) {
-    if (m_securityFlags & security) {
-        return true;
-    }
-    return false;
+bool QNetworkSettingsWireless::supportsSecurity(Security security) {
+    return m_supportedSecurites.testFlag(security);
 }
 
 bool QNetworkSettingsWireless::hidden() const {
@@ -637,12 +634,8 @@ void QNetworkSettingsWireless::setSignalStrength(const int signalStrength) {
 /*!
     Sets \a security flags.
 */
-void QNetworkSettingsWireless::setSecurity(const SecurityFlags security) {
-    if (security == None) {
-        m_securityFlags = None;
-    } else {
-        m_securityFlags |= security;
-    }
+void QNetworkSettingsWireless::setSecurity(const Securities securities) {
+    m_supportedSecurites = securities;
 }
 
 void QNetworkSettingsWireless::setOutOfRange(const bool aOutOfRange) {
diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h
index 84f5899..c4e748a 100644
--- a/src/networksettings/qnetworksettings.h
+++ b/src/networksettings/qnetworksettings.h
@@ -39,72 +39,85 @@ QT_BEGIN_NAMESPACE
 class Q_DECL_EXPORT QNetworkSettingsState : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(States)
-    Q_PROPERTY(States state READ state WRITE setState NOTIFY stateChanged)
+    Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
 
 public:
-    enum States {Idle, Failure, Association, Configuration, Ready, Disconnect, Online, Undefined};
+    enum State {
+        Idle = 0,
+        Failure,
+        Association,
+        Configuration,
+        Ready,
+        Disconnect,
+        Online,
+        Undefined
+    };
+    Q_ENUM(State)
 
-    explicit QNetworkSettingsState(States state, QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsState(State state, QObject *parent = Q_NULLPTR);
     explicit QNetworkSettingsState(QObject *parent = Q_NULLPTR);
 
-    States state() const;
-    void setState(const States state);
+    State state() const;
+    void setState(const State state);
 
 Q_SIGNALS:
     void stateChanged();
 
 private:
-    States m_state;
+    State m_state;
 };
 
 class Q_DECL_EXPORT QNetworkSettingsType : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Types)
-    Q_PROPERTY(Types type READ type WRITE setType NOTIFY typeChanged)
+    Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged)
 
 public:
-    enum Types {
-        Wired,
+    enum Type {
+        Wired = 0,
         Wifi,
         Bluetooth,
         Unknown
     };
+    Q_ENUM(Type)
 
-    explicit QNetworkSettingsType(Types type, QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsType(Type type, QObject *parent = Q_NULLPTR);
     explicit QNetworkSettingsType(QObject *parent = Q_NULLPTR);
 
-    Types type() const;
-    void setType(const Types type);
+    Type type() const;
+    void setType(const Type type);
 
 Q_SIGNALS:
     void typeChanged();
 
 private:
-    Types m_type;
+    Type m_type;
 };
 
 class Q_DECL_EXPORT QNetworkSettingsIPv4 : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(MethodType)
     Q_PROPERTY(QString address READ address WRITE setAddress NOTIFY addressChanged)
     Q_PROPERTY(QString gateway READ gateway WRITE setGateway NOTIFY gatewayChanged)
-    Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged)
+    Q_PROPERTY(Method method READ method WRITE setMethod NOTIFY methodChanged)
     Q_PROPERTY(QString mask READ mask WRITE setMask NOTIFY maskChanged)
 
 public:
     explicit QNetworkSettingsIPv4(QObject *parent = Q_NULLPTR);
 
-    enum MethodType {Dhcp, Manual, Off};
+    enum Method {
+        Dhcp = 0,
+        Manual,
+        Off
+    };
+    Q_ENUM(Method)
 
     QString address() const;
     void setAddress(const QString& address);
     QString gateway() const;
     void setGateway(const QString& gateway);
-    MethodType method() const;
-    void setMethod(const MethodType method);
+    Method method() const;
+    void setMethod(const Method method);
     QString mask() const;
     void setMask(const QString& mask);
 
@@ -117,35 +130,44 @@ Q_SIGNALS:
 private:
     QString m_address;
     QString m_gateway;
-    MethodType m_method;
+    Method m_method;
     QString m_mask;
 };
 
-
 class Q_DECL_EXPORT QNetworkSettingsIPv6 : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(MethodType PrivacyType)
     Q_PROPERTY(QString address READ address WRITE setAddress NOTIFY addressChanged)
     Q_PROPERTY(QString gateway READ gateway WRITE setGateway NOTIFY gatewayChanged)
-    Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged)
-    Q_PROPERTY(PrivacyType privacy READ privacy WRITE setPrivacy NOTIFY privacyChanged)
+    Q_PROPERTY(Method method READ method WRITE setMethod NOTIFY methodChanged)
+    Q_PROPERTY(Privacy privacy READ privacy WRITE setPrivacy NOTIFY privacyChanged)
     Q_PROPERTY(int prefixLength READ prefixLength WRITE setPrefixLength NOTIFY prefixLengthChanged)
 
 public:
     explicit QNetworkSettingsIPv6(QObject *parent = Q_NULLPTR);
 
-    enum MethodType {Auto, Manual, Off};
-    enum PrivacyType {Disabled, Enabled, Preferred};
+    enum Method {
+        Auto = 0,
+        Manual,
+        Off
+    };
+    Q_ENUM(Method)
+
+    enum Privacy {
+        Disabled = 0,
+        Enabled,
+        Preferred
+    };
+    Q_ENUM(Privacy)
 
     QString address() const;
     void setAddress(const QString& address);
     QString gateway() const;
     void setGateway(const QString& gateway);
-    MethodType method() const;
-    void setMethod(const MethodType method);
-    PrivacyType privacy() const;
-    void setPrivacy(const PrivacyType privacy);
+    Method method() const;
+    void setMethod(const Method method);
+    Privacy privacy() const;
+    void setPrivacy(const Privacy privacy);
     int prefixLength() const;
     void setPrefixLength(const int& prefixLength);
 
@@ -159,23 +181,27 @@ Q_SIGNALS:
 private:
     QString m_address;
     QString m_gateway;
-    MethodType m_method;
-    PrivacyType m_privacy;
+    Method m_method;
+    Privacy m_privacy;
     int m_prefixLength;
 };
 
-class Q_DECL_EXPORT QNetworkSettingsProxy   : public QObject
+class Q_DECL_EXPORT QNetworkSettingsProxy : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(MethodType)
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
     Q_PROPERTY(QAbstractItemModel* servers READ servers NOTIFY serversChanged)
     Q_PROPERTY(QAbstractItemModel* excludes READ excludes NOTIFY excludesChanged)
-    Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged)
+    Q_PROPERTY(Method method READ method WRITE setMethod NOTIFY methodChanged)
 public:
     explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR);
 
-    enum MethodType {Direct, Auto, Manual};
+    enum Method {
+        Direct = 0,
+        Auto,
+        Manual
+    };
+    Q_ENUM(Method)
 
     QUrl url() const;
     void setUrl(const QUrl& url);
@@ -185,8 +211,8 @@ public:
     QAbstractItemModel* excludes();
     QStringList excludes() const;
     void setExcludes(const QStringList& excludes);
-    MethodType method() const;
-    void setMethod(const MethodType& method);
+    Method method() const;
+    void setMethod(const Method& method);
 
 Q_SIGNALS:
     void urlChanged();
@@ -197,27 +223,32 @@ private:
     QUrl m_url;
     QNetworkSettingsAddressModel m_servers;
     QNetworkSettingsAddressModel m_excludes;
-    MethodType m_method;
+    Method m_method;
 };
 
 class Q_DECL_EXPORT QNetworkSettingsWireless : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(SecurityFlags)
     Q_PROPERTY(int signalStrength READ signalStrength WRITE setSignalStrength NOTIFY signalStrengthChanged)
     Q_PROPERTY(bool hidden READ hidden NOTIFY hiddenChanged)
     Q_PROPERTY(bool isOutOfRange READ outOfRange WRITE setOutOfRange NOTIFY outOfRangeChanged)
 public:
     explicit QNetworkSettingsWireless(QObject* parent = Q_NULLPTR);
 
-    enum SecurityFlags {None=1, WEP=2, WPA=4, WPA2=8};
+    enum class Security {
+        None    = 0x0000,
+        WEP     = 0x0002,
+        WPA     = 0x0004,
+        WPA2    = 0x0008
+    };
+    Q_DECLARE_FLAGS(Securities, Security)
 
-    Q_INVOKABLE bool supportsSecurity(SecurityFlags security);
+    Q_INVOKABLE bool supportsSecurity(Security security);
     bool hidden() const;
     void setHidden(const bool hidden);
     int signalStrength() const;
     void setSignalStrength(const int signalStrength);
-    void setSecurity(const SecurityFlags security);
+    void setSecurity(const Securities securities);
     void setOutOfRange(const bool aOutOfRange);
     bool outOfRange() const;
 
@@ -227,11 +258,12 @@ Q_SIGNALS:
     void passwordChanged();
     void outOfRangeChanged();
 private:
-    quint16 m_securityFlags;
+    Securities m_supportedSecurites;
     bool m_hidden;
     int m_signalStrength;
     bool m_isOutOfRange;
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkSettingsWireless::Securities)
 
 QT_END_NAMESPACE
 
diff --git a/src/networksettings/qnetworksettingsinterface.cpp b/src/networksettings/qnetworksettingsinterface.cpp
index d885394..053820d 100644
--- a/src/networksettings/qnetworksettingsinterface.cpp
+++ b/src/networksettings/qnetworksettingsinterface.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
     \readonly
     \brief Holds the state of the network interface.
 
-    \sa QNetworkSettingsState::States
+    \sa QNetworkSettingsState::State
 */
 
 /*!
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
     \readonly
     \brief Holds the type of the network interface.
 
-    \sa QNetworkSettingsType::Types
+    \sa QNetworkSettingsType::Type
 */
 
 /*!
@@ -146,7 +146,7 @@ QString QNetworkSettingsInterface::name() const
 /*!
     Returns the state of the network interface.
 */
-QNetworkSettingsState::States QNetworkSettingsInterface::state()
+QNetworkSettingsState::State QNetworkSettingsInterface::state()
 {
     Q_D(QNetworkSettingsInterface);
     return d->state();
@@ -168,7 +168,7 @@ QNetworkSettingsState::States QNetworkSettingsInterface::state()
 /*!
     Returns the type of the network interface.
 */
-QNetworkSettingsType::Types QNetworkSettingsInterface::type()
+QNetworkSettingsType::Type QNetworkSettingsInterface::type()
 {
     Q_D(QNetworkSettingsInterface);
     return d->type();
diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h
index 20c1187..0c4b08b 100644
--- a/src/networksettings/qnetworksettingsinterface.h
+++ b/src/networksettings/qnetworksettingsinterface.h
@@ -39,15 +39,15 @@ QT_BEGIN_NAMESPACE
 class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject {
     Q_OBJECT
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QNetworkSettingsState::States state READ state NOTIFY stateChanged)
-    Q_PROPERTY(QNetworkSettingsType::Types type READ type NOTIFY typeChanged)
+    Q_PROPERTY(QNetworkSettingsState::State state READ state NOTIFY stateChanged)
+    Q_PROPERTY(QNetworkSettingsType::Type type READ type NOTIFY typeChanged)
     Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged)
 
 public:
     explicit QNetworkSettingsInterface(QObject* parent = Q_NULLPTR);
     QString name() const;
-    QNetworkSettingsState::States state();
-    QNetworkSettingsType::Types type();
+    QNetworkSettingsState::State state();
+    QNetworkSettingsType::Type type();
     bool powered() const;
     void setPowered(const bool powered);
     Q_INVOKABLE void scanServices();
diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp
index 8d6ca60..2ab5020 100644
--- a/src/networksettings/qnetworksettingsinterfacemodel.cpp
+++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \brief This enum type holds information about a network interface.
 
     \value  Type
-            Network interface \l{QNetworkSettingsType::Types}{type}.
+            Network interface \l{QNetworkSettingsType::Type}{type}.
     \value  Status
             Network interface \l{QNetworkSettingsState::States}{state}.
     \value  Name
diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index 667004f..1ef9739 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE
     {
         QList<QNetworkSettingsInterface*> interfaces = manager->interfaces()->getModel();
         for (const auto &interface : interfaces) {
-            if (interface->type() == QNetworkSettingsType::Types::Wifi) {
+            if (interface->type() == QNetworkSettingsType::Type::Wifi) {
                 if (interface->powered()) {
                     interface->scanServices();
                 } else {
@@ -167,7 +167,7 @@ QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
 /*!
     Returns the service model.
 
-    \l QNetworkSettingsType::Types
+    \l QNetworkSettingsType::Type
 */
 QNetworkSettingsServiceFilter *QNetworkSettingsManager::services()
 {
diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h
index 01159dd..9802c4d 100644
--- a/src/networksettings/qnetworksettingsmanager.h
+++ b/src/networksettings/qnetworksettingsmanager.h
@@ -45,7 +45,6 @@ QT_BEGIN_NAMESPACE
 class Q_DECL_EXPORT QNetworkSettingsManager : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(StateTypes NetworkTypeTypes)
     Q_PROPERTY(QNetworkSettingsServiceFilter* services READ services NOTIFY servicesChanged)
     Q_PROPERTY(QNetworkSettingsInterfaceModel* interfaces READ interfaces NOTIFY interfacesChanged)
     Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ userAgent CONSTANT)
diff --git a/src/networksettings/qnetworksettingsservice.cpp b/src/networksettings/qnetworksettingsservice.cpp
index 001c676..ef0773c 100644
--- a/src/networksettings/qnetworksettingsservice.cpp
+++ b/src/networksettings/qnetworksettingsservice.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     \readonly
     \brief Holds the state of this service.
 
-    \sa QNetworkSettingsState::States
+    \sa QNetworkSettingsState::State
 */
 
 /*!
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     \readonly
     \brief Holds the type of this service.
 
-    \sa QNetworkSettingsType::Types
+    \sa QNetworkSettingsType::Type
 */
 
 /*!
@@ -226,9 +226,9 @@ bool QNetworkSettingsService::autoConnect() const
 /*!
     Returns the network service state.
 
-    \sa QNetworkSettingsState::States
+    \sa QNetworkSettingsState::State
 */
-QNetworkSettingsState::States QNetworkSettingsService::state()
+QNetworkSettingsState::State QNetworkSettingsService::state()
 {
     Q_D(QNetworkSettingsService);
     return d->m_state.state();
@@ -246,9 +246,9 @@ QNetworkSettingsState::States QNetworkSettingsService::state()
 /*!
     Returns the network service type.
 
-    \sa QNetworkSettingsType::Types
+    \sa QNetworkSettingsType::Type
 */
-QNetworkSettingsType::Types QNetworkSettingsService::type()
+QNetworkSettingsType::Type QNetworkSettingsService::type()
 {
     Q_D(QNetworkSettingsService);
     return d->m_type.type();
diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h
index dd9d52a..f28e968 100644
--- a/src/networksettings/qnetworksettingsservice.h
+++ b/src/networksettings/qnetworksettingsservice.h
@@ -39,11 +39,10 @@ QT_BEGIN_NAMESPACE
 class Q_DECL_EXPORT QNetworkSettingsService : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(StateTypes)
     Q_PROPERTY(QString id READ id CONSTANT)
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QNetworkSettingsState::States state READ state NOTIFY stateChanged)
-    Q_PROPERTY(QNetworkSettingsType::Types type READ type NOTIFY typeChanged)
+    Q_PROPERTY(QNetworkSettingsState::State state READ state NOTIFY stateChanged)
+    Q_PROPERTY(QNetworkSettingsType::Type type READ type NOTIFY typeChanged)
     Q_PROPERTY(QNetworkSettingsIPv4* ipv4 READ ipv4 NOTIFY ipv4Changed)
     Q_PROPERTY(QNetworkSettingsIPv6* ipv6 READ ipv6 NOTIFY ipv6Changed)
     Q_PROPERTY(QNetworkSettingsProxy* proxy READ proxy  NOTIFY proxyChanged)
@@ -56,8 +55,8 @@ public:
 
     QString id() const;
     QString name() const;
-    QNetworkSettingsState::States state();
-    QNetworkSettingsType::Types type();
+    QNetworkSettingsState::State state();
+    QNetworkSettingsType::Type type();
     QNetworkSettingsIPv4* ipv4();
     QNetworkSettingsIPv6* ipv6();
     QNetworkSettingsProxy* proxy();
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp
index 115fe35..cba63a3 100644
--- a/src/networksettings/qnetworksettingsservicemodel.cpp
+++ b/src/networksettings/qnetworksettingsservicemodel.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
     This enum type holds information about the network connection.
 
     \value  Type
-            Network \l{QNetworkSettingsType::Types}{type}.
+            Network \l{QNetworkSettingsType::Type}{type}.
     \value  Name
             The service set identifier (SSID) of the network.
     \value  SignalStrength
@@ -296,7 +296,7 @@ void QNetworkSettingsServiceModel::signalStrengthChanged()
     \property QNetworkSettingsServiceFilter::type
     \brief The type of the network.
 
-    \l QNetworkSettingsType::Types
+    \l QNetworkSettingsType::Type
 */
 
 /*!
@@ -351,19 +351,19 @@ QNetworkSettingsServiceFilter::~QNetworkSettingsServiceFilter()
 /*!
     Returns the service model.
 
-    \l QNetworkSettingsType::Types
+    \l QNetworkSettingsType::Type
 */
-QNetworkSettingsType::Types  QNetworkSettingsServiceFilter::type() const
+QNetworkSettingsType::Type  QNetworkSettingsServiceFilter::type() const
 {
     return m_type;
 }
 
 /*!
-    \fn void QNetworkSettingsServiceFilter::setType(QNetworkSettingsType::Types type)
+    \fn void QNetworkSettingsServiceFilter::setType(QNetworkSettingsType::Type type)
 
     Sets the service model to \a type.
 */
-void QNetworkSettingsServiceFilter::setType(const QNetworkSettingsType::Types type)
+void QNetworkSettingsServiceFilter::setType(const QNetworkSettingsType::Type type)
 {
     m_type = type;
     emit typeChanged();
diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h
index 01447f6..6617f8d 100644
--- a/src/networksettings/qnetworksettingsservicemodel.h
+++ b/src/networksettings/qnetworksettingsservicemodel.h
@@ -77,14 +77,14 @@ private:
 class Q_DECL_EXPORT QNetworkSettingsServiceFilter : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_PROPERTY(QNetworkSettingsType::Types type READ type WRITE setType NOTIFY typeChanged)
+    Q_PROPERTY(QNetworkSettingsType::Type type READ type WRITE setType NOTIFY typeChanged)
     Q_PROPERTY(bool wiredNetworksAvailable MEMBER m_wiredNetworksAvailable WRITE setWiredNetworksAvailable NOTIFY wiredNetworksAvailableChanged)
 public:
     explicit QNetworkSettingsServiceFilter(QObject* parent = Q_NULLPTR);
     virtual ~QNetworkSettingsServiceFilter();
     bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override;
-    QNetworkSettingsType::Types type() const;
-    void setType(QNetworkSettingsType::Types type);
+    QNetworkSettingsType::Type type() const;
+    void setType(QNetworkSettingsType::Type type);
     Q_INVOKABLE QVariant itemFromRow(const int row) const;
     Q_INVOKABLE int activeRow() const;
     void setWiredNetworksAvailable(bool);
@@ -92,7 +92,7 @@ Q_SIGNALS:
     void typeChanged();
     void wiredNetworksAvailableChanged();
 private:
-    QNetworkSettingsType::Types m_type;
+    QNetworkSettingsType::Type m_type;
     bool m_wiredNetworksAvailable;
 };