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 <marten.nordheim@qt.io>
This commit is contained in:
parent
ffc5491757
commit
a0c0d40842
@ -157,7 +157,7 @@ void QHttpNetworkConnectionChannel::init()
|
|||||||
if (!ignoreSslErrorsList.isEmpty())
|
if (!ignoreSslErrorsList.isEmpty())
|
||||||
sslSocket->ignoreSslErrors(ignoreSslErrorsList);
|
sslSocket->ignoreSslErrors(ignoreSslErrorsList);
|
||||||
|
|
||||||
if (sslConfiguration.data() && !sslConfiguration->isNull())
|
if (sslConfiguration && !sslConfiguration->isNull())
|
||||||
sslSocket->setSslConfiguration(*sslConfiguration);
|
sslSocket->setSslConfiguration(*sslConfiguration);
|
||||||
} else {
|
} else {
|
||||||
#endif // !QT_NO_SSL
|
#endif // !QT_NO_SSL
|
||||||
@ -740,10 +740,10 @@ void QHttpNetworkConnectionChannel::setSslConfiguration(const QSslConfiguration
|
|||||||
if (socket)
|
if (socket)
|
||||||
static_cast<QSslSocket *>(socket)->setSslConfiguration(config);
|
static_cast<QSslSocket *>(socket)->setSslConfiguration(config);
|
||||||
|
|
||||||
if (sslConfiguration.data())
|
if (sslConfiguration)
|
||||||
*sslConfiguration = config;
|
*sslConfiguration = config;
|
||||||
else
|
else
|
||||||
sslConfiguration.reset(new QSslConfiguration(config));
|
sslConfiguration = QSslConfiguration(config);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -45,9 +45,9 @@
|
|||||||
|
|
||||||
|
|
||||||
#include <QtCore/qpointer.h>
|
#include <QtCore/qpointer.h>
|
||||||
#include <QtCore/qscopedpointer.h>
|
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <optional>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
QT_REQUIRE_CONFIG(http);
|
QT_REQUIRE_CONFIG(http);
|
||||||
@ -102,7 +102,7 @@ public:
|
|||||||
#ifndef QT_NO_SSL
|
#ifndef QT_NO_SSL
|
||||||
bool ignoreAllSslErrors;
|
bool ignoreAllSslErrors;
|
||||||
QList<QSslError> ignoreSslErrorsList;
|
QList<QSslError> ignoreSslErrorsList;
|
||||||
QScopedPointer<QSslConfiguration> sslConfiguration;
|
std::optional<QSslConfiguration> sslConfiguration;
|
||||||
void ignoreSslErrors();
|
void ignoreSslErrors();
|
||||||
void ignoreSslErrors(const QList<QSslError> &errors);
|
void ignoreSslErrors(const QList<QSslError> &errors);
|
||||||
void setSslConfiguration(const QSslConfiguration &config);
|
void setSslConfiguration(const QSslConfiguration &config);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user