diff options
Diffstat (limited to 'src/core/api')
-rw-r--r-- | src/core/api/qwebengineclientcertificatestore.cpp | 25 | ||||
-rw-r--r-- | src/core/api/qwebengineclientcertificatestore.h | 12 |
2 files changed, 11 insertions, 26 deletions
diff --git a/src/core/api/qwebengineclientcertificatestore.cpp b/src/core/api/qwebengineclientcertificatestore.cpp index 40412dfd8..cac8fb151 100644 --- a/src/core/api/qwebengineclientcertificatestore.cpp +++ b/src/core/api/qwebengineclientcertificatestore.cpp @@ -48,8 +48,6 @@ QT_BEGIN_NAMESPACE #if QT_CONFIG(ssl) -QWebEngineClientCertificateStore *QWebEngineClientCertificateStore::m_instance = nullptr; - /*! \class QWebEngineClientCertificateStore::Entry \inmodule QtWebEngineCore @@ -69,8 +67,8 @@ QWebEngineClientCertificateStore *QWebEngineClientCertificateStore::m_instance = The getInstance() method can be used to access the single instance of the class. */ -QWebEngineClientCertificateStore::QWebEngineClientCertificateStore() - : d_ptr(new QtWebEngineCore::ClientCertificateStoreData) +QWebEngineClientCertificateStore::QWebEngineClientCertificateStore(QtWebEngineCore::ClientCertificateStoreData *storeData) + : m_storeData(storeData) { } @@ -85,23 +83,12 @@ QWebEngineClientCertificateStore::~QWebEngineClientCertificateStore() } /*! - Returns an in-memory client certificate store. -*/ - -QWebEngineClientCertificateStore *QWebEngineClientCertificateStore::getInstance() -{ - if (!m_instance) - m_instance = new QWebEngineClientCertificateStore; - return m_instance; -} - -/*! Adds a \a certificate with the \a privateKey to the in-memory client certificate store. */ void QWebEngineClientCertificateStore::add(const QSslCertificate &certificate, const QSslKey &privateKey) { - d_ptr->add(certificate, privateKey); + m_storeData->add(certificate, privateKey); } /*! @@ -112,7 +99,7 @@ void QWebEngineClientCertificateStore::add(const QSslCertificate &certificate, c QList<QWebEngineClientCertificateStore::Entry> QWebEngineClientCertificateStore::toList() const { QList<Entry> certificateList; - for (auto data : qAsConst(d_ptr->extraCerts)) { + for (auto data : qAsConst(m_storeData->extraCerts)) { Entry entry; entry.certificate = data->certificate; entry.privateKey = data->key; @@ -128,7 +115,7 @@ QList<QWebEngineClientCertificateStore::Entry> QWebEngineClientCertificateStore: void QWebEngineClientCertificateStore::remove(const QSslCertificate &certificate) { - d_ptr->remove(certificate); + m_storeData->remove(certificate); } /*! @@ -137,7 +124,7 @@ void QWebEngineClientCertificateStore::remove(const QSslCertificate &certificate void QWebEngineClientCertificateStore::clear() { - d_ptr->clear(); + m_storeData->clear(); } #endif // QT_CONFIG(ssl) diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h index 0000299a2..441a5f913 100644 --- a/src/core/api/qwebengineclientcertificatestore.h +++ b/src/core/api/qwebengineclientcertificatestore.h @@ -47,15 +47,15 @@ #include <QtNetwork/qsslkey.h> namespace QtWebEngineCore { -class ClientCertOverrideStore; struct ClientCertificateStoreData; +class ProfileAdapter; } QT_BEGIN_NAMESPACE #if QT_CONFIG(ssl) - +class QWebEngineProfile; class QWEBENGINECORE_EXPORT QWebEngineClientCertificateStore { public: @@ -64,20 +64,18 @@ public: QSslCertificate certificate; }; - static QWebEngineClientCertificateStore *getInstance(); void add(const QSslCertificate &certificate, const QSslKey &privateKey); QList<Entry> toList() const; void remove(const QSslCertificate &certificate); void clear(); private: - friend class QtWebEngineCore::ClientCertOverrideStore; - static QWebEngineClientCertificateStore *m_instance; + friend class QtWebEngineCore::ProfileAdapter; Q_DISABLE_COPY(QWebEngineClientCertificateStore) - QWebEngineClientCertificateStore(); + QWebEngineClientCertificateStore(QtWebEngineCore::ClientCertificateStoreData *storeData); ~QWebEngineClientCertificateStore(); - QScopedPointer<QtWebEngineCore::ClientCertificateStoreData> d_ptr; + QtWebEngineCore::ClientCertificateStoreData *m_storeData; }; #endif // QT_CONFIG(ssl) |