summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2024-01-25 18:53:59 +0100
committerMarc Mutz <marc.mutz@qt.io>2024-01-26 07:11:06 +0100
commitf5056a0b53bcc3f095efb5664201e4a0daea9c1e (patch)
tree72e5ed506234e0091eb5746f00700d4534c50eba /src/network
parent119a6b51869b7ffba4fa49bc07e78a243fe4a9ba (diff)
QHttpHeaders: Self-Encapsulate Field d->headers
Use QHttpHeaders::reserve() and QHttpHeaders::isEmpty() instead of going directly to d->headers. Will help in enabling a nullptr d. Pick-to: 6.7 Change-Id: Id530f8922b17058ec47530523ed43e08927c3ce3 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qhttpheaders.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qhttpheaders.cpp b/src/network/access/qhttpheaders.cpp
index 5b32387d91..c2461648d0 100644
--- a/src/network/access/qhttpheaders.cpp
+++ b/src/network/access/qhttpheaders.cpp
@@ -485,7 +485,7 @@ QHttpHeaders::QHttpHeaders() : d(new QHttpHeadersPrivate)
QHttpHeaders QHttpHeaders::fromListOfPairs(const QList<std::pair<QByteArray, QByteArray>> &headers)
{
QHttpHeaders h;
- h.d->headers.reserve(headers.size());
+ h.reserve(headers.size());
for (const auto &header : headers)
h.append(header.first, header.second);
return h;
@@ -500,7 +500,7 @@ QHttpHeaders QHttpHeaders::fromListOfPairs(const QList<std::pair<QByteArray, QBy
QHttpHeaders QHttpHeaders::fromMultiMap(const QMultiMap<QByteArray, QByteArray> &headers)
{
QHttpHeaders h;
- h.d->headers.reserve(headers.size());
+ h.reserve(headers.size());
for (const auto &[name,value] : headers.asKeyValueRange())
h.append(name, value);
return h;
@@ -515,7 +515,7 @@ QHttpHeaders QHttpHeaders::fromMultiMap(const QMultiMap<QByteArray, QByteArray>
QHttpHeaders QHttpHeaders::fromMultiHash(const QMultiHash<QByteArray, QByteArray> &headers)
{
QHttpHeaders h;
- h.d->headers.reserve(headers.size());
+ h.reserve(headers.size());
for (const auto &[name,value] : headers.asKeyValueRange())
h.append(name, value);
return h;
@@ -1097,7 +1097,7 @@ QMultiHash<QByteArray, QByteArray> QHttpHeaders::toMultiHash() const
*/
void QHttpHeaders::clear()
{
- if (d->headers.isEmpty())
+ if (isEmpty())
return;
d.detach();
d->headers.clear();