QHttpNetworkConnection: use std::optional instead of QScopedPointer

As pointed out in the code review.

Task-number: QTBUG-132213
Change-Id: Ia67cae1aa89dd11bd54331d1593d5717deafcf8d
Reviewed-by: Mårten Nordheim <[email protected]>

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<QSslSocket *>(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 <QtCore/qpointer.h>
-#include <QtCore/qscopedpointer.h>
 
 #include <memory>
+#include <optional>
 #include <utility>
 
 QT_REQUIRE_CONFIG(http);
@@ -102,7 +102,7 @@ public:
 #ifndef QT_NO_SSL
     bool ignoreAllSslErrors;
     QList<QSslError> ignoreSslErrorsList;
-    QScopedPointer<QSslConfiguration> sslConfiguration;
+    std::optional<QSslConfiguration> sslConfiguration;
     void ignoreSslErrors();
     void ignoreSslErrors(const QList<QSslError> &errors);
     void setSslConfiguration(const QSslConfiguration &config);