diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index f9a9d44ca..35e7c2619 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -958,7 +958,7 @@ namespace BlackCore { if (!m_accessManager) { m_accessManager = new QNetworkAccessManager(this); } - m_cookieManager = new CCookieManager({}, this); + m_cookieManager = new CCookieManager(this); m_cookieManager->setParent(m_accessManager); m_accessManager->setCookieJar(m_cookieManager); diff --git a/src/blackcore/cookiemanager.cpp b/src/blackcore/cookiemanager.cpp index 7c9d208b1..910e06a3d 100644 --- a/src/blackcore/cookiemanager.cpp +++ b/src/blackcore/cookiemanager.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "blackcore/cookiemanager.h" -#include "blackmisc/restricted.h" #include #include @@ -10,14 +9,9 @@ #include #include -using namespace BlackMisc; - namespace BlackCore { - CCookieManager::CCookieManager(BlackMisc::Restricted, QObject *parent) : QNetworkCookieJar(parent) - { - // code - } + CCookieManager::CCookieManager(QObject *parent) : QNetworkCookieJar(parent) {} bool CCookieManager::setCookiesFromUrl(const QList &cookies, const QUrl &url) { @@ -32,11 +26,6 @@ namespace BlackCore return cookies; } - QList CCookieManager::cookiesForRequest(const QNetworkRequest &request) const - { - return cookiesForUrl(request.url()); - } - bool CCookieManager::deleteCookie(const QNetworkCookie &cookie) { QWriteLocker l(&m_lock); diff --git a/src/blackcore/cookiemanager.h b/src/blackcore/cookiemanager.h index 4f2a0e351..262696bee 100644 --- a/src/blackcore/cookiemanager.h +++ b/src/blackcore/cookiemanager.h @@ -7,7 +7,6 @@ #define BLACKCORE_COOKIEMANAGER_H #include "blackcore/blackcoreexport.h" -#include "blackmisc/restricted.h" #include #include @@ -15,39 +14,32 @@ #include class QNetworkCookie; -class QNetworkRequest; class QUrl; namespace BlackCore { - class CApplication; - /*! - * Cookie manager, which allows thread safe sharing of cookies + * Threadsafe version of QNetworkCookieJar */ class BLACKCORE_EXPORT CCookieManager : public QNetworkCookieJar { Q_OBJECT public: - //! Constructor, only allowed from BlackCore::CApplication - CCookieManager(BlackMisc::Restricted, QObject *parent = nullptr); + //! Constructor + explicit CCookieManager(QObject *parent = nullptr); //! \copydoc QNetworkCookieJar::setCookiesFromUrl //! \threadsafe - virtual bool setCookiesFromUrl(const QList &cookies, const QUrl &url) override; + bool setCookiesFromUrl(const QList &cookies, const QUrl &url) override; //! \copydoc QNetworkCookieJar::cookiesForUrl //! \threadsafe - virtual QList cookiesForUrl(const QUrl &url) const override; - - //! Cookies for request - //! \threadsafe - QList cookiesForRequest(const QNetworkRequest &request) const; + QList cookiesForUrl(const QUrl &url) const override; //! \copydoc QNetworkCookieJar::deleteCookie //! \threadsafe - virtual bool deleteCookie(const QNetworkCookie &cookie) override; + bool deleteCookie(const QNetworkCookie &cookie) override; //! Delete all cookies //! \threadsafe @@ -55,11 +47,11 @@ namespace BlackCore //! \copydoc QNetworkCookieJar::insertCookie //! \threadsafe - virtual bool insertCookie(const QNetworkCookie &cookie) override; + bool insertCookie(const QNetworkCookie &cookie) override; //! \copydoc QNetworkCookieJar::updateCookie //! \threadsafe - virtual bool updateCookie(const QNetworkCookie &cookie) override; + bool updateCookie(const QNetworkCookie &cookie) override; private: mutable QReadWriteLock m_lock { QReadWriteLock::Recursive };