QtNetwork: use const (and const APIs) more

For CoW types, prefer const methods to avoid needless detach()ing.

Mark predictNextRequest() as const, because this method
does not modify the object.

Change-Id: Ic94e2b31445ece46ab1423bf5b5f4e66d9a5b6ca
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

8 files changed, 16 insertions, 16 deletions

diff --git a/src/network/ssl/qasn1element.cpp b/src/network/ssl/qasn1element.cpp
index 7ac3a4b45d..dc59c41d59 100644
--- a/src/network/ssl/qasn1element.cpp
+++ b/src/network/ssl/qasn1element.cpp
@@ -192,7 +192,7 @@ QAsn1Element QAsn1Element::fromObjectId(const QByteArray &id)
 {
     QAsn1Element elem;
     elem.mType = ObjectIdentifierType;
-    QList<QByteArray> bits = id.split('.');
+    const QList<QByteArray> bits = id.split('.');
     Q_ASSERT(bits.size() > 2);
     elem.mValue += quint8((bits[0].toUInt() * 40 + bits[1].toUInt()));
     for (int i = 2; i < bits.size(); ++i) {
@@ -311,11 +311,11 @@ QByteArray QAsn1Element::toObjectId() const
 {
     QByteArray key;
     if (mType == ObjectIdentifierType && !mValue.isEmpty()) {
-        quint8 b = mValue[0];
+        quint8 b = mValue.at(0);
         key += QByteArray::number(b / 40) + '.' + QByteArray::number (b % 40);
         unsigned int val = 0;
         for (int i = 1; i < mValue.size(); ++i) {
-            b = mValue[i];
+            b = mValue.at(i);
             val = (val << 7) | (b & 0x7f);
             if (!(b & 0x80)) {
                 key += '.' + QByteArray::number(val);
diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp
index a20100505a..28b7eda54a 100644
--- a/src/network/ssl/qsslcertificate_openssl.cpp
+++ b/src/network/ssl/qsslcertificate_openssl.cpp
@@ -507,7 +507,7 @@ QString QSslCertificate::toText() const
 void QSslCertificatePrivate::init(const QByteArray &data, QSsl::EncodingFormat format)
 {
     if (!data.isEmpty()) {
-        QList<QSslCertificate> certs = (format == QSsl::Pem)
+        const QList<QSslCertificate> certs = (format == QSsl::Pem)
             ? certificatesFromPem(data, 1)
             : certificatesFromDer(data, 1);
         if (!certs.isEmpty()) {
diff --git a/src/network/ssl/qsslcertificate_qt.cpp b/src/network/ssl/qsslcertificate_qt.cpp
index d712fe09b3..a351b8ecc7 100644
--- a/src/network/ssl/qsslcertificate_qt.cpp
+++ b/src/network/ssl/qsslcertificate_qt.cpp
@@ -197,7 +197,7 @@ QString QSslCertificate::toText() const
 void QSslCertificatePrivate::init(const QByteArray &data, QSsl::EncodingFormat format)
 {
     if (!data.isEmpty()) {
-        QList<QSslCertificate> certs = (format == QSsl::Pem)
+        const QList<QSslCertificate> certs = (format == QSsl::Pem)
             ? certificatesFromPem(data, 1)
             : certificatesFromDer(data, 1);
         if (!certs.isEmpty()) {
@@ -309,7 +309,7 @@ bool QSslCertificatePrivate::parse(const QByteArray &data)
         if (!elem.read(versionStream) || elem.type() != QAsn1Element::IntegerType)
             return false;
 
-        versionString = QByteArray::number(elem.value()[0] + 1);
+        versionString = QByteArray::number(elem.value().at(0) + 1);
         if (!elem.read(certStream))
             return false;
     } else {
diff --git a/src/network/ssl/qsslkey_qt.cpp b/src/network/ssl/qsslkey_qt.cpp
index 196edb0956..3c5dc830d3 100644
--- a/src/network/ssl/qsslkey_qt.cpp
+++ b/src/network/ssl/qsslkey_qt.cpp
@@ -169,7 +169,7 @@ void QSslKeyPrivate::decodeDer(const QByteArray &der, bool deepClear)
         QDataStream keyStream(elem.value());
         if (!elem.read(keyStream) || elem.type() != QAsn1Element::SequenceType)
             return;
-        QVector<QAsn1Element> infoItems = elem.toVector();
+        const QVector<QAsn1Element> infoItems = elem.toVector();
         if (infoItems.size() < 2 || infoItems[0].type() != QAsn1Element::ObjectIdentifierType)
             return;
         if (algorithm == QSsl::Rsa) {
@@ -189,7 +189,7 @@ void QSslKeyPrivate::decodeDer(const QByteArray &der, bool deepClear)
             if (infoItems[1].type() != QAsn1Element::SequenceType)
                 return;
             // key params
-            QVector<QAsn1Element> params = infoItems[1].toVector();
+            const QVector<QAsn1Element> params = infoItems[1].toVector();
             if (params.isEmpty() || params[0].type() != QAsn1Element::IntegerType)
                 return;
             keyLength = numberOfBits(params[0].value());
@@ -202,7 +202,7 @@ void QSslKeyPrivate::decodeDer(const QByteArray &der, bool deepClear)
         }
 
     } else {
-        QVector<QAsn1Element> items = elem.toVector();
+        const QVector<QAsn1Element> items = elem.toVector();
         if (items.isEmpty())
             return;
 
@@ -249,7 +249,7 @@ void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhra
     QMap<QByteArray, QByteArray> headers;
     QByteArray data = derFromPem(pem, &headers);
     if (headers.value("Proc-Type") == "4,ENCRYPTED") {
-        QList<QByteArray> dekInfo = headers.value("DEK-Info").split(',');
+        const QList<QByteArray> dekInfo = headers.value("DEK-Info").split(',');
         if (dekInfo.size() != 2) {
             clear(deepClear);
             return;
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 3e7a30aa9f..35dce23601 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -2526,7 +2526,7 @@ void QSslSocketPrivate::_q_resumeImplementation()
         if (verifyErrorsHaveBeenIgnored()) {
             continueHandshake();
         } else {
-            setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, sslErrors.first().errorString());
+            setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, sslErrors.constFirst().errorString());
             plainSocket->disconnectFromHost();
             return;
         }
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp
index 602496d730..c164342166 100644
--- a/src/network/ssl/qsslsocket_mac.cpp
+++ b/src/network/ssl/qsslsocket_mac.cpp
@@ -442,7 +442,7 @@ void QSslSocketPrivate::ensureInitialized()
         SSLGetSupportedCiphers(context, cfCiphers.data(), &numCiphers);
 
         for (size_t i = 0; i < size_t(cfCiphers.size()); ++i) {
-            const QSslCipher ciph(QSslSocketBackendPrivate::QSslCipher_from_SSLCipherSuite(cfCiphers[i]));
+            const QSslCipher ciph(QSslSocketBackendPrivate::QSslCipher_from_SSLCipherSuite(cfCiphers.at(i)));
             if (!ciph.isNull()) {
                 ciphers << ciph;
                 if (ciph.usedBits() >= 128)
@@ -1033,7 +1033,7 @@ bool QSslSocketBackendPrivate::setSessionCertificate(QString &errorDescription,
 
     QSslCertificate localCertificate;
     if (!configuration.localCertificateChain.isEmpty())
-        localCertificate = configuration.localCertificateChain[0];
+        localCertificate = configuration.localCertificateChain.at(0);
 
     if (!localCertificate.isNull()) {
         // Require a private key as well.
@@ -1327,7 +1327,7 @@ bool QSslSocketBackendPrivate::checkSslErrors()
             paused = true;
         } else {
             setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError,
-                            sslErrors.first().errorString());
+                            sslErrors.constFirst().errorString());
             plainSocket->disconnectFromHost();
         }
         return false;
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 35bdd1c87d..67b4550607 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -1234,7 +1234,7 @@ bool QSslSocketBackendPrivate::checkSslErrors()
             pauseSocketNotifiers(q);
             paused = true;
         } else {
-            setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, sslErrors.first().errorString());
+            setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, sslErrors.constFirst().errorString());
             plainSocket->disconnectFromHost();
         }
         return false;
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index 6694e64abc..edc8ca0bbb 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -626,7 +626,7 @@ HRESULT QSslSocketBackendPrivate::onSslUpgrade(IAsyncAction *action, AsyncStatus
 
     if (!sslErrors.isEmpty()) {
         emit q->sslErrors(sslErrors);
-        setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, sslErrors.first().errorString());
+        setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, sslErrors.constFirst().errorString());
 
         // Disconnect if there are any non-ignorable errors
         for (const QSslError &error : qAsConst(sslErrors)) {