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>

3 files changed, 11 insertions, 9 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);