whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNetworkInterface: Use ranged-for in postProcess 

Use ranged-for loops instead of a normal for-loop with iterators.

Change-Id: I13ba2001b7eb0fff1a0d9474f615a81d02af62f0
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Mårten Nordheim 2017-10-23 15:18:01 +02:00
parent 760e80feb2
commit ea284937ea
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/kernel/qnetworkinterface.cpp
View File

@ -59,19 +59,15 @@ static QList<QNetworkInterfacePrivate *> postProcess(QList<QNetworkInterfacePriv
// The math is:
// broadcast = IP | ~netmask
QList<QNetworkInterfacePrivate *>::Iterator it = list.begin();
const QList<QNetworkInterfacePrivate *>::Iterator end = list.end();
for ( ; it != end; ++it) {
QList<QNetworkAddressEntry>::Iterator addr_it = (*it)->addressEntries.begin();
const QList<QNetworkAddressEntry>::Iterator addr_end = (*it)->addressEntries.end();
for ( ; addr_it != addr_end; ++addr_it) {
if (addr_it->ip().protocol() != QAbstractSocket::IPv4Protocol)
for (QNetworkInterfacePrivate *interface : list) {
for (QNetworkAddressEntry &address : interface->addressEntries) {
if (address.ip().protocol() != QAbstractSocket::IPv4Protocol)
continue;
if (!addr_it->netmask().isNull() && addr_it->broadcast().isNull()) {
QHostAddress bcast = addr_it->ip();
bcast = QHostAddress(bcast.toIPv4Address() | ~addr_it->netmask().toIPv4Address());
addr_it->setBroadcast(bcast);
if (!address.netmask().isNull() && address.broadcast().isNull()) {
QHostAddress bcast = address.ip();
bcast = QHostAddress(bcast.toIPv4Address() | ~address.netmask().toIPv4Address());
address.setBroadcast(bcast);
}
}
}