From 9a3641f43572ce9e77dd6770f0029e82bd92d70c Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 13 Aug 2013 18:56:34 +0200 Subject: Use QObject::d_ptr for public API classes This follows the model used by the rest of Qt, potentially avoiding binary compatibility issues. The compromise is that we now depend on core-private, thus forcing us to follow Qt's release cycle. Change-Id: Ib2df51071fc35935ac99edf7b9c5562949cb43e2 Reviewed-by: Andras Becsi --- lib/widgets/Api/qwebengineview.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/widgets/Api/qwebengineview.cpp') diff --git a/lib/widgets/Api/qwebengineview.cpp b/lib/widgets/Api/qwebengineview.cpp index a7a135fc8..369aa6efa 100644 --- a/lib/widgets/Api/qwebengineview.cpp +++ b/lib/widgets/Api/qwebengineview.cpp @@ -49,19 +49,22 @@ #include QWebEngineViewPrivate::QWebEngineViewPrivate() - : m_isLoading(false) + : QWidgetPrivate(QObjectPrivateVersion) + , m_isLoading(false) , adapter(new WebContentsAdapter(this)) { } void QWebEngineViewPrivate::titleChanged(const QString &title) { - Q_EMIT q_ptr->titleChanged(title); + Q_Q(QWebEngineView); + Q_EMIT q->titleChanged(title); } void QWebEngineViewPrivate::urlChanged(const QUrl &url) { - Q_EMIT q_ptr->urlChanged(url); + Q_Q(QWebEngineView); + Q_EMIT q->urlChanged(url); } void QWebEngineViewPrivate::loadingStateChanged() @@ -99,10 +102,9 @@ RenderWidgetHostViewQtDelegate *QWebEngineViewPrivate::CreateRenderWidgetHostVie return new RenderWidgetHostViewQtDelegateWidget; } -QWebEngineView::QWebEngineView() - : d_ptr(new QWebEngineViewPrivate) +QWebEngineView::QWebEngineView(QWidget *parent) + : QWidget(*(new QWebEngineViewPrivate), parent, 0) { - d_ptr->q_ptr=this; // This causes the child RenderWidgetHostViewQtDelegateWidgets to fill this widget. setLayout(new QStackedLayout); } -- cgit v1.2.1