From a0c0d40842a13dfb5ddfa267647ba1ab986595b3 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Sat, 17 May 2025 15:58:59 +0300 Subject: [PATCH] QHttpNetworkConnection: use std::optional instead of QScopedPointer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As pointed out in the code review. Task-number: QTBUG-132213 Change-Id: Ia67cae1aa89dd11bd54331d1593d5717deafcf8d Reviewed-by: MÃ¥rten Nordheim --- src/network/access/qhttpnetworkconnectionchannel.cpp | 6 +++--- src/network/access/qhttpnetworkconnectionchannel_p.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index b116d26805a..8750071ac7b 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -157,7 +157,7 @@ void QHttpNetworkConnectionChannel::init() if (!ignoreSslErrorsList.isEmpty()) sslSocket->ignoreSslErrors(ignoreSslErrorsList); - if (sslConfiguration.data() && !sslConfiguration->isNull()) + if (sslConfiguration && !sslConfiguration->isNull()) sslSocket->setSslConfiguration(*sslConfiguration); } else { #endif // !QT_NO_SSL @@ -740,10 +740,10 @@ void QHttpNetworkConnectionChannel::setSslConfiguration(const QSslConfiguration if (socket) static_cast(socket)->setSslConfiguration(config); - if (sslConfiguration.data()) + if (sslConfiguration) *sslConfiguration = config; else - sslConfiguration.reset(new QSslConfiguration(config)); + sslConfiguration = QSslConfiguration(config); } #endif diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index e2a324fb5fd..cf172f82993 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -45,9 +45,9 @@ #include -#include #include +#include #include QT_REQUIRE_CONFIG(http); @@ -102,7 +102,7 @@ public: #ifndef QT_NO_SSL bool ignoreAllSslErrors; QList ignoreSslErrorsList; - QScopedPointer sslConfiguration; + std::optional sslConfiguration; void ignoreSslErrors(); void ignoreSslErrors(const QList &errors); void setSslConfiguration(const QSslConfiguration &config);