[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libnm-qt] settings: Move all private methods in ConnectionSettings to ConnectionSettingsPrivate.
From: Lamarque V. Souza <lamarque () kde ! org>
Date: 2013-08-01 0:50:21
Message-ID: E1V4h5x-0004MG-D9 () scm ! kde ! org
[Download RAW message or body]
Git commit ecf9fcbd552c4e8f566c6b8ee66acd273c9c90bc by Lamarque V. Souza.
Committed on 19/07/2013 at 17:36.
Pushed by lvsouza into branch 'master'.
Move all private methods in ConnectionSettings to ConnectionSettingsPrivate.
M +187 -189 settings/connectionsettings.cpp
M +0 -5 settings/connectionsettings.h
M +10 -1 settings/connectionsettings_p.h
http://commits.kde.org/libnm-qt/ecf9fcbd552c4e8f566c6b8ee66acd273c9c90bc
diff --git a/settings/connectionsettings.cpp b/settings/connectionsettings.cpp
index 1dd7ec3..ddddc4a 100644
--- a/settings/connectionsettings.cpp
+++ b/settings/connectionsettings.cpp
@@ -64,166 +64,41 @@
#include <QtCore/QUuid>
-NetworkManager::ConnectionSettingsPrivate::ConnectionSettingsPrivate():
- name(NM_SETTING_CONNECTION_SETTING_NAME),
- uuid(QUuid().toString()),
- type(ConnectionSettings::Wired),
- autoconnect(true),
- readOnly(false)
+NetworkManager::ConnectionSettingsPrivate::ConnectionSettingsPrivate(ConnectionSettings \
*q) + : name(NM_SETTING_CONNECTION_SETTING_NAME)
+ , uuid(QUuid().toString())
+ , type(ConnectionSettings::Wired)
+ , autoconnect(true)
+ , readOnly(false)
+ , q_ptr(q)
{ }
-NetworkManager::ConnectionSettings::ConnectionType \
NetworkManager::ConnectionSettings::typeFromString(const QString &typeString) +void \
NetworkManager::ConnectionSettingsPrivate::addSetting(const \
NetworkManager::Setting::Ptr &setting) {
- ConnectionSettings::ConnectionType type = Wired;
-
- if (typeString == QLatin1String(NM_SETTING_ADSL_SETTING_NAME)) {
- type = Adsl;
- } else if (typeString == QLatin1String(NM_SETTING_BLUETOOTH_SETTING_NAME)) {
- type = Bluetooth;
- } else if (typeString == QLatin1String(NM_SETTING_BOND_SETTING_NAME)) {
- type = Bond;
- } else if (typeString == QLatin1String(NM_SETTING_BRIDGE_SETTING_NAME)) {
- type = Bridge;
- } else if (typeString == QLatin1String(NM_SETTING_CDMA_SETTING_NAME)) {
- type = Cdma;
- } else if (typeString == QLatin1String(NM_SETTING_GSM_SETTING_NAME)) {
- type = Gsm;
- } else if (typeString == QLatin1String(NM_SETTING_INFINIBAND_SETTING_NAME)) {
- type = Infiniband;
- } else if (typeString == QLatin1String(NM_SETTING_OLPC_MESH_SETTING_NAME)) {
- type = OLPCMesh;
- } else if (typeString == QLatin1String(NM_SETTING_PPPOE_SETTING_NAME)) {
- type = Pppoe;
- } else if (typeString == QLatin1String(NM_SETTING_VLAN_SETTING_NAME)) {
- type = Vlan;
- } else if (typeString == QLatin1String(NM_SETTING_VPN_SETTING_NAME)) {
- type = Vpn;
- } else if (typeString == QLatin1String(NM_SETTING_WIMAX_SETTING_NAME)) {
- type = Wimax;
- } else if (typeString == QLatin1String(NM_SETTING_WIRED_SETTING_NAME)) {
- type = Wired;
- } else if (typeString == QLatin1String(NM_SETTING_WIRELESS_SETTING_NAME)) {
- type = Wireless;
- }
-
- return type;
+ settings.push_back(setting);
}
-QString NetworkManager::ConnectionSettings::typeAsString(NetworkManager::ConnectionSettings::ConnectionType \
type) +void NetworkManager::ConnectionSettingsPrivate::clearSettings()
{
- QString typeString;
-
- switch (type) {
- case Adsl:
- typeString = QLatin1String(NM_SETTING_ADSL_SETTING_NAME);
- break;
- case Bond:
- typeString = QLatin1String(NM_SETTING_BOND_SETTING_NAME);
- break;
- case Bluetooth:
- typeString = QLatin1String(NM_SETTING_BLUETOOTH_SETTING_NAME);
- break;
- case Bridge:
- typeString = QLatin1String(NM_SETTING_BRIDGE_SETTING_NAME);
- break;
- case Cdma:
- typeString = QLatin1String(NM_SETTING_CDMA_SETTING_NAME);
- break;
- case Gsm:
- typeString = QLatin1String(NM_SETTING_GSM_SETTING_NAME);
- break;
- case Infiniband:
- typeString = QLatin1String(NM_SETTING_INFINIBAND_SETTING_NAME);
- break;
- case OLPCMesh:
- typeString = QLatin1String(NM_SETTING_OLPC_MESH_SETTING_NAME);
- break;
- case Pppoe:
- typeString = QLatin1String(NM_SETTING_PPPOE_SETTING_NAME);
- break;
- case Vlan:
- typeString = QLatin1String(NM_SETTING_VLAN_SETTING_NAME);
- break;
- case Vpn:
- typeString = QLatin1String(NM_SETTING_VPN_SETTING_NAME);
- break;
- case Wimax:
- typeString = QLatin1String(NM_SETTING_WIMAX_SETTING_NAME);
- break;
- case Wired:
- typeString = QLatin1String(NM_SETTING_WIRED_SETTING_NAME);
- break;
- case Wireless:
- typeString = QLatin1String(NM_SETTING_WIRELESS_SETTING_NAME);
- break;
- default:
- break;
- };
-
- return typeString;
-}
-
-QString NetworkManager::ConnectionSettings::createNewUuid()
-{
- return QUuid::createUuid().toString().mid(1, \
QUuid::createUuid().toString().length() - 2);
-}
-
-NetworkManager::ConnectionSettings::ConnectionSettings():
- d_ptr(new ConnectionSettingsPrivate())
-{ }
-
-NetworkManager::ConnectionSettings::ConnectionSettings(NetworkManager::ConnectionSettings::ConnectionType \
type, NMBluetoothCapabilities bt_cap):
- d_ptr(new ConnectionSettingsPrivate())
-{
- setConnectionType(type, bt_cap);
+ settings.clear();
}
-NetworkManager::ConnectionSettings::ConnectionSettings(const \
NetworkManager::ConnectionSettings::Ptr &other):
- d_ptr(new ConnectionSettingsPrivate())
-{
- setId(other->id());
- setUuid(other->uuid());
- setConnectionType(other->connectionType());
- setPermissions(other->permissions());
- setAutoconnect(other->autoconnect());
- setTimestamp(other->timestamp());
- setReadOnly(other->readOnly());
- setZone(other->zone());
- setMaster(other->master());
- setSlaveType(other->slaveType());
-
- initSettings(other);
-}
-
-NetworkManager::ConnectionSettings::ConnectionSettings(const NMVariantMapMap &map) :
- d_ptr(new ConnectionSettingsPrivate())
-{
- fromMap(map);
-}
-
-NetworkManager::ConnectionSettings::~ConnectionSettings()
+void NetworkManager::ConnectionSettingsPrivate::initSettings(NMBluetoothCapabilities \
bt_cap) {
clearSettings();
- delete d_ptr;
-}
-
-void NetworkManager::ConnectionSettings::initSettings(NMBluetoothCapabilities \
bt_cap)
-{
- clearSettings();
-
- switch (connectionType()) {
- case Adsl:
+ switch (type) {
+ case ConnectionSettings::Adsl:
addSetting(Setting::Ptr(new AdslSetting()));
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
break;
- case Bond:
+ case ConnectionSettings::Bond:
addSetting(Setting::Ptr(new BondSetting()));
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
break;
- case Bluetooth:
+ case ConnectionSettings::Bluetooth:
addSetting(Setting::Ptr(new BluetoothSetting()));
addSetting(Setting::Ptr(new Ipv4Setting()));
//addSetting(Setting::Ptr(new Ipv6Setting()));
@@ -233,169 +108,307 @@ void \
NetworkManager::ConnectionSettings::initSettings(NMBluetoothCapabilities bt \
addSetting(Setting::Ptr(new SerialSetting())); }
break;
- case Bridge:
+ case ConnectionSettings::Bridge:
addSetting(Setting::Ptr(new BridgeSetting()));
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
break;
- case Cdma:
+ case ConnectionSettings::Cdma:
addSetting(Setting::Ptr(new CdmaSetting()));
addSetting(Setting::Ptr(new Ipv4Setting()));
//addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new PppSetting()));
break;
- case Gsm:
+ case ConnectionSettings::Gsm:
addSetting(Setting::Ptr(new GsmSetting()));
addSetting(Setting::Ptr(new Ipv4Setting()));
//addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new PppSetting()));
break;
- case Infiniband:
+ case ConnectionSettings::Infiniband:
addSetting(Setting::Ptr(new InfinibandSetting()));
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
break;
- case OLPCMesh:
+ case ConnectionSettings::OLPCMesh:
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new OlpcMeshSetting()));
break;
- case Pppoe:
+ case ConnectionSettings::Pppoe:
addSetting(Setting::Ptr(new Ipv4Setting()));
//addSetting(new Ipv6Setting()));
addSetting(Setting::Ptr(new PppSetting()));
addSetting(Setting::Ptr(new PppoeSetting()));
addSetting(Setting::Ptr(new WiredSetting()));
break;
- case Vlan:
+ case ConnectionSettings::Vlan:
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new VlanSetting()));
break;
- case Vpn:
+ case ConnectionSettings::Vpn:
addSetting(Setting::Ptr(new Ipv4Setting()));
//addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new VpnSetting()));
break;
- case Wimax:
+ case ConnectionSettings::Wimax:
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new WimaxSetting()));
break;
- case Wired:
+ case ConnectionSettings::Wired:
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new Security8021xSetting()));
addSetting(Setting::Ptr(new WiredSetting()));
break;
- case Wireless:
+ case ConnectionSettings::Wireless:
addSetting(Setting::Ptr(new Ipv4Setting()));
addSetting(Setting::Ptr(new Ipv6Setting()));
addSetting(Setting::Ptr(new Security8021xSetting()));
addSetting(Setting::Ptr(new WirelessSetting()));
addSetting(Setting::Ptr(new WirelessSecuritySetting()));
break;
- case Unknown:
- break;
+ case ConnectionSettings::Unknown:
default:
break;
}
}
-void NetworkManager::ConnectionSettings::initSettings(const \
NetworkManager::ConnectionSettings::Ptr &connectionSettings) +void \
NetworkManager::ConnectionSettingsPrivate::initSettings(const \
NetworkManager::ConnectionSettings::Ptr &connectionSettings) {
+ Q_Q(ConnectionSettings);
+
clearSettings();
- switch (connectionType()) {
- case Adsl:
+ switch (type) {
+ case ConnectionSettings::Adsl:
addSetting(connectionSettings->setting(Setting::Adsl));
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
break;
- case Bond:
+ case ConnectionSettings::Bond:
addSetting(connectionSettings->setting(Setting::Bond));
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
break;
- case Bluetooth:
+ case ConnectionSettings::Bluetooth:
addSetting(connectionSettings->setting(Setting::Bluetooth));
addSetting(connectionSettings->setting(Setting::Ipv4));
//addSetting(connectionSettings->setting(Setting::Ipv6));
- if (setting(Setting::Gsm) && setting(Setting::Ppp) && \
setting(Setting::Serial)) { + if (q->setting(Setting::Gsm) && \
q->setting(Setting::Ppp) && q->setting(Setting::Serial)) { \
addSetting(connectionSettings->setting(Setting::Gsm)); \
addSetting(connectionSettings->setting(Setting::Ppp)); \
addSetting(connectionSettings->setting(Setting::Serial)); }
break;
- case Bridge:
+ case ConnectionSettings::Bridge:
addSetting(connectionSettings->setting(Setting::Bridge));
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
break;
- case Cdma:
+ case ConnectionSettings::Cdma:
addSetting(connectionSettings->setting(Setting::Cdma));
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Ppp));
break;
- case Gsm:
+ case ConnectionSettings::Gsm:
addSetting(connectionSettings->setting(Setting::Gsm));
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Ppp));
break;
- case Infiniband:
+ case ConnectionSettings::Infiniband:
addSetting(connectionSettings->setting(Setting::Infiniband));
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
break;
- case OLPCMesh:
+ case ConnectionSettings::OLPCMesh:
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::OlpcMesh));
break;
- case Pppoe:
+ case ConnectionSettings::Pppoe:
addSetting(connectionSettings->setting(Setting::Ipv4));
//addSetting(Ipv6Setting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Ppp));
addSetting(connectionSettings->setting(Setting::Pppoe));
addSetting(connectionSettings->setting(Setting::Wired));
break;
- case Vlan:
+ case ConnectionSettings::Vlan:
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Vlan));
break;
- case Vpn:
+ case ConnectionSettings::Vpn:
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Vpn));
break;
- case Wimax:
+ case ConnectionSettings::Wimax:
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Wimax));
break;
- case Wired:
+ case ConnectionSettings::Wired:
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Security8021x));
addSetting(connectionSettings->setting(Setting::Wired));
break;
- case Wireless:
+ case ConnectionSettings::Wireless:
addSetting(connectionSettings->setting(Setting::Ipv4));
addSetting(connectionSettings->setting(Setting::Ipv6));
addSetting(connectionSettings->setting(Setting::Security8021x));
addSetting(connectionSettings->setting(Setting::Wireless));
addSetting(connectionSettings->setting(Setting::WirelessSecurity));
break;
- case Unknown:
- break;
+ case ConnectionSettings::Unknown:
default:
break;
}
}
+NetworkManager::ConnectionSettings::ConnectionType \
NetworkManager::ConnectionSettings::typeFromString(const QString &typeString) +{
+ ConnectionSettings::ConnectionType type = Wired;
+
+ if (typeString == QLatin1String(NM_SETTING_ADSL_SETTING_NAME)) {
+ type = Adsl;
+ } else if (typeString == QLatin1String(NM_SETTING_BLUETOOTH_SETTING_NAME)) {
+ type = Bluetooth;
+ } else if (typeString == QLatin1String(NM_SETTING_BOND_SETTING_NAME)) {
+ type = Bond;
+ } else if (typeString == QLatin1String(NM_SETTING_BRIDGE_SETTING_NAME)) {
+ type = Bridge;
+ } else if (typeString == QLatin1String(NM_SETTING_CDMA_SETTING_NAME)) {
+ type = Cdma;
+ } else if (typeString == QLatin1String(NM_SETTING_GSM_SETTING_NAME)) {
+ type = Gsm;
+ } else if (typeString == QLatin1String(NM_SETTING_INFINIBAND_SETTING_NAME)) {
+ type = Infiniband;
+ } else if (typeString == QLatin1String(NM_SETTING_OLPC_MESH_SETTING_NAME)) {
+ type = OLPCMesh;
+ } else if (typeString == QLatin1String(NM_SETTING_PPPOE_SETTING_NAME)) {
+ type = Pppoe;
+ } else if (typeString == QLatin1String(NM_SETTING_VLAN_SETTING_NAME)) {
+ type = Vlan;
+ } else if (typeString == QLatin1String(NM_SETTING_VPN_SETTING_NAME)) {
+ type = Vpn;
+ } else if (typeString == QLatin1String(NM_SETTING_WIMAX_SETTING_NAME)) {
+ type = Wimax;
+ } else if (typeString == QLatin1String(NM_SETTING_WIRED_SETTING_NAME)) {
+ type = Wired;
+ } else if (typeString == QLatin1String(NM_SETTING_WIRELESS_SETTING_NAME)) {
+ type = Wireless;
+ }
+
+ return type;
+}
+
+QString NetworkManager::ConnectionSettings::typeAsString(NetworkManager::ConnectionSettings::ConnectionType \
type) +{
+ QString typeString;
+
+ switch (type) {
+ case Adsl:
+ typeString = QLatin1String(NM_SETTING_ADSL_SETTING_NAME);
+ break;
+ case Bond:
+ typeString = QLatin1String(NM_SETTING_BOND_SETTING_NAME);
+ break;
+ case Bluetooth:
+ typeString = QLatin1String(NM_SETTING_BLUETOOTH_SETTING_NAME);
+ break;
+ case Bridge:
+ typeString = QLatin1String(NM_SETTING_BRIDGE_SETTING_NAME);
+ break;
+ case Cdma:
+ typeString = QLatin1String(NM_SETTING_CDMA_SETTING_NAME);
+ break;
+ case Gsm:
+ typeString = QLatin1String(NM_SETTING_GSM_SETTING_NAME);
+ break;
+ case Infiniband:
+ typeString = QLatin1String(NM_SETTING_INFINIBAND_SETTING_NAME);
+ break;
+ case OLPCMesh:
+ typeString = QLatin1String(NM_SETTING_OLPC_MESH_SETTING_NAME);
+ break;
+ case Pppoe:
+ typeString = QLatin1String(NM_SETTING_PPPOE_SETTING_NAME);
+ break;
+ case Vlan:
+ typeString = QLatin1String(NM_SETTING_VLAN_SETTING_NAME);
+ break;
+ case Vpn:
+ typeString = QLatin1String(NM_SETTING_VPN_SETTING_NAME);
+ break;
+ case Wimax:
+ typeString = QLatin1String(NM_SETTING_WIMAX_SETTING_NAME);
+ break;
+ case Wired:
+ typeString = QLatin1String(NM_SETTING_WIRED_SETTING_NAME);
+ break;
+ case Wireless:
+ typeString = QLatin1String(NM_SETTING_WIRELESS_SETTING_NAME);
+ break;
+ default:
+ break;
+ };
+
+ return typeString;
+}
+
+QString NetworkManager::ConnectionSettings::createNewUuid()
+{
+ return QUuid::createUuid().toString().mid(1, \
QUuid::createUuid().toString().length() - 2); +}
+
+NetworkManager::ConnectionSettings::ConnectionSettings():
+ d_ptr(new ConnectionSettingsPrivate(this))
+{ }
+
+NetworkManager::ConnectionSettings::ConnectionSettings(NetworkManager::ConnectionSettings::ConnectionType \
type, NMBluetoothCapabilities bt_cap): + d_ptr(new \
ConnectionSettingsPrivate(this)) +{
+ setConnectionType(type, bt_cap);
+}
+
+NetworkManager::ConnectionSettings::ConnectionSettings(const \
NetworkManager::ConnectionSettings::Ptr &other): + d_ptr(new \
ConnectionSettingsPrivate(this)) +{
+ Q_D(ConnectionSettings);
+
+ setId(other->id());
+ setUuid(other->uuid());
+ setConnectionType(other->connectionType());
+ setPermissions(other->permissions());
+ setAutoconnect(other->autoconnect());
+ setTimestamp(other->timestamp());
+ setReadOnly(other->readOnly());
+ setZone(other->zone());
+ setMaster(other->master());
+ setSlaveType(other->slaveType());
+
+ d->initSettings(other);
+}
+
+NetworkManager::ConnectionSettings::ConnectionSettings(const NMVariantMapMap &map) :
+ d_ptr(new ConnectionSettingsPrivate(this))
+{
+ fromMap(map);
+}
+
+NetworkManager::ConnectionSettings::~ConnectionSettings()
+{
+ d_ptr->clearSettings();
+
+ delete d_ptr;
+}
+
void NetworkManager::ConnectionSettings::fromMap(const NMVariantMapMap &map)
{
QVariantMap connectionSettings = \
map.value(QLatin1String(NM_SETTING_CONNECTION_SETTING_NAME)); @@ -562,8 +575,7 @@ \
void NetworkManager::ConnectionSettings::setConnectionType(NetworkManager::Conne \
Q_D(ConnectionSettings);
d->type = type;
-
- initSettings(bt_cap);
+ d->initSettings(bt_cap);
}
NetworkManager::ConnectionSettings::ConnectionType \
NetworkManager::ConnectionSettings::connectionType() const @@ -722,20 +734,6 @@ \
NetworkManager::Setting::List NetworkManager::ConnectionSettings::settings() con \
return d->settings; }
-void NetworkManager::ConnectionSettings::addSetting(const \
NetworkManager::Setting::Ptr &setting)
-{
- Q_D(ConnectionSettings);
-
- d->settings.push_back(setting);
-}
-
-void NetworkManager::ConnectionSettings::clearSettings()
-{
- Q_D(ConnectionSettings);
-
- d->settings.clear();
-}
-
QDebug NetworkManager::operator <<(QDebug dbg, const \
NetworkManager::ConnectionSettings &setting) {
dbg.nospace() << "CONNECTION SETTINGS\n";
diff --git a/settings/connectionsettings.h b/settings/connectionsettings.h
index 0f01af5..b3c9162 100644
--- a/settings/connectionsettings.h
+++ b/settings/connectionsettings.h
@@ -122,11 +122,6 @@ protected:
private:
Q_DECLARE_PRIVATE(ConnectionSettings)
-
- void addSetting(const Setting::Ptr &setting);
- void clearSettings();
- void initSettings(NMBluetoothCapabilities bt_cap = NM_BT_CAPABILITY_DUN);
- void initSettings(const Ptr &connectionSettings);
};
QDebug operator<<(QDebug dbg, const ConnectionSettings &setting);
diff --git a/settings/connectionsettings_p.h b/settings/connectionsettings_p.h
index 3dabdbc..3659612 100644
--- a/settings/connectionsettings_p.h
+++ b/settings/connectionsettings_p.h
@@ -34,7 +34,14 @@ namespace NetworkManager
class ConnectionSettingsPrivate
{
public:
- ConnectionSettingsPrivate();
+ Q_DECLARE_PUBLIC(ConnectionSettings)
+
+ ConnectionSettingsPrivate(ConnectionSettings *q);
+
+ void addSetting(const NetworkManager::Setting::Ptr &setting);
+ void clearSettings();
+ void initSettings(NMBluetoothCapabilities bt_cap);
+ void initSettings(const NetworkManager::ConnectionSettings::Ptr \
&connectionSettings);
QString name;
QString id;
@@ -49,6 +56,8 @@ public:
QString slaveType;
QStringList secondaries;
Setting::List settings;
+
+ ConnectionSettings *q_ptr;
};
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic