AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fortune* Example: convert simple for-loop to ranged-for

Browse Source 
Ends up shortening the loop, making it easier to read at a glance.

Pick-to: 6.5
Task-number: QTBUG-108875
Change-Id: Ia12a994259b00e9b57f2de48124be9cb38553bf5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Mårten Nordheim 2023-01-13 16:56:05 +01:00
parent 45717db7a5
commit 605eec7b55
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/network/blockingfortuneclient/blockingclient.cpp
View File

@ -14,12 +14,11 @@ BlockingClient::BlockingClient(QWidget *parent)
// find out which IP to connect to // find out which IP to connect to
QString ipAddress; QString ipAddress;
QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses(); const QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
// use the first non-localhost IPv4 address // use the first non-localhost IPv4 address
for (int i = 0; i < ipAddressesList.size(); ++i) { for (const QHostAddress &entry : ipAddressesList) {
if (ipAddressesList.at(i) != QHostAddress::LocalHost && if (entry != QHostAddress::LocalHost && entry.toIPv4Address()) {
ipAddressesList.at(i).toIPv4Address()) { ipAddress = entry.toString();
ipAddress = ipAddressesList.at(i).toString();
break; break;
} }
} }

14
examples/network/fortuneclient/client.cpp
View File

@ -28,16 +28,16 @@ Client::Client(QWidget *parent)
if (name != QLatin1String("localhost")) if (name != QLatin1String("localhost"))
hostCombo->addItem(QString("localhost")); hostCombo->addItem(QString("localhost"));
// find out IP addresses of this machine // find out IP addresses of this machine
QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses(); const QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
// add non-localhost addresses // add non-localhost addresses
for (int i = 0; i < ipAddressesList.size(); ++i) { for (const QHostAddress &entry : ipAddressesList) {
if (!ipAddressesList.at(i).isLoopback()) if (!entry.isLoopback())
hostCombo->addItem(ipAddressesList.at(i).toString()); hostCombo->addItem(entry.toString());
} }
// add localhost addresses // add localhost addresses
for (int i = 0; i < ipAddressesList.size(); ++i) { for (const QHostAddress &entry : ipAddressesList) {
if (ipAddressesList.at(i).isLoopback()) if (entry.isLoopback())
hostCombo->addItem(ipAddressesList.at(i).toString()); hostCombo->addItem(entry.toString());
} }
portLineEdit->setValidator(new QIntValidator(1, 65535, this)); portLineEdit->setValidator(new QIntValidator(1, 65535, this));

9
examples/network/fortuneserver/server.cpp
View File

@ -72,12 +72,11 @@ void Server::initServer()
} }
//! [0] //! [0]
QString ipAddress; QString ipAddress;
QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses(); const QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
// use the first non-localhost IPv4 address // use the first non-localhost IPv4 address
for (int i = 0; i < ipAddressesList.size(); ++i) { for (const QHostAddress &entry : ipAddressesList) {
if (ipAddressesList.at(i) != QHostAddress::LocalHost && if (entry != QHostAddress::LocalHost && entry.toIPv4Address()) {
ipAddressesList.at(i).toIPv4Address()) { ipAddress = entry.toString();
ipAddress = ipAddressesList.at(i).toString();
break; break;
} }
} }

10
examples/network/threadedfortuneserver/dialog.cpp
View File

@ -26,12 +26,12 @@ Dialog::Dialog(QWidget *parent)
} }
QString ipAddress; QString ipAddress;
QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses(); const QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
// use the first non-localhost IPv4 address // use the first non-localhost IPv4 address
for (int i = 0; i < ipAddressesList.size(); ++i) {
if (ipAddressesList.at(i) != QHostAddress::LocalHost && for (const QHostAddress &entry : ipAddressesList) {
ipAddressesList.at(i).toIPv4Address()) { if (entry != QHostAddress::LocalHost && entry.toIPv4Address()) {
ipAddress = ipAddressesList.at(i).toString(); ipAddress = entry.toString();
break; break;
} }
} }