From f3af7fce4a9174fb80de22cf650435516c2f3796 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 26 Jan 2016 14:38:54 +0100 Subject: QtNetwork: eradicate Q_FOREACH loops [rvalues] ... by replacing them with C++11 range-for loops. This is the simplest of the patch series: Q_FOREACH took a copy, so we do, too. Except we don't, since we're just catching the return value that comes out of the function (RVO). We can't feed the rvalues into range-for, because they are non-const and would thus detach. Change-Id: I42c9c44d948ab1512a69d42890187bc3cf2d7e58 Reviewed-by: Lars Knoll --- src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp | 3 ++- src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp | 3 ++- src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/network/doc') diff --git a/src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp b/src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp index dabd2373e7..76a0d61427 100644 --- a/src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp +++ b/src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp @@ -75,7 +75,8 @@ void MyObject::handleServers() } // Handle the results. - foreach (const QDnsServiceRecord &record, dns->serviceRecords()) { + const auto records = dns->serviceRecords(); + for (const QDnsServiceRecord &record : records) { ... } dns->deleteLater(); diff --git a/src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp b/src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp index 0d06fb44c7..b7939bb1c0 100644 --- a/src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp +++ b/src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp @@ -78,7 +78,8 @@ void MyWidget::lookedUp(const QHostInfo &host) return; } - foreach (const QHostAddress &address, host.addresses()) + const auto addresses = host.addresses(); + for (const QHostAddress &address : addresses) qDebug() << "Found address:" << address.toString(); } //! [3] diff --git a/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp index fd1de88754..12691da7a2 100644 --- a/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp +++ b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp @@ -49,9 +49,9 @@ ****************************************************************************/ //! [0] -foreach (const QSslCertificate &cert, QSslCertificate::fromPath("C:/ssl/certificate.*.pem", - QSsl::Pem, - QRegExp::Wildcard)) { +const auto certs = QSslCertificate::fromPath("C:/ssl/certificate.*.pem", + QSsl::Pem, QRegExp::Wildcard); +for (const QSslCertificate &cert : certs) { qDebug() << cert.issuerInfo(QSslCertificate::Organization); } //! [0] -- cgit v1.2.3