diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-12-31 17:41:11 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-06 13:39:49 +0000 |
commit | 7984327c40a09cdd79f03a52649484e5f0c5704c (patch) | |
tree | c06c81d439d96af40aeaf52a819f38498477b29a /examples/network/network-chat | |
parent | 0c54e0251f27fab85baa03fff7213600419f491c (diff) |
Network examples: cleanup foreach usage
Replace deprecated foreach macro with range-based for loop
Change-Id: I0d1f2cfd557d02ccc48b41b3fea137baa2962fc1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'examples/network/network-chat')
-rw-r--r-- | examples/network/network-chat/client.cpp | 7 | ||||
-rw-r--r-- | examples/network/network-chat/peermanager.cpp | 12 | ||||
-rw-r--r-- | examples/network/network-chat/peermanager.h | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp index 97c2c44b6b..b76ef18238 100644 --- a/examples/network/network-chat/client.cpp +++ b/examples/network/network-chat/client.cpp @@ -71,8 +71,7 @@ void Client::sendMessage(const QString &message) if (message.isEmpty()) return; - QList<Connection *> connections = peers.values(); - foreach (Connection *connection, connections) + for (Connection *connection : qAsConst(peers)) connection->sendMessage(message); } @@ -90,8 +89,8 @@ bool Client::hasConnection(const QHostAddress &senderIp, int senderPort) const if (!peers.contains(senderIp)) return false; - QList<Connection *> connections = peers.values(senderIp); - foreach (Connection *connection, connections) { + const QList<Connection *> connections = peers.values(senderIp); + for (const Connection *connection : connections) { if (connection->peerPort() == senderPort) return true; } diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp index 38fa2e8e50..5c48edb1b9 100644 --- a/examples/network/network-chat/peermanager.cpp +++ b/examples/network/network-chat/peermanager.cpp @@ -104,9 +104,9 @@ void PeerManager::startBroadcasting() broadcastTimer.start(); } -bool PeerManager::isLocalHostAddress(const QHostAddress &address) +bool PeerManager::isLocalHostAddress(const QHostAddress &address) const { - foreach (QHostAddress localAddress, ipAddresses) { + for (const QHostAddress &localAddress : ipAddresses) { if (address.isEqual(localAddress)) return true; } @@ -125,7 +125,7 @@ void PeerManager::sendBroadcastDatagram() } bool validBroadcastAddresses = true; - foreach (QHostAddress address, broadcastAddresses) { + for (const QHostAddress &address : qAsConst(broadcastAddresses)) { if (broadcastSocket.writeDatagram(datagram, address, broadcastPort) == -1) validBroadcastAddresses = false; @@ -182,8 +182,10 @@ void PeerManager::updateAddresses() { broadcastAddresses.clear(); ipAddresses.clear(); - foreach (QNetworkInterface interface, QNetworkInterface::allInterfaces()) { - foreach (QNetworkAddressEntry entry, interface.addressEntries()) { + const QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces(); + for (const QNetworkInterface &interface : interfaces) { + const QList<QNetworkAddressEntry> entries = interface.addressEntries(); + for (const QNetworkAddressEntry &entry : entries) { QHostAddress broadcastAddress = entry.broadcast(); if (broadcastAddress != QHostAddress::Null && entry.ip() != QHostAddress::LocalHost) { broadcastAddresses << broadcastAddress; diff --git a/examples/network/network-chat/peermanager.h b/examples/network/network-chat/peermanager.h index b79028235b..6105c83115 100644 --- a/examples/network/network-chat/peermanager.h +++ b/examples/network/network-chat/peermanager.h @@ -70,7 +70,7 @@ public: void setServerPort(int port); QString userName() const; void startBroadcasting(); - bool isLocalHostAddress(const QHostAddress &address); + bool isLocalHostAddress(const QHostAddress &address) const; signals: void newConnection(Connection *connection); |