Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2020-05-11 13:30:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Mon May 11 13:30:53 2020 rev:78 rq:802124 version:5.70.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2020-04-15 20:05:10.534051267 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.2738/libKF5NetworkManagerQt.changes
2020-05-11 13:33:00.296067502 +0200
@@ -1,0 +2,14 @@
+Sun May 3 09:40:18 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 5.70.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/kde-frameworks-5.70.0
+- Changes since 5.69.0:
+ * Replace foreach with range-for
+ * [NetworkManager-qt] Replace foreach with range for, hopefully last pass
+ * [NetworkManager-qt] Replace foreach with range/index for loop, third pass
+ * [NetworkManager-qt] Replace foreach with range/index for loop
+ * [NetworkManager-qt] replace foreach (deprecated) with range-for, first pass
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.69.0.tar.xz
networkmanager-qt-5.69.0.tar.xz.sig
New:
----
networkmanager-qt-5.70.0.tar.xz
networkmanager-qt-5.70.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.XY2iDp/_old 2020-05-11 13:33:04.096075468 +0200
+++ /var/tmp/diff_new_pack.XY2iDp/_new 2020-05-11 13:33:04.100075476 +0200
@@ -17,7 +17,7 @@
%define soversion 6
-%define _tar_path 5.69
+%define _tar_path 5.70
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: libKF5NetworkManagerQt
-Version: 5.69.0
+Version: 5.70.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ networkmanager-qt-5.69.0.tar.xz -> networkmanager-qt-5.70.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/CMakeLists.txt
new/networkmanager-qt-5.70.0/CMakeLists.txt
--- old/networkmanager-qt-5.69.0/CMakeLists.txt 2020-04-05 00:38:36.000000000
+0200
+++ new/networkmanager-qt-5.70.0/CMakeLists.txt 2020-05-03 00:01:33.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.69.0") # handled by release scripts
+set(KF5_VERSION "5.70.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.69.0 NO_MODULE)
+find_package(ECM 5.70.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -21,6 +21,7 @@
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Network)
add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/examples/createconnection/main.cpp
new/networkmanager-qt-5.70.0/examples/createconnection/main.cpp
--- old/networkmanager-qt-5.69.0/examples/createconnection/main.cpp
2020-04-05 00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/examples/createconnection/main.cpp
2020-05-03 00:01:33.000000000 +0200
@@ -29,12 +29,12 @@
QTextStream qin(stdin, QIODevice::ReadOnly);
NetworkManager::ConnectionSettings *settings = new
NetworkManager::ConnectionSettings(NetworkManager::ConnectionSettings::Wireless);
- Device::List deviceList = NetworkManager::networkInterfaces();
+ const Device::List deviceList = NetworkManager::networkInterfaces();
WirelessDevice::Ptr wifiDevice;
// We have to find some wireless device
- Q_FOREACH (Device::Ptr dev, deviceList) {
+ for (Device::Ptr dev : deviceList) {
if (dev->type() == Device::Wifi) {
wifiDevice = qobject_cast<WirelessDevice *>(dev);
break;
@@ -45,13 +45,13 @@
return 1;
}
- QStringList accessPointList = wifiDevice->accessPoints();
+ const QStringList accessPointList = wifiDevice->accessPoints();
QString ssid;
QString result;
QString accessPointPath;
// Check for available accesspoint
- Q_FOREACH (const QString & ap, accessPointList) {
+ for (const QString &ap : accessPointList) {
AccessPoint accessPoint(ap);
// For simplification we use APs only with Wep security or without any
security
if (accessPoint.wpaFlags().testFlag(AccessPoint::PairWep40) ||
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/examples/main.cpp
new/networkmanager-qt-5.70.0/examples/main.cpp
--- old/networkmanager-qt-5.69.0/examples/main.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/examples/main.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -33,11 +33,11 @@
{
QTextStream qout(stdout, QIODevice::WriteOnly);
- NetworkManager::Device::List list = NetworkManager::networkInterfaces();
+ const NetworkManager::Device::List list =
NetworkManager::networkInterfaces();
// List device configuration, not including vpn connections, which do not
// have a real device tied to them.
- Q_FOREACH (NetworkManager::Device::Ptr dev, list) {
+ for (NetworkManager::Device::Ptr &dev : list) {
qout << "\n=====\n";
qout << dev->uni() << "\n";
qout << "type: " << typeAsString(dev->type()) << "\n";
@@ -99,11 +99,11 @@
}
}
- NetworkManager::Connection::List connections =
dev->availableConnections();
+ const NetworkManager::Connection::List connections =
dev->availableConnections();
qout << "available connections: ";
- Q_FOREACH (NetworkManager::Connection::Ptr con, connections) {
+ for (NetworkManager::Connection::Ptr &con : connections) {
qout << "con";
NetworkManager::ConnectionSettings::Ptr settings = con->settings();
qout << "\"" << settings->id() << "\" ";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/activeconnection.cpp
new/networkmanager-qt-5.70.0/src/activeconnection.cpp
--- old/networkmanager-qt-5.69.0/src/activeconnection.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/activeconnection.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -257,7 +257,7 @@
properties << QLatin1String("Dhcp6Config");
}
- Q_FOREACH (const QString &property, properties) {
+ for (const QString &property : qAsConst(properties)) {
QDBusMessage message =
QDBusMessage::createMethodCall(NetworkManager::NetworkManagerPrivate::DBUS_SERVICE,
NetworkManager::NetworkManagerPrivate::DBUS_DAEMON_PATH,
NetworkManager::NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
@@ -403,7 +403,8 @@
Q_EMIT q->uuidChanged(uuid);
} else if (property == QLatin1String("Devices")) {
devices.clear();
- Q_FOREACH (const QDBusObjectPath & path, qdbus_cast<
QList<QDBusObjectPath> >(value)) {
+ const QList<QDBusObjectPath> opList = qdbus_cast<
QList<QDBusObjectPath> >(value);
+ for (const QDBusObjectPath &path : opList) {
devices.append(path.path());
}
Q_EMIT q->devicesChanged();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/bonddevice.cpp
new/networkmanager-qt-5.70.0/src/bonddevice.cpp
--- old/networkmanager-qt-5.69.0/src/bonddevice.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/bonddevice.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -80,7 +80,8 @@
Q_EMIT q->hwAddressChanged(hwAddress);
} else if (property == QLatin1String("Slaves")) {
QStringList list;
- Q_FOREACH (const QDBusObjectPath & op, qdbus_cast<
QList<QDBusObjectPath> >(value)) {
+ const QList<QDBusObjectPath> opList = qdbus_cast<
QList<QDBusObjectPath> >(value);
+ for (const QDBusObjectPath &op : opList) {
list << op.path();
}
slaves = list;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/bridgedevice.cpp
new/networkmanager-qt-5.70.0/src/bridgedevice.cpp
--- old/networkmanager-qt-5.69.0/src/bridgedevice.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/bridgedevice.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -78,7 +78,8 @@
Q_EMIT q->hwAddressChanged(hwAddress);
} else if (property == QLatin1String("Slaves")) {
QStringList list;
- Q_FOREACH (const QDBusObjectPath & op, qdbus_cast<
QList<QDBusObjectPath> >(value)) {
+ const QList<QDBusObjectPath> opList = qdbus_cast<
QList<QDBusObjectPath> >(value);
+ for (const QDBusObjectPath & op : opList) {
list << op.path();
}
slaves = list;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/device.cpp
new/networkmanager-qt-5.70.0/src/device.cpp
--- old/networkmanager-qt-5.69.0/src/device.cpp 2020-04-05 00:38:36.000000000
+0200
+++ new/networkmanager-qt-5.70.0/src/device.cpp 2020-05-03 00:01:33.000000000
+0200
@@ -234,18 +234,22 @@
Q_EMIT q->autoconnectChanged();
} else if (property == QLatin1String("AvailableConnections")) {
QStringList newAvailableConnections;
- QList<QDBusObjectPath> availableConnectionsTmp = qdbus_cast<
QList<QDBusObjectPath> >(value);
- Q_FOREACH (const QDBusObjectPath & availableConnection,
availableConnectionsTmp) {
+ const QList<QDBusObjectPath> availableConnectionsTmp = qdbus_cast<
QList<QDBusObjectPath> >(value);
+ for (const QDBusObjectPath &availableConnection :
availableConnectionsTmp) {
newAvailableConnections << availableConnection.path();
if (!availableConnections.contains(availableConnection.path())) {
availableConnections << availableConnection.path();
Q_EMIT
q->availableConnectionAppeared(availableConnection.path());
}
}
- Q_FOREACH (const QString & availableConnection, availableConnections) {
+ auto it = availableConnections.begin();
+ while (it != availableConnections.end()) {
+ const QString availableConnection = *it;
if (!newAvailableConnections.contains(availableConnection)) {
- availableConnections.removeOne(availableConnection);
+ it = availableConnections.erase(it);
Q_EMIT q->availableConnectionDisappeared(availableConnection);
+ } else {
+ ++it;
}
}
Q_EMIT q->availableConnectionChanged();
@@ -402,7 +406,7 @@
Q_D(const Device);
NetworkManager::Connection::List list;
- Q_FOREACH (const QString & availableConnection, d->availableConnections) {
+ for (const QString &availableConnection :
qAsConst(d->availableConnections)) {
NetworkManager::Connection::Ptr connection =
NetworkManager::findConnection(availableConnection);
if (connection) {
list << connection;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/dnsconfiguration.cpp
new/networkmanager-qt-5.70.0/src/dnsconfiguration.cpp
--- old/networkmanager-qt-5.69.0/src/dnsconfiguration.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/dnsconfiguration.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -93,11 +93,13 @@
map["options"] = d->options;
QVariantMap domains;
- Q_FOREACH (const NetworkManager::DnsDomain &domain, d->domains) {
+ for (const NetworkManager::DnsDomain &domain : qAsConst(d->domains)) {
QVariantMap contents;
QStringList serversList;
- Q_FOREACH (const QHostAddress &address, domain.servers())
+ const QList<QHostAddress> servers = domain.servers();
+ for (const QHostAddress &address : servers) {
serversList.append(address.toString());
+ }
contents["servers"] = serversList;
contents["options"] = domain.options();
domains[domain.name()] = contents;
@@ -116,10 +118,12 @@
QVariantMap domains = map["domains"].toMap();
QVariantMap::const_iterator i = domains.constBegin();
while (i != domains.constEnd()) {
- QVariantMap contents = i.value().toMap();
+ const QVariantMap contents = i.value().toMap();
QList<QHostAddress> addressList;
- Q_FOREACH (const QString &server, contents["servers"].toStringList())
+ const QStringList serversList = contents["servers"].toStringList();
+ for (const QString &server : serversList) {
addressList.append(QHostAddress(server));
+ }
NetworkManager::DnsDomain domain(i.key(),
addressList,
contents["options"].toStringList());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/fakenetwork/fakenetwork.cpp
new/networkmanager-qt-5.70.0/src/fakenetwork/fakenetwork.cpp
--- old/networkmanager-qt-5.69.0/src/fakenetwork/fakenetwork.cpp
2020-04-05 00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/fakenetwork/fakenetwork.cpp
2020-05-03 00:01:33.000000000 +0200
@@ -182,15 +182,17 @@
QDBusConnection::sessionBus().registerObject(QLatin1String("/org/kde/fakenetwork"),
this, QDBusConnection::ExportScriptableContents);
QDBusConnection::sessionBus().registerObject(QLatin1String("/org/kde/fakenetwork/Settings"),
m_settings, QDBusConnection::ExportScriptableContents);
- Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
- QDBusConnection::sessionBus().registerObject(devicePath.path(),
m_devices.value(devicePath), QDBusConnection::ExportScriptableContents);
+ for (auto it = m_devices.cbegin(); it != m_devices.cend(); ++it) {
+ const QDBusObjectPath &devicePath = it.key();
+ QDBusConnection::sessionBus().registerObject(devicePath.path(),
it.value(), QDBusConnection::ExportScriptableContents);
Q_EMIT DeviceAdded(devicePath);
}
}
void FakeNetwork::unregisterService()
{
- Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
+ for (auto it = m_devices.cbegin(); it != m_devices.cend(); ++it) {
+ const QDBusObjectPath &devicePath = it.key();
QDBusConnection::sessionBus().unregisterObject(devicePath.path());
Q_EMIT DeviceRemoved(devicePath);
}
@@ -404,7 +406,7 @@
NetworkManager::ConnectionSettings::ConnectionType type =
NetworkManager::ConnectionSettings::typeFromString(settings.value(QLatin1String("connection")).value(QLatin1String("type")).toString());
if (!m_devices.isEmpty()) {
Device *selectedDevice = nullptr;
- Q_FOREACH (Device * device, m_devices.values()) {
+ for (Device *device : qAsConst(m_devices)) {
if (type == NetworkManager::ConnectionSettings::Wired &&
device->deviceType() == NetworkManager::Device::Ethernet) {
selectedDevice = device;
device->addAvailableConnection(connection);
@@ -430,7 +432,7 @@
void FakeNetwork::onConnectionRemoved(const QDBusObjectPath &connection)
{
- Q_FOREACH (Device * device, m_devices.values()) {
+ for (Device *device : qAsConst(m_devices)) {
if (device && device->availableConnections().contains(connection)) {
device->removeAvailableConnection(connection);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/fakenetwork/settings.cpp
new/networkmanager-qt-5.70.0/src/fakenetwork/settings.cpp
--- old/networkmanager-qt-5.69.0/src/fakenetwork/settings.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/fakenetwork/settings.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -19,7 +19,8 @@
Settings::~Settings()
{
- Q_FOREACH (const QDBusObjectPath & connection, m_connections.keys()) {
+ for (auto it = m_connections.cbegin(); it != m_connections.cend(); ++it) {
+ const QDBusObjectPath &connection = it.key();
QDBusConnection::sessionBus().unregisterObject(connection.path());
Q_EMIT ConnectionRemoved(connection);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/fakenetwork/wirelessdevice.cpp
new/networkmanager-qt-5.70.0/src/fakenetwork/wirelessdevice.cpp
--- old/networkmanager-qt-5.69.0/src/fakenetwork/wirelessdevice.cpp
2020-04-05 00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/fakenetwork/wirelessdevice.cpp
2020-05-03 00:01:33.000000000 +0200
@@ -20,7 +20,8 @@
WirelessDevice::~WirelessDevice()
{
- Q_FOREACH (const QDBusObjectPath & ap, m_accessPoints.keys()) {
+ for (auto it = m_accessPoints.cbegin(); it != m_accessPoints.cend(); ++it)
{
+ const QDBusObjectPath &ap = it.key();
QDBusConnection::sessionBus().unregisterObject(ap.path());
Q_EMIT AccessPointRemoved(ap);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/ipconfig.cpp
new/networkmanager-qt-5.70.0/src/ipconfig.cpp
--- old/networkmanager-qt-5.69.0/src/ipconfig.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/ipconfig.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -75,8 +75,8 @@
QList<NetworkManager::IpAddress> addressObjects;
QList<NetworkManager::IpRoute> routeObjects;
if (NetworkManager::checkVersion(1, 0, 0)) {
- NMVariantMapList addresses = iface.addressData();
- Q_FOREACH (const QVariantMap &addressList, addresses) {
+ const NMVariantMapList addresses = iface.addressData();
+ for (const QVariantMap &addressList : addresses) {
if (addressList.contains(QLatin1String("address")) &&
addressList.contains(QLatin1String("prefix"))) {
NetworkManager::IpAddress address;
@@ -89,8 +89,8 @@
}
}
- NMVariantMapList routes = iface.routeData();
- Q_FOREACH (const QVariantMap &routeList, routes) {
+ const NMVariantMapList routes = iface.routeData();
+ for (const QVariantMap &routeList : routes) {
if (routeList.contains(QLatin1String("address")) &&
routeList.contains(QLatin1String("prefix"))) {
NetworkManager::IpRoute route;
@@ -108,8 +108,8 @@
}
} else {
//convert ipaddresses into object
- UIntListList addresses = iface.addresses();
- Q_FOREACH (const UIntList & addressList, addresses) {
+ const UIntListList addresses = iface.addresses();
+ for (const UIntList &addressList : addresses) {
if (addressList.count() == 3) {
NetworkManager::IpAddress address;
address.setIp(QHostAddress(ntohl(addressList[0])));
@@ -119,8 +119,8 @@
}
}
//convert routes into objects
- UIntListList routes = iface.routes();
- Q_FOREACH (const UIntList & routeList, routes) {
+ const UIntListList routes = iface.routes();
+ for (const UIntList &routeList : routes) {
if (routeList.count() == 4) {
NetworkManager::IpRoute route;
route.setIp(QHostAddress(ntohl(routeList[0])));
@@ -133,7 +133,8 @@
}
// nameservers' IP addresses are always in network byte order
QList<QHostAddress> nameservers;
- Q_FOREACH (uint nameserver, iface.nameservers()) {
+ const QList<uint> ifaceNameservers = iface.nameservers();
+ for (uint nameserver : ifaceNameservers) {
nameservers << QHostAddress(ntohl(nameserver));
}
@@ -163,8 +164,8 @@
QList<NetworkManager::IpAddress> addressObjects;
QList<NetworkManager::IpRoute> routeObjects;
if (NetworkManager::checkVersion(1, 0, 0)) {
- NMVariantMapList addresses = iface.addressData();
- Q_FOREACH (const QVariantMap &addressList, addresses) {
+ const NMVariantMapList addresses = iface.addressData();
+ for (const QVariantMap &addressList : addresses) {
if (addressList.contains(QLatin1String("address")) &&
addressList.contains(QLatin1String("prefix"))) {
NetworkManager::IpAddress address;
@@ -177,8 +178,8 @@
}
}
- NMVariantMapList routes = iface.routeData();
- Q_FOREACH (const QVariantMap &routeList, routes) {
+ const NMVariantMapList routes = iface.routeData();
+ for (const QVariantMap &routeList : routes) {
if (routeList.contains(QLatin1String("address")) &&
routeList.contains(QLatin1String("prefix"))) {
NetworkManager::IpRoute route;
@@ -195,8 +196,8 @@
}
}
} else {
- IpV6DBusAddressList addresses = iface.addresses();
- Q_FOREACH (const IpV6DBusAddress & address, addresses) {
+ const IpV6DBusAddressList addresses = iface.addresses();
+ for (const IpV6DBusAddress &address : addresses) {
Q_IPV6ADDR addr;
Q_IPV6ADDR gateway;
for (int i = 0; i < 16; i++) {
@@ -212,8 +213,8 @@
addressObjects << addressEntry;
}
- IpV6DBusRouteList routes = iface.routes();
- Q_FOREACH (const IpV6DBusRoute & route, routes) {
+ const IpV6DBusRouteList routes = iface.routes();
+ for (const IpV6DBusRoute &route : routes) {
Q_IPV6ADDR dest;
Q_IPV6ADDR nexthop;
for (int i = 0; i < 16; i++) {
@@ -232,7 +233,8 @@
}
QList<QHostAddress> nameservers;
- Q_FOREACH (const QByteArray & nameserver, iface.nameservers()) {
+ const QList<QByteArray> ifaceNservers = iface.nameservers();
+ for (const QByteArray &nameserver : ifaceNservers) {
Q_IPV6ADDR address;
for (int i = 0; i < 16; i++) {
address[i] = static_cast<quint8>(nameserver[i]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/manager.cpp
new/networkmanager-qt-5.70.0/src/manager.cpp
--- old/networkmanager-qt-5.69.0/src/manager.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/manager.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -165,9 +165,9 @@
QTimer::singleShot(0, [] { qobject_cast<SettingsPrivate
*>(settingsNotifier())->init(); });
if (iface.isValid()) {
- QList <QDBusObjectPath> devices = iface.devices();
+ const QList <QDBusObjectPath> devices = iface.devices();
qCDebug(NMQT) << "Device list";
- Q_FOREACH (const QDBusObjectPath & op, devices) {
+ for (const QDBusObjectPath &op : devices) {
networkInterfaceMap.insert(op.path(), Device::Ptr());
Q_EMIT deviceAdded(op.path());
qCDebug(NMQT) << " " << op.path();
@@ -744,7 +744,7 @@
while (it != changedProperties.constEnd()) {
const QString property = it.key();
if (property == QLatin1String("ActiveConnections")) {
- QList<QDBusObjectPath> activePaths = qdbus_cast<
QList<QDBusObjectPath> >(*it);
+ const QList<QDBusObjectPath> activePaths = qdbus_cast<
QList<QDBusObjectPath> >(*it);
if (activePaths.isEmpty()) {
QMap<QString, ActiveConnection::Ptr>::const_iterator it =
m_activeConnections.constBegin();
while (it != m_activeConnections.constEnd()) {
@@ -754,7 +754,7 @@
m_activeConnections.clear();
} else {
QStringList knownConnections = m_activeConnections.keys();
- Q_FOREACH (const QDBusObjectPath & ac, activePaths) {
+ for (const QDBusObjectPath &ac : activePaths) {
if (!m_activeConnections.contains(ac.path())) {
m_activeConnections.insert(ac.path(),
NetworkManager::ActiveConnection::Ptr());
Q_EMIT activeConnectionAdded(ac.path());
@@ -763,7 +763,7 @@
}
// qCDebug(NMQT) << " " << ac.path();
}
- Q_FOREACH (const QString & path, knownConnections) {
+ for (const QString &path : qAsConst(knownConnections)) {
m_activeConnections.remove(path);
Q_EMIT activeConnectionRemoved(path);
}
@@ -921,9 +921,9 @@
{
NetworkManager::ActiveConnection::List list;
- // We do not use const_iterator here because
- // findRegisteredActiveConnection() changes m_activeConnections.
- foreach (const QString &key, m_activeConnections.keys()) {
+ // Take a copy because findRegisteredActiveConnection() may change
m_activeConnections.
+ const QStringList keyList = m_activeConnections.keys();
+ for (const QString &key : keyList) {
NetworkManager::ActiveConnection::Ptr activeConnection =
findRegisteredActiveConnection(key);
if (activeConnection) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/settings/connectionsettings.cpp
new/networkmanager-qt-5.70.0/src/settings/connectionsettings.cpp
--- old/networkmanager-qt-5.69.0/src/settings/connectionsettings.cpp
2020-04-05 00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/connectionsettings.cpp
2020-05-03 00:01:33.000000000 +0200
@@ -509,8 +509,8 @@
setInterfaceName(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_INTERFACE_NAME)).toString());
}
if
(connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_PERMISSIONS)))
{
- QStringList permissions =
connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_PERMISSIONS)).toStringList();
- Q_FOREACH (const QString & permission, permissions) {
+ const QStringList permissions =
connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_PERMISSIONS)).toStringList();
+ for (const QString & permission : permissions) {
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList split = permission.split(QLatin1Char(':'),
QString::KeepEmptyParts);
#else
@@ -577,7 +577,8 @@
setStableId(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_STABLE_ID)).toString());
}
- Q_FOREACH (const Setting::Ptr & setting, settings()) {
+ const auto settingsList = settings();
+ for (const Setting::Ptr &setting : settingsList) {
if (map.contains(setting->name())) {
setting->fromMap(map.value(setting->name()));
setting->setInitialized(true);
@@ -671,7 +672,8 @@
result.insert(QLatin1String(NM_SETTING_CONNECTION_SETTING_NAME),
connectionSetting);
- Q_FOREACH (const Setting::Ptr & setting, settings()) {
+ const auto settingsList = settings();
+ for (const Setting::Ptr &setting : settingsList) {
QVariantMap map = setting->toMap();
if (!setting->isNull()) {
result.insert(setting->name(), map);
@@ -970,7 +972,8 @@
NetworkManager::Setting::Ptr
NetworkManager::ConnectionSettings::setting(Setting::SettingType type) const
{
- Q_FOREACH (const Setting::Ptr & setting, settings()) {
+ const auto settingsList = settings();
+ for (const Setting::Ptr &setting : settingsList) {
if (setting->type() == type) {
return setting;
}
@@ -1016,7 +1019,8 @@
dbg.nospace() << NM_SETTING_CONNECTION_METERED << ": " <<
setting.metered() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_STABLE_ID << ": " <<
setting.stableId() << '\n';
dbg.nospace() << "===================\n";
- Q_FOREACH (const Setting::Ptr & settingPtr, setting.settings()) {
+ const auto settingsList = setting.settings();
+ for (const Setting::Ptr &settingPtr : settingsList) {
dbg.nospace() <<
settingPtr->typeAsString(settingPtr->type()).toUpper() << " SETTINGS\n";
dbg.nospace() << "---------------------------\n";
switch (settingPtr->type()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/settings/dcbsetting.cpp
new/networkmanager-qt-5.70.0/src/settings/dcbsetting.cpp
--- old/networkmanager-qt-5.69.0/src/settings/dcbsetting.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/dcbsetting.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -500,37 +500,43 @@
dbg.nospace() << NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS << ": " <<
setting.priorityFlowControlFlags() << '\n';
dbg.nospace() << NM_SETTING_DCB_PRIORITY_FLOW_CONTROL << ": ";
- Q_FOREACH (const quint32 enabled, setting.priorityFlowControl()) {
+ const auto flowControlList = setting.priorityFlowControl();
+ for (const quint32 enabled : flowControlList) {
dbg.nospace() << enabled << ' ';
}
dbg.nospace() << '\n';
dbg.nospace() << NM_SETTING_DCB_PRIORITY_BANDWIDTH << ": ";
- Q_FOREACH (const quint32 bandwidthPercent, setting.priorityBandwidth()) {
+ const auto bwList = setting.priorityBandwidth();
+ for (const quint32 bandwidthPercent : bwList) {
dbg.nospace() << bandwidthPercent << ' ';
}
dbg.nospace() << '\n';
dbg.nospace() << NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH << ": ";
- Q_FOREACH (const quint32 bandwidthPercent,
setting.priorityGroupBandwidth()) {
+ const auto gbwList = setting.priorityGroupBandwidth();
+ for (const quint32 bandwidthPercent : gbwList) {
dbg.nospace() << bandwidthPercent << ' ';
}
dbg.nospace() << '\n';
dbg.nospace() << NM_SETTING_DCB_PRIORITY_GROUP_ID << ": ";
- Q_FOREACH (const quint32 groupId, setting.priorityGroupId()) {
+ const auto groupIds = setting.priorityGroupId();
+ for (const quint32 groupId : groupIds) {
dbg.nospace() << groupId << ' ';
}
dbg.nospace() << '\n';
dbg.nospace() << NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH << ": ";
- Q_FOREACH (const quint32 strict, setting.priorityStrictBandwidth()) {
+ const auto strictList = setting.priorityStrictBandwidth();
+ for (const quint32 strict : strictList) {
dbg.nospace() << strict << ' ';
}
dbg.nospace() << '\n';
dbg.nospace() << NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS << ": ";
- Q_FOREACH (const quint32 trafficClass, setting.priorityTrafficClass()) {
+ const auto trafficList = setting.priorityTrafficClass();
+ for (const quint32 trafficClass : trafficList) {
dbg.nospace() << trafficClass << ' ';
}
dbg.nospace() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/settings/ipv4setting.cpp
new/networkmanager-qt-5.70.0/src/settings/ipv4setting.cpp
--- old/networkmanager-qt-5.69.0/src/settings/ipv4setting.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/ipv4setting.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -379,7 +379,7 @@
temp =
setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS)).value<QList<uint> >();
}
- Q_FOREACH (const uint utmp, temp) {
+ for (const uint utmp : qAsConst(temp)) {
QHostAddress tmpHost(ntohl(utmp));
dbusDns << tmpHost;
}
@@ -401,7 +401,7 @@
temp =
setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES)).value<QList<QList<uint>
> >();
}
- Q_FOREACH (const QList<uint> &uintList, temp) {
+ for (const QList<uint> &uintList : qAsConst(temp)) {
if (uintList.count() != 3) {
continue;
}
@@ -430,7 +430,7 @@
temp =
setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).value<QList<QList<uint>
> >();
}
- Q_FOREACH (const QList<uint> &uintList, temp) {
+ for (const QList<uint> &uintList : qAsConst(temp)) {
if (uintList.count() != 4) {
continue;
}
@@ -530,7 +530,8 @@
if (!dns().isEmpty()) {
QList<uint> dbusDns;
- Q_FOREACH (const QHostAddress & dns, dns()) {
+ const QList<QHostAddress> dnsList = dns();
+ for (const QHostAddress &dns : dnsList) {
dbusDns << htonl(dns.toIPv4Address());
}
@@ -543,7 +544,8 @@
if (!addresses().isEmpty()) {
QList<QList<uint> > dbusAddresses;
- Q_FOREACH (const NetworkManager::IpAddress & addr, addresses()) {
+ const auto addressesList = addresses();
+ for (const NetworkManager::IpAddress &addr : addressesList) {
QList<uint> dbusAddress;
dbusAddress << htonl(addr.ip().toIPv4Address())
<< addr.prefixLength()
@@ -556,7 +558,8 @@
if (!routes().isEmpty()) {
QList<QList<uint> > dbusRoutes;
- Q_FOREACH (const NetworkManager::IpRoute & route, routes()) {
+ const auto routesList = routes();
+ for (const NetworkManager::IpRoute & route : routesList) {
QList<uint> dbusRoute;
dbusRoute << htonl(route.ip().toIPv4Address())
<< route.prefixLength()
@@ -638,16 +641,19 @@
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_METHOD << ": " <<
setting.method() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS << ":\n";
- Q_FOREACH (const QHostAddress & address, setting.dns()) {
+ const QList<QHostAddress> dnsList = setting.dns();
+ for (const QHostAddress &address : dnsList) {
dbg.nospace() << address.toString() << '\n';
}
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS_SEARCH << ": " <<
setting.dnsSearch() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ADDRESSES << '\n';
- Q_FOREACH (const NetworkManager::IpAddress & address, setting.addresses())
{
+ const auto addressesList = setting.addresses();
+ for (const NetworkManager::IpAddress &address : addressesList) {
dbg.nospace() << address.ip() << ": " << address.gateway() << ": " <<
address.netmask() << '\n';
}
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ROUTES << '\n';
- Q_FOREACH (const NetworkManager::IpRoute & route, setting.routes()) {
+ const auto routesList = setting.routes();
+ for (const NetworkManager::IpRoute &route : routesList) {
dbg.nospace() << route.ip() << ": " << route.netmask() << ": " <<
route.nextHop() << ": " << route.metric() << '\n';
}
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC << ":" <<
setting.routeMetric() << '\n';
@@ -664,14 +670,16 @@
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY << ": " <<
setting.dnsPriority() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_GATEWAY << ": " <<
setting.gateway() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA << ": " << '\n';
- Q_FOREACH (const QVariantMap & addressData, setting.addressData()) {
+ const NMVariantMapList addDataList = setting.addressData();
+ for (const QVariantMap &addressData : addDataList) {
QVariantMap::const_iterator i = addressData.constBegin();
while (i != addressData.constEnd()) {
dbg.nospace() << i.key() << ": " << i.value() << '\n';
}
}
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ROUTE_DATA << ": " << '\n';
- Q_FOREACH (const QVariantMap & routeData, setting.routeData()) {
+ const NMVariantMapList routeDataList = setting.routeData();
+ for (const QVariantMap &routeData : routeDataList) {
QVariantMap::const_iterator i = routeData.constBegin();
while (i != routeData.constEnd()) {
dbg.nospace() << i.key() << ": " << i.value() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/settings/ipv6setting.cpp
new/networkmanager-qt-5.70.0/src/settings/ipv6setting.cpp
--- old/networkmanager-qt-5.69.0/src/settings/ipv6setting.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/ipv6setting.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -396,7 +396,7 @@
temp =
setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS)).value<QList<QByteArray>
>();
}
- Q_FOREACH (const QByteArray & utmp, temp) {
+ for (const QByteArray &utmp : qAsConst(temp)) {
dbusDns << ipv6AddressAsHostAddress(utmp);
}
@@ -417,7 +417,7 @@
}
QList<NetworkManager::IpAddress> addresses;
- Q_FOREACH (const IpV6DBusAddress & addressMap, temp) {
+ for (const IpV6DBusAddress &addressMap : qAsConst(temp)) {
if (addressMap.address.isEmpty() || !addressMap.prefix ||
addressMap.gateway.isEmpty()) {
continue;
}
@@ -446,7 +446,7 @@
}
QList<NetworkManager::IpRoute> routes;
- Q_FOREACH (const IpV6DBusRoute & routeMap, temp) {
+ for (const IpV6DBusRoute &routeMap : qAsConst(temp)) {
if (routeMap.destination.isEmpty() || !routeMap.prefix ||
routeMap.nexthop.isEmpty() || !routeMap.metric) {
continue;
}
@@ -548,7 +548,8 @@
if (!dns().isEmpty()) {
QList<QByteArray> dbusDns;
- Q_FOREACH (const QHostAddress & dns, dns()) {
+ const QList<QHostAddress> dnsList = dns();
+ for (const QHostAddress &dns : dnsList) {
dbusDns << ipv6AddressFromHostAddress(dns);
}
setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS),
QVariant::fromValue(dbusDns));
@@ -560,7 +561,8 @@
if (!addresses().isEmpty()) {
QList<IpV6DBusAddress> dbusAddresses;
- Q_FOREACH (const NetworkManager::IpAddress & addr, addresses()) {
+ const QList<NetworkManager::IpAddress> addressesList = addresses();
+ for (const NetworkManager::IpAddress &addr : addressesList) {
IpV6DBusAddress dbusAddress;
dbusAddress.address = ipv6AddressFromHostAddress(addr.ip());
dbusAddress.prefix = addr.prefixLength();
@@ -573,7 +575,8 @@
if (!routes().isEmpty()) {
QList<IpV6DBusRoute> dbusRoutes;
- Q_FOREACH (const NetworkManager::IpRoute & route, routes()) {
+ const QList<NetworkManager::IpRoute> routesList = routes();
+ for (const NetworkManager::IpRoute &route : routesList) {
IpV6DBusRoute dbusRoute;
dbusRoute.destination = ipv6AddressFromHostAddress(route.ip());
dbusRoute.prefix = route.prefixLength();
@@ -657,16 +660,19 @@
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_METHOD << ": " <<
setting.method() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DNS << '\n';
- Q_FOREACH (const QHostAddress & address, setting.dns()) {
+ const QList<QHostAddress> hostAdresses = setting.dns();
+ for (const QHostAddress &address : hostAdresses) {
dbg.nospace() << address.toString() << '\n';
}
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DNS_SEARCH << ": " <<
setting.dnsSearch() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ADDRESSES << '\n';
- Q_FOREACH (const NetworkManager::IpAddress & address, setting.addresses())
{
+ const QList<NetworkManager::IpAddress> ipList = setting.addresses();
+ for (const NetworkManager::IpAddress &address : ipList) {
dbg.nospace() << address.ip().toString() << ": " <<
address.gateway().toString() << ": " << address.netmask() << '\n';
}
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ROUTES << '\n';
- Q_FOREACH (const NetworkManager::IpRoute & route, setting.routes()) {
+ const QList<NetworkManager::IpRoute> routesList = setting.routes();
+ for (const NetworkManager::IpRoute &route : routesList) {
dbg.nospace() << route.ip().toString() << ": " << route.metric() << ":
" << route.nextHop().toString() << ": " << route.metric() << '\n';
}
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC << ":" <<
setting.routeMetric() << '\n';
@@ -683,14 +689,16 @@
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_TOKEN << ": " << setting.token()
<< '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DNS_OPTIONS << ": " <<
setting.dnsOptions() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA << ": " << '\n';
- Q_FOREACH (const QVariantMap & addressData, setting.addressData()) {
+ const auto dataList = setting.addressData();
+ for (const QVariantMap &addressData : dataList) {
QVariantMap::const_iterator i = addressData.constBegin();
while (i != addressData.constEnd()) {
dbg.nospace() << i.key() << ": " << i.value() << '\n';
}
}
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ROUTE_DATA << ": " << '\n';
- Q_FOREACH (const QVariantMap & routeData, setting.routeData()) {
+ const auto routeDataList = setting.routeData();
+ for (const QVariantMap &routeData : routeDataList) {
QVariantMap::const_iterator i = routeData.constBegin();
while (i != routeData.constEnd()) {
dbg.nospace() << i.key() << ": " << i.value() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/settings/security8021xsetting.cpp
new/networkmanager-qt-5.70.0/src/settings/security8021xsetting.cpp
--- old/networkmanager-qt-5.69.0/src/settings/security8021xsetting.cpp
2020-04-05 00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/security8021xsetting.cpp
2020-05-03 00:01:33.000000000 +0200
@@ -619,7 +619,7 @@
if (setting.contains(QLatin1String(NM_SETTING_802_1X_EAP))) {
const QStringList methods =
setting.value(QLatin1String(NM_SETTING_802_1X_EAP)).toStringList();
QList<EapMethod> eapMethods;
- Q_FOREACH (const QString & method, methods) {
+ for (const QString &method : methods) {
if (method == "leap") {
eapMethods << EapMethodLeap;
} else if (method == "md5") {
@@ -828,7 +828,8 @@
if (!eapMethods().isEmpty()) {
QStringList methods;
- Q_FOREACH (const EapMethod & method, eapMethods()) {
+ const auto methodList = eapMethods();
+ for (const EapMethod &method : methodList) {
if (method == EapMethodLeap) {
methods << "leap";
} else if (method == EapMethodMd5) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/settings/tcsetting.cpp
new/networkmanager-qt-5.70.0/src/settings/tcsetting.cpp
--- old/networkmanager-qt-5.69.0/src/settings/tcsetting.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/tcsetting.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -105,14 +105,16 @@
dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
dbg.nospace() << NM_SETTING_TC_CONFIG_QDISCS << ": " << '\n';
- Q_FOREACH (const QVariantMap & qdisc, setting.qdiscs()) {
+ const NMVariantMapList qdiscList = setting.qdiscs();
+ for (const QVariantMap &qdisc : qdiscList) {
QVariantMap::const_iterator i = qdisc.constBegin();
while (i != qdisc.constEnd()) {
dbg.nospace() << i.key() << ": " << i.value() << '\n';
}
}
dbg.nospace() << NM_SETTING_TC_CONFIG_TFILTERS << ": " << '\n';
- Q_FOREACH (const QVariantMap & tfilter, setting.tfilters()) {
+ const NMVariantMapList tfiltersList = setting.tfilters();
+ for (const QVariantMap &tfilter : tfiltersList) {
QVariantMap::const_iterator i = tfilter.constBegin();
while (i != tfilter.constEnd()) {
dbg.nospace() << i.key() << ": " << i.value() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/settings/teamportsetting.cpp
new/networkmanager-qt-5.70.0/src/settings/teamportsetting.cpp
--- old/networkmanager-qt-5.69.0/src/settings/teamportsetting.cpp
2020-04-05 00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/teamportsetting.cpp
2020-05-03 00:01:33.000000000 +0200
@@ -238,7 +238,8 @@
dbg.nospace() << NM_SETTING_TEAM_PORT_STICKY << ": " << setting.sticky()
<< '\n';
dbg.nospace() << NM_SETTING_TEAM_PORT_LINK_WATCHERS << ": " << '\n';
- Q_FOREACH (const QVariantMap & linkWatcher, setting.linkWatchers()) {
+ const NMVariantMapList variantMapList = setting.linkWatchers();
+ for (const QVariantMap &linkWatcher : variantMapList) {
QVariantMap::const_iterator i = linkWatcher.constBegin();
while (i != linkWatcher.constEnd()) {
dbg.nospace() << i.key() << ": " << i.value() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.69.0/src/settings/wirelesssecuritysetting.cpp
new/networkmanager-qt-5.70.0/src/settings/wirelesssecuritysetting.cpp
--- old/networkmanager-qt-5.69.0/src/settings/wirelesssecuritysetting.cpp
2020-04-05 00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings/wirelesssecuritysetting.cpp
2020-05-03 00:01:33.000000000 +0200
@@ -450,7 +450,7 @@
if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PROTO))) {
const QStringList strList =
map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PROTO)).toStringList();
QList<WpaProtocolVersion> list;
- Q_FOREACH (const QString & str, strList) {
+ for (const QString &str : strList) {
if (str == "wpa") {
list.push_back(Wpa);
} else if (str == "rsn") {
@@ -463,7 +463,7 @@
if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PAIRWISE))) {
const QStringList strList =
map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_PAIRWISE)).toStringList();
QList<WpaEncryptionCapabilities> list;
- Q_FOREACH (const QString & str, strList) {
+ for (const QString &str : strList) {
if (str == "wep40") {
list.push_back(Wep40);
} else if (str == "wep104") {
@@ -480,7 +480,7 @@
if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SECURITY_GROUP))) {
const QStringList strList =
map.value(QLatin1String(NM_SETTING_WIRELESS_SECURITY_GROUP)).toStringList();
QList<WpaEncryptionCapabilities> list;
- Q_FOREACH (const QString & str, strList) {
+ for (const QString &str : strList) {
if (str == "wep40") {
list.push_back(Wep40);
} else if (str == "wep104") {
@@ -579,7 +579,8 @@
if (!proto().isEmpty()) {
QStringList strList;
- Q_FOREACH (const WpaProtocolVersion & version, proto()) {
+ const auto protoList = proto();
+ for (const WpaProtocolVersion &version : protoList) {
if (version == Wpa) {
strList << "wpa";
} else if (version == Rsn) {
@@ -591,7 +592,8 @@
if (!pairwise().isEmpty()) {
QStringList strList;
- Q_FOREACH (const WpaEncryptionCapabilities & capability, pairwise()) {
+ const auto encryptions = pairwise();
+ for (const WpaEncryptionCapabilities &capability : encryptions) {
if (capability == Wep40) {
strList << "wep40";
} else if (capability == Wep104) {
@@ -607,7 +609,8 @@
if (!group().isEmpty()) {
QStringList strList;
- Q_FOREACH (const WpaEncryptionCapabilities & capability, group()) {
+ const auto encryptions = group();
+ for (const WpaEncryptionCapabilities &capability : encryptions) {
if (capability == Wep40) {
strList << "wep40";
} else if (capability == Wep104) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/settings.cpp
new/networkmanager-qt-5.70.0/src/settings.cpp
--- old/networkmanager-qt-5.69.0/src/settings.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/settings.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -46,9 +46,9 @@
void NetworkManager::SettingsPrivate::init()
{
- QList<QDBusObjectPath> connectionList = iface.connections();
+ const QList<QDBusObjectPath> connectionList = iface.connections();
qCDebug(NMQT) << "Connections list";
- Q_FOREACH (const QDBusObjectPath & connection, connectionList) {
+ for (const QDBusObjectPath &connection : connectionList) {
if (!connections.contains(connection.path())) {
connections.insert(connection.path(), Connection::Ptr());
Q_EMIT connectionAdded(connection.path());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/teamdevice.cpp
new/networkmanager-qt-5.70.0/src/teamdevice.cpp
--- old/networkmanager-qt-5.69.0/src/teamdevice.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/teamdevice.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -85,7 +85,8 @@
Q_EMIT q->hwAddressChanged(hwAddress);
} else if (property == QLatin1String("Slaves")) {
QStringList list;
- Q_FOREACH (const QDBusObjectPath & op, qdbus_cast<
QList<QDBusObjectPath> >(value)) {
+ const QList<QDBusObjectPath> opList = qdbus_cast<
QList<QDBusObjectPath> >(value);
+ for (const QDBusObjectPath & op : opList) {
list << op.path();
}
slaves = list;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/utils.cpp
new/networkmanager-qt-5.70.0/src/utils.cpp
--- old/networkmanager-qt-5.69.0/src/utils.cpp 2020-04-05 00:38:36.000000000
+0200
+++ new/networkmanager-qt-5.70.0/src/utils.cpp 2020-05-03 00:01:33.000000000
+0200
@@ -48,14 +48,14 @@
QByteArray NetworkManager::macAddressFromString(const QString &s)
{
- QStringList macStringList = s.split(':');
+ const QStringList macStringList = s.split(':');
// Q_ASSERT(macStringList.size() == 6);
QByteArray ba;
if (!s.isEmpty()) {
ba.resize(6);
int i = 0;
- Q_FOREACH (const QString & macPart, macStringList) {
+ for (const QString &macPart : macStringList) {
ba[i++] = macPart.toUInt(nullptr, 16);
}
}
@@ -364,15 +364,17 @@
NetworkManager::WirelessSecurityType
NetworkManager::findBestWirelessSecurity(NetworkManager::WirelessDevice::Capabilities
interfaceCaps, bool haveAp, bool adHoc,
NetworkManager::AccessPoint::Capabilities apCaps,
NetworkManager::AccessPoint::WpaFlags apWpa,
NetworkManager::AccessPoint::WpaFlags apRsn)
{
- QList<NetworkManager::WirelessSecurityType> types;
-
// The ordering of this list is a pragmatic combination of security level
and popularity.
// Therefore static WEP is before LEAP and Dynamic WEP because there is no
way to detect
// if an AP is capable of Dynamic WEP and showing Dynamic WEP first would
confuse
// Static WEP users.
- types << NetworkManager::SAE << NetworkManager::Wpa2Eap <<
NetworkManager::Wpa2Psk << NetworkManager::WpaEap << NetworkManager::WpaPsk <<
NetworkManager::StaticWep << NetworkManager::DynamicWep << NetworkManager::Leap
<< NetworkManager::NoneSecurity;
+ const QList<NetworkManager::WirelessSecurityType> types = {
NetworkManager::SAE, NetworkManager::Wpa2Eap,
+
NetworkManager::Wpa2Psk, NetworkManager::WpaEap,
+
NetworkManager::WpaPsk, NetworkManager::StaticWep,
+
NetworkManager::DynamicWep, NetworkManager::Leap,
+
NetworkManager::NoneSecurity };
- Q_FOREACH (NetworkManager::WirelessSecurityType type, types) {
+ for (NetworkManager::WirelessSecurityType type : types) {
if (NetworkManager::securityIsValid(type, interfaceCaps, haveAp,
adHoc, apCaps, apWpa, apRsn)) {
return type;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/wimaxdevice.cpp
new/networkmanager-qt-5.70.0/src/wimaxdevice.cpp
--- old/networkmanager-qt-5.69.0/src/wimaxdevice.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/wimaxdevice.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -21,8 +21,8 @@
#endif
{
qDBusRegisterMetaType<QList<QDBusObjectPath> >();
- QList <QDBusObjectPath> nsps = wimaxIface.nsps();
- Q_FOREACH (const QDBusObjectPath & op, nsps) {
+ const QList <QDBusObjectPath> nsps = wimaxIface.nsps();
+ for (const QDBusObjectPath &op : nsps) {
nspMap.insert(op.path(), NetworkManager::WimaxNsp::Ptr());
//qCDebug(NMQT) << " " << op.path();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/wirelessdevice.cpp
new/networkmanager-qt-5.70.0/src/wirelessdevice.cpp
--- old/networkmanager-qt-5.69.0/src/wirelessdevice.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/wirelessdevice.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -37,9 +37,9 @@
qDBusRegisterMetaType<QList<QDBusObjectPath> >();
- QList <QDBusObjectPath> aps = d->wirelessIface.accessPoints();
+ const QList <QDBusObjectPath> aps = d->wirelessIface.accessPoints();
// qCDebug(NMQT) << "AccessPoint list";
- Q_FOREACH (const QDBusObjectPath & op, aps) {
+ for (const QDBusObjectPath &op : aps) {
// qCDebug(NMQT) << " " << op.path();
d->accessPointAdded(op);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.69.0/src/wirelessnetwork.cpp
new/networkmanager-qt-5.70.0/src/wirelessnetwork.cpp
--- old/networkmanager-qt-5.69.0/src/wirelessnetwork.cpp 2020-04-05
00:38:36.000000000 +0200
+++ new/networkmanager-qt-5.70.0/src/wirelessnetwork.cpp 2020-05-03
00:01:33.000000000 +0200
@@ -62,7 +62,7 @@
int maximumStrength = -1;
NetworkManager::AccessPoint::Ptr strongestAp;
- Q_FOREACH (const NetworkManager::AccessPoint::Ptr & iface, aps) {
+ for (const NetworkManager::AccessPoint::Ptr &iface : qAsConst(aps)) {
if (maximumStrength <= iface->signalStrength()) {
maximumStrength = iface->signalStrength();
strongestAp = iface;
