refactor: Clean up CCookieManager

For more loose coupling, Restricted is removed.

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);
 

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 <QNetworkCookie>
 #include <QNetworkCookieJar>
@@ -10,14 +9,9 @@
 #include <QReadLocker>
 #include <QWriteLocker>
 
-using namespace BlackMisc;
-
 namespace BlackCore
 {
-    CCookieManager::CCookieManager(BlackMisc::Restricted<CApplication>, QObject *parent) : QNetworkCookieJar(parent)
+    CCookieManager::CCookieManager(QObject *parent) : QNetworkCookieJar(parent) {}
-    {
-        // code
-    }
 
     bool CCookieManager::setCookiesFromUrl(const QList<QNetworkCookie> &cookies, const QUrl &url)
     {
@@ -32,11 +26,6 @@ namespace BlackCore
         return cookies;
     }
 
-    QList<QNetworkCookie> CCookieManager::cookiesForRequest(const QNetworkRequest &request) const
-    {
-        return cookiesForUrl(request.url());
-    }
-
     bool CCookieManager::deleteCookie(const QNetworkCookie &cookie)
     {
         QWriteLocker l(&m_lock);

src/blackcore/cookiemanager.h

@@ -7,7 +7,6 @@
 #define BLACKCORE_COOKIEMANAGER_H
 
 #include "blackcore/blackcoreexport.h"
-#include "blackmisc/restricted.h"
 
 #include <QList>
 #include <QNetworkCookieJar>
@@ -15,39 +14,32 @@
 #include <QReadWriteLock>
 
 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
+        //! Constructor
-        CCookieManager(BlackMisc::Restricted<CApplication>, QObject *parent = nullptr);
+        explicit CCookieManager(QObject *parent = nullptr);
 
         //! \copydoc QNetworkCookieJar::setCookiesFromUrl
         //! \threadsafe
-        virtual bool setCookiesFromUrl(const QList<QNetworkCookie> &cookies, const QUrl &url) override;
+        bool setCookiesFromUrl(const QList<QNetworkCookie> &cookies, const QUrl &url) override;
 
         //! \copydoc QNetworkCookieJar::cookiesForUrl
         //! \threadsafe
-        virtual QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const override;
+        QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const override;
-
-        //! Cookies for request
-        //! \threadsafe
-        QList<QNetworkCookie> cookiesForRequest(const QNetworkRequest &request) const;
 
         //! \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 };