From 8d914a161db9a4760594267285c48521b3af5481 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Wed, 6 Aug 2014 17:25:01 +0200
Subject: Clean up opaque pointer handling for QQuickWebEngineLoadRequest

Hide QObject's d_ptr member and use the macros when accessing
the private class. This patch also adds missing qt namespace
macros to the implementation.

Change-Id: I004e3ea52bf21618835724d218f2a405f77ca4d1
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
 src/webengine/api/qquickwebengineloadrequest.cpp | 29 +++++++++++++++++++++++-
 src/webengine/api/qquickwebengineloadrequest_p.h | 21 ++---------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/webengine/api/qquickwebengineloadrequest.cpp b/src/webengine/api/qquickwebengineloadrequest.cpp
index 227a86710..cf9ef6ece 100644
--- a/src/webengine/api/qquickwebengineloadrequest.cpp
+++ b/src/webengine/api/qquickwebengineloadrequest.cpp
@@ -41,6 +41,26 @@
 
 #include <qquickwebengineloadrequest_p.h>
 
+QT_BEGIN_NAMESPACE
+
+class QQuickWebEngineLoadRequestPrivate {
+public:
+    QQuickWebEngineLoadRequestPrivate(const QUrl& url, QQuickWebEngineView::LoadStatus status, const QString& errorString, int errorCode, QQuickWebEngineView::ErrorDomain errorDomain)
+        : url(url)
+        , status(status)
+        , errorString(errorString)
+        , errorCode(errorCode)
+        , errorDomain(errorDomain)
+    {
+    }
+
+    QUrl url;
+    QQuickWebEngineView::LoadStatus status;
+    QString errorString;
+    int errorCode;
+    QQuickWebEngineView::ErrorDomain errorDomain;
+};
+
 /*!
     \qmltype WebEngineLoadRequest
     \instantiates QQuickWebEngineLoadRequest
@@ -55,7 +75,7 @@
 */
 QQuickWebEngineLoadRequest::QQuickWebEngineLoadRequest(const QUrl& url, QQuickWebEngineView::LoadStatus status, const QString& errorString, int errorCode, QQuickWebEngineView::ErrorDomain errorDomain, QObject* parent)
     : QObject(parent)
-    , d(new QQuickWebEngineLoadRequestPrivate(url, status, errorString, errorCode, errorDomain))
+    , d_ptr(new QQuickWebEngineLoadRequestPrivate(url, status, errorString, errorCode, errorDomain))
 {
 }
 
@@ -69,6 +89,7 @@ QQuickWebEngineLoadRequest::~QQuickWebEngineLoadRequest()
  */
 QUrl QQuickWebEngineLoadRequest::url() const
 {
+    Q_D(const QQuickWebEngineLoadRequest);
     return d->url;
 }
 
@@ -88,6 +109,7 @@ QUrl QQuickWebEngineLoadRequest::url() const
 */
 QQuickWebEngineView::LoadStatus QQuickWebEngineLoadRequest::status() const
 {
+    Q_D(const QQuickWebEngineLoadRequest);
     return d->status;
 }
 
@@ -96,11 +118,13 @@ QQuickWebEngineView::LoadStatus QQuickWebEngineLoadRequest::status() const
 */
 QString QQuickWebEngineLoadRequest::errorString() const
 {
+    Q_D(const QQuickWebEngineLoadRequest);
     return d->errorString;
 }
 
 QQuickWebEngineView::ErrorDomain QQuickWebEngineLoadRequest::errorDomain() const
 {
+    Q_D(const QQuickWebEngineLoadRequest);
     return d->errorDomain;
 }
 
@@ -109,5 +133,8 @@ QQuickWebEngineView::ErrorDomain QQuickWebEngineLoadRequest::errorDomain() const
 */
 int QQuickWebEngineLoadRequest::errorCode() const
 {
+    Q_D(const QQuickWebEngineLoadRequest);
     return d->errorCode;
 }
+
+QT_END_NAMESPACE
diff --git a/src/webengine/api/qquickwebengineloadrequest_p.h b/src/webengine/api/qquickwebengineloadrequest_p.h
index b20247942..44af60bef 100644
--- a/src/webengine/api/qquickwebengineloadrequest_p.h
+++ b/src/webengine/api/qquickwebengineloadrequest_p.h
@@ -67,25 +67,8 @@ public:
     int errorCode() const;
 
 private:
-    QScopedPointer<QQuickWebEngineLoadRequestPrivate> d;
-};
-
-class QQuickWebEngineLoadRequestPrivate {
-public:
-    QQuickWebEngineLoadRequestPrivate(const QUrl& url, QQuickWebEngineView::LoadStatus status, const QString& errorString, int errorCode, QQuickWebEngineView::ErrorDomain errorDomain)
-        : url(url)
-        , status(status)
-        , errorString(errorString)
-        , errorCode(errorCode)
-        , errorDomain(errorDomain)
-    {
-    }
-
-    QUrl url;
-    QQuickWebEngineView::LoadStatus status;
-    QString errorString;
-    int errorCode;
-    QQuickWebEngineView::ErrorDomain errorDomain;
+    Q_DECLARE_PRIVATE(QQuickWebEngineLoadRequest)
+    QScopedPointer<QQuickWebEngineLoadRequestPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3