From 70a376d73718cc4ff8d96f6761b8c1896ca25c23 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Mon, 9 Nov 2015 15:23:32 +0100
Subject: Make QWebEngineFullScreenRequest const correct

Let QWebEngineFullScreenRequest be logically const-correct. It feels
weird to be allowed to call "accept()" or "reject()" on a constant
object.

Also allow the user to copy the request, but check whether the
page is still valid in the implementations of accept(), reject().

Change-Id: Ibf139a126734fc8e2db68ec26dc8f24cd4438942
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
 src/webenginewidgets/api/qwebenginefullscreenrequest.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/webenginewidgets/api/qwebenginefullscreenrequest.h')

diff --git a/src/webenginewidgets/api/qwebenginefullscreenrequest.h b/src/webenginewidgets/api/qwebenginefullscreenrequest.h
index c6768f4d6..26f7247e0 100644
--- a/src/webenginewidgets/api/qwebenginefullscreenrequest.h
+++ b/src/webenginewidgets/api/qwebenginefullscreenrequest.h
@@ -38,26 +38,25 @@
 #define QWEBENGINEFULLSCREENREQUEST_H
 
 #include <qtwebenginewidgetsglobal.h>
-#include <qwebenginepage.h>
-#include <QtCore/qurl.h>
+#include <qurl.h>
+#include <qpointer.h>
 
 QT_BEGIN_NAMESPACE
-class QWebEnginePagePrivate;
+class QWebEnginePage;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineFullScreenRequest {
     Q_GADGET
     Q_PROPERTY(bool toggleOn READ toggleOn)
     Q_PROPERTY(QUrl origin READ origin)
 public:
-    Q_INVOKABLE void reject() const;
-    Q_INVOKABLE void accept() const;
+    Q_INVOKABLE void reject();
+    Q_INVOKABLE void accept();
     bool toggleOn() const { return m_toggleOn; }
     const QUrl &origin() const { return m_origin; }
 
 private:
-    Q_DISABLE_COPY(QWebEngineFullScreenRequest)
-    QWebEngineFullScreenRequest(QWebEnginePagePrivate *pagePrivate, const QUrl &origin, bool toggleOn);
-    QWebEnginePagePrivate *m_pagePrivate;
+    QWebEngineFullScreenRequest(QWebEnginePage *page, const QUrl &origin, bool toggleOn);
+    QPointer<QWebEnginePage> m_page;
     const QUrl m_origin;
     const bool m_toggleOn;
     friend class QWebEnginePagePrivate;
-- 
cgit v1.2.1