From 38429c16b5b0db9cba109783da8e50a68c32ac3e Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Tue, 22 Aug 2023 15:11:41 +0300 Subject: qhttpheaderparser: port some methods to QBAV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If9d74e42e8633cdbc0caeebedc9a36918c0b05a5 Reviewed-by: MÃ¥rten Nordheim --- src/network/access/qhttpheaderparser.cpp | 10 +++++----- src/network/access/qhttpheaderparser_p.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/network/access/qhttpheaderparser.cpp b/src/network/access/qhttpheaderparser.cpp index 95ce4a7eb1e..e13ed234920 100644 --- a/src/network/access/qhttpheaderparser.cpp +++ b/src/network/access/qhttpheaderparser.cpp @@ -133,7 +133,7 @@ const QList >& QHttpHeaderParser::headers() const return fields; } -QByteArray QHttpHeaderParser::firstHeaderField(const QByteArray &name, +QByteArray QHttpHeaderParser::firstHeaderField(QByteArrayView name, const QByteArray &defaultValue) const { for (auto it = fields.constBegin(); it != fields.constEnd(); ++it) { @@ -143,7 +143,7 @@ QByteArray QHttpHeaderParser::firstHeaderField(const QByteArray &name, return defaultValue; } -QByteArray QHttpHeaderParser::combinedHeaderValue(const QByteArray &name, const QByteArray &defaultValue) const +QByteArray QHttpHeaderParser::combinedHeaderValue(QByteArrayView name, const QByteArray &defaultValue) const { const QList allValues = headerFieldValues(name); if (allValues.isEmpty()) @@ -151,7 +151,7 @@ QByteArray QHttpHeaderParser::combinedHeaderValue(const QByteArray &name, const return allValues.join(", "); } -QList QHttpHeaderParser::headerFieldValues(const QByteArray &name) const +QList QHttpHeaderParser::headerFieldValues(QByteArrayView name) const { QList result; for (auto it = fields.constBegin(); it != fields.constEnd(); ++it) @@ -161,9 +161,9 @@ QList QHttpHeaderParser::headerFieldValues(const QByteArray &name) c return result; } -void QHttpHeaderParser::removeHeaderField(const QByteArray &name) +void QHttpHeaderParser::removeHeaderField(QByteArrayView name) { - auto firstEqualsName = [&name](const QPair &header) { + auto firstEqualsName = [name](const QPair &header) { return name.compare(header.first, Qt::CaseInsensitive) == 0; }; fields.removeIf(firstEqualsName); diff --git a/src/network/access/qhttpheaderparser_p.h b/src/network/access/qhttpheaderparser_p.h index 9b149570e0b..3b416eb618a 100644 --- a/src/network/access/qhttpheaderparser_p.h +++ b/src/network/access/qhttpheaderparser_p.h @@ -62,15 +62,15 @@ public: QString getReasonPhrase() const; void setReasonPhrase(const QString &reason); - QByteArray firstHeaderField(const QByteArray &name, + QByteArray firstHeaderField(QByteArrayView name, const QByteArray &defaultValue = QByteArray()) const; - QByteArray combinedHeaderValue(const QByteArray &name, + QByteArray combinedHeaderValue(QByteArrayView name, const QByteArray &defaultValue = QByteArray()) const; - QList headerFieldValues(const QByteArray &name) const; + QList headerFieldValues(QByteArrayView name) const; void setHeaderField(const QByteArray &name, const QByteArray &data); void prependHeaderField(const QByteArray &name, const QByteArray &data); void appendHeaderField(const QByteArray &name, const QByteArray &data); - void removeHeaderField(const QByteArray &name); + void removeHeaderField(QByteArrayView name); void clearHeaders(); void setMaxHeaderFieldSize(qsizetype size) { maxFieldSize = size; } -- cgit v1.2.3