From 1a2dd9276759742a7eda704341ee618d296ad8bf Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 25 Jan 2021 11:28:48 +0100 Subject: TLS backend: merge with its factory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QTlsBackend is a factory itself - it creates TLS/X509 objects. Having an intermediary between Factory->Backend->TLS primitive does not look very natural thus let's squash the first two parts. Backend is a factory creating TLS primitives, but its static functions also provide information about backends availablei and give access to those backends. Fixes: QTBUG-90606 Task-number: QTBUG-65922 Change-Id: I8409d81fd11fb46e6ab4465b4937a7680a8c2447 Reviewed-by: Alex Blasche Reviewed-by: Mårten Nordheim --- src/network/ssl/qsslsocket_mac.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/network/ssl/qsslsocket_mac.cpp') diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index abbcf8a6ac..6370a83dd3 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -84,20 +84,7 @@ class SecureTransportBackend : public QTlsBackend private: QString backendName() const override { - return QTlsBackendFactory::builtinBackendNames[QTlsBackendFactory::nameIndexSecureTransport]; - } -}; - -class SecureTransportBackendFactory : public QTlsBackendFactory -{ -private: - QString backendName() const override - { - return QTlsBackendFactory::builtinBackendNames[QTlsBackendFactory::nameIndexSecureTransport]; - } - QTlsBackend *create() const override - { - return new SecureTransportBackend; + return builtinBackendNames[nameIndexSecureTransport]; } QList supportedProtocols() const override @@ -135,7 +122,7 @@ private: } }; -Q_GLOBAL_STATIC(SecureTransportBackendFactory, factory) +Q_GLOBAL_STATIC(SecureTransportBackend, backend) #ifdef Q_OS_MACOS /* @@ -1618,7 +1605,7 @@ void QSslSocketPrivate::registerAdHocFactory() { // TLSTODO: this is a temporary solution, waiting for // backends to move to ... plugins. - if (!factory()) + if (!backend()) qCWarning(lcSsl, "Failed to create backend factory"); } -- cgit v1.2.3