diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp index 2bd0003aa57..9334b01de6a 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 705c5b32eae..390a6f2f516 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 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 RawHeaderPair; const QList& rawHeaderPairs() const; diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index cbfd1739abd..e084d08e8bf 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 e5043751eba..75458e156be 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 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 8d826fb3d20..48fcdcf1eda 100644 --- a/src/network/access/qnetworkrequest_p.h +++ b/src/network/access/qnetworkrequest_p.h @@ -40,7 +40,7 @@ public: AttributesMap attributes; QPointer originatingObject; - RawHeadersList::ConstIterator findRawHeader(QByteArrayView key) const; + RawHeadersList::ConstIterator findRawHeader(QAnyStringView key) const; RawHeadersList allRawHeaders() const; QList rawHeadersKeys() const; void setRawHeader(const QByteArray &key, const QByteArray &value);