Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2014-07-25 09:09:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2014-07-11 20:05:41.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2014-07-25 09:10:08.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul 11 19:32:41 UTC 2014 - [email protected]
+
+- Version update to 5.0.91
+
+-------------------------------------------------------------------
Old:
----
libnm-qt-5.0.90.tar.xz
New:
----
libnm-qt-5.0.91.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.GEhdDS/_old 2014-07-25 09:10:10.000000000 +0200
+++ /var/tmp/diff_new_pack.GEhdDS/_new 2014-07-25 09:10:10.000000000 +0200
@@ -20,7 +20,7 @@
%define soversion 5
Name: libKF5NetworkManagerQt
-Version: 5.0.90
+Version: 5.0.91
Release: 0
Summary: A qt wrapper around the NetworkManager libraries
License: LGPL-2.1 or LGPL-3.0
++++++ libnm-qt-5.0.90.tar.xz -> libnm-qt-5.0.91.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/CMakeLists.txt
new/libnm-qt-5.0.91/CMakeLists.txt
--- old/libnm-qt-5.0.90/CMakeLists.txt 2014-07-03 17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/CMakeLists.txt 2014-07-10 20:21:19.000000000 +0200
@@ -2,7 +2,7 @@
project(NetworkManagerQt)
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
+find_package(ECM 1.0.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake
${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -29,7 +29,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.0.90")
+set(KF5_VERSION "5.0.91")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX NETWORKMANAGERQT
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/networkmanagerqt_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/networkmanagerqt.yaml
new/libnm-qt-5.0.91/networkmanagerqt.yaml
--- old/libnm-qt-5.0.90/networkmanagerqt.yaml 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/networkmanagerqt.yaml 2014-07-10 20:21:19.000000000
+0200
@@ -1 +1,10 @@
+maintainer: Lamarque Souza, Jan Grulich, Lukáš Tinkl
+description: Qt wrapper for NetworkManager API
tier: 1
+type: integration
+platforms:
+ - name: Linux
+ - note: Functional only with running NetworkManager
+portingAid: false
+deprecated: false
+release: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/bonddevice.cpp
new/libnm-qt-5.0.91/src/bonddevice.cpp
--- old/libnm-qt-5.0.90/src/bonddevice.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/bonddevice.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -40,9 +40,9 @@
};
}
-NetworkManager::BondDevicePrivate::BondDevicePrivate(const QString &path,
BondDevice *q):
- DevicePrivate(path, q), iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus()),
- carrier(false)
+NetworkManager::BondDevicePrivate::BondDevicePrivate(const QString &path,
BondDevice *q)
+ : DevicePrivate(path, q), iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus())
+ , carrier(false)
{
carrier = iface.carrier();
hwAddress = iface.hwAddress();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/dhcp6config.cpp
new/libnm-qt-5.0.91/src/dhcp6config.cpp
--- old/libnm-qt-5.0.90/src/dhcp6config.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/dhcp6config.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -23,9 +23,9 @@
#include "manager_p.h"
#include "nmdebug.h"
-NetworkManager::Dhcp6ConfigPrivate::Dhcp6ConfigPrivate(const QString &path,
QObject *owner) :
- dhcp6Iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus()),
- myPath(path)
+NetworkManager::Dhcp6ConfigPrivate::Dhcp6ConfigPrivate(const QString &path,
QObject *owner)
+ : dhcp6Iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus())
+ , myPath(path)
{
Q_UNUSED(owner);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/ipaddress.cpp
new/libnm-qt-5.0.91/src/ipaddress.cpp
--- old/libnm-qt-5.0.90/src/ipaddress.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/ipaddress.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -41,9 +41,9 @@
delete d;
}
-NetworkManager::IpAddress::IpAddress(const NetworkManager::IpAddress &other) :
- QNetworkAddressEntry(other),
- d(new Private)
+NetworkManager::IpAddress::IpAddress(const NetworkManager::IpAddress &other)
+ : QNetworkAddressEntry(other)
+ , d(new Private)
{
*this = other;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/ipconfig.cpp
new/libnm-qt-5.0.91/src/ipconfig.cpp
--- old/libnm-qt-5.0.90/src/ipconfig.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/ipconfig.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -69,8 +69,8 @@
{
}
-NetworkManager::IpConfig::IpConfig(const IpConfig &other) :
- d(new Private)
+NetworkManager::IpConfig::IpConfig(const IpConfig &other)
+ : d(new Private)
{
*this = other;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/iproute.cpp
new/libnm-qt-5.0.91/src/iproute.cpp
--- old/libnm-qt-5.0.90/src/iproute.cpp 2014-07-03 17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/iproute.cpp 2014-07-10 20:21:19.000000000 +0200
@@ -34,8 +34,8 @@
}
-NetworkManager::IpRoute::IpRoute():
- d(new Private)
+NetworkManager::IpRoute::IpRoute()
+ : d(new Private)
{
}
@@ -44,9 +44,9 @@
delete d;
}
-NetworkManager::IpRoute::IpRoute(const NetworkManager::IpRoute &other) :
- QNetworkAddressEntry(other),
- d(new Private)
+NetworkManager::IpRoute::IpRoute(const NetworkManager::IpRoute &other)
+ : QNetworkAddressEntry(other)
+ , d(new Private)
{
*this = other;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/macvlandevice.cpp
new/libnm-qt-5.0.91/src/macvlandevice.cpp
--- old/libnm-qt-5.0.90/src/macvlandevice.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/macvlandevice.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -37,8 +37,8 @@
};
}
-NetworkManager::MacVlanDevicePrivate::MacVlanDevicePrivate(const QString
&path, MacVlanDevice *q):
- DevicePrivate(path, q), iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus())
+NetworkManager::MacVlanDevicePrivate::MacVlanDevicePrivate(const QString
&path, MacVlanDevice *q)
+ : DevicePrivate(path, q), iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus())
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/secretagent.cpp
new/libnm-qt-5.0.91/src/secretagent.cpp
--- old/libnm-qt-5.0.90/src/secretagent.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/secretagent.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -33,10 +33,10 @@
NetworkManager::SecretAgentPrivate::SecretAgentPrivate(const QString &id,
NetworkManager::SecretAgent *parent)
: q_ptr(parent)
- , agent(parent)
- , agentManager(NetworkManagerPrivate::DBUS_SERVICE,
QLatin1String(NM_DBUS_PATH_AGENT_MANAGER), QDBusConnection::systemBus(), parent)
- , watcher(NetworkManagerPrivate::DBUS_SERVICE,
QDBusConnection::systemBus(), QDBusServiceWatcher::WatchForRegistration, parent)
- , agentId(id)
+ , agent(parent)
+ , agentManager(NetworkManagerPrivate::DBUS_SERVICE,
QLatin1String(NM_DBUS_PATH_AGENT_MANAGER), QDBusConnection::systemBus(), parent)
+ , watcher(NetworkManagerPrivate::DBUS_SERVICE,
QDBusConnection::systemBus(), QDBusServiceWatcher::WatchForRegistration, parent)
+ , agentId(id)
{
Q_Q(SecretAgent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/adslsetting.cpp
new/libnm-qt-5.0.91/src/settings/adslsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/adslsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/adslsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -26,13 +26,13 @@
#include <QtCore/QDebug>
-NetworkManager::AdslSettingPrivate::AdslSettingPrivate():
- name(NM_SETTING_ADSL_SETTING_NAME),
- passwordFlags(Setting::None),
- protocol(AdslSetting::UnknownProtocol),
- encapsulation(AdslSetting::UnknownEncapsulation),
- vpi(0),
- vci(0)
+NetworkManager::AdslSettingPrivate::AdslSettingPrivate()
+ : name(NM_SETTING_ADSL_SETTING_NAME)
+ , passwordFlags(Setting::None)
+ , protocol(AdslSetting::UnknownProtocol)
+ , encapsulation(AdslSetting::UnknownEncapsulation)
+ , vpi(0)
+ , vci(0)
{ }
NetworkManager::AdslSetting::AdslSetting():
@@ -40,9 +40,9 @@
d_ptr(new AdslSettingPrivate())
{ }
-NetworkManager::AdslSetting::AdslSetting(const AdslSetting::Ptr &other):
- Setting(other),
- d_ptr(new AdslSettingPrivate())
+NetworkManager::AdslSetting::AdslSetting(const AdslSetting::Ptr &other)
+ : Setting(other)
+ , d_ptr(new AdslSettingPrivate())
{
setUsername(other->username());
setPassword(other->password());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/bluetoothsetting.cpp
new/libnm-qt-5.0.91/src/settings/bluetoothsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/bluetoothsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/bluetoothsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,19 +25,19 @@
#include <QtCore/QDebug>
-NetworkManager::BluetoothSettingPrivate::BluetoothSettingPrivate():
- name(NM_SETTING_BLUETOOTH_SETTING_NAME),
- profileType(BluetoothSetting::Unknown)
+NetworkManager::BluetoothSettingPrivate::BluetoothSettingPrivate()
+ : name(NM_SETTING_BLUETOOTH_SETTING_NAME)
+ , profileType(BluetoothSetting::Unknown)
{ }
-NetworkManager::BluetoothSetting::BluetoothSetting():
- Setting(Setting::Bluetooth),
- d_ptr(new BluetoothSettingPrivate())
+NetworkManager::BluetoothSetting::BluetoothSetting()
+ : Setting(Setting::Bluetooth)
+ , d_ptr(new BluetoothSettingPrivate())
{ }
-NetworkManager::BluetoothSetting::BluetoothSetting(const Ptr &other):
- Setting(other),
- d_ptr(new BluetoothSettingPrivate())
+NetworkManager::BluetoothSetting::BluetoothSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new BluetoothSettingPrivate())
{
setBluetoothAddress(other->bluetoothAddress());
setProfileType(other->profileType());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/bondsetting.cpp
new/libnm-qt-5.0.91/src/settings/bondsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/bondsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/bondsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,18 +25,18 @@
#include <QtCore/QDebug>
-NetworkManager::BondSettingPrivate::BondSettingPrivate():
- name(NM_SETTING_BOND_SETTING_NAME)
+NetworkManager::BondSettingPrivate::BondSettingPrivate()
+ : name(NM_SETTING_BOND_SETTING_NAME)
{ }
-NetworkManager::BondSetting::BondSetting():
- Setting(Setting::Bond),
- d_ptr(new BondSettingPrivate())
+NetworkManager::BondSetting::BondSetting()
+ : Setting(Setting::Bond)
+ , d_ptr(new BondSettingPrivate())
{ }
-NetworkManager::BondSetting::BondSetting(const Ptr &other):
- Setting(other),
- d_ptr(new BondSettingPrivate())
+NetworkManager::BondSetting::BondSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new BondSettingPrivate())
{
setInterfaceName(other->interfaceName());
setOptions(other->options());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/bridgeportsetting.cpp
new/libnm-qt-5.0.91/src/settings/bridgeportsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/bridgeportsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/bridgeportsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,21 +25,21 @@
#include <QtCore/QDebug>
-NetworkManager::BridgePortSettingPrivate::BridgePortSettingPrivate():
- name(NM_SETTING_BRIDGE_PORT_SETTING_NAME),
- priority(32),
- pathCost(100),
- hairpinMode(false)
+NetworkManager::BridgePortSettingPrivate::BridgePortSettingPrivate()
+ : name(NM_SETTING_BRIDGE_PORT_SETTING_NAME)
+ , priority(32)
+ , pathCost(100)
+ , hairpinMode(false)
{ }
-NetworkManager::BridgePortSetting::BridgePortSetting():
- Setting(Setting::BridgePort),
- d_ptr(new BridgePortSettingPrivate())
+NetworkManager::BridgePortSetting::BridgePortSetting()
+ : Setting(Setting::BridgePort)
+ , d_ptr(new BridgePortSettingPrivate())
{ }
-NetworkManager::BridgePortSetting::BridgePortSetting(const
NetworkManager::BridgePortSetting::Ptr &other) :
- Setting(other),
- d_ptr(new BridgePortSettingPrivate())
+NetworkManager::BridgePortSetting::BridgePortSetting(const
NetworkManager::BridgePortSetting::Ptr &other)
+ : Setting(other)
+ , d_ptr(new BridgePortSettingPrivate())
{
setPriority(other->priority());
setPathCost(other->pathCost());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/bridgesetting.cpp
new/libnm-qt-5.0.91/src/settings/bridgesetting.cpp
--- old/libnm-qt-5.0.90/src/settings/bridgesetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/bridgesetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,24 +25,24 @@
#include <QtCore/QDebug>
-NetworkManager::BridgeSettingPrivate::BridgeSettingPrivate():
- name(NM_SETTING_BRIDGE_SETTING_NAME),
- stp(true),
- priority(128),
- forwardDelay(15),
- helloTime(2),
- maxAge(20),
- agingTime(300)
+NetworkManager::BridgeSettingPrivate::BridgeSettingPrivate()
+ : name(NM_SETTING_BRIDGE_SETTING_NAME)
+ , stp(true)
+ , priority(128)
+ , forwardDelay(15)
+ , helloTime(2)
+ , maxAge(20)
+ , agingTime(300)
{ }
-NetworkManager::BridgeSetting::BridgeSetting():
- Setting(Setting::Bridge),
- d_ptr(new BridgeSettingPrivate())
+NetworkManager::BridgeSetting::BridgeSetting()
+ : Setting(Setting::Bridge)
+ , d_ptr(new BridgeSettingPrivate())
{ }
-NetworkManager::BridgeSetting::BridgeSetting(const Ptr &other):
- Setting(other),
- d_ptr(new BridgeSettingPrivate())
+NetworkManager::BridgeSetting::BridgeSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new BridgeSettingPrivate())
{
setInterfaceName(other->interfaceName());
setStp(other->stp());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/cdmasetting.cpp
new/libnm-qt-5.0.91/src/settings/cdmasetting.cpp
--- old/libnm-qt-5.0.90/src/settings/cdmasetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/cdmasetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -30,14 +30,14 @@
passwordFlags(Setting::None)
{ }
-NetworkManager::CdmaSetting::CdmaSetting():
- Setting(Setting::Cdma),
- d_ptr(new CdmaSettingPrivate())
+NetworkManager::CdmaSetting::CdmaSetting()
+ : Setting(Setting::Cdma)
+ , d_ptr(new CdmaSettingPrivate())
{ }
-NetworkManager::CdmaSetting::CdmaSetting(const Ptr &other):
- Setting(other),
- d_ptr(new CdmaSettingPrivate())
+NetworkManager::CdmaSetting::CdmaSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new CdmaSettingPrivate())
{
setUsername(other->username());
setNumber(other->number());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/connectionsettings.cpp
new/libnm-qt-5.0.91/src/settings/connectionsettings.cpp
--- old/libnm-qt-5.0.90/src/settings/connectionsettings.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/connectionsettings.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -395,23 +395,26 @@
return QUuid::createUuid().toString().mid(1,
QUuid::createUuid().toString().length() - 2);
}
-NetworkManager::ConnectionSettings::ConnectionSettings():
- d_ptr(new ConnectionSettingsPrivate(this))
+NetworkManager::ConnectionSettings::ConnectionSettings()
+ : d_ptr(new ConnectionSettingsPrivate(this))
{ }
-NetworkManager::ConnectionSettings::ConnectionSettings(NetworkManager::ConnectionSettings::ConnectionType
type, NMBluetoothCapabilities bt_cap):
- 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))
+NetworkManager::ConnectionSettings::ConnectionSettings(const
NetworkManager::ConnectionSettings::Ptr &other)
+ : d_ptr(new ConnectionSettingsPrivate(this))
{
Q_D(ConnectionSettings);
setId(other->id());
setUuid(other->uuid());
+#if NM_CHECK_VERSION(0, 9, 10)
+ setInterfaceName(other->interfaceName());
+#endif
setConnectionType(other->connectionType());
setPermissions(other->permissions());
setAutoconnect(other->autoconnect());
@@ -420,12 +423,14 @@
setZone(other->zone());
setMaster(other->master());
setSlaveType(other->slaveType());
-
+#if NM_CHECK_VERSION(0, 9, 10)
+ setGatewayPingTimeout(other->gatewayPingTimeout());
+#endif
d->initSettings(other);
}
-NetworkManager::ConnectionSettings::ConnectionSettings(const NMVariantMapMap
&map) :
- d_ptr(new ConnectionSettingsPrivate(this))
+NetworkManager::ConnectionSettings::ConnectionSettings(const NMVariantMapMap
&map)
+ : d_ptr(new ConnectionSettingsPrivate(this))
{
fromMap(map);
}
@@ -445,6 +450,11 @@
setUuid(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_UUID)).toString());
setConnectionType(typeFromString(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_TYPE)).toString()));
+#if NM_CHECK_VERSION(0, 9, 10)
+ if
(connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_INTERFACE_NAME)))
{
+
setInterfaceName(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_INTERFACE_NAME)).toString());
+ }
+#endif
if
(connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_PERMISSIONS)))
{
QStringList permissions =
connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_PERMISSIONS)).toStringList();
foreach (const QString &permission, permissions) {
@@ -484,6 +494,12 @@
setSecondaries(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_SECONDARIES)).toStringList());
}
+#if NM_CHECK_VERSION(0, 9, 10)
+ if
(connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT)))
{
+
setGatewayPingTimeout(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT)).toUInt());
+ }
+#endif
+
foreach (const Setting::Ptr &setting, settings()) {
if (map.contains(setting->name())) {
setting->fromMap(map.value(setting->name()));
@@ -511,6 +527,12 @@
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_TYPE),
typeAsString(connectionType()));
}
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (!interfaceName().isEmpty()) {
+
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_INTERFACE_NAME),
interfaceName());
+ }
+#endif
+
if (!permissions().isEmpty()) {
QStringList perm;
QHash<QString, QString> perms = permissions();
@@ -552,6 +574,12 @@
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_SECONDARIES),
secondaries());
}
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (gatewayPingTimeout()) {
+
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT),
gatewayPingTimeout());
+ }
+#endif
+
result.insert(QLatin1String(NM_SETTING_CONNECTION_SETTING_NAME),
connectionSetting);
foreach (const Setting::Ptr &setting, settings()) {
@@ -598,6 +626,22 @@
return d->uuid;
}
+#if NM_CHECK_VERSION(0, 9, 10)
+void NetworkManager::ConnectionSettings::setInterfaceName(const QString
&interfaceName)
+{
+ Q_D(ConnectionSettings);
+
+ d->interfaceName = interfaceName;
+}
+
+QString NetworkManager::ConnectionSettings::interfaceName() const
+{
+ Q_D(const ConnectionSettings);
+
+ return d->interfaceName;
+}
+#endif
+
void
NetworkManager::ConnectionSettings::setConnectionType(NetworkManager::ConnectionSettings::ConnectionType
type, NMBluetoothCapabilities bt_cap)
{
Q_D(ConnectionSettings);
@@ -739,6 +783,22 @@
return d->secondaries;
}
+#if NM_CHECK_VERSION(0, 9, 10)
+void NetworkManager::ConnectionSettings::setGatewayPingTimeout(quint32 timeout)
+{
+ Q_D(ConnectionSettings);
+
+ d->gatewayPingTimeout = timeout;
+}
+
+quint32 NetworkManager::ConnectionSettings::gatewayPingTimeout() const
+{
+ Q_D(const ConnectionSettings);
+
+ return d->gatewayPingTimeout;
+}
+#endif
+
NetworkManager::Setting::Ptr
NetworkManager::ConnectionSettings::setting(Setting::SettingType type) const
{
foreach (const Setting::Ptr &setting, settings()) {
@@ -769,6 +829,9 @@
dbg.nospace() << NM_SETTING_CONNECTION_ID << ": " << setting.id() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_UUID << ": " << setting.uuid() <<
'\n';
+#if NM_CHECK_VERSION(0, 9, 10)
+ dbg.nospace() << NM_SETTING_CONNECTION_INTERFACE_NAME << ": " <<
setting.interfaceName() << '\n';
+#endif
dbg.nospace() << NM_SETTING_CONNECTION_TYPE << ": " <<
setting.typeAsString(setting.connectionType()) << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_PERMISSIONS << ": " <<
setting.permissions() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_AUTOCONNECT << ": " <<
setting.autoconnect() << '\n';
@@ -778,6 +841,9 @@
dbg.nospace() << NM_SETTING_CONNECTION_MASTER << ": " << setting.master()
<< '\n';
dbg.nospace() << NM_SETTING_CONNECTION_SLAVE_TYPE << ": " <<
setting.slaveType() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_SECONDARIES << ": " <<
setting.secondaries() << '\n';
+#if NM_CHECK_VERSION(0, 9, 10)
+ dbg.nospace() << NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT << ": " <<
setting.gatewayPingTimeout() << '\n';
+#endif
dbg.nospace() << "===================\n";
foreach (const Setting::Ptr &settingPtr, setting.settings()) {
dbg.nospace() <<
settingPtr->typeAsString(settingPtr->type()).toUpper() << " SETTINGS\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/connectionsettings.h
new/libnm-qt-5.0.91/src/settings/connectionsettings.h
--- old/libnm-qt-5.0.90/src/settings/connectionsettings.h 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/connectionsettings.h 2014-07-10
20:21:19.000000000 +0200
@@ -86,6 +86,11 @@
void setUuid(const QString &uuid);
QString uuid() const;
+#if NM_CHECK_VERSION(0, 9, 10)
+ void setInterfaceName(const QString &interfaceName);
+ QString interfaceName() const;
+#endif
+
void setConnectionType(ConnectionType type, NMBluetoothCapabilities bt_cap
= NM_BT_CAPABILITY_DUN);
ConnectionType connectionType() const;
@@ -116,6 +121,11 @@
void setSecondaries(const QStringList &secondaries);
QStringList secondaries() const;
+#if NM_CHECK_VERSION(0, 9, 10)
+ void setGatewayPingTimeout(quint32 timeout);
+ quint32 gatewayPingTimeout() const;
+#endif
+
Setting::Ptr setting(Setting::SettingType type) const;
Setting::Ptr setting(const QString &type) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/connectionsettings_p.h
new/libnm-qt-5.0.91/src/settings/connectionsettings_p.h
--- old/libnm-qt-5.0.90/src/settings/connectionsettings_p.h 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/connectionsettings_p.h 2014-07-10
20:21:19.000000000 +0200
@@ -46,6 +46,9 @@
QString name;
QString id;
QString uuid;
+#if NM_CHECK_VERSION(0, 9, 10)
+ QString interfaceName;
+#endif
NetworkManager::ConnectionSettings::ConnectionType type;
QHash<QString, QString> permissions;
bool autoconnect;
@@ -55,6 +58,9 @@
QString master;
QString slaveType;
QStringList secondaries;
+#if NM_CHECK_VERSION(0, 9, 10)
+ quint32 gatewayPingTimeout;
+#endif
Setting::List settings;
ConnectionSettings *q_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/gsmsetting.cpp
new/libnm-qt-5.0.91/src/settings/gsmsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/gsmsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/gsmsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,23 +25,23 @@
#include <QtCore/QDebug>
-NetworkManager::GsmSettingPrivate::GsmSettingPrivate():
- name(NM_SETTING_GSM_SETTING_NAME),
- passwordFlags(NetworkManager::GsmSetting::None),
- networkType(NetworkManager::GsmSetting::Any),
- pinFlags(NetworkManager::GsmSetting::None),
- allowedBand(1),
- homeOnly(false)
+NetworkManager::GsmSettingPrivate::GsmSettingPrivate()
+ : name(NM_SETTING_GSM_SETTING_NAME)
+ , passwordFlags(NetworkManager::GsmSetting::None)
+ , networkType(NetworkManager::GsmSetting::Any)
+ , pinFlags(NetworkManager::GsmSetting::None)
+ , allowedBand(1)
+ , homeOnly(false)
{ }
-NetworkManager::GsmSetting::GsmSetting():
- Setting(Setting::Gsm),
- d_ptr(new GsmSettingPrivate())
+NetworkManager::GsmSetting::GsmSetting()
+ : Setting(Setting::Gsm)
+ , d_ptr(new GsmSettingPrivate())
{ }
-NetworkManager::GsmSetting::GsmSetting(const Ptr &other):
- Setting(other),
- d_ptr(new GsmSettingPrivate())
+NetworkManager::GsmSetting::GsmSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new GsmSettingPrivate())
{
setNumber(other->number());
setUsername(other->username());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/infinibandsetting.cpp
new/libnm-qt-5.0.91/src/settings/infinibandsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/infinibandsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/infinibandsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,24 +25,31 @@
#include <QtCore/QDebug>
-NetworkManager::InfinibandSettingPrivate::InfinibandSettingPrivate():
- name(NM_SETTING_INFINIBAND_SETTING_NAME),
- mtu(0),
- transportMode(InfinibandSetting::Unknown)
+NetworkManager::InfinibandSettingPrivate::InfinibandSettingPrivate()
+ : name(NM_SETTING_INFINIBAND_SETTING_NAME)
+ , mtu(0)
+#if NM_CHECK_VERSION(0, 9, 10)
+ , transportMode(InfinibandSetting::Unknown)
+ , pKey(-1)
+#endif
{ }
-NetworkManager::InfinibandSetting::InfinibandSetting():
- Setting(Setting::Infiniband),
- d_ptr(new InfinibandSettingPrivate())
+NetworkManager::InfinibandSetting::InfinibandSetting()
+ : Setting(Setting::Infiniband)
+ , d_ptr(new InfinibandSettingPrivate())
{ }
-NetworkManager::InfinibandSetting::InfinibandSetting(const
NetworkManager::InfinibandSetting::Ptr &other) :
- Setting(other),
- d_ptr(new InfinibandSettingPrivate())
+NetworkManager::InfinibandSetting::InfinibandSetting(const
NetworkManager::InfinibandSetting::Ptr &other)
+ : Setting(other)
+ , d_ptr(new InfinibandSettingPrivate())
{
setMacAddress(other->macAddress());
setMtu(other->mtu());
setTransportMode(other->transportMode());
+#if NM_CHECK_VERSION(0, 9, 10)
+ setPKey(other->pKey());
+ setParent(other->parent());
+#endif
}
NetworkManager::InfinibandSetting::~InfinibandSetting()
@@ -99,6 +106,36 @@
return d->transportMode;
}
+#if NM_CHECK_VERSION(0, 9, 10)
+void NetworkManager::InfinibandSetting::setPKey(qint32 key)
+{
+ Q_D(InfinibandSetting);
+
+ d->pKey = key;
+}
+
+qint32 NetworkManager::InfinibandSetting::pKey() const
+{
+ Q_D(const InfinibandSetting);
+
+ return d->pKey;
+}
+
+void NetworkManager::InfinibandSetting::setParent(const QString &parent)
+{
+ Q_D(InfinibandSetting);
+
+ d->parent = parent;
+}
+
+QString NetworkManager::InfinibandSetting::parent() const
+{
+ Q_D(const InfinibandSetting);
+
+ return d->parent;
+}
+#endif
+
void NetworkManager::InfinibandSetting::fromMap(const QVariantMap &setting)
{
if (setting.contains(QLatin1String(NM_SETTING_INFINIBAND_MAC_ADDRESS))) {
@@ -118,6 +155,16 @@
setTransportMode(Connected);
}
}
+
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (setting.contains(QLatin1String(NM_SETTING_INFINIBAND_P_KEY))) {
+
setPKey(setting.value(QLatin1String(NM_SETTING_INFINIBAND_P_KEY)).toInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_INFINIBAND_PARENT))) {
+
setParent(setting.value(QLatin1String(NM_SETTING_INFINIBAND_PARENT)).toString());
+ }
+#endif
}
QVariantMap NetworkManager::InfinibandSetting::toMap() const
@@ -140,6 +187,16 @@
}
}
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (pKey() != -1) {
+ setting.insert(QLatin1String(NM_SETTING_INFINIBAND_P_KEY), pKey());
+ }
+
+ if (!parent().isEmpty()) {
+ setting.insert(QLatin1String(NM_SETTING_INFINIBAND_PARENT), parent());
+ }
+#endif
+
return setting;
}
@@ -151,6 +208,10 @@
dbg.nospace() << NM_SETTING_INFINIBAND_MAC_ADDRESS << ": " <<
setting.macAddress() << '\n';
dbg.nospace() << NM_SETTING_INFINIBAND_MTU << ": " << setting.mtu() <<
'\n';
dbg.nospace() << NM_SETTING_INFINIBAND_TRANSPORT_MODE << ": " <<
setting.transportMode() << '\n';
+#if NM_CHECK_VERSION(0, 9, 10)
+ dbg.nospace() << NM_SETTING_INFINIBAND_P_KEY << ": " << setting.pKey() <<
'\n';
+ dbg.nospace() << NM_SETTING_INFINIBAND_PARENT << ": " << setting.parent()
<< '\n';
+#endif
return dbg.maybeSpace();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/infinibandsetting.h
new/libnm-qt-5.0.91/src/settings/infinibandsetting.h
--- old/libnm-qt-5.0.90/src/settings/infinibandsetting.h 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/infinibandsetting.h 2014-07-10
20:21:19.000000000 +0200
@@ -25,6 +25,7 @@
#include "setting.h"
#include <QtCore/QString>
+#include <NetworkManager.h>
namespace NetworkManager
{
@@ -52,6 +53,14 @@
void setTransportMode(TransportMode mode);
TransportMode transportMode() const;
+#if NM_CHECK_VERSION(0, 9, 10)
+ void setPKey(qint32 key);
+ qint32 pKey() const;
+
+ void setParent(const QString &parent);
+ QString parent() const;
+
+#endif
void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
QVariantMap toMap() const Q_DECL_OVERRIDE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/infinibandsetting_p.h
new/libnm-qt-5.0.91/src/settings/infinibandsetting_p.h
--- old/libnm-qt-5.0.90/src/settings/infinibandsetting_p.h 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/infinibandsetting_p.h 2014-07-10
20:21:19.000000000 +0200
@@ -22,6 +22,7 @@
#define NETWORKMANAGERQT_INFINIBAND_SETTING_P_H
#include <QtCore/QString>
+#include <NetworkManager.h>
namespace NetworkManager
{
@@ -35,6 +36,11 @@
QByteArray macAddress;
quint32 mtu;
NetworkManager::InfinibandSetting::TransportMode transportMode;
+#if NM_CHECK_VERSION(0, 9, 10)
+ qint32 pKey;
+ QString parent;
+#endif
+
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/ipv4setting.cpp
new/libnm-qt-5.0.91/src/settings/ipv4setting.cpp
--- old/libnm-qt-5.0.90/src/settings/ipv4setting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/ipv4setting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -29,24 +29,24 @@
#include <QtCore/QDebug>
-NetworkManager::Ipv4SettingPrivate::Ipv4SettingPrivate():
- name(NM_SETTING_IP4_CONFIG_SETTING_NAME),
- method(NetworkManager::Ipv4Setting::Automatic),
- ignoreAutoRoutes(false),
- ignoreAutoDns(false),
- dhcpSendHostname(true),
- neverDefault(false),
- mayFail(true)
+NetworkManager::Ipv4SettingPrivate::Ipv4SettingPrivate()
+ : name(NM_SETTING_IP4_CONFIG_SETTING_NAME)
+ , method(NetworkManager::Ipv4Setting::Automatic)
+ , ignoreAutoRoutes(false)
+ , ignoreAutoDns(false)
+ , dhcpSendHostname(true)
+ , neverDefault(false)
+ , mayFail(true)
{ }
-NetworkManager::Ipv4Setting::Ipv4Setting():
- Setting(Setting::Ipv4),
- d_ptr(new Ipv4SettingPrivate())
+NetworkManager::Ipv4Setting::Ipv4Setting()
+ : Setting(Setting::Ipv4)
+ , d_ptr(new Ipv4SettingPrivate())
{ }
-NetworkManager::Ipv4Setting::Ipv4Setting(const Ptr &other):
- Setting(other),
- d_ptr(new Ipv4SettingPrivate())
+NetworkManager::Ipv4Setting::Ipv4Setting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new Ipv4SettingPrivate())
{
setMethod(other->method());
setDns(other->dns());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/ipv6setting.cpp
new/libnm-qt-5.0.91/src/settings/ipv6setting.cpp
--- old/libnm-qt-5.0.90/src/settings/ipv6setting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/ipv6setting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -29,24 +29,24 @@
#include <arpa/inet.h>
#include <nm-setting-ip6-config.h>
-NetworkManager::Ipv6SettingPrivate::Ipv6SettingPrivate():
- name(NM_SETTING_IP6_CONFIG_SETTING_NAME),
- method(NetworkManager::Ipv6Setting::Automatic),
- ignoreAutoRoutes(false),
- ignoreAutoDns(false),
- neverDefault(false),
- mayFail(true),
- privacy(NetworkManager::Ipv6Setting::Unknown)
+NetworkManager::Ipv6SettingPrivate::Ipv6SettingPrivate()
+ : name(NM_SETTING_IP6_CONFIG_SETTING_NAME)
+ , method(NetworkManager::Ipv6Setting::Automatic)
+ , ignoreAutoRoutes(false)
+ , ignoreAutoDns(false)
+ , neverDefault(false)
+ , mayFail(true)
+ , privacy(NetworkManager::Ipv6Setting::Unknown)
{ }
-NetworkManager::Ipv6Setting::Ipv6Setting():
- Setting(Setting::Ipv6),
- d_ptr(new Ipv6SettingPrivate())
+NetworkManager::Ipv6Setting::Ipv6Setting()
+ : Setting(Setting::Ipv6)
+ , d_ptr(new Ipv6SettingPrivate())
{ }
-NetworkManager::Ipv6Setting::Ipv6Setting(const Ptr &other):
- Setting(other),
- d_ptr(new Ipv6SettingPrivate())
+NetworkManager::Ipv6Setting::Ipv6Setting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new Ipv6SettingPrivate())
{
setMethod(other->method());
setDns(other->dns());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/olpcmeshsetting.cpp
new/libnm-qt-5.0.91/src/settings/olpcmeshsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/olpcmeshsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/olpcmeshsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,19 +25,19 @@
#include <QtCore/QDebug>
-NetworkManager::OlpcMeshSettingPrivate::OlpcMeshSettingPrivate():
- name(NM_SETTING_OLPC_MESH_SETTING_NAME),
- channel(0)
+NetworkManager::OlpcMeshSettingPrivate::OlpcMeshSettingPrivate()
+ : name(NM_SETTING_OLPC_MESH_SETTING_NAME)
+ , channel(0)
{ }
-NetworkManager::OlpcMeshSetting::OlpcMeshSetting():
- Setting(Setting::Bond),
- d_ptr(new OlpcMeshSettingPrivate())
+NetworkManager::OlpcMeshSetting::OlpcMeshSetting()
+ : Setting(Setting::Bond)
+ , d_ptr(new OlpcMeshSettingPrivate())
{ }
-NetworkManager::OlpcMeshSetting::OlpcMeshSetting(const Ptr &other):
- Setting(other),
- d_ptr(new OlpcMeshSettingPrivate())
+NetworkManager::OlpcMeshSetting::OlpcMeshSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new OlpcMeshSettingPrivate())
{
setSsid(other->ssid());
setChannel(other->channel());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/pppoesetting.cpp
new/libnm-qt-5.0.91/src/settings/pppoesetting.cpp
--- old/libnm-qt-5.0.90/src/settings/pppoesetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/pppoesetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,19 +25,19 @@
#include <QtCore/QDebug>
-NetworkManager::PppoeSettingPrivate::PppoeSettingPrivate():
- name(NM_SETTING_PPPOE_SETTING_NAME),
- passwordFlags(Setting::None)
+NetworkManager::PppoeSettingPrivate::PppoeSettingPrivate()
+ : name(NM_SETTING_PPPOE_SETTING_NAME)
+ , passwordFlags(Setting::None)
{ }
-NetworkManager::PppoeSetting::PppoeSetting():
- Setting(Setting::Pppoe),
- d_ptr(new PppoeSettingPrivate())
+NetworkManager::PppoeSetting::PppoeSetting()
+ : Setting(Setting::Pppoe)
+ , d_ptr(new PppoeSettingPrivate())
{ }
-NetworkManager::PppoeSetting::PppoeSetting(const Ptr &other):
- Setting(other),
- d_ptr(new PppoeSettingPrivate())
+NetworkManager::PppoeSetting::PppoeSetting(const Ptr &other)
+ :Setting(other)
+ , d_ptr(new PppoeSettingPrivate())
{
setService(other->service());
setUsername(other->username());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/pppsetting.cpp
new/libnm-qt-5.0.91/src/settings/pppsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/pppsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/pppsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,36 +25,36 @@
#include <QtCore/QDebug>
-NetworkManager::PppSettingPrivate::PppSettingPrivate():
- name(NM_SETTING_PPP_SETTING_NAME),
- noauth(true),
- refuseEap(false),
- refusePap(false),
- refuseChap(false),
- refuseMschap(false),
- refuseMschapv2(false),
- nobsdcomp(false),
- nodeflate(false),
- noVjComp(false),
- requireMppe(false),
- requireMppe128(false),
- mppeStateful(false),
- crtscts(false),
- baud(0),
- mru(0),
- mtu(0),
- lcpEchoFailure(0),
- lcpEchoInterval(0)
+NetworkManager::PppSettingPrivate::PppSettingPrivate()
+ : name(NM_SETTING_PPP_SETTING_NAME)
+ , noauth(true)
+ , refuseEap(false)
+ , refusePap(false)
+ , refuseChap(false)
+ , refuseMschap(false)
+ , refuseMschapv2(false)
+ , nobsdcomp(false)
+ , nodeflate(false)
+ , noVjComp(false)
+ , requireMppe(false)
+ , requireMppe128(false)
+ , mppeStateful(false)
+ , crtscts(false)
+ , baud(0)
+ , mru(0)
+ , mtu(0)
+ , lcpEchoFailure(0)
+ , lcpEchoInterval(0)
{ }
-NetworkManager::PppSetting::PppSetting():
- Setting(Setting::Ppp),
- d_ptr(new PppSettingPrivate())
+NetworkManager::PppSetting::PppSetting()
+ : Setting(Setting::Ppp)
+ , d_ptr(new PppSettingPrivate())
{ }
-NetworkManager::PppSetting::PppSetting(const Ptr &other):
- Setting(other),
- d_ptr(new PppSettingPrivate())
+NetworkManager::PppSetting::PppSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new PppSettingPrivate())
{
setNoAuth(other->noAuth());
setRefuseEap(other->refuseEap());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libnm-qt-5.0.90/src/settings/security8021xsetting.cpp
new/libnm-qt-5.0.91/src/settings/security8021xsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/security8021xsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/security8021xsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,29 +25,29 @@
#include <QtCore/QDebug>
-NetworkManager::Security8021xSettingPrivate::Security8021xSettingPrivate():
- name(NM_SETTING_802_1X_SETTING_NAME),
- phase1PeapVer(Security8021xSetting::PeapVersionUnknown),
- phase1PeapLabel(Security8021xSetting::PeapLabelUnknown),
- phase1FastProvisioning(Security8021xSetting::FastProvisioningUnknown),
- phase2AuthMethod(Security8021xSetting::AuthMethodUnknown),
- phase2AuthEapMethod(Security8021xSetting::AuthEapMethodUnknown),
- passwordFlags(NetworkManager::Setting::None),
- passwordRawFlags(NetworkManager::Setting::None),
- privateKeyPasswordFlags(NetworkManager::Setting::None),
- phase2PrivateKeyPasswordFlags(NetworkManager::Setting::None),
- pinFlags(NetworkManager::Setting::None),
- systemCaCerts(false)
+NetworkManager::Security8021xSettingPrivate::Security8021xSettingPrivate()
+ : name(NM_SETTING_802_1X_SETTING_NAME)
+ , phase1PeapVer(Security8021xSetting::PeapVersionUnknown)
+ , phase1PeapLabel(Security8021xSetting::PeapLabelUnknown)
+ , phase1FastProvisioning(Security8021xSetting::FastProvisioningUnknown)
+ , phase2AuthMethod(Security8021xSetting::AuthMethodUnknown)
+ , phase2AuthEapMethod(Security8021xSetting::AuthEapMethodUnknown)
+ , passwordFlags(NetworkManager::Setting::None)
+ , passwordRawFlags(NetworkManager::Setting::None)
+ , privateKeyPasswordFlags(NetworkManager::Setting::None)
+ , phase2PrivateKeyPasswordFlags(NetworkManager::Setting::None)
+ , pinFlags(NetworkManager::Setting::None)
+ , systemCaCerts(false)
{ }
-NetworkManager::Security8021xSetting::Security8021xSetting():
- Setting(Setting::Security8021x),
- d_ptr(new Security8021xSettingPrivate())
+NetworkManager::Security8021xSetting::Security8021xSetting()
+ : Setting(Setting::Security8021x)
+ , d_ptr(new Security8021xSettingPrivate())
{ }
-NetworkManager::Security8021xSetting::Security8021xSetting(const Ptr &other):
- Setting(other),
- d_ptr(new Security8021xSettingPrivate())
+NetworkManager::Security8021xSetting::Security8021xSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new Security8021xSettingPrivate())
{
setEapMethods(other->eapMethods());
setIdentity(other->identity());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/serialsetting.cpp
new/libnm-qt-5.0.91/src/settings/serialsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/serialsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/serialsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,23 +25,23 @@
#include <QtCore/QDebug>
-NetworkManager::SerialSettingPrivate::SerialSettingPrivate():
- name(NM_SETTING_SERIAL_SETTING_NAME),
- baud(57600),
- bits(8),
- parity(SerialSetting::NoParity),
- stopbits(1),
- sendDelay(0)
+NetworkManager::SerialSettingPrivate::SerialSettingPrivate()
+ : name(NM_SETTING_SERIAL_SETTING_NAME)
+ , baud(57600)
+ , bits(8)
+ , parity(SerialSetting::NoParity)
+ , stopbits(1)
+ , sendDelay(0)
{ }
-NetworkManager::SerialSetting::SerialSetting():
- Setting(Setting::Serial),
- d_ptr(new SerialSettingPrivate())
+NetworkManager::SerialSetting::SerialSetting()
+ : Setting(Setting::Serial)
+ , d_ptr(new SerialSettingPrivate())
{ }
-NetworkManager::SerialSetting::SerialSetting(const Ptr &other):
- Setting(other),
- d_ptr(new SerialSettingPrivate())
+NetworkManager::SerialSetting::SerialSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new SerialSettingPrivate())
{
setBaud(other->baud());
setBits(other->bits());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/setting.cpp
new/libnm-qt-5.0.91/src/settings/setting.cpp
--- old/libnm-qt-5.0.90/src/settings/setting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/setting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -194,14 +194,14 @@
return type;
}
-NetworkManager::Setting::Setting(SettingType type):
- d_ptr(new SettingPrivate())
+NetworkManager::Setting::Setting(SettingType type)
+ : d_ptr(new SettingPrivate())
{
setType(type);
}
-NetworkManager::Setting::Setting(const NetworkManager::Setting::Ptr &setting):
- d_ptr(new SettingPrivate())
+NetworkManager::Setting::Setting(const NetworkManager::Setting::Ptr &setting)
+ : d_ptr(new SettingPrivate())
{
setInitialized(!setting->isNull());
setType(setting->type());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/teamsetting.cpp
new/libnm-qt-5.0.91/src/settings/teamsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/teamsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/teamsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,18 +25,18 @@
#include <QtCore/QDebug>
-NetworkManager::TeamSettingPrivate::TeamSettingPrivate():
- name(NM_SETTING_TEAM_SETTING_NAME)
+NetworkManager::TeamSettingPrivate::TeamSettingPrivate()
+ : name(NM_SETTING_TEAM_SETTING_NAME)
{ }
-NetworkManager::TeamSetting::TeamSetting():
- Setting(Setting::Team),
- d_ptr(new TeamSettingPrivate())
+NetworkManager::TeamSetting::TeamSetting()
+ : Setting(Setting::Team)
+ , d_ptr(new TeamSettingPrivate())
{ }
-NetworkManager::TeamSetting::TeamSetting(const Ptr &other):
- Setting(other),
- d_ptr(new TeamSettingPrivate())
+NetworkManager::TeamSetting::TeamSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new TeamSettingPrivate())
{
setInterfaceName(other->interfaceName());
setConfig(other->config());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/template.cpp
new/libnm-qt-5.0.91/src/settings/template.cpp
--- old/libnm-qt-5.0.90/src/settings/template.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/template.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -26,8 +26,8 @@
#include <QtCore/QDebug>
-NetworkManager::Settings::TemplateSettingPrivate::TemplateSettingPrivate():
- name(QString("template"))
+NetworkManager::Settings::TemplateSettingPrivate::TemplateSettingPrivate()
+ : name(QString("template"))
{ }
NetworkManager::Settings::TemplateSetting::TemplateSetting():
@@ -38,9 +38,9 @@
d_ptr(new TemplateSettingPrivate())
{ }
-NetworkManager::Settings::TemplateSetting::TemplateSetting(TemplateSetting
*setting):
- Setting(setting),
- d_ptr(new TemplateSettingPrivate())
+NetworkManager::Settings::TemplateSetting::TemplateSetting(TemplateSetting
*setting)
+ : Setting(setting)
+ , d_ptr(new TemplateSettingPrivate())
{
/*
* setFoo(setting->foo());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/vlansetting.cpp
new/libnm-qt-5.0.91/src/settings/vlansetting.cpp
--- old/libnm-qt-5.0.90/src/settings/vlansetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/vlansetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,20 +25,20 @@
#include <QtCore/QDebug>
-NetworkManager::VlanSettingPrivate::VlanSettingPrivate():
- name(NM_SETTING_VLAN_SETTING_NAME),
- id(0),
- flags(VlanSetting::None)
+NetworkManager::VlanSettingPrivate::VlanSettingPrivate()
+ : name(NM_SETTING_VLAN_SETTING_NAME)
+ , id(0)
+ , flags(VlanSetting::None)
{ }
-NetworkManager::VlanSetting::VlanSetting():
- Setting(Setting::Vlan),
- d_ptr(new VlanSettingPrivate())
+NetworkManager::VlanSetting::VlanSetting()
+ : Setting(Setting::Vlan)
+ , d_ptr(new VlanSettingPrivate())
{ }
-NetworkManager::VlanSetting::VlanSetting(const Ptr &other):
- Setting(other),
- d_ptr(new VlanSettingPrivate())
+NetworkManager::VlanSetting::VlanSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new VlanSettingPrivate())
{
setInterfaceName(other->interfaceName());
setParent(other->parent());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/vpnsetting.cpp
new/libnm-qt-5.0.91/src/settings/vpnsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/vpnsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/vpnsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -24,18 +24,18 @@
#include <nm-setting-vpn.h>
-NetworkManager::VpnSettingPrivate::VpnSettingPrivate():
- name(NM_SETTING_VPN_SETTING_NAME)
+NetworkManager::VpnSettingPrivate::VpnSettingPrivate()
+ : name(NM_SETTING_VPN_SETTING_NAME)
{ }
-NetworkManager::VpnSetting::VpnSetting():
- Setting(Setting::Vpn),
- d_ptr(new VpnSettingPrivate())
+NetworkManager::VpnSetting::VpnSetting()
+ : Setting(Setting::Vpn)
+ , d_ptr(new VpnSettingPrivate())
{ }
-NetworkManager::VpnSetting::VpnSetting(const Ptr &other):
- Setting(other),
- d_ptr(new VpnSettingPrivate())
+NetworkManager::VpnSetting::VpnSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new VpnSettingPrivate())
{
setServiceType(other->serviceType());
setUsername(other->username());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/wimaxsetting.cpp
new/libnm-qt-5.0.91/src/settings/wimaxsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/wimaxsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/wimaxsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -26,18 +26,18 @@
#include <QtCore/QDebug>
-NetworkManager::WimaxSettingPrivate::WimaxSettingPrivate():
- name(NM_SETTING_WIMAX_SETTING_NAME)
+NetworkManager::WimaxSettingPrivate::WimaxSettingPrivate()
+ : name(NM_SETTING_WIMAX_SETTING_NAME)
{ }
-NetworkManager::WimaxSetting::WimaxSetting():
- Setting(Setting::Wimax),
- d_ptr(new WimaxSettingPrivate())
+NetworkManager::WimaxSetting::WimaxSetting()
+ : Setting(Setting::Wimax)
+ , d_ptr(new WimaxSettingPrivate())
{ }
-NetworkManager::WimaxSetting::WimaxSetting(const Ptr &other):
- Setting(other),
- d_ptr(new WimaxSettingPrivate())
+NetworkManager::WimaxSetting::WimaxSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new WimaxSettingPrivate())
{
setNetworkName(other->networkName());
setMacAddress(other->macAddress());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/wiredsetting.cpp
new/libnm-qt-5.0.91/src/settings/wiredsetting.cpp
--- old/libnm-qt-5.0.90/src/settings/wiredsetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/wiredsetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,24 +25,24 @@
#include <QtCore/QDebug>
-NetworkManager::WiredSettingPrivate::WiredSettingPrivate():
- name(NM_SETTING_WIRED_SETTING_NAME),
- port(NetworkManager::WiredSetting::UnknownPort),
- speed(0),
- duplex(NetworkManager::WiredSetting::UnknownDuplexType),
- autoNegotiate(true),
- mtu(0),
- s390NetType(NetworkManager::WiredSetting::Undefined)
+NetworkManager::WiredSettingPrivate::WiredSettingPrivate()
+ : name(NM_SETTING_WIRED_SETTING_NAME)
+ , port(NetworkManager::WiredSetting::UnknownPort)
+ , speed(0)
+ , duplex(NetworkManager::WiredSetting::UnknownDuplexType)
+ , autoNegotiate(true)
+ , mtu(0)
+ , s390NetType(NetworkManager::WiredSetting::Undefined)
{ }
-NetworkManager::WiredSetting::WiredSetting():
- Setting(Setting::Wired),
- d_ptr(new WiredSettingPrivate())
+NetworkManager::WiredSetting::WiredSetting()
+ : Setting(Setting::Wired)
+ , d_ptr(new WiredSettingPrivate())
{ }
-NetworkManager::WiredSetting::WiredSetting(const WiredSetting::Ptr &other):
- Setting(other),
- d_ptr(new WiredSettingPrivate())
+NetworkManager::WiredSetting::WiredSetting(const WiredSetting::Ptr &other)
+ : Setting(other)
+ , d_ptr(new WiredSettingPrivate())
{
setPort(other->port());
setSpeed(other->speed());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libnm-qt-5.0.90/src/settings/wirelesssecuritysetting.cpp
new/libnm-qt-5.0.91/src/settings/wirelesssecuritysetting.cpp
--- old/libnm-qt-5.0.90/src/settings/wirelesssecuritysetting.cpp
2014-07-03 17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/wirelesssecuritysetting.cpp
2014-07-10 20:21:19.000000000 +0200
@@ -26,25 +26,25 @@
#include <QtCore/QDebug>
-NetworkManager::WirelessSecuritySettingPrivate::WirelessSecuritySettingPrivate():
- name(NM_SETTING_WIRELESS_SECURITY_SETTING_NAME),
- keyMgmt(NetworkManager::WirelessSecuritySetting::Unknown),
- wepTxKeyidx(0),
- authAlg(NetworkManager::WirelessSecuritySetting::None),
- wepKeyFlags(NetworkManager::Setting::None),
- wepKeyType(NetworkManager::WirelessSecuritySetting::NotSpecified),
- pskFlags(NetworkManager::Setting::None),
- leapPasswordFlags(NetworkManager::Setting::None)
+NetworkManager::WirelessSecuritySettingPrivate::WirelessSecuritySettingPrivate()
+ : name(NM_SETTING_WIRELESS_SECURITY_SETTING_NAME)
+ , keyMgmt(NetworkManager::WirelessSecuritySetting::Unknown)
+ , wepTxKeyidx(0)
+ , authAlg(NetworkManager::WirelessSecuritySetting::None)
+ , wepKeyFlags(NetworkManager::Setting::None)
+ , wepKeyType(NetworkManager::WirelessSecuritySetting::NotSpecified)
+ , pskFlags(NetworkManager::Setting::None)
+ , leapPasswordFlags(NetworkManager::Setting::None)
{ }
-NetworkManager::WirelessSecuritySetting::WirelessSecuritySetting():
- Setting(Setting::WirelessSecurity),
- d_ptr(new WirelessSecuritySettingPrivate())
+NetworkManager::WirelessSecuritySetting::WirelessSecuritySetting()
+ : Setting(Setting::WirelessSecurity)
+ , d_ptr(new WirelessSecuritySettingPrivate())
{ }
-NetworkManager::WirelessSecuritySetting::WirelessSecuritySetting(const Ptr
&other):
- Setting(Setting::WirelessSecurity),
- d_ptr(new WirelessSecuritySettingPrivate())
+NetworkManager::WirelessSecuritySetting::WirelessSecuritySetting(const Ptr
&other)
+ : Setting(Setting::WirelessSecurity)
+ , d_ptr(new WirelessSecuritySettingPrivate())
{
setKeyMgmt(other->keyMgmt());
setWepTxKeyindex(other->wepTxKeyindex());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/settings/wirelesssetting.cpp
new/libnm-qt-5.0.91/src/settings/wirelesssetting.cpp
--- old/libnm-qt-5.0.90/src/settings/wirelesssetting.cpp 2014-07-03
17:24:26.000000000 +0200
+++ new/libnm-qt-5.0.91/src/settings/wirelesssetting.cpp 2014-07-10
20:21:19.000000000 +0200
@@ -25,25 +25,25 @@
#include <QtCore/QDebug>
-NetworkManager::WirelessSettingPrivate::WirelessSettingPrivate():
- name(NM_SETTING_WIRELESS_SETTING_NAME),
- mode(NetworkManager::WirelessSetting::Infrastructure),
- band(WirelessSetting::Automatic),
- channel(0),
- rate(0),
- txPower(0),
- mtu(0),
- hidden(false)
+NetworkManager::WirelessSettingPrivate::WirelessSettingPrivate()
+ : name(NM_SETTING_WIRELESS_SETTING_NAME)
+ , mode(NetworkManager::WirelessSetting::Infrastructure)
+ , band(WirelessSetting::Automatic)
+ , channel(0)
+ , rate(0)
+ , txPower(0)
+ , mtu(0)
+ , hidden(false)
{ }
-NetworkManager::WirelessSetting::WirelessSetting():
- Setting(Setting::Wireless),
- d_ptr(new WirelessSettingPrivate())
+NetworkManager::WirelessSetting::WirelessSetting()
+ : Setting(Setting::Wireless)
+ , d_ptr(new WirelessSettingPrivate())
{ }
-NetworkManager::WirelessSetting::WirelessSetting(const Ptr &setting):
- Setting(setting),
- d_ptr(new WirelessSettingPrivate)
+NetworkManager::WirelessSetting::WirelessSetting(const Ptr &setting)
+ : Setting(setting)
+ , d_ptr(new WirelessSettingPrivate)
{
setSsid(setting->ssid());
setMode(setting->mode());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/tundevice.cpp
new/libnm-qt-5.0.91/src/tundevice.cpp
--- old/libnm-qt-5.0.90/src/tundevice.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/tundevice.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -37,8 +37,8 @@
};
}
-NetworkManager::TunDevicePrivate::TunDevicePrivate(const QString &path,
TunDevice *q):
- DevicePrivate(path, q), iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus())
+NetworkManager::TunDevicePrivate::TunDevicePrivate(const QString &path,
TunDevice *q)
+ : DevicePrivate(path, q), iface(NetworkManagerPrivate::DBUS_SERVICE, path,
QDBusConnection::systemBus())
{
}
@@ -46,8 +46,8 @@
{
}
-NetworkManager::TunDevice::TunDevice(const QString &path, QObject *parent):
- Device(*new TunDevicePrivate(path, this), parent)
+NetworkManager::TunDevice::TunDevice(const QString &path, QObject *parent)
+ : Device(*new TunDevicePrivate(path, this), parent)
{
Q_D(TunDevice);
connect(&d->iface,
&OrgFreedesktopNetworkManagerDeviceTunInterface::PropertiesChanged, this,
&TunDevice::propertiesChanged);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-5.0.90/src/vpnplugin.cpp
new/libnm-qt-5.0.91/src/vpnplugin.cpp
--- old/libnm-qt-5.0.90/src/vpnplugin.cpp 2014-07-03 17:24:26.000000000
+0200
+++ new/libnm-qt-5.0.91/src/vpnplugin.cpp 2014-07-10 20:21:19.000000000
+0200
@@ -38,8 +38,8 @@
{
}
-NetworkManager::VpnPlugin::VpnPlugin(const QString &path, QObject *parent):
- QObject(parent), d_ptr(new VpnPluginPrivate(path))
+NetworkManager::VpnPlugin::VpnPlugin(const QString &path, QObject *parent)
+ : QObject(parent), d_ptr(new VpnPluginPrivate(path))
{
Q_D(VpnPlugin);
d->state = (NetworkManager::VpnConnection::State)d->iface.state();
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
