Remove dependency on QObjectPrivate

Change-Id: Id6831f821e069affad1b5b34dd5550af766ab76e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 9 insertions, 31 deletions

diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index 4617882ab..8adf46bea 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE
 
 using namespace QtWebEngineCore;
 
-QWebEngineCookieStorePrivate::QWebEngineCookieStorePrivate()
-    : m_nextCallbackId(CallbackDirectory::ReservedCallbackIdsEnd)
+QWebEngineCookieStorePrivate::QWebEngineCookieStorePrivate(QWebEngineCookieStore *q)
+    : q_ptr(q)
+    , m_nextCallbackId(CallbackDirectory::ReservedCallbackIdsEnd)
     , m_deleteSessionCookiesPending(false)
     , m_deleteAllCookiesPending(false)
     , m_getAllCookiesPending(false)
@@ -213,9 +214,9 @@ void QWebEngineCookieStorePrivate::onCookieChanged(const QNetworkCookie &cookie,
 */
 
 QWebEngineCookieStore::QWebEngineCookieStore(QObject *parent)
-    : QObject(*new QWebEngineCookieStorePrivate, parent)
+    : QObject(parent)
+    , d_ptr(new QWebEngineCookieStorePrivate(this))
 {
-
 }
 
 /*!
diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h
index 5001ba3a1..c05a72cf1 100644
--- a/src/core/api/qwebenginecookiestore.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -78,6 +78,7 @@ private:
     friend class QtWebEngineCore::CookieMonsterDelegateQt;
     Q_DISABLE_COPY(QWebEngineCookieStore)
     Q_DECLARE_PRIVATE(QWebEngineCookieStore)
+    QScopedPointer<QWebEngineCookieStorePrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h
index 90380f2c6..582c0712a 100644
--- a/src/core/api/qwebenginecookiestore_p.h
+++ b/src/core/api/qwebenginecookiestore_p.h
@@ -59,7 +59,6 @@
 #include <QVector>
 #include <QNetworkCookie>
 #include <QUrl>
-#include <QtCore/private/qobject_p.h>
 
 namespace QtWebEngineCore {
 class CookieMonsterDelegateQt;
@@ -67,7 +66,7 @@ class CookieMonsterDelegateQt;
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStorePrivate : public QObjectPrivate
+class QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStorePrivate
 {
     Q_DECLARE_PUBLIC(QWebEngineCookieStore)
     struct CookieData {
@@ -76,6 +75,7 @@ class QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStorePrivate : public QObjectPri
         QUrl origin;
     };
     friend class QTypeInfo<CookieData>;
+    QWebEngineCookieStore *q_ptr;
 public:
     QtWebEngineCore::CallbackDirectory callbackDirectory;
     QVector<CookieData> m_pendingUserCookies;
@@ -86,7 +86,7 @@ public:
 
     QtWebEngineCore::CookieMonsterDelegateQt *delegate;
 
-    QWebEngineCookieStorePrivate();
+    QWebEngineCookieStorePrivate(QWebEngineCookieStore *q);
 
     void processPendingUserCookies();
     void rejectPendingUserCookies();
diff --git a/tests/auto/bic/data/QtWebEngine.5.8.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtWebEngine.5.8.0.linux-gcc-amd64.txt
index 5c1f96b36..97114c1e3 100644
--- a/tests/auto/bic/data/QtWebEngine.5.8.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtWebEngine.5.8.0.linux-gcc-amd64.txt
@@ -10964,14 +10964,6 @@ QWebEngineCookieStore::_ZTV21QWebEngineCookieStore: 14u entries
 96    (int (*)(...))QObject::connectNotify
 104   (int (*)(...))QObject::disconnectNotify
 
-Class QWebEngineCookieStore
-   size=16 align=8
-   base size=16 base align=8
-QWebEngineCookieStore (0x0x7f7e8ce861a0) 0
-    vptr=((& QWebEngineCookieStore::_ZTV21QWebEngineCookieStore) + 16u)
-  QObject (0x0x7f7e8ce47ae0) 0
-      primary-for QWebEngineCookieStore (0x0x7f7e8ce861a0)
-
 Class QWebEngineUrlRequestInfo
    size=8 align=8
    base size=8 base align=8
diff --git a/tests/auto/bic/data/QtWebEngineCore.5.8.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtWebEngineCore.5.8.0.linux-gcc-amd64.txt
index f5ba7c254..f32d66ef8 100644
--- a/tests/auto/bic/data/QtWebEngineCore.5.8.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtWebEngineCore.5.8.0.linux-gcc-amd64.txt
@@ -10964,14 +10964,6 @@ QWebEngineCookieStore::_ZTV21QWebEngineCookieStore: 14u entries
 96    (int (*)(...))QObject::connectNotify
 104   (int (*)(...))QObject::disconnectNotify
 
-Class QWebEngineCookieStore
-   size=16 align=8
-   base size=16 base align=8
-QWebEngineCookieStore (0x0x7f916977f1a0) 0
-    vptr=((& QWebEngineCookieStore::_ZTV21QWebEngineCookieStore) + 16u)
-  QObject (0x0x7f9169741a20) 0
-      primary-for QWebEngineCookieStore (0x0x7f916977f1a0)
-
 Class QWebEngineUrlRequestInfo
    size=8 align=8
    base size=8 base align=8
diff --git a/tests/auto/bic/data/QtWebEngineWidgets.5.8.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtWebEngineWidgets.5.8.0.linux-gcc-amd64.txt
index 44642bc4e..ec5624321 100644
--- a/tests/auto/bic/data/QtWebEngineWidgets.5.8.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtWebEngineWidgets.5.8.0.linux-gcc-amd64.txt
@@ -10964,14 +10964,6 @@ QWebEngineCookieStore::_ZTV21QWebEngineCookieStore: 14u entries
 96    (int (*)(...))QObject::connectNotify
 104   (int (*)(...))QObject::disconnectNotify
 
-Class QWebEngineCookieStore
-   size=16 align=8
-   base size=16 base align=8
-QWebEngineCookieStore (0x0x7f2623007d68) 0
-    vptr=((& QWebEngineCookieStore::_ZTV21QWebEngineCookieStore) + 16u)
-  QObject (0x0x7f26230dd6c0) 0
-      primary-for QWebEngineCookieStore (0x0x7f2623007d68)
-
 Class QWebEngineUrlRequestInfo
    size=8 align=8
    base size=8 base align=8