diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-12-16 17:47:15 +0200 |
---|---|---|
committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-01-14 08:59:51 +0200 |
commit | 5ef7499de54fead8fe468b30c4c93235829a3b3c (patch) | |
tree | 08da06acb8e38c2f61dcd9dafcad5bfa84aa3d2c /src/networksettings/connman/qnetworksettingsservice_p.cpp | |
parent | e133f76de459cad7e4356be1b2d34e81b8fa5299 (diff) |
Refactor using Q_ENUM instead of deprecated Q_ENUMS
Task-number: QTBUG-99742
Pick-to: 6.2 6.3
Change-Id: I9f3fc10b562d5cf25b366cca9f299cc53bb0f9f5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsservice_p.cpp')
-rw-r--r-- | src/networksettings/connman/qnetworksettingsservice_p.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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); |