Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2018-06-22 13:25:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Fri Jun 22 13:25:01 2018 rev:51 rq:616797 version:5.47.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2018-05-18 14:24:43.549366939 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2018-06-22 13:25:02.417587590 +0200
@@ -1,0 +2,13 @@
+Tue Jun 12 21:26:08 UTC 2018 - lbeltr...@kde.org
+
+- Update to 5.47.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.47.0.php
+- Changes since 5.46.0:
+ * Add missing override
+ * Use override
+ * Make information about unhandled property just debug messages
+ * WirelessSetting: implement assignedMacAddress property
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.46.0.tar.xz
New:
----
networkmanager-qt-5.47.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.GFSCOi/_old 2018-06-22 13:25:04.205521517 +0200
+++ /var/tmp/diff_new_pack.GFSCOi/_new 2018-06-22 13:25:04.205521517 +0200
@@ -17,13 +17,13 @@
%define soversion 6
-%define _tar_path 5.46
+%define _tar_path 5.47
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: libKF5NetworkManagerQt
-Version: 5.46.0
+Version: 5.47.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ networkmanager-qt-5.46.0.tar.xz -> networkmanager-qt-5.47.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/CMakeLists.txt
new/networkmanager-qt-5.47.0/CMakeLists.txt
--- old/networkmanager-qt-5.46.0/CMakeLists.txt 2018-05-05 14:40:04.000000000
+0200
+++ new/networkmanager-qt-5.47.0/CMakeLists.txt 2018-06-02 18:30:15.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.46.0") # handled by release scripts
+set(KF5_VERSION "5.47.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.46.0 NO_MODULE)
+find_package(ECM 5.47.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/autotests/settings/wirelesssettingtest.cpp
new/networkmanager-qt-5.47.0/autotests/settings/wirelesssettingtest.cpp
--- old/networkmanager-qt-5.46.0/autotests/settings/wirelesssettingtest.cpp
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/autotests/settings/wirelesssettingtest.cpp
2018-06-02 18:30:15.000000000 +0200
@@ -24,6 +24,8 @@
#include <libnm/NetworkManager.h>
+#define NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS "assigned-mac-address"
+
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION
"mac-address-randomization"
#define NM_SETTING_WIRELESS_POWERSAVE "powersave"
@@ -46,7 +48,6 @@
QTest::addColumn<quint32>("rate");
QTest::addColumn<quint32>("txPower");
QTest::addColumn<QByteArray>("macAddress");
- QTest::addColumn<QByteArray>("clonedMacAddress");
QTest::addColumn<QString>("generateMacAddressMask");
QTest::addColumn<QStringList>("macAddressBlacklist");
QTest::addColumn<uint>("macAddressRandomization");
@@ -55,6 +56,7 @@
QTest::addColumn<uint>("powerSave");
QTest::addColumn<QString>("security");
QTest::addColumn<bool>("hidden");
+ QTest::addColumn<QString>("assignedMacAddress");
QStringList macAddressBlacklist;
macAddressBlacklist << "00:08:C7:1B:8C:02";
@@ -71,7 +73,6 @@
<< (quint32)2 // rate
<< (quint32)3 // txPower
<< QByteArray("00-B0-D0-86-BB-F7") // macAddress
- << QByteArray("00-14-22-01-23-4") //
clonedMacAddress
<< QString("FE:FF:FF:00:00:00 68:F7:28:00:00:00") //
generateMacAddressMask
<< macAddressBlacklist //
macAddressBlacklist
<< (uint) 1 //
macAddressRandomization
@@ -79,7 +80,8 @@
<< seenBssids // seenBssids
<< (uint) 2 // powerSave
<< QString("802-11-wireless-security") // security
- << true; // hidden
+ << true // hidden
+ << QString("random"); //
assignedMacAddress
}
void WirelessSettingTest::testSetting()
@@ -92,7 +94,6 @@
QFETCH(quint32, rate);
QFETCH(quint32, txPower);
QFETCH(QByteArray, macAddress);
- QFETCH(QByteArray, clonedMacAddress);
QFETCH(QString, generateMacAddressMask);
QFETCH(QStringList, macAddressBlacklist);
QFETCH(uint, macAddressRandomization);
@@ -101,6 +102,7 @@
QFETCH(uint, powerSave);
QFETCH(QString, security);
QFETCH(bool, hidden);
+ QFETCH(QString, assignedMacAddress);
QVariantMap map;
@@ -112,7 +114,6 @@
map.insert(QLatin1String(NM_SETTING_WIRELESS_RATE), rate);
map.insert(QLatin1String(NM_SETTING_WIRELESS_TX_POWER), txPower);
map.insert(QLatin1String(NM_SETTING_WIRELESS_MAC_ADDRESS), macAddress);
- map.insert(QLatin1String(NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),
clonedMacAddress);
map.insert(QLatin1String(NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK),
generateMacAddressMask);
map.insert(QLatin1String(NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST),
macAddressBlacklist);
map.insert(QLatin1String(NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION),
macAddressRandomization);
@@ -122,6 +123,7 @@
map.insert(QLatin1String("security"), security);
map.insert(QLatin1String(NM_SETTING_WIRELESS_HIDDEN), hidden);
+ map.insert(QLatin1String(NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS),
assignedMacAddress);
NetworkManager::WirelessSetting setting;
setting.fromMap(map);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/accesspoint.cpp
new/networkmanager-qt-5.47.0/src/accesspoint.cpp
--- old/networkmanager-qt-5.46.0/src/accesspoint.cpp 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/accesspoint.cpp 2018-06-02
18:30:15.000000000 +0200
@@ -227,7 +227,7 @@
lastSeen = it->toInt();
Q_EMIT q->lastSeenChanged(lastSeen);
} else {
- qCWarning(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
+ qCDebug(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
}
++it;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/activeconnection.cpp
new/networkmanager-qt-5.47.0/src/activeconnection.cpp
--- old/networkmanager-qt-5.46.0/src/activeconnection.cpp 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/activeconnection.cpp 2018-06-02
18:30:15.000000000 +0200
@@ -412,6 +412,6 @@
}
Q_EMIT q->devicesChanged();
} else {
- qCWarning(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
+ qCDebug(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/adsldevice.h
new/networkmanager-qt-5.47.0/src/adsldevice.h
--- old/networkmanager-qt-5.46.0/src/adsldevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/adsldevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -40,9 +40,9 @@
typedef QSharedPointer<AdslDevice> Ptr;
typedef QList<Ptr> List;
explicit AdslDevice(const QString &path, QObject *parent = nullptr);
- virtual ~AdslDevice();
+ ~AdslDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Indicates whether the physical carrier is found
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/adsldevice_p.h
new/networkmanager-qt-5.47.0/src/adsldevice_p.h
--- old/networkmanager-qt-5.46.0/src/adsldevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/adsldevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -46,7 +46,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/bluetoothdevice.h
new/networkmanager-qt-5.47.0/src/bluetoothdevice.h
--- old/networkmanager-qt-5.46.0/src/bluetoothdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/bluetoothdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -63,7 +63,7 @@
/**
* Destroys a BluetoothDevice object.
*/
- virtual ~BluetoothDevice();
+ ~BluetoothDevice() override;
/**
* Retrieves the capabilities supported by this device.
@@ -85,7 +85,7 @@
*
* @return the NetworkManager::Device::Type. This always returns
NetworkManager::Device::Bluetooth
*/
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
Q_SIGNALS:
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/bluetoothdevice_p.h
new/networkmanager-qt-5.47.0/src/bluetoothdevice_p.h
--- old/networkmanager-qt-5.46.0/src/bluetoothdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/bluetoothdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -42,7 +42,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/bonddevice.h
new/networkmanager-qt-5.47.0/src/bonddevice.h
--- old/networkmanager-qt-5.46.0/src/bonddevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/bonddevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
typedef QSharedPointer<BondDevice> Ptr;
typedef QList<Ptr> List;
explicit BondDevice(const QString &path, QObject *parent = nullptr);
- virtual ~BondDevice();
+ ~BondDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Indicates whether the physical carrier is found
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/bonddevice_p.h
new/networkmanager-qt-5.47.0/src/bonddevice_p.h
--- old/networkmanager-qt-5.46.0/src/bonddevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/bonddevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -45,7 +45,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
#endif // NETWORKMANAGERQT__BLUETOOTH_DEVICE_P_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/bridgedevice.h
new/networkmanager-qt-5.47.0/src/bridgedevice.h
--- old/networkmanager-qt-5.46.0/src/bridgedevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/bridgedevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
typedef QSharedPointer<BridgeDevice> Ptr;
typedef QList<Ptr> List;
explicit BridgeDevice(const QString &path, QObject *parent = nullptr);
- virtual ~BridgeDevice();
+ ~BridgeDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Indicates whether the physical carrier is found
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/bridgedevice_p.h
new/networkmanager-qt-5.47.0/src/bridgedevice_p.h
--- old/networkmanager-qt-5.46.0/src/bridgedevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/bridgedevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -46,7 +46,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/device.cpp
new/networkmanager-qt-5.47.0/src/device.cpp
--- old/networkmanager-qt-5.46.0/src/device.cpp 2018-05-05 14:40:04.000000000
+0200
+++ new/networkmanager-qt-5.47.0/src/device.cpp 2018-06-02 18:30:15.000000000
+0200
@@ -335,7 +335,7 @@
metered =
NetworkManager::DevicePrivate::convertMeteredStatus(value.toUInt());
Q_EMIT q->meteredChanged(metered);
} else {
- qCWarning(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
+ qCDebug(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/fakenetwork/wireddevice.h
new/networkmanager-qt-5.47.0/src/fakenetwork/wireddevice.h
--- old/networkmanager-qt-5.46.0/src/fakenetwork/wireddevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/fakenetwork/wireddevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -54,7 +54,7 @@
void setHwAddress(const QString &hwAddress);
void setPermanentHwAddress(const QString &permanentHwAddress);
void setSpeed(uint speed);
- void setState(uint state) Q_DECL_OVERRIDE;
+ void setState(uint state) override;
Q_SIGNALS:
Q_SCRIPTABLE void PropertiesChanged(const QVariantMap &properties);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/fakenetwork/wirelessdevice.h
new/networkmanager-qt-5.47.0/src/fakenetwork/wirelessdevice.h
--- old/networkmanager-qt-5.46.0/src/fakenetwork/wirelessdevice.h
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/fakenetwork/wirelessdevice.h
2018-06-02 18:30:15.000000000 +0200
@@ -64,7 +64,7 @@
void setHwAddress(const QString &hwAddress);
void setMode(uint mode);
void setPermHwAddress(const QString &permHwAddress);
- void setState(uint state) Q_DECL_OVERRIDE;
+ void setState(uint state) override;
void setWirelessCapabilities(uint capabilities);
public Q_SLOTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/genericdevice.h
new/networkmanager-qt-5.47.0/src/genericdevice.h
--- old/networkmanager-qt-5.46.0/src/genericdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/genericdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,11 +43,11 @@
typedef QSharedPointer<GenericDevice> Ptr;
typedef QList<Ptr> List;
explicit GenericDevice(const QString &path, QObject *parent = nullptr);
- virtual ~GenericDevice();
+ ~GenericDevice() override;
/**
* Return the type
*/
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Active hardware address of the device
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/genericdevice_p.h
new/networkmanager-qt-5.47.0/src/genericdevice_p.h
--- old/networkmanager-qt-5.46.0/src/genericdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/genericdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -46,7 +46,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/gredevice.h
new/networkmanager-qt-5.47.0/src/gredevice.h
--- old/networkmanager-qt-5.46.0/src/gredevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/gredevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -52,9 +52,9 @@
typedef QSharedPointer<GreDevice> Ptr;
typedef QList<Ptr> List;
explicit GreDevice(const QString &path, QObject *parent = nullptr);
- virtual ~GreDevice();
+ ~GreDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
ushort inputFlags() const;
ushort outputFlags() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/gredevice_p.h
new/networkmanager-qt-5.47.0/src/gredevice_p.h
--- old/networkmanager-qt-5.46.0/src/gredevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/gredevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -56,7 +56,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/infinibanddevice.h
new/networkmanager-qt-5.47.0/src/infinibanddevice.h
--- old/networkmanager-qt-5.46.0/src/infinibanddevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/infinibanddevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -42,9 +42,9 @@
typedef QSharedPointer<InfinibandDevice> Ptr;
typedef QList<Ptr> List;
explicit InfinibandDevice(const QString &path, QObject *parent = nullptr);
- virtual ~InfinibandDevice();
+ ~InfinibandDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Indicates whether the physical carrier is found
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/infinibanddevice_p.h
new/networkmanager-qt-5.47.0/src/infinibanddevice_p.h
--- old/networkmanager-qt-5.46.0/src/infinibanddevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/infinibanddevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -46,7 +46,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/iptunneldevice.h
new/networkmanager-qt-5.47.0/src/iptunneldevice.h
--- old/networkmanager-qt-5.46.0/src/iptunneldevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/iptunneldevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -51,9 +51,9 @@
typedef QSharedPointer<IpTunnelDevice> Ptr;
typedef QList<Ptr> List;
explicit IpTunnelDevice(const QString &path, QObject *parent = nullptr);
- virtual ~IpTunnelDevice();
+ ~IpTunnelDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* How many additional levels of encapsulation are permitted to be
prepended to packets.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/iptunneldevice_p.h
new/networkmanager-qt-5.47.0/src/iptunneldevice_p.h
--- old/networkmanager-qt-5.46.0/src/iptunneldevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/iptunneldevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -57,7 +57,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/macvlandevice.h
new/networkmanager-qt-5.47.0/src/macvlandevice.h
--- old/networkmanager-qt-5.46.0/src/macvlandevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/macvlandevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
typedef QSharedPointer<MacVlanDevice> Ptr;
typedef QList<Ptr> List;
explicit MacVlanDevice(const QString &path, QObject *parent = nullptr);
- virtual ~MacVlanDevice();
+ ~MacVlanDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
QString mode() const;
bool noPromisc() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/macvlandevice_p.h
new/networkmanager-qt-5.47.0/src/macvlandevice_p.h
--- old/networkmanager-qt-5.46.0/src/macvlandevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/macvlandevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -47,7 +47,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/manager.cpp
new/networkmanager-qt-5.47.0/src/manager.cpp
--- old/networkmanager-qt-5.46.0/src/manager.cpp 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/manager.cpp 2018-06-02
18:30:15.000000000 +0200
@@ -807,7 +807,7 @@
m_metered = (NetworkManager::Device::MeteredStatus)it->toUInt();
Q_EMIT meteredChanged(m_metered);
} else {
- qCWarning(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
+ qCDebug(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
}
++it;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/modemdevice.h
new/networkmanager-qt-5.47.0/src/modemdevice.h
--- old/networkmanager-qt-5.46.0/src/modemdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/modemdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -45,11 +45,11 @@
Q_DECLARE_FLAGS(Capabilities, Capability)
explicit ModemDevice(const QString &path, QObject *parent = nullptr);
explicit ModemDevice(ModemDevicePrivate &dd, QObject *parent = nullptr);
- virtual ~ModemDevice();
+ ~ModemDevice() override;
/**
* Return the type
*/
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* The generic family of access technologies the modem supports. Not all
capabilities are
* available at the same time however; some modems require a firmware
reload or other
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/modemdevice_p.h
new/networkmanager-qt-5.47.0/src/modemdevice_p.h
--- old/networkmanager-qt-5.46.0/src/modemdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/modemdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -45,7 +45,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
} // namespace NetworkManager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/olpcmeshdevice.h
new/networkmanager-qt-5.47.0/src/olpcmeshdevice.h
--- old/networkmanager-qt-5.46.0/src/olpcmeshdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/olpcmeshdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -52,11 +52,11 @@
/**
* Destroys a OlpcMeshDevice object.
*/
- ~OlpcMeshDevice();
+ ~OlpcMeshDevice() override;
/**
* Return the type
*/
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Currently active channel.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/olpcmeshdevice_p.h
new/networkmanager-qt-5.47.0/src/olpcmeshdevice_p.h
--- old/networkmanager-qt-5.46.0/src/olpcmeshdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/olpcmeshdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,7 +43,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/adslsetting.h
new/networkmanager-qt-5.47.0/src/settings/adslsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/adslsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/adslsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -44,9 +44,9 @@
AdslSetting();
explicit AdslSetting(const Ptr &other);
- ~AdslSetting();
+ ~AdslSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setUsername(const QString &username);
QString username() const;
@@ -69,11 +69,11 @@
void setVci(quint32 vci);
quint32 vci() const;
- QStringList needSecrets(bool requestNew = false) const Q_DECL_OVERRIDE;
+ QStringList needSecrets(bool requestNew = false) const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
AdslSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/bluetoothsetting.h
new/networkmanager-qt-5.47.0/src/settings/bluetoothsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/bluetoothsetting.h
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/bluetoothsetting.h
2018-06-02 18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
BluetoothSetting();
explicit BluetoothSetting(const Ptr &other);
- ~BluetoothSetting();
+ ~BluetoothSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setBluetoothAddress(const QByteArray &address);
QByteArray bluetoothAddress() const;
@@ -53,9 +53,9 @@
void setProfileType(ProfileType type);
ProfileType profileType() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
BluetoothSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/bondsetting.h
new/networkmanager-qt-5.47.0/src/settings/bondsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/bondsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/bondsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -49,9 +49,9 @@
typedef QList<Ptr> List;
BondSetting();
explicit BondSetting(const Ptr &other);
- ~BondSetting();
+ ~BondSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
/// @deprecated in favor of connection.interface-name in NM 1.0.0
void setInterfaceName(const QString &name);
@@ -61,9 +61,9 @@
void setOptions(const NMStringMap &options);
NMStringMap options() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
BondSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/bridgeportsetting.h
new/networkmanager-qt-5.47.0/src/settings/bridgeportsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/bridgeportsetting.h
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/bridgeportsetting.h
2018-06-02 18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
BridgePortSetting();
explicit BridgePortSetting(const Ptr &other);
- ~BridgePortSetting();
+ ~BridgePortSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setPriority(quint32 priority);
quint32 priority() const;
@@ -54,9 +54,9 @@
void setHairpinMode(bool enable);
bool hairpinMode() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
BridgePortSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/bridgesetting.h
new/networkmanager-qt-5.47.0/src/settings/bridgesetting.h
--- old/networkmanager-qt-5.46.0/src/settings/bridgesetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/bridgesetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
BridgeSetting();
explicit BridgeSetting(const Ptr &other);
- ~BridgeSetting();
+ ~BridgeSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
// Deprecated in favor of connection.interface-name in NM 1.0.0
void setInterfaceName(const QString &name);
@@ -73,9 +73,9 @@
void setMacAddress(const QByteArray &address);
QByteArray macAddress() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
BridgeSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/cdmasetting.h
new/networkmanager-qt-5.47.0/src/settings/cdmasetting.h
--- old/networkmanager-qt-5.46.0/src/settings/cdmasetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/cdmasetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
CdmaSetting();
explicit CdmaSetting(const Ptr &other);
- ~CdmaSetting();
+ ~CdmaSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setNumber(const QString &number);
QString number() const;
@@ -57,15 +57,15 @@
void setPasswordFlags(SecretFlags flags);
SecretFlags passwordFlags() const;
- QStringList needSecrets(bool requestNew = false) const Q_DECL_OVERRIDE;
+ QStringList needSecrets(bool requestNew = false) const override;
- void secretsFromMap(const QVariantMap &secrets) Q_DECL_OVERRIDE;
+ void secretsFromMap(const QVariantMap &secrets) override;
- QVariantMap secretsToMap() const Q_DECL_OVERRIDE;
+ QVariantMap secretsToMap() const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
CdmaSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/genericsetting.h
new/networkmanager-qt-5.47.0/src/settings/genericsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/genericsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/genericsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,11 +43,11 @@
explicit GenericSetting(const Ptr &other);
~GenericSetting();
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
GenericSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/gsmsetting.h
new/networkmanager-qt-5.47.0/src/settings/gsmsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/gsmsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/gsmsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
GsmSetting();
explicit GsmSetting(const Ptr &other);
- ~GsmSetting();
+ ~GsmSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setNumber(const QString &number);
QString number() const;
@@ -91,15 +91,15 @@
void setSimOperatorId(const QString &id);
QString simOperatorId() const;
- void secretsFromMap(const QVariantMap &secrets) Q_DECL_OVERRIDE;
+ void secretsFromMap(const QVariantMap &secrets) override;
- QVariantMap secretsToMap() const Q_DECL_OVERRIDE;
+ QVariantMap secretsToMap() const override;
- QStringList needSecrets(bool requestNew = false) const Q_DECL_OVERRIDE;
+ QStringList needSecrets(bool requestNew = false) const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
GsmSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/infinibandsetting.h
new/networkmanager-qt-5.47.0/src/settings/infinibandsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/infinibandsetting.h
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/infinibandsetting.h
2018-06-02 18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
InfinibandSetting();
explicit InfinibandSetting(const Ptr &other);
- ~InfinibandSetting();
+ ~InfinibandSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setMacAddress(const QByteArray &address);
QByteArray macAddress() const;
@@ -62,9 +62,9 @@
void setParent(const QString &parent);
QString parent() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
InfinibandSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/ipv4setting.h
new/networkmanager-qt-5.47.0/src/settings/ipv4setting.h
--- old/networkmanager-qt-5.46.0/src/settings/ipv4setting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/ipv4setting.h 2018-06-02
18:30:15.000000000 +0200
@@ -67,9 +67,9 @@
Ipv4Setting();
explicit Ipv4Setting(const Ptr &other);
- ~Ipv4Setting();
+ ~Ipv4Setting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setMethod(ConfigMethod method);
ConfigMethod method() const;
@@ -110,9 +110,9 @@
void setMayFail(bool mayFail);
bool mayFail() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
Ipv4SettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/ipv6setting.h
new/networkmanager-qt-5.47.0/src/settings/ipv6setting.h
--- old/networkmanager-qt-5.46.0/src/settings/ipv6setting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/ipv6setting.h 2018-06-02
18:30:15.000000000 +0200
@@ -69,9 +69,9 @@
Ipv6Setting();
explicit Ipv6Setting(const Ptr &other);
- ~Ipv6Setting();
+ ~Ipv6Setting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setMethod(ConfigMethod method);
ConfigMethod method() const;
@@ -106,9 +106,9 @@
void setPrivacy(IPv6Privacy privacy);
IPv6Privacy privacy() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
Ipv6SettingPrivate *const d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/olpcmeshsetting.h
new/networkmanager-qt-5.47.0/src/settings/olpcmeshsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/olpcmeshsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/olpcmeshsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
OlpcMeshSetting();
explicit OlpcMeshSetting(const Ptr &other);
- ~OlpcMeshSetting();
+ ~OlpcMeshSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setSsid(const QByteArray &ssid);
QByteArray ssid() const;
@@ -54,9 +54,9 @@
void setDhcpAnycastAddress(const QByteArray &address);
QByteArray dhcpAnycastAddress() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
OlpcMeshSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/pppoesetting.h
new/networkmanager-qt-5.47.0/src/settings/pppoesetting.h
--- old/networkmanager-qt-5.46.0/src/settings/pppoesetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/pppoesetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
PppoeSetting();
explicit PppoeSetting(const Ptr &other);
- ~PppoeSetting();
+ ~PppoeSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setService(const QString &service);
QString service() const;
@@ -57,15 +57,15 @@
void setPasswordFlags(Setting::SecretFlags flags);
Setting::SecretFlags passwordFlags() const;
- QStringList needSecrets(bool requestNew = false) const Q_DECL_OVERRIDE;
+ QStringList needSecrets(bool requestNew = false) const override;
- void secretsFromMap(const QVariantMap &secrets) Q_DECL_OVERRIDE;
+ void secretsFromMap(const QVariantMap &secrets) override;
- QVariantMap secretsToMap() const Q_DECL_OVERRIDE;
+ QVariantMap secretsToMap() const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
PppoeSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/pppsetting.h
new/networkmanager-qt-5.47.0/src/settings/pppsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/pppsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/pppsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
PppSetting();
explicit PppSetting(const Ptr &other);
- ~PppSetting();
+ ~PppSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setNoAuth(bool require);
bool noAuth() const;
@@ -99,9 +99,9 @@
void setLcpEchoInterval(quint32 interval);
quint32 lcpEchoInterval() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
PppSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/security8021xsetting.h
new/networkmanager-qt-5.47.0/src/settings/security8021xsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/security8021xsetting.h
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/security8021xsetting.h
2018-06-02 18:30:15.000000000 +0200
@@ -50,9 +50,9 @@
Security8021xSetting();
explicit Security8021xSetting(const Ptr &other);
- ~Security8021xSetting();
+ ~Security8021xSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setEapMethods(const QList<EapMethod> &methods);
QList<EapMethod> eapMethods() const;
@@ -187,15 +187,15 @@
void setSystemCaCertificates(bool use);
bool systemCaCertificates() const;
- QStringList needSecrets(bool requestNew = false) const Q_DECL_OVERRIDE;
+ QStringList needSecrets(bool requestNew = false) const override;
- void secretsFromMap(const QVariantMap &secrets) Q_DECL_OVERRIDE;
+ void secretsFromMap(const QVariantMap &secrets) override;
- QVariantMap secretsToMap() const Q_DECL_OVERRIDE;
+ QVariantMap secretsToMap() const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
Security8021xSettingPrivate *const d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/serialsetting.h
new/networkmanager-qt-5.47.0/src/settings/serialsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/serialsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/serialsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
SerialSetting();
explicit SerialSetting(const Ptr &other);
- ~SerialSetting();
+ ~SerialSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setBaud(quint32 speed);
quint32 baud() const;
@@ -62,9 +62,9 @@
void setSendDelay(quint64 delay);
quint64 sendDelay() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
SerialSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/teamsetting.h
new/networkmanager-qt-5.47.0/src/settings/teamsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/teamsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/teamsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
TeamSetting();
explicit TeamSetting(const Ptr &other);
- ~TeamSetting();
+ ~TeamSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
/// @deprecated in favor of connection.interface-name in NM 1.0.0
void setInterfaceName(const QString &name);
@@ -52,9 +52,9 @@
QString config() const;
void setConfig(const QString &config);
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
TeamSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/template.h
new/networkmanager-qt-5.47.0/src/settings/template.h
--- old/networkmanager-qt-5.46.0/src/settings/template.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/template.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,13 +41,13 @@
typedef QList<Ptr> List;
TemplateSetting();
explicit TemplateSetting(const Ptr &other);
- ~TemplateSetting();
+ ~TemplateSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
TemplateSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/tunsetting.h
new/networkmanager-qt-5.47.0/src/settings/tunsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/tunsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/tunsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -44,9 +44,9 @@
TunSetting();
explicit TunSetting(const Ptr &other);
- ~TunSetting();
+ ~TunSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setGroup(const QString& group);
QString group() const;
@@ -66,9 +66,9 @@
void setVnetHdr(bool vnetHdr);
bool vnetHdr() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
TunSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/vlansetting.h
new/networkmanager-qt-5.47.0/src/settings/vlansetting.h
--- old/networkmanager-qt-5.46.0/src/settings/vlansetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/vlansetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -44,9 +44,9 @@
VlanSetting();
explicit VlanSetting(const Ptr &other);
- ~VlanSetting();
+ ~VlanSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
/// @deprecated in favor of connection.interface-name in NM 1.0.0
void setInterfaceName(const QString &name);
@@ -67,9 +67,9 @@
void setEgressPriorityMap(const QStringList &map);
QStringList egressPriorityMap() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
VlanSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/vpnsetting.h
new/networkmanager-qt-5.47.0/src/settings/vpnsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/vpnsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/vpnsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -41,9 +41,9 @@
typedef QList<Ptr> List;
VpnSetting();
explicit VpnSetting(const Ptr &other);
- ~VpnSetting();
+ ~VpnSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
bool persistent() const;
void setPersistent(bool persistent);
@@ -63,15 +63,15 @@
void setSecrets(const NMStringMap &secrets);
NMStringMap secrets() const;
- void secretsFromMap(const QVariantMap &secrets) Q_DECL_OVERRIDE;
- QVariantMap secretsToMap() const Q_DECL_OVERRIDE;
+ void secretsFromMap(const QVariantMap &secrets) override;
+ QVariantMap secretsToMap() const override;
- void secretsFromStringMap(const NMStringMap &map) Q_DECL_OVERRIDE;
- NMStringMap secretsToStringMap() const Q_DECL_OVERRIDE;
+ void secretsFromStringMap(const NMStringMap &map) override;
+ NMStringMap secretsToStringMap() const override;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
VpnSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/wimaxsetting.h
new/networkmanager-qt-5.47.0/src/settings/wimaxsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/wimaxsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/wimaxsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -42,9 +42,9 @@
typedef QList<Ptr> List;
WimaxSetting();
explicit WimaxSetting(const Ptr &other);
- ~WimaxSetting();
+ ~WimaxSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setNetworkName(const QString &name);
QString networkName() const;
@@ -52,9 +52,9 @@
void setMacAddress(const QByteArray &address);
QByteArray macAddress() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
WimaxSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/settings/wiredsetting.h
new/networkmanager-qt-5.47.0/src/settings/wiredsetting.h
--- old/networkmanager-qt-5.46.0/src/settings/wiredsetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/wiredsetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -76,9 +76,9 @@
WiredSetting();
explicit WiredSetting(const Ptr &other);
- ~WiredSetting();
+ ~WiredSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setPort(PortType port);
PortType port() const;
@@ -122,9 +122,9 @@
QString wakeOnLanPassword() const;
void setWakeOnLanPassword(const QString& password);
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
WiredSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/wirelesssecuritysetting.h
new/networkmanager-qt-5.47.0/src/settings/wirelesssecuritysetting.h
--- old/networkmanager-qt-5.46.0/src/settings/wirelesssecuritysetting.h
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/wirelesssecuritysetting.h
2018-06-02 18:30:15.000000000 +0200
@@ -47,9 +47,9 @@
WirelessSecuritySetting();
explicit WirelessSecuritySetting(const Ptr &other);
- virtual ~WirelessSecuritySetting();
+ ~WirelessSecuritySetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setKeyMgmt(KeyMgmt mgmt);
KeyMgmt keyMgmt() const;
@@ -102,15 +102,15 @@
void setLeapPasswordFlags(SecretFlags type);
SecretFlags leapPasswordFlags() const;
- void secretsFromMap(const QVariantMap &secrets) Q_DECL_OVERRIDE;
+ void secretsFromMap(const QVariantMap &secrets) override;
- QVariantMap secretsToMap() const Q_DECL_OVERRIDE;
+ QVariantMap secretsToMap() const override;
- QStringList needSecrets(bool requestNew = false) const Q_DECL_OVERRIDE;
+ QStringList needSecrets(bool requestNew = false) const override;
- void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &map) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
WirelessSecuritySettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/wirelesssetting.cpp
new/networkmanager-qt-5.47.0/src/settings/wirelesssetting.cpp
--- old/networkmanager-qt-5.46.0/src/settings/wirelesssetting.cpp
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/wirelesssetting.cpp
2018-06-02 18:30:15.000000000 +0200
@@ -21,8 +21,11 @@
#include "wirelesssetting.h"
#include "wirelesssetting_p.h"
+#include "utils.h"
+
//define the deprecated&dropped values
#define NM_SETTING_WIRELESS_SEC "security"
+#define NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS "assigned-mac-address"
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION
"mac-address-randomization"
@@ -74,6 +77,7 @@
setPowerSave(setting->powerSave());
setSecurity(setting->security());
setHidden(setting->hidden());
+ setAssignedMacAddress(setting->assignedMacAddress());
}
NetworkManager::WirelessSetting::~WirelessSetting()
@@ -186,6 +190,20 @@
return d->txPower;
}
+void NetworkManager::WirelessSetting::setAssignedMacAddress(const QString
&assignedMacAddress)
+{
+ Q_D(WirelessSetting);
+
+ d->assignedMacAddress = assignedMacAddress;
+}
+
+QString NetworkManager::WirelessSetting::assignedMacAddress() const
+{
+ Q_D(const WirelessSetting);
+
+ return d->assignedMacAddress;
+}
+
void NetworkManager::WirelessSetting::setMacAddress(const QByteArray &address)
{
Q_D(WirelessSetting);
@@ -204,14 +222,14 @@
{
Q_D(WirelessSetting);
- d->clonedMacAddress = address;
+ d->assignedMacAddress = NetworkManager::macAddressAsString(address);
}
QByteArray NetworkManager::WirelessSetting::clonedMacAddress() const
{
Q_D(const WirelessSetting);
- return d->clonedMacAddress;
+ return
NetworkManager::macAddressFromString(d->assignedMacAddress.toUtf8());
}
void NetworkManager::WirelessSetting::setGenerateMacAddressMask(const QString&
macAddressMask)
@@ -368,6 +386,10 @@
setTxPower(setting.value(QLatin1String(NM_SETTING_WIRELESS_TX_POWER)).toUInt());
}
+ if
(setting.contains(QLatin1String(NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS))) {
+
setAssignedMacAddress(setting.value(QLatin1String(NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS)).toString());
+ }
+
if (setting.contains(QLatin1String(NM_SETTING_WIRELESS_MAC_ADDRESS))) {
setMacAddress(setting.value(QLatin1String(NM_SETTING_WIRELESS_MAC_ADDRESS)).toByteArray());
}
@@ -449,6 +471,10 @@
setting.insert(QLatin1String(NM_SETTING_WIRELESS_TX_POWER), txPower());
}
+ if (!assignedMacAddress().isEmpty()) {
+
setting.insert(QLatin1String(NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS),
assignedMacAddress());
+ }
+
if (!macAddress().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_WIRELESS_MAC_ADDRESS),
macAddress());
}
@@ -457,10 +483,6 @@
setting.insert(QLatin1String(NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK),
generateMacAddressMask());
}
- if (!clonedMacAddress().isEmpty()) {
- setting.insert(QLatin1String(NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),
clonedMacAddress());
- }
-
if (!macAddressBlacklist().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST),
macAddressBlacklist());
}
@@ -500,8 +522,8 @@
dbg.nospace() << NM_SETTING_WIRELESS_BSSID << ": " << setting.bssid() <<
'\n';
dbg.nospace() << NM_SETTING_WIRELESS_RATE << ": " << setting.rate() <<
'\n';
dbg.nospace() << NM_SETTING_WIRELESS_TX_POWER << ": " << setting.txPower()
<< '\n';
+ dbg.nospace() << NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS << ": " <<
setting.assignedMacAddress() << '\n';
dbg.nospace() << NM_SETTING_WIRELESS_MAC_ADDRESS << ": " <<
setting.macAddress() << '\n';
- dbg.nospace() << NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS << ": " <<
setting.clonedMacAddress() << '\n';
dbg.nospace() << NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK << ": " <<
setting.generateMacAddressMask() << '\n';
dbg.nospace() << NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST << ": " <<
setting.macAddressBlacklist() << '\n';
dbg.nospace() << NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION << ": " <<
setting.macAddressRandomization() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/wirelesssetting.h
new/networkmanager-qt-5.47.0/src/settings/wirelesssetting.h
--- old/networkmanager-qt-5.46.0/src/settings/wirelesssetting.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/wirelesssetting.h 2018-06-02
18:30:15.000000000 +0200
@@ -62,9 +62,9 @@
WirelessSetting();
explicit WirelessSetting(const Ptr &setting);
- virtual ~WirelessSetting();
+ ~WirelessSetting() override;
- QString name() const Q_DECL_OVERRIDE;
+ QString name() const override;
void setSsid(const QByteArray &ssid);
QByteArray ssid() const;
@@ -87,9 +87,13 @@
void setTxPower(quint32 power);
quint32 txPower() const;
+ void setAssignedMacAddress(const QString &assignedMacAddress);
+ QString assignedMacAddress() const;
+
void setMacAddress(const QByteArray &address);
QByteArray macAddress() const;
+ /// @deprecated since NM 1.4.0, will internally use assigned-mac-address
property
void setClonedMacAddress(const QByteArray &address);
QByteArray clonedMacAddress() const;
@@ -118,9 +122,9 @@
void setHidden(bool hidden);
bool hidden() const;
- void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &setting) override;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
WirelessSettingPrivate *d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.46.0/src/settings/wirelesssetting_p.h
new/networkmanager-qt-5.47.0/src/settings/wirelesssetting_p.h
--- old/networkmanager-qt-5.46.0/src/settings/wirelesssetting_p.h
2018-05-05 14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/settings/wirelesssetting_p.h
2018-06-02 18:30:15.000000000 +0200
@@ -49,6 +49,7 @@
QString generateMacAddressMask;
NetworkManager::Setting::MacAddressRandomization macAddressRandomization;
NetworkManager::WirelessSetting::PowerSave powersave;
+ QString assignedMacAddress;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/teamdevice.h
new/networkmanager-qt-5.47.0/src/teamdevice.h
--- old/networkmanager-qt-5.46.0/src/teamdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/teamdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -45,9 +45,9 @@
typedef QList<Ptr> List;
explicit TeamDevice(const QString &path, QObject *parent = nullptr);
- virtual ~TeamDevice();
+ ~TeamDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Indicates whether the physical carrier is found
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/teamdevice_p.h
new/networkmanager-qt-5.47.0/src/teamdevice_p.h
--- old/networkmanager-qt-5.46.0/src/teamdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/teamdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -50,7 +50,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/tundevice.h
new/networkmanager-qt-5.47.0/src/tundevice.h
--- old/networkmanager-qt-5.46.0/src/tundevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/tundevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -48,9 +48,9 @@
typedef QSharedPointer<TunDevice> Ptr;
typedef QList<Ptr> List;
explicit TunDevice(const QString &path, QObject *parent = nullptr);
- virtual ~TunDevice();
+ ~TunDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* The uid of the tunnel owner, or -1 if it has no owner.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/tundevice_p.h
new/networkmanager-qt-5.47.0/src/tundevice_p.h
--- old/networkmanager-qt-5.46.0/src/tundevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/tundevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -50,7 +50,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/vethdevice.h
new/networkmanager-qt-5.47.0/src/vethdevice.h
--- old/networkmanager-qt-5.46.0/src/vethdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/vethdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -43,9 +43,9 @@
typedef QList<Ptr> List;
explicit VethDevice(const QString &path, QObject *parent = nullptr);
- virtual ~VethDevice();
+ ~VethDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
QString peer() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/vethdevice_p.h
new/networkmanager-qt-5.47.0/src/vethdevice_p.h
--- old/networkmanager-qt-5.46.0/src/vethdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/vethdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -45,7 +45,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/vlandevice.h
new/networkmanager-qt-5.47.0/src/vlandevice.h
--- old/networkmanager-qt-5.46.0/src/vlandevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/vlandevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -45,9 +45,9 @@
typedef QList<Ptr> List;
explicit VlanDevice(const QString &path, QObject *parent = nullptr);
- virtual ~VlanDevice();
+ ~VlanDevice() override;
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Indicates whether the physical carrier is found
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/vlandevice_p.h
new/networkmanager-qt-5.47.0/src/vlandevice_p.h
--- old/networkmanager-qt-5.46.0/src/vlandevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/vlandevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -48,7 +48,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/vpnconnection_p.h
new/networkmanager-qt-5.47.0/src/vpnconnection_p.h
--- old/networkmanager-qt-5.46.0/src/vpnconnection_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/vpnconnection_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -52,7 +52,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
private Q_SLOTS:
void dbusPropertiesChanged(const QString &interfaceName, const QVariantMap
&properties, const QStringList &invalidatedProperties);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/wimaxdevice.h
new/networkmanager-qt-5.47.0/src/wimaxdevice.h
--- old/networkmanager-qt-5.46.0/src/wimaxdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/wimaxdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -55,11 +55,11 @@
/**
* Destroys a WimaxDevice object.
*/
- ~WimaxDevice();
+ ~WimaxDevice() override;
/**
* Return the type
*/
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* List of network service providers currently visible to the hardware
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/wimaxdevice_p.h
new/networkmanager-qt-5.47.0/src/wimaxdevice_p.h
--- old/networkmanager-qt-5.46.0/src/wimaxdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/wimaxdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -52,7 +52,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/wireddevice.h
new/networkmanager-qt-5.47.0/src/wireddevice.h
--- old/networkmanager-qt-5.46.0/src/wireddevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/wireddevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -48,11 +48,11 @@
typedef QSharedPointer<WiredDevice> Ptr;
typedef QList<Ptr> List;
explicit WiredDevice(const QString &path, QObject *parent = nullptr);
- virtual ~WiredDevice();
+ ~WiredDevice() override;
/**
* Return the type
*/
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* Active hardware address of the device
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/wireddevice_p.h
new/networkmanager-qt-5.47.0/src/wireddevice_p.h
--- old/networkmanager-qt-5.46.0/src/wireddevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/wireddevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -46,7 +46,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
};
} // namespace NetworkManager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/wirelessdevice.h
new/networkmanager-qt-5.47.0/src/wirelessdevice.h
--- old/networkmanager-qt-5.46.0/src/wirelessdevice.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/wirelessdevice.h 2018-06-02
18:30:15.000000000 +0200
@@ -87,11 +87,11 @@
/**
* Destroys a WirelessDevice object.
*/
- ~WirelessDevice();
+ ~WirelessDevice() override;
/**
* Return the type
*/
- Type type() const Q_DECL_OVERRIDE;
+ Type type() const override;
/**
* List of wireless networks currently visible to the hardware
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.46.0/src/wirelessdevice_p.h
new/networkmanager-qt-5.47.0/src/wirelessdevice_p.h
--- old/networkmanager-qt-5.46.0/src/wirelessdevice_p.h 2018-05-05
14:40:04.000000000 +0200
+++ new/networkmanager-qt-5.47.0/src/wirelessdevice_p.h 2018-06-02
18:30:15.000000000 +0200
@@ -50,7 +50,7 @@
* When subclassing make sure to call the parent class method
* if the property was not useful to your new class
*/
- void propertyChanged(const QString &property, const QVariant &value)
Q_DECL_OVERRIDE;
+ void propertyChanged(const QString &property, const QVariant &value)
override;
protected Q_SLOTS:
void accessPointAdded(const QDBusObjectPath &);
