[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libnm-qt/settings] settings: Use QFlags instead of enum
From: Jan Grulich <jgrulich () redhat ! com>
Date: 2013-03-18 13:55:24
Message-ID: 20130318135524.A8FDBA604F () git ! kde ! org
[Download RAW message or body]
Git commit 77dd9cd52e980559cac1a387d0d69311e0dad2fc by Jan Grulich.
Committed on 18/03/2013 at 14:54.
Pushed by grulich into branch 'settings'.
Use QFlags instead of enum
M +0 -5 settings/802-11-olpc-mesh.cpp
M +0 -2 settings/802-11-olpc-mesh.h
M +13 -13 settings/802-11-wireless-security.cpp
M +6 -6 settings/802-11-wireless-security.h
M +3 -3 settings/802-11-wireless-security_p.h
M +0 -5 settings/802-11-wireless.cpp
M +0 -2 settings/802-11-wireless.h
M +24 -24 settings/802-1x.cpp
M +10 -10 settings/802-1x.h
M +5 -5 settings/802-1x_p.h
M +0 -5 settings/802-3-ethernet.cpp
M +0 -2 settings/802-3-ethernet.h
M +5 -5 settings/adsl.cpp
M +2 -2 settings/adsl.h
M +1 -1 settings/adsl_p.h
M +0 -5 settings/bluetooth.cpp
M +0 -2 settings/bluetooth.h
M +0 -5 settings/bond.cpp
M +0 -2 settings/bond.h
M +0 -5 settings/bridge.cpp
M +0 -2 settings/bridge.h
M +0 -5 settings/bridgeport.cpp
M +0 -2 settings/bridgeport.h
M +5 -5 settings/cdma.cpp
M +2 -2 settings/cdma.h
M +1 -1 settings/cdma_p.h
M +10 -23 settings/gsm.cpp
M +4 -6 settings/gsm.h
M +2 -2 settings/gsm_p.h
M +0 -5 settings/infiniband.cpp
M +0 -2 settings/infiniband.h
M +0 -5 settings/ipv4.cpp
M +0 -2 settings/ipv4.h
M +0 -5 settings/ipv6.cpp
M +0 -2 settings/ipv6.h
M +0 -5 settings/ppp.cpp
M +0 -2 settings/ppp.h
M +5 -5 settings/pppoe.cpp
M +2 -2 settings/pppoe.h
M +1 -1 settings/pppoe_p.h
M +0 -5 settings/serial.cpp
M +0 -2 settings/serial.h
M +0 -5 settings/setting.cpp
M +3 -2 settings/setting.h
M +0 -5 settings/template.cpp
M +0 -2 settings/template.h
M +0 -5 settings/vlan.cpp
M +0 -2 settings/vlan.h
M +0 -5 settings/vpn.cpp
M +0 -2 settings/vpn.h
M +0 -5 settings/wimax.cpp
M +0 -2 settings/wimax.h
http://commits.kde.org/libnm-qt/77dd9cd52e980559cac1a387d0d69311e0dad2fc
diff --git a/settings/802-11-olpc-mesh.cpp b/settings/802-11-olpc-mesh.cpp
index a9cbdbe..fcfd851 100644
--- a/settings/802-11-olpc-mesh.cpp
+++ b/settings/802-11-olpc-mesh.cpp
@@ -100,11 +100,6 @@ QByteArray \
NetworkManager::Settings::OlpcMeshSetting::dhcpAnycastAddress() const return \
d->dhcpAnycastAddress; }
-bool NetworkManager::Settings::OlpcMeshSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::OlpcMeshSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_OLPC_MESH_SSID))) {
diff --git a/settings/802-11-olpc-mesh.h b/settings/802-11-olpc-mesh.h
index 072d4af..17da0de 100644
--- a/settings/802-11-olpc-mesh.h
+++ b/settings/802-11-olpc-mesh.h
@@ -51,8 +51,6 @@ public:
void setDhcpAnycastAddress(const QByteArray & address);
QByteArray dhcpAnycastAddress() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/802-11-wireless-security.cpp \
b/settings/802-11-wireless-security.cpp index c1a7435..4b80ddb 100644
--- a/settings/802-11-wireless-security.cpp
+++ b/settings/802-11-wireless-security.cpp
@@ -242,14 +242,14 @@ QString \
NetworkManager::Settings::WirelessSecuritySetting::wepKey3() const return \
d->wepKey3; }
-void NetworkManager::Settings::WirelessSecuritySetting::setWepKeyFlags(NetworkManager::Settings::Setting::SecretFlagType \
type) +void NetworkManager::Settings::WirelessSecuritySetting::setWepKeyFlags(NetworkManager::Settings::Setting::SecretFlags \
type) {
Q_D(WirelessSecuritySetting);
d->wepKeyFlags = type;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::WirelessSecuritySetting::wepKeyFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::WirelessSecuritySetting::wepKeyFlags() const {
Q_D(const WirelessSecuritySetting);
@@ -284,14 +284,14 @@ QString \
NetworkManager::Settings::WirelessSecuritySetting::psk() const return d->psk;
}
-void NetworkManager::Settings::WirelessSecuritySetting::setPskFlags(NetworkManager::Settings::Setting::SecretFlagType \
type) +void NetworkManager::Settings::WirelessSecuritySetting::setPskFlags(NetworkManager::Settings::Setting::SecretFlags \
type) {
Q_D(WirelessSecuritySetting);
d->pskFlags = type;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::WirelessSecuritySetting::pskFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::WirelessSecuritySetting::pskFlags() const {
Q_D(const WirelessSecuritySetting);
@@ -312,14 +312,14 @@ QString \
NetworkManager::Settings::WirelessSecuritySetting::leapPassword() const return \
d->leapPassword; }
-void NetworkManager::Settings::WirelessSecuritySetting::setLeapPasswordFlags(NetworkManager::Settings::Setting::SecretFlagType \
type) +void NetworkManager::Settings::WirelessSecuritySetting::setLeapPasswordFlags(NetworkManager::Settings::Setting::SecretFlags \
type) {
Q_D(WirelessSecuritySetting);
d->leapPasswordFlags = type;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::WirelessSecuritySetting::leapPasswordFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::WirelessSecuritySetting::leapPasswordFlags() const {
Q_D(const WirelessSecuritySetting);
@@ -389,7 +389,7 @@ QStringList \
NetworkManager::Settings::WirelessSecuritySetting::needSecrets(bool QStringList \
secrets;
if (keyMgmt() == Wep) {
- if (wepKeyFlags() != Setting::NotRequired) {
+ if (!wepKeyFlags().testFlag(Setting::NotRequired)) {
switch (wepTxKeyindex()) {
case 0:
if (wepKey0().isEmpty() || requestNew) {
@@ -546,7 +546,7 @@ void \
NetworkManager::Settings::WirelessSecuritySetting::fromMap(const QVariantMa }
if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS))) {
- setWepKeyFlags((SecretFlagType)map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS)).toUInt());
+ setWepKeyFlags((SecretFlags)map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS)).toUInt());
}
if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE))) {
@@ -559,7 +559,7 @@ void \
NetworkManager::Settings::WirelessSecuritySetting::fromMap(const QVariantMa }
if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS))) {
- setPskFlags((SecretFlagType)map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS)).toInt());
+ setPskFlags((SecretFlags)map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS)).toInt());
}
// SECRETS
@@ -568,7 +568,7 @@ void \
NetworkManager::Settings::WirelessSecuritySetting::fromMap(const QVariantMa }
if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS))) \
{
- setLeapPasswordFlags((SecretFlagType)map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS)).toInt());
+ setLeapPasswordFlags((SecretFlags)map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS)).toInt());
}
}
@@ -671,7 +671,7 @@ QVariantMap \
NetworkManager::Settings::WirelessSecuritySetting::toMap() const }
if (wepKeyFlags()) {
- setting.insert(QLatin1String(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS), \
wepKeyFlags()); + \
setting.insert(QLatin1String(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS), \
(int)wepKeyFlags()); }
if (wepKeyType()) {
@@ -684,7 +684,7 @@ QVariantMap \
NetworkManager::Settings::WirelessSecuritySetting::toMap() const }
if (pskFlags()) {
- setting.insert(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS), \
pskFlags()); + \
setting.insert(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS), \
(int)pskFlags()); }
// SECRETS
@@ -693,7 +693,7 @@ QVariantMap \
NetworkManager::Settings::WirelessSecuritySetting::toMap() const }
if (leapPasswordFlags()) {
- setting.insert(QLatin1String(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS), \
leapPasswordFlags()); + \
setting.insert(QLatin1String(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS), \
(int)leapPasswordFlags()); }
return setting;
diff --git a/settings/802-11-wireless-security.h \
b/settings/802-11-wireless-security.h index c44c7c1..42ef339 100644
--- a/settings/802-11-wireless-security.h
+++ b/settings/802-11-wireless-security.h
@@ -82,8 +82,8 @@ public:
void setWepKey3(const QString key);
QString wepKey3() const;
- void setWepKeyFlags(SecretFlagType type);
- SecretFlagType wepKeyFlags() const;
+ void setWepKeyFlags(SecretFlags type);
+ SecretFlags wepKeyFlags() const;
void setWepKeyType(WepKeyType type);
WepKeyType wepKeyType() const;
@@ -91,14 +91,14 @@ public:
void setPsk(const QString & key);
QString psk() const;
- void setPskFlags(SecretFlagType type);
- SecretFlagType pskFlags() const;
+ void setPskFlags(SecretFlags type);
+ SecretFlags pskFlags() const;
void setLeapPassword(const QString & password);
QString leapPassword() const;
- void setLeapPasswordFlags(SecretFlagType type);
- SecretFlagType leapPasswordFlags() const;
+ void setLeapPasswordFlags(SecretFlags type);
+ SecretFlags leapPasswordFlags() const;
void secretsFromMap(const QVariantMap & secrets);
diff --git a/settings/802-11-wireless-security_p.h \
b/settings/802-11-wireless-security_p.h index d47f083..86dacc3 100644
--- a/settings/802-11-wireless-security_p.h
+++ b/settings/802-11-wireless-security_p.h
@@ -45,12 +45,12 @@ namespace Settings
QString wepKey1;
QString wepKey2;
QString wepKey3;
- NetworkManager::Settings::Setting::SecretFlagType wepKeyFlags;
+ NetworkManager::Settings::Setting::SecretFlags wepKeyFlags;
NetworkManager::Settings::WirelessSecuritySetting::WepKeyType wepKeyType;
QString psk;
- NetworkManager::Settings::Setting::SecretFlagType pskFlags;
+ NetworkManager::Settings::Setting::SecretFlags pskFlags;
QString leapPassword;
- NetworkManager::Settings::Setting::SecretFlagType leapPasswordFlags;
+ NetworkManager::Settings::Setting::SecretFlags leapPasswordFlags;
};
}
}
diff --git a/settings/802-11-wireless.cpp b/settings/802-11-wireless.cpp
index fa744d8..a89d894 100644
--- a/settings/802-11-wireless.cpp
+++ b/settings/802-11-wireless.cpp
@@ -276,11 +276,6 @@ bool NetworkManager::Settings::WirelessSetting::hidden() const
return d->hidden;
}
-bool NetworkManager::Settings::WirelessSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::WirelessSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_WIRELESS_SSID))) {
diff --git a/settings/802-11-wireless.h b/settings/802-11-wireless.h
index a5fc4a4..5168f5f 100644
--- a/settings/802-11-wireless.h
+++ b/settings/802-11-wireless.h
@@ -87,8 +87,6 @@ public:
void setHidden(bool hidden);
bool hidden() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/802-1x.cpp b/settings/802-1x.cpp
index 5bef89e..b8066be 100644
--- a/settings/802-1x.cpp
+++ b/settings/802-1x.cpp
@@ -393,14 +393,14 @@ QString \
NetworkManager::Settings::Security8021xSetting::password() const return d->password;
}
-void NetworkManager::Settings::Security8021xSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::Security8021xSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(Security8021xSetting);
d->passwordFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::Security8021xSetting::passwordFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::Security8021xSetting::passwordFlags() const {
Q_D(const Security8021xSetting);
@@ -421,14 +421,14 @@ QByteArray \
NetworkManager::Settings::Security8021xSetting::passwordRaw() const return \
d->passwordRaw; }
-void NetworkManager::Settings::Security8021xSetting::setPasswordRawFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::Security8021xSetting::setPasswordRawFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(Security8021xSetting);
d->passwordRawFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::Security8021xSetting::passwordRawFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::Security8021xSetting::passwordRawFlags() const {
Q_D(const Security8021xSetting);
@@ -463,14 +463,14 @@ QString \
NetworkManager::Settings::Security8021xSetting::privateKeyPassword() con return \
d->privateKeyPassword; }
-void NetworkManager::Settings::Security8021xSetting::setPrivateKeyPasswordFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::Security8021xSetting::setPrivateKeyPasswordFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(Security8021xSetting);
d->privateKeyPasswordFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::Security8021xSetting::privateKeyPasswordFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::Security8021xSetting::privateKeyPasswordFlags() const {
Q_D(const Security8021xSetting);
@@ -505,14 +505,14 @@ QString \
NetworkManager::Settings::Security8021xSetting::phase2PrivateKeyPassword return \
d->phase2PrivateKeyPassword; }
-void NetworkManager::Settings::Security8021xSetting::setPhase2PrivateKeyPasswordFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::Security8021xSetting::setPhase2PrivateKeyPasswordFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(Security8021xSetting);
d->phase2PrivateKeyPasswordFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::Security8021xSetting::phase2PrivateKeyPasswordFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::Security8021xSetting::phase2PrivateKeyPasswordFlags() const \
{ Q_D(const Security8021xSetting);
@@ -540,14 +540,14 @@ QString NetworkManager::Settings::Security8021xSetting::pin() \
const return d->pin;
}
-void NetworkManager::Settings::Security8021xSetting::setPinFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::Security8021xSetting::setPinFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(Security8021xSetting);
d->pinFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::Security8021xSetting::pinFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::Security8021xSetting::pinFlags() const {
Q_D(const Security8021xSetting);
@@ -566,19 +566,19 @@ QStringList \
NetworkManager::Settings::Security8021xSetting::needSecrets(bool req QStringList \
secrets;
if (eapMethods().contains(EapMethodTls) && (privateKeyPassword().isEmpty() || \
requestNew) &&
- privateKeyPasswordFlags() != NotRequired) {
+ !privateKeyPasswordFlags().testFlag(NotRequired)) {
secrets << QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
} else if ((eapMethods().contains(EapMethodTtls) || \
eapMethods().contains(EapMethodPeap) ||
eapMethods().contains(EapMethodLeap) || \
eapMethods().contains(EapMethodFast)) &&
- (password().isEmpty() || requestNew) && passwordFlags() != \
NotRequired) { + (password().isEmpty() || requestNew) && \
!passwordFlags().testFlag(NotRequired)) { secrets << \
QLatin1String(NM_SETTING_802_1X_PASSWORD); secrets << \
QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW);
- } else if (eapMethods().contains(EapMethodSim) && (pin().isEmpty() || \
requestNew) && pinFlags() != NotRequired) { + } else if \
(eapMethods().contains(EapMethodSim) && (pin().isEmpty() || requestNew) && \
!pinFlags().testFlag(NotRequired)) { secrets << \
QLatin1String(NM_SETTING_802_1X_PIN); }
if ((phase2AuthMethod() == AuthMethodTls || phase2AuthEapMethod() == \
AuthEapMethodTls) &&
- (phase2PrivateKeyPassword().isEmpty() || requestNew) && \
phase2PrivateKeyPasswordFlags() != NotRequired) { + \
(phase2PrivateKeyPassword().isEmpty() || requestNew) && \
!phase2PrivateKeyPasswordFlags().testFlag(NotRequired)) {
secrets << QLatin1String(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD);
}
@@ -786,7 +786,7 @@ void \
NetworkManager::Settings::Security8021xSetting::fromMap(const QVariantMap& }
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PASSWORD_FLAGS))) {
- setPasswordFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_802_1X_PASSWORD_FLAGS)).toUInt());
+ setPasswordFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_802_1X_PASSWORD_FLAGS)).toUInt());
}
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW))) {
@@ -794,7 +794,7 @@ void \
NetworkManager::Settings::Security8021xSetting::fromMap(const QVariantMap& }
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW_FLAGS))) {
- setPasswordRawFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW_FLAGS)).toUInt());
+ setPasswordRawFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW_FLAGS)).toUInt());
}
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY))) {
@@ -806,7 +806,7 @@ void \
NetworkManager::Settings::Security8021xSetting::fromMap(const QVariantMap& }
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS))) \
{
- setPrivateKeyPasswordFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS)).toUInt());
+ setPrivateKeyPasswordFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS)).toUInt());
}
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY))) {
@@ -818,7 +818,7 @@ void \
NetworkManager::Settings::Security8021xSetting::fromMap(const QVariantMap& }
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS))) \
{
- setPhase2PrivateKeyPasswordFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS)).toUInt());
+ setPhase2PrivateKeyPasswordFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS)).toUInt());
}
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PIN))) {
@@ -826,7 +826,7 @@ void \
NetworkManager::Settings::Security8021xSetting::fromMap(const QVariantMap& }
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PIN_FLAGS))) {
- setPinFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_802_1X_PIN_FLAGS)).toUInt());
+ setPinFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_802_1X_PIN_FLAGS)).toUInt());
}
if (setting.contains(QLatin1String(NM_SETTING_802_1X_SYSTEM_CA_CERTS))) {
@@ -1016,7 +1016,7 @@ QVariantMap \
NetworkManager::Settings::Security8021xSetting::toMap() const }
if (passwordFlags() != None) {
- setting.insert(QLatin1String(NM_SETTING_802_1X_PASSWORD_FLAGS), \
passwordFlags()); + \
setting.insert(QLatin1String(NM_SETTING_802_1X_PASSWORD_FLAGS), \
(int)passwordFlags()); }
if (!passwordRaw().isEmpty()) {
@@ -1024,7 +1024,7 @@ QVariantMap \
NetworkManager::Settings::Security8021xSetting::toMap() const }
if (passwordRawFlags() != None) {
- setting.insert(QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW_FLAGS), \
passwordRawFlags()); + \
setting.insert(QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW_FLAGS), \
(int)passwordRawFlags()); }
if (!privateKey().isEmpty()) {
@@ -1036,7 +1036,7 @@ QVariantMap \
NetworkManager::Settings::Security8021xSetting::toMap() const }
if (privateKeyPasswordFlags() != None) {
- setting.insert(QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS), \
privateKeyPasswordFlags()); + \
setting.insert(QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS), \
(int)privateKeyPasswordFlags()); }
if (!phase2PrivateKey().isEmpty()) {
@@ -1048,7 +1048,7 @@ QVariantMap \
NetworkManager::Settings::Security8021xSetting::toMap() const }
if (phase2PrivateKeyPasswordFlags() != None) {
- setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS), \
phase2PrivateKeyPasswordFlags()); + \
setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS), \
(int)phase2PrivateKeyPasswordFlags()); }
if (!pin().isEmpty()) {
@@ -1056,7 +1056,7 @@ QVariantMap \
NetworkManager::Settings::Security8021xSetting::toMap() const }
if (pinFlags() != None) {
- setting.insert(QLatin1String(NM_SETTING_802_1X_PIN_FLAGS), pinFlags());
+ setting.insert(QLatin1String(NM_SETTING_802_1X_PIN_FLAGS), (int)pinFlags());
}
if (systemCaCertificates()) {
diff --git a/settings/802-1x.h b/settings/802-1x.h
index 02d9bd7..86df6d1 100644
--- a/settings/802-1x.h
+++ b/settings/802-1x.h
@@ -109,14 +109,14 @@ public:
void setPassword(const QString & password);
QString password() const;
- void setPasswordFlags(Setting::SecretFlagType flags);
- Setting::SecretFlagType passwordFlags() const;
+ void setPasswordFlags(Setting::SecretFlags flags);
+ Setting::SecretFlags passwordFlags() const;
void setPasswordRaw(const QByteArray & password);
QByteArray passwordRaw() const;
- void setPasswordRawFlags(Setting::SecretFlagType flags);
- Setting::SecretFlagType passwordRawFlags() const;
+ void setPasswordRawFlags(Setting::SecretFlags flags);
+ Setting::SecretFlags passwordRawFlags() const;
void setPrivateKey(const QByteArray & key);
QByteArray privateKey() const;
@@ -124,8 +124,8 @@ public:
void setPrivateKeyPassword(const QString & password);
QString privateKeyPassword() const;
- void setPrivateKeyPasswordFlags(Setting::SecretFlagType flags);
- Setting::SecretFlagType privateKeyPasswordFlags() const;
+ void setPrivateKeyPasswordFlags(Setting::SecretFlags flags);
+ Setting::SecretFlags privateKeyPasswordFlags() const;
void setPhase2PrivateKey(const QByteArray & key);
QByteArray phase2PrivateKey() const;
@@ -133,14 +133,14 @@ public:
void setPhase2PrivateKeyPassword(const QString & password);
QString phase2PrivateKeyPassword() const;
- void setPhase2PrivateKeyPasswordFlags(Setting::SecretFlagType flags);
- Setting::SecretFlagType phase2PrivateKeyPasswordFlags() const;
+ void setPhase2PrivateKeyPasswordFlags(Setting::SecretFlags flags);
+ Setting::SecretFlags phase2PrivateKeyPasswordFlags() const;
void setPin(const QString & pin);
QString pin() const;
- void setPinFlags(Setting::SecretFlagType flags);
- Setting::SecretFlagType pinFlags() const;
+ void setPinFlags(Setting::SecretFlags flags);
+ Setting::SecretFlags pinFlags() const;
void setSystemCaCertificates(bool use);
bool systemCaCertificates() const;
diff --git a/settings/802-1x_p.h b/settings/802-1x_p.h
index 6f61211..df0e7ec 100644
--- a/settings/802-1x_p.h
+++ b/settings/802-1x_p.h
@@ -53,17 +53,17 @@ namespace Settings
QStringList phase2AltSubjectMatches;
QByteArray phase2ClientCert;
QString password;
- Setting::SecretFlagType passwordFlags;
+ Setting::SecretFlags passwordFlags;
QByteArray passwordRaw;
- Setting::SecretFlagType passwordRawFlags;
+ Setting::SecretFlags passwordRawFlags;
QByteArray privateKey;
QString privateKeyPassword;
- Setting::SecretFlagType privateKeyPasswordFlags;
+ Setting::SecretFlags privateKeyPasswordFlags;
QByteArray phase2PrivateKey;
QString phase2PrivateKeyPassword;
- Setting::SecretFlagType phase2PrivateKeyPasswordFlags;
+ Setting::SecretFlags phase2PrivateKeyPasswordFlags;
QString pin;
- Setting::SecretFlagType pinFlags;
+ Setting::SecretFlags pinFlags;
bool systemCaCerts;
};
}
diff --git a/settings/802-3-ethernet.cpp b/settings/802-3-ethernet.cpp
index 9bbca55..eba9a30 100644
--- a/settings/802-3-ethernet.cpp
+++ b/settings/802-3-ethernet.cpp
@@ -230,11 +230,6 @@ QMap<QString,QString> \
NetworkManager::Settings::WiredSetting::s390Options() cons return d->s390Options;
}
-bool NetworkManager::Settings::WiredSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::WiredSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_WIRED_PORT))) {
diff --git a/settings/802-3-ethernet.h b/settings/802-3-ethernet.h
index e78bad3..ab612f7 100644
--- a/settings/802-3-ethernet.h
+++ b/settings/802-3-ethernet.h
@@ -79,8 +79,6 @@ public:
void setS390Options(const QMap<QString,QString> &options);
QMap<QString,QString> s390Options() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/adsl.cpp b/settings/adsl.cpp
index 07076fa..4d0d27d 100644
--- a/settings/adsl.cpp
+++ b/settings/adsl.cpp
@@ -95,14 +95,14 @@ QString NetworkManager::Settings::AdslSetting::password() const
return d->password;
}
-void NetworkManager::Settings::AdslSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::AdslSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(AdslSetting);
d->passwordFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::AdslSetting::passwordFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::AdslSetting::passwordFlags() const {
Q_D(const AdslSetting);
@@ -169,7 +169,7 @@ QStringList \
NetworkManager::Settings::AdslSetting::needSecrets(bool requestNew) {
QStringList secrets;
- if ((password().isEmpty() || requestNew) && passwordFlags() != NotRequired) {
+ if ((password().isEmpty() || requestNew) && \
!passwordFlags().testFlag(NotRequired)) { secrets << \
QLatin1String(NM_SETTING_ADSL_PASSWORD); }
@@ -187,7 +187,7 @@ void NetworkManager::Settings::AdslSetting::fromMap(const \
QVariantMap& setting) }
if (setting.contains(QLatin1String(NM_SETTING_ADSL_PASSWORD_FLAGS))) {
- setPasswordFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_ADSL_PASSWORD_FLAGS)).toUInt());
+ setPasswordFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_ADSL_PASSWORD_FLAGS)).toUInt());
}
if (setting.contains(QLatin1String(NM_SETTING_ADSL_PROTOCOL))) {
@@ -234,7 +234,7 @@ QVariantMap NetworkManager::Settings::AdslSetting::toMap() const
}
if (passwordFlags() != None) {
- setting.insert(QLatin1String(NM_SETTING_ADSL_PASSWORD_FLAGS), \
passwordFlags()); + \
setting.insert(QLatin1String(NM_SETTING_ADSL_PASSWORD_FLAGS), (int)passwordFlags()); \
}
if (protocol() != UnknownProtocol) {
diff --git a/settings/adsl.h b/settings/adsl.h
index 987fa78..abf6f9d 100644
--- a/settings/adsl.h
+++ b/settings/adsl.h
@@ -52,8 +52,8 @@ public:
void setPassword(const QString & password);
QString password() const;
- void setPasswordFlags(SecretFlagType flags);
- SecretFlagType passwordFlags() const;
+ void setPasswordFlags(SecretFlags flags);
+ SecretFlags passwordFlags() const;
void setProtocol(Protocol protocol);
Protocol protocol() const;
diff --git a/settings/adsl_p.h b/settings/adsl_p.h
index 713a674..c3f52b9 100644
--- a/settings/adsl_p.h
+++ b/settings/adsl_p.h
@@ -35,7 +35,7 @@ namespace Settings
QString name;
QString username;
QString password;
- NetworkManager::Settings::Setting::SecretFlagType passwordFlags;
+ NetworkManager::Settings::Setting::SecretFlags passwordFlags;
NetworkManager::Settings::AdslSetting::Protocol protocol;
NetworkManager::Settings::AdslSetting::Encapsulation encapsulation;
quint32 vpi;
diff --git a/settings/bluetooth.cpp b/settings/bluetooth.cpp
index 2e4d7de..328d16b 100644
--- a/settings/bluetooth.cpp
+++ b/settings/bluetooth.cpp
@@ -84,11 +84,6 @@ NetworkManager::Settings::BluetoothSetting::Type \
NetworkManager::Settings::Bluet return d->type;
}
-bool NetworkManager::Settings::BluetoothSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::BluetoothSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_BLUETOOTH_BDADDR))) {
diff --git a/settings/bluetooth.h b/settings/bluetooth.h
index a303db7..c4a084e 100644
--- a/settings/bluetooth.h
+++ b/settings/bluetooth.h
@@ -50,8 +50,6 @@ public:
void setType(Type type);
Type type() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/bond.cpp b/settings/bond.cpp
index 5cab582..c85791f 100644
--- a/settings/bond.cpp
+++ b/settings/bond.cpp
@@ -91,11 +91,6 @@ QStringMap NetworkManager::Settings::BondSetting::options() const
return d->options;
}
-bool NetworkManager::Settings::BondSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::BondSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_BOND_INTERFACE_NAME))) {
diff --git a/settings/bond.h b/settings/bond.h
index 173a6df..b6c670c 100644
--- a/settings/bond.h
+++ b/settings/bond.h
@@ -50,8 +50,6 @@ public:
void setOptions(const QStringMap & options);
QStringMap options() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/bridge.cpp b/settings/bridge.cpp
index a84f6f2..713e4b1 100644
--- a/settings/bridge.cpp
+++ b/settings/bridge.cpp
@@ -164,11 +164,6 @@ quint32 NetworkManager::Settings::BridgeSetting::ageintTime() \
const return d->ageintTime;
}
-bool NetworkManager::Settings::BridgeSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::BridgeSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_BRIDGE_INTERFACE_NAME))) {
diff --git a/settings/bridge.h b/settings/bridge.h
index 71d7cad..a64940d 100644
--- a/settings/bridge.h
+++ b/settings/bridge.h
@@ -64,8 +64,6 @@ public:
void setAgeintTime(quint32 time);
quint32 ageintTime() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/bridgeport.cpp b/settings/bridgeport.cpp
index ea14e12..bffefcc 100644
--- a/settings/bridgeport.cpp
+++ b/settings/bridgeport.cpp
@@ -100,11 +100,6 @@ bool NetworkManager::Settings::BridgePortSetting::hairpinMode() \
const return d->hairpinMode;
}
-bool NetworkManager::Settings::BridgePortSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::BridgePortSetting::fromMap(const QVariantMap& \
setting) {
if (setting.contains(QLatin1String(NM_SETTING_BRIDGE_PORT_PRIORITY))) {
diff --git a/settings/bridgeport.h b/settings/bridgeport.h
index 5ef2d0e..74716d9 100644
--- a/settings/bridgeport.h
+++ b/settings/bridgeport.h
@@ -52,8 +52,6 @@ public:
void setHairpinMode(bool enable);
bool hairpinMode() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/cdma.cpp b/settings/cdma.cpp
index 5bda227..ac4a5fd 100644
--- a/settings/cdma.cpp
+++ b/settings/cdma.cpp
@@ -102,14 +102,14 @@ QString NetworkManager::Settings::CdmaSetting::password() const
return d->password;
}
-void NetworkManager::Settings::CdmaSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::CdmaSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(CdmaSetting);
d->passwordFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::CdmaSetting::passwordFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::CdmaSetting::passwordFlags() const {
Q_D(const CdmaSetting);
@@ -120,7 +120,7 @@ QStringList \
NetworkManager::Settings::CdmaSetting::needSecrets(bool requestNew) {
QStringList secrets;
if (!username().isEmpty()) {
- if ((password().isEmpty() || requestNew) && passwordFlags() != NotRequired) \
{ + if ((password().isEmpty() || requestNew) && \
!passwordFlags().testFlag(NotRequired)) { secrets << \
QLatin1String(NM_SETTING_CDMA_PASSWORD); }
}
@@ -162,7 +162,7 @@ void NetworkManager::Settings::CdmaSetting::fromMap(const \
QVariantMap& setting) }
if (setting.contains(QLatin1String(NM_SETTING_CDMA_PASSWORD_FLAGS))) {
- setPasswordFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_CDMA_PASSWORD_FLAGS)).toUInt());
+ setPasswordFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_CDMA_PASSWORD_FLAGS)).toUInt());
}
}
@@ -184,7 +184,7 @@ QVariantMap NetworkManager::Settings::CdmaSetting::toMap() const
}
if (passwordFlags() != None) {
- setting.insert(QLatin1String(NM_SETTING_CDMA_PASSWORD_FLAGS), \
passwordFlags()); + \
setting.insert(QLatin1String(NM_SETTING_CDMA_PASSWORD_FLAGS), (int)passwordFlags()); \
}
return setting;
diff --git a/settings/cdma.h b/settings/cdma.h
index d35ded2..65f341e 100644
--- a/settings/cdma.h
+++ b/settings/cdma.h
@@ -51,8 +51,8 @@ public:
void setPassword(const QString & password);
QString password() const;
- void setPasswordFlags(SecretFlagType flags);
- SecretFlagType passwordFlags() const;
+ void setPasswordFlags(SecretFlags flags);
+ SecretFlags passwordFlags() const;
QStringList needSecrets(bool requestNew = false) const;
diff --git a/settings/cdma_p.h b/settings/cdma_p.h
index 5b344c0..b975afe 100644
--- a/settings/cdma_p.h
+++ b/settings/cdma_p.h
@@ -36,7 +36,7 @@ namespace Settings
QString number;
QString username;
QString password;
- NetworkManager::Settings::Setting::SecretFlagType passwordFlags;
+ NetworkManager::Settings::Setting::SecretFlags passwordFlags;
};
}
}
diff --git a/settings/gsm.cpp b/settings/gsm.cpp
index 4282388..c26b21c 100644
--- a/settings/gsm.cpp
+++ b/settings/gsm.cpp
@@ -116,14 +116,14 @@ QString NetworkManager::Settings::GsmSetting::password() const
return d->password;
}
-void NetworkManager::Settings::GsmSetting::setPasswordFlags(GsmSetting::SecretFlagType \
flags) +void NetworkManager::Settings::GsmSetting::setPasswordFlags(GsmSetting::SecretFlags \
flags) {
Q_D(GsmSetting);
d->passwordFlags = flags;
}
-NetworkManager::Settings::GsmSetting::SecretFlagType \
NetworkManager::Settings::GsmSetting::passwordFlags() const \
+NetworkManager::Settings::GsmSetting::SecretFlags \
NetworkManager::Settings::GsmSetting::passwordFlags() const {
Q_D(const GsmSetting);
@@ -186,14 +186,14 @@ QString NetworkManager::Settings::GsmSetting::pin() const
return d->pin;
}
-void NetworkManager::Settings::GsmSetting::setPinFlags(GsmSetting::SecretFlagType \
flags) +void NetworkManager::Settings::GsmSetting::setPinFlags(GsmSetting::SecretFlags \
flags) {
Q_D(GsmSetting);
d->pinFlags = flags;
}
-NetworkManager::Settings::GsmSetting::SecretFlagType \
NetworkManager::Settings::GsmSetting::pinFlags() const \
+NetworkManager::Settings::GsmSetting::SecretFlags \
NetworkManager::Settings::GsmSetting::pinFlags() const {
Q_D(const GsmSetting);
@@ -228,19 +228,6 @@ bool NetworkManager::Settings::GsmSetting::homeOnly() const
return d->homeOnly;
}
-bool NetworkManager::Settings::GsmSetting::hasSecrets() const
-{
- if (passwordFlags() == None || passwordFlags() == AgentOwned) {
- return true;
- }
-
- if (pinFlags() == None || passwordFlags() == AgentOwned) {
- return true;
- }
-
- return false;
-}
-
void NetworkManager::Settings::GsmSetting::secretsFromMap(const QVariantMap& \
secrets) {
if (secrets.contains(QLatin1String(NM_SETTING_GSM_PASSWORD))) {
@@ -271,11 +258,11 @@ QStringList \
NetworkManager::Settings::GsmSetting::needSecrets(bool requestNew) c {
QStringList list;
- if ((password().isEmpty() || requestNew) && passwordFlags() != NotRequired) {
+ if ((password().isEmpty() || requestNew) && \
!passwordFlags().testFlag(NotRequired)) { list << \
QLatin1String(NM_SETTING_GSM_PASSWORD); }
- if ((pin().isEmpty() || requestNew) && pinFlags() != NotRequired) {
+ if ((pin().isEmpty() || requestNew) && !pinFlags().testFlag(NotRequired)) {
list << QLatin1String(NM_SETTING_GSM_PIN);
}
@@ -298,7 +285,7 @@ void NetworkManager::Settings::GsmSetting::fromMap(const \
QVariantMap& setting) }
if (setting.contains(QLatin1String(NM_SETTING_GSM_PASSWORD_FLAGS))) {
- setPasswordFlags((SecretFlagType)setting.value(QLatin1String(NM_SETTING_GSM_PASSWORD_FLAGS)).toInt());
+ setPasswordFlags((SecretFlags)setting.value(QLatin1String(NM_SETTING_GSM_PASSWORD_FLAGS)).toInt());
}
if (setting.contains(QLatin1String(NM_SETTING_GSM_APN))) {
@@ -319,7 +306,7 @@ void NetworkManager::Settings::GsmSetting::fromMap(const \
QVariantMap& setting) }
if (setting.contains(QLatin1String(NM_SETTING_GSM_PIN_FLAGS))) {
- setPinFlags((SecretFlagType)setting.value(QLatin1String(NM_SETTING_GSM_PIN_FLAGS)).toInt());
+ setPinFlags((SecretFlags)setting.value(QLatin1String(NM_SETTING_GSM_PIN_FLAGS)).toInt());
}
if (setting.contains(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS))) {
@@ -348,7 +335,7 @@ QVariantMap NetworkManager::Settings::GsmSetting::toMap() const
setting.insert(QLatin1String(NM_SETTING_GSM_PASSWORD), password());
}
- setting.insert(QLatin1String(NM_SETTING_GSM_PASSWORD_FLAGS), passwordFlags());
+ setting.insert(QLatin1String(NM_SETTING_GSM_PASSWORD_FLAGS), \
(int)passwordFlags());
if (!apn().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_GSM_APN), apn());
@@ -367,7 +354,7 @@ QVariantMap NetworkManager::Settings::GsmSetting::toMap() const
setting.insert(QLatin1String(NM_SETTING_GSM_PIN), pin());
}
- setting.insert(QLatin1String(NM_SETTING_GSM_PIN_FLAGS), pinFlags());
+ setting.insert(QLatin1String(NM_SETTING_GSM_PIN_FLAGS),(int)pinFlags());
if (allowedBand() != 1) {
setting.insert(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS), allowedBand());
diff --git a/settings/gsm.h b/settings/gsm.h
index 9b78408..ce8867d 100644
--- a/settings/gsm.h
+++ b/settings/gsm.h
@@ -51,8 +51,8 @@ public:
void setPassword(const QString & password);
QString password() const;
- void setPasswordFlags(SecretFlagType flags);
- SecretFlagType passwordFlags() const;
+ void setPasswordFlags(SecretFlags flags);
+ SecretFlags passwordFlags() const;
void setApn(const QString & apn);
QString apn() const;
@@ -66,8 +66,8 @@ public:
void setPin(const QString & pin);
QString pin() const;
- void setPinFlags(SecretFlagType flags);
- SecretFlagType pinFlags() const;
+ void setPinFlags(SecretFlags flags);
+ SecretFlags pinFlags() const;
void setAllowedBand(quint32 band);
quint32 allowedBand() const;
@@ -77,8 +77,6 @@ public:
void secretsFromMap(const QVariantMap & secrets);
- bool hasSecrets() const;
-
QVariantMap secretsToMap() const;
QStringList needSecrets(bool requestNew = false) const;
diff --git a/settings/gsm_p.h b/settings/gsm_p.h
index 01f383e..6c739a0 100644
--- a/settings/gsm_p.h
+++ b/settings/gsm_p.h
@@ -36,12 +36,12 @@ namespace Settings
QString number;
QString username;
QString password;
- NetworkManager::Settings::Setting::SecretFlagType passwordFlags;
+ NetworkManager::Settings::Setting::SecretFlags passwordFlags;
QString apn;
QString networkId;
qint32 networkType;
QString pin;
- NetworkManager::Settings::Setting::SecretFlagType pinFlags;
+ NetworkManager::Settings::Setting::SecretFlags pinFlags;
quint32 allowedBand;
bool homeOnly;
};
diff --git a/settings/infiniband.cpp b/settings/infiniband.cpp
index 0855540..bea2da1 100644
--- a/settings/infiniband.cpp
+++ b/settings/infiniband.cpp
@@ -100,11 +100,6 @@ NetworkManager::Settings::InfinibandSetting::TransportMode \
NetworkManager::Setti return d->transportMode;
}
-bool NetworkManager::Settings::InfinibandSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::InfinibandSetting::fromMap(const QVariantMap& \
setting) {
if (setting.contains(QLatin1String(NM_SETTING_INFINIBAND_MAC_ADDRESS))) {
diff --git a/settings/infiniband.h b/settings/infiniband.h
index 7a198c8..a389bb4 100644
--- a/settings/infiniband.h
+++ b/settings/infiniband.h
@@ -53,8 +53,6 @@ public:
void setTransportMode(TransportMode mode);
TransportMode transportMode() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/ipv4.cpp b/settings/ipv4.cpp
index 4ba3dab..2627d40 100644
--- a/settings/ipv4.cpp
+++ b/settings/ipv4.cpp
@@ -247,11 +247,6 @@ bool NetworkManager::Settings::Ipv4Setting::mayFail() const
return d->mayFail;
}
-bool NetworkManager::Settings::Ipv4Setting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::Ipv4Setting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD))) {
diff --git a/settings/ipv4.h b/settings/ipv4.h
index 743755e..28967f2 100644
--- a/settings/ipv4.h
+++ b/settings/ipv4.h
@@ -82,8 +82,6 @@ public:
void setMayFail(bool mayFail);
bool mayFail() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/ipv6.cpp b/settings/ipv6.cpp
index 216c467..0f124fd 100644
--- a/settings/ipv6.cpp
+++ b/settings/ipv6.cpp
@@ -215,11 +215,6 @@ NetworkManager::Settings::Ipv6Setting::IPv6Privacy \
NetworkManager::Settings::Ipv return d->privacy;
}
-bool NetworkManager::Settings::Ipv6Setting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::Ipv6Setting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD))) {
diff --git a/settings/ipv6.h b/settings/ipv6.h
index 63fbbea..0ec35b0 100644
--- a/settings/ipv6.h
+++ b/settings/ipv6.h
@@ -77,8 +77,6 @@ public:
void setPrivacy(IPv6Privacy privacy);
IPv6Privacy privacy() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/ppp.cpp b/settings/ppp.cpp
index 1c906dc..b2703c8 100644
--- a/settings/ppp.cpp
+++ b/settings/ppp.cpp
@@ -340,11 +340,6 @@ quint32 NetworkManager::Settings::PppSetting::lcpEchoInterval() \
const return d->lcpEchoInterval;
}
-bool NetworkManager::Settings::PppSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::PppSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_PPP_NOAUTH))) {
diff --git a/settings/ppp.h b/settings/ppp.h
index dd0f3eb..2f9157a 100644
--- a/settings/ppp.h
+++ b/settings/ppp.h
@@ -96,8 +96,6 @@ public:
void setLcpEchoInterval(quint32 interval);
quint32 lcpEchoInterval() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/pppoe.cpp b/settings/pppoe.cpp
index bbd5aa3..29c8543 100644
--- a/settings/pppoe.cpp
+++ b/settings/pppoe.cpp
@@ -102,14 +102,14 @@ QString NetworkManager::Settings::PppoeSetting::password() \
const return d->password;
}
-void NetworkManager::Settings::PppoeSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlagType \
flags) +void NetworkManager::Settings::PppoeSetting::setPasswordFlags(NetworkManager::Settings::Setting::SecretFlags \
flags) {
Q_D(PppoeSetting);
d->passwordFlags = flags;
}
-NetworkManager::Settings::Setting::SecretFlagType \
NetworkManager::Settings::PppoeSetting::passwordFlags() const \
+NetworkManager::Settings::Setting::SecretFlags \
NetworkManager::Settings::PppoeSetting::passwordFlags() const {
Q_D(const PppoeSetting);
@@ -120,7 +120,7 @@ QStringList \
NetworkManager::Settings::PppoeSetting::needSecrets(bool requestNew) {
QStringList secrets;
- if ((password().isEmpty() || requestNew) && passwordFlags() != \
Setting::NotRequired) { + if ((password().isEmpty() || requestNew) && \
!passwordFlags().testFlag(Setting::NotRequired)) { secrets << \
QLatin1String(NM_SETTING_PPPOE_PASSWORD); }
@@ -160,7 +160,7 @@ void NetworkManager::Settings::PppoeSetting::fromMap(const \
QVariantMap& setting) }
if (setting.contains(QLatin1String(NM_SETTING_PPPOE_PASSWORD_FLAGS))) {
- setPasswordFlags((Setting::SecretFlagType)setting.value(QLatin1String(NM_SETTING_PPPOE_PASSWORD_FLAGS)).toUInt());
+ setPasswordFlags((Setting::SecretFlags)setting.value(QLatin1String(NM_SETTING_PPPOE_PASSWORD_FLAGS)).toUInt());
}
}
@@ -181,7 +181,7 @@ QVariantMap NetworkManager::Settings::PppoeSetting::toMap() const
}
if (passwordFlags()) {
- setting.insert(QLatin1String(NM_SETTING_PPPOE_PASSWORD_FLAGS), \
passwordFlags()); + \
setting.insert(QLatin1String(NM_SETTING_PPPOE_PASSWORD_FLAGS), (int)passwordFlags()); \
}
return setting;
diff --git a/settings/pppoe.h b/settings/pppoe.h
index c601c2c..3dbc3f9 100644
--- a/settings/pppoe.h
+++ b/settings/pppoe.h
@@ -51,8 +51,8 @@ public:
void setPassword(const QString & password);
QString password() const;
- void setPasswordFlags(Setting::SecretFlagType flags);
- Setting::SecretFlagType passwordFlags() const;
+ void setPasswordFlags(Setting::SecretFlags flags);
+ Setting::SecretFlags passwordFlags() const;
QStringList needSecrets(bool requestNew = false) const;
diff --git a/settings/pppoe_p.h b/settings/pppoe_p.h
index 1dc4423..943f0a0 100644
--- a/settings/pppoe_p.h
+++ b/settings/pppoe_p.h
@@ -36,7 +36,7 @@ namespace Settings
QString service;
QString username;
QString password;
- NetworkManager::Settings::Setting::SecretFlagType passwordFlags;
+ NetworkManager::Settings::Setting::SecretFlags passwordFlags;
};
}
}
diff --git a/settings/serial.cpp b/settings/serial.cpp
index aac5cfa..fbaebb8 100644
--- a/settings/serial.cpp
+++ b/settings/serial.cpp
@@ -132,11 +132,6 @@ quint64 NetworkManager::Settings::SerialSetting::sendDelay() \
const return d->sendDelay;
}
-bool NetworkManager::Settings::SerialSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::SerialSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_SERIAL_BAUD))) {
diff --git a/settings/serial.h b/settings/serial.h
index 8103d65..6daeb70 100644
--- a/settings/serial.h
+++ b/settings/serial.h
@@ -59,8 +59,6 @@ public:
void setSendDelay(quint64 delay);
quint64 sendDelay() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/setting.cpp b/settings/setting.cpp
index 26f3f77..e3d83a2 100644
--- a/settings/setting.cpp
+++ b/settings/setting.cpp
@@ -185,11 +185,6 @@ NetworkManager::Settings::Setting::~Setting()
delete d_ptr;
}
-bool NetworkManager::Settings::Setting::hasSecrets() const
-{
- return false;
-}
-
QStringList NetworkManager::Settings::Setting::needSecrets(bool requestNew) const
{
return QStringList();
diff --git a/settings/setting.h b/settings/setting.h
index 37536ef..72ce391 100644
--- a/settings/setting.h
+++ b/settings/setting.h
@@ -25,6 +25,7 @@
#include <QtCore/QVariantMap>
#include <QtCore/QStringList>
+#include <QtCore/QFlags>
namespace NetworkManager
{
@@ -39,6 +40,7 @@ public:
enum SettingType {Adsl, Cdma, Gsm, Infiniband, Ipv4, Ipv6, Ppp, Pppoe, \
Security8021x, Serial,
Vpn, Wired, Wireless, WirelessSecurity, Bluetooth, OlpcMesh, \
Vlan, Wimax, Bond, Bridge, BridgePort};
enum SecretFlagType {None = 0, AgentOwned = 0x01, NotSaved = 0x02, NotRequired = \
0x04}; + Q_DECLARE_FLAGS(SecretFlags, SecretFlagType);
static QString typeAsString(SettingType type);
static SettingType typeFromString(const QString & type);
@@ -51,8 +53,6 @@ public:
virtual QVariantMap toMap() const = 0;
- virtual bool hasSecrets() const;
-
virtual void secretsFromMap(const QVariantMap & map);
virtual QVariantMap secretsToMap() const;
@@ -73,6 +73,7 @@ public:
private:
SettingPrivate * d_ptr;
};
+Q_DECLARE_OPERATORS_FOR_FLAGS(Setting::SecretFlags)
}
}
diff --git a/settings/template.cpp b/settings/template.cpp
index ac9b7a5..1ff2e2b 100644
--- a/settings/template.cpp
+++ b/settings/template.cpp
@@ -60,11 +60,6 @@ QString NetworkManager::Settings::TemplateSetting::name() const
return d->name;
}
-bool NetworkManager::Settings::TemplateSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::TemplateSetting::fromMap(const QVariantMap& setting)
{
/*
diff --git a/settings/template.h b/settings/template.h
index 66007e7..160d672 100644
--- a/settings/template.h
+++ b/settings/template.h
@@ -43,8 +43,6 @@ namespace Settings
QString name() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/vlan.cpp b/settings/vlan.cpp
index 00c3c34..12be42e 100644
--- a/settings/vlan.cpp
+++ b/settings/vlan.cpp
@@ -148,11 +148,6 @@ QStringList \
NetworkManager::Settings::VlanSetting::egressPriorityMap() const return \
d->egressPriorityMap; }
-bool NetworkManager::Settings::VlanSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::VlanSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_VLAN_INTERFACE_NAME))) {
diff --git a/settings/vlan.h b/settings/vlan.h
index 508c40b..cbfb918 100644
--- a/settings/vlan.h
+++ b/settings/vlan.h
@@ -62,8 +62,6 @@ public:
void setEgressPriorityMap(const QStringList & map);
QStringList egressPriorityMap() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/vpn.cpp b/settings/vpn.cpp
index 816f209..c49bc91 100644
--- a/settings/vpn.cpp
+++ b/settings/vpn.cpp
@@ -116,11 +116,6 @@ QStringMap NetworkManager::Settings::VpnSetting::secrets() const
return d->secrets;
}
-bool NetworkManager::Settings::VpnSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::VpnSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_VPN_SERVICE_TYPE))) {
diff --git a/settings/vpn.h b/settings/vpn.h
index 16e7d53..ff0f74a 100644
--- a/settings/vpn.h
+++ b/settings/vpn.h
@@ -55,8 +55,6 @@ public:
void setSecrets(const QStringMap & secrets);
QStringMap secrets() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
diff --git a/settings/wimax.cpp b/settings/wimax.cpp
index bc007bc..8e876c1 100644
--- a/settings/wimax.cpp
+++ b/settings/wimax.cpp
@@ -84,11 +84,6 @@ QByteArray NetworkManager::Settings::WimaxSetting::macAddress() \
const return d->macAddress;
}
-bool NetworkManager::Settings::WimaxSetting::hasSecrets() const
-{
- return false;
-}
-
void NetworkManager::Settings::WimaxSetting::fromMap(const QVariantMap& setting)
{
if (setting.contains(QLatin1String(NM_SETTING_WIMAX_NETWORK_NAME))) {
diff --git a/settings/wimax.h b/settings/wimax.h
index 466cfe0..4b1ad0d 100644
--- a/settings/wimax.h
+++ b/settings/wimax.h
@@ -49,8 +49,6 @@ public:
void setMacAddress(const QByteArray & address);
QByteArray macAddress() const;
- bool hasSecrets() const;
-
void fromMap(const QVariantMap & setting);
QVariantMap toMap() const;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic