Change QNetworkRequest/Reply rawHeader functions to take QASV

QHttpHeaders uses QASV for the header name field, and this aligns
these functions with that. Furthermore having QASV as a parameter
will allow a wider range of string types to be passed as a
parameter (convenience).

Resulted from API-review

Amends: 56bb4ac484adb544925b6d7b58e4fd1d77d49503

Pick-to: 6.7
Change-Id: Iff42b75393b6470a2c34a1913dbe615bf21238db
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

5 files changed, 12 insertions, 11 deletions

diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 2bd0003aa5..9334b01de6 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -614,7 +614,7 @@ QVariant QNetworkReply::header(QNetworkRequest::KnownHeaders header) const
     \sa rawHeader()
     \note In Qt versions prior to 6.7, this function took QByteArray only.
 */
-bool QNetworkReply::hasRawHeader(QByteArrayView headerName) const
+bool QNetworkReply::hasRawHeader(QAnyStringView headerName) const
 {
     Q_D(const QNetworkReply);
     return d->findRawHeader(headerName) != d->rawHeaders.constEnd();
@@ -630,7 +630,7 @@ bool QNetworkReply::hasRawHeader(QByteArrayView headerName) const
     \sa setRawHeader(), hasRawHeader(), header()
     \note In Qt versions prior to 6.7, this function took QByteArray only.
 */
-QByteArray QNetworkReply::rawHeader(QByteArrayView headerName) const
+QByteArray QNetworkReply::rawHeader(QAnyStringView headerName) const
 {
     Q_D(const QNetworkReply);
     if (const auto it = d->findRawHeader(headerName); it != d->rawHeaders.constEnd())
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 705c5b32ea..390a6f2f51 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -100,12 +100,12 @@ public:
 #if QT_NETWORK_REMOVED_SINCE(6, 7)
     bool hasRawHeader(const QByteArray &headerName) const;
 #endif
-    bool hasRawHeader(QByteArrayView headerName) const;
+    bool hasRawHeader(QAnyStringView headerName) const;
     QList<QByteArray> rawHeaderList() const;
 #if QT_NETWORK_REMOVED_SINCE(6, 7)
     QByteArray rawHeader(const QByteArray &headerName) const;
 #endif
-    QByteArray rawHeader(QByteArrayView headerName) const;
+    QByteArray rawHeader(QAnyStringView headerName) const;
 
     typedef QPair<QByteArray, QByteArray> RawHeaderPair;
     const QList<RawHeaderPair>& rawHeaderPairs() const;
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index cbfd1739ab..e084d08e8b 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -631,7 +631,7 @@ void QNetworkRequest::setHeader(KnownHeaders header, const QVariant &value)
     \sa rawHeader(), setRawHeader()
     \note In Qt versions prior to 6.7, this function took QByteArray only.
 */
-bool QNetworkRequest::hasRawHeader(QByteArrayView headerName) const
+bool QNetworkRequest::hasRawHeader(QAnyStringView headerName) const
 {
     return d->findRawHeader(headerName) != d->rawHeaders.constEnd();
 }
@@ -647,7 +647,7 @@ bool QNetworkRequest::hasRawHeader(QByteArrayView headerName) const
     \sa header(), setRawHeader()
     \note In Qt versions prior to 6.7, this function took QByteArray only.
 */
-QByteArray QNetworkRequest::rawHeader(QByteArrayView headerName) const
+QByteArray QNetworkRequest::rawHeader(QAnyStringView headerName) const
 {
     if (const auto it = d->findRawHeader(headerName); it != d->rawHeaders.constEnd())
         return it->second;
@@ -1329,11 +1329,12 @@ static QVariant parseHeaderValue(QNetworkRequest::KnownHeaders header, const QBy
 }
 
 QNetworkHeadersPrivate::RawHeadersList::ConstIterator
-QNetworkHeadersPrivate::findRawHeader(QByteArrayView key) const
+QNetworkHeadersPrivate::findRawHeader(QAnyStringView key) const
 {
     auto isKeyEqual = [key](const auto &headerPair)
     {
-        return headerPair.first.compare(key, Qt::CaseInsensitive) == 0;
+        QLatin1StringView name{headerPair.first};
+        return QAnyStringView::compare(name, key, Qt::CaseInsensitive) == 0;
     };
     return std::find_if(rawHeaders.begin(), rawHeaders.end(), isKeyEqual);
 }
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index e5043751eb..75458e156b 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -127,12 +127,12 @@ public:
 #if QT_NETWORK_REMOVED_SINCE(6, 7)
     bool hasRawHeader(const QByteArray &headerName) const;
 #endif
-    bool hasRawHeader(QByteArrayView headerName) const;
+    bool hasRawHeader(QAnyStringView headerName) const;
     QList<QByteArray> rawHeaderList() const;
 #if QT_NETWORK_REMOVED_SINCE(6, 7)
     QByteArray rawHeader(const QByteArray &headerName) const;
 #endif
-    QByteArray rawHeader(QByteArrayView headerName) const;
+    QByteArray rawHeader(QAnyStringView headerName) const;
     void setRawHeader(const QByteArray &headerName, const QByteArray &value);
 
     // attributes
diff --git a/src/network/access/qnetworkrequest_p.h b/src/network/access/qnetworkrequest_p.h
index 8d826fb3d2..48fcdcf1ed 100644
--- a/src/network/access/qnetworkrequest_p.h
+++ b/src/network/access/qnetworkrequest_p.h
@@ -40,7 +40,7 @@ public:
     AttributesMap attributes;
     QPointer<QObject> originatingObject;
 
-    RawHeadersList::ConstIterator findRawHeader(QByteArrayView key) const;
+    RawHeadersList::ConstIterator findRawHeader(QAnyStringView key) const;
     RawHeadersList allRawHeaders() const;
     QList<QByteArray> rawHeadersKeys() const;
     void setRawHeader(const QByteArray &key, const QByteArray &value);