From 1c2a4da1c73bfc2456c59146ce615b7e2122e90e Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Mon, 7 Jul 2014 18:12:15 +0200
Subject: Don't inherit from Qt private types

Do the d_ptr magic ourselves to avoid having to include private
headers from qtcore, qtgui and qtdeclarative.

It is hackish to hide QObject's d_ptr member to have the macros
working in a public class, but if anything goes wrong we just
need to replace the private macro convenience while maintaining
the binary compatibility of the stored extra opaque pointer.

Change-Id: Idb92f4f902826bef9068a5c2ef6ea31fc3fa15b2
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/webenginewidgets/api/qwebenginepage.cpp | 11 +++++++----
 src/webenginewidgets/api/qwebenginepage.h   |  1 +
 src/webenginewidgets/api/qwebenginepage_p.h |  4 ++--
 src/webenginewidgets/api/qwebengineview.cpp |  9 ++++++---
 src/webenginewidgets/api/qwebengineview.h   |  1 +
 src/webenginewidgets/api/qwebengineview_p.h |  4 ++--
 6 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'src/webenginewidgets/api')

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index fd1f54834..10e3dcda5 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -42,6 +42,7 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QStandardPaths>
+#include <QStyle>
 #include <QUrl>
 
 QT_BEGIN_NAMESPACE
@@ -162,12 +163,10 @@ void CallbackDirectory::CallbackSharedDataPointer::doDeref()
 }
 
 QWebEnginePagePrivate::QWebEnginePagePrivate()
-    : QObjectPrivate(QObjectPrivateVersion)
-    , adapter(new WebContentsAdapter)
+    : adapter(new WebContentsAdapter)
     , history(new QWebEngineHistory(new QWebEngineHistoryPrivate(this)))
     , view(0)
 {
-    adapter->initialize(this);
     memset(actions, 0, sizeof(actions));
 }
 
@@ -407,8 +406,12 @@ void QWebEnginePagePrivate::recreateFromSerializedHistory(QDataStream &input)
 }
 
 QWebEnginePage::QWebEnginePage(QObject* parent)
-    : QObject(*new QWebEnginePagePrivate, parent)
+    : QObject(parent)
+    , d_ptr(new QWebEnginePagePrivate)
 {
+    Q_D(QWebEnginePage);
+    d->q_ptr = this;
+    d->adapter->initialize(d);
 }
 
 QWebEnginePage::~QWebEnginePage()
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index bd1e5c7a9..7d4a00e7e 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -213,6 +213,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QWebEnginePage);
+    QScopedPointer<QWebEnginePagePrivate> d_ptr;
 #ifndef QT_NO_ACTION
     Q_PRIVATE_SLOT(d_func(), void _q_webActionTriggered(bool checked))
 #endif
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index 3f421ed7e..90924bd8d 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -45,7 +45,6 @@
 #include "qwebenginepage.h"
 
 #include "web_contents_adapter_client.h"
-#include <QtCore/private/qobject_p.h>
 #include <QtCore/qcompilerdetection.h>
 #include <QSharedData>
 
@@ -100,10 +99,11 @@ private:
     QHash<quint64, CallbackSharedDataPointer> m_callbackMap;
 };
 
-class QWebEnginePagePrivate : public QObjectPrivate, public WebContentsAdapterClient
+class QWebEnginePagePrivate : public WebContentsAdapterClient
 {
 public:
     Q_DECLARE_PUBLIC(QWebEnginePage)
+    QWebEnginePage *q_ptr;
 
     QWebEnginePagePrivate();
     ~QWebEnginePagePrivate();
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 03bb474bb..13ee75cf9 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -99,16 +99,19 @@ static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *obje
 }
 
 QWebEngineViewPrivate::QWebEngineViewPrivate()
-    : QWidgetPrivate(QObjectPrivateVersion)
-    , page(0)
+    : page(0)
     , m_pendingContextMenuEvent(false)
 {
     QAccessible::installFactory(&webAccessibleFactory);
 }
 
 QWebEngineView::QWebEngineView(QWidget *parent)
-    : QWidget(*(new QWebEngineViewPrivate), parent, 0)
+    : QWidget(parent)
+    , d_ptr(new QWebEngineViewPrivate)
 {
+    Q_D(QWebEngineView);
+    d->q_ptr = this;
+
     // This causes the child RenderWidgetHostViewQtDelegateWidgets to fill this widget.
     setLayout(new QStackedLayout);
 }
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index c3ebfba07..f96833b18 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -99,6 +99,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QWebEngineView);
+    QScopedPointer<QWebEngineViewPrivate> d_ptr;
 
     friend class QWebEnginePage;
     friend class QWebEnginePagePrivate;
diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index b3156a353..fd6fb3b66 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -42,7 +42,6 @@
 #ifndef QWEBENGINEVIEW_P_H
 #define QWEBENGINEVIEW_P_H
 
-#include <QtWidgets/private/qwidget_p.h>
 #include <QtWebEngineWidgets/qwebengineview.h>
 
 #include <QtWidgets/qaccessiblewidget.h>
@@ -51,10 +50,11 @@ QT_BEGIN_NAMESPACE
 
 class QWebEngineView;
 
-class QWebEngineViewPrivate : public QWidgetPrivate
+class QWebEngineViewPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QWebEngineView)
+    QWebEngineView *q_ptr;
 
     static void bind(QWebEngineView *view, QWebEnginePage *page);
 
-- 
cgit v1.2.3