From b694c58d5eeca13bfe93413cf65d934cdb644e40 Mon Sep 17 00:00:00 2001 From: Lena Biliaieva Date: Mon, 1 Jul 2024 16:48:06 +0200 Subject: [PATCH] QHttpHeaderParser: add rvalue-this overload to headers() Add rvalue-this overload to be called by corresponding QHttpServerRequest::headers() method. Task-number: QTBUG-125859 Change-Id: I2b12d2b80614f627c1aca514a10e1e86a2c5b24d Reviewed-by: Ivan Solovev (cherry picked from commit 5e9212c1069604dd88fef9f0877459abeb87ad27) Reviewed-by: Qt Cherry-pick Bot --- src/network/access/qhttpheaderparser.cpp | 7 ++++++- src/network/access/qhttpheaderparser_p.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/network/access/qhttpheaderparser.cpp b/src/network/access/qhttpheaderparser.cpp index 0b7882c18a7..d8df6ac8f29 100644 --- a/src/network/access/qhttpheaderparser.cpp +++ b/src/network/access/qhttpheaderparser.cpp @@ -128,11 +128,16 @@ bool QHttpHeaderParser::parseStatus(QByteArrayView status) return ok && uint(majorVersion) <= 9 && uint(minorVersion) <= 9; } -const QHttpHeaders& QHttpHeaderParser::headers() const +const QHttpHeaders& QHttpHeaderParser::headers() const & { return fields; } +QHttpHeaders QHttpHeaderParser::headers() && +{ + return std::move(fields); +} + QByteArray QHttpHeaderParser::firstHeaderField(QByteArrayView name, const QByteArray &defaultValue) const { diff --git a/src/network/access/qhttpheaderparser_p.h b/src/network/access/qhttpheaderparser_p.h index 5e8f3c81300..5f364f3175f 100644 --- a/src/network/access/qhttpheaderparser_p.h +++ b/src/network/access/qhttpheaderparser_p.h @@ -53,7 +53,8 @@ public: bool parseHeaders(QByteArrayView headers); bool parseStatus(QByteArrayView status); - const QHttpHeaders& headers() const; + const QHttpHeaders& headers() const &; + QHttpHeaders headers() &&; void setStatusCode(int code); int getStatusCode() const; int getMajorVersion() const;