Remove qwebengineview setter from qwebenginepage

Change-Id: Ifaac7287d24e38e04e217cae65f6e5294e8bdd9e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 13 insertions, 13 deletions

diff --git a/examples/webenginewidgets/printme/main.cpp b/examples/webenginewidgets/printme/main.cpp
index 212faf12e..3993c6740 100644
--- a/examples/webenginewidgets/printme/main.cpp
+++ b/examples/webenginewidgets/printme/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
     view.show();
 
     PrintHandler handler;
-    handler.setPage(view.page());
+    handler.setView(&view);
 
     auto printPreviewShortCut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_P), &view);
     auto printShortCut = new QShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_P), &view);
diff --git a/examples/webenginewidgets/printme/printhandler.cpp b/examples/webenginewidgets/printme/printhandler.cpp
index d8c4fc177..9d23c5b1f 100644
--- a/examples/webenginewidgets/printme/printhandler.cpp
+++ b/examples/webenginewidgets/printme/printhandler.cpp
@@ -54,7 +54,7 @@
 #include <QPrinter>
 #include <QPainter>
 #include <QPrintPreviewDialog>
-#include <QWebEnginePage>
+#include <QWebEngineView>
 
 PrintHandler::PrintHandler(QObject *parent)
     : QObject(parent)
@@ -62,17 +62,17 @@ PrintHandler::PrintHandler(QObject *parent)
 
 }
 
-void PrintHandler::setPage(QWebEnginePage *page)
+void PrintHandler::setView(QWebEngineView *view)
 {
-    Q_ASSERT(!m_page);
-    m_page = page;
-    connect(m_page, &QWebEnginePage::printRequested, this, &PrintHandler::printPreview);
+    Q_ASSERT(!m_view);
+    m_view = view;
+    connect(view->page(), &QWebEnginePage::printRequested, this, &PrintHandler::printPreview);
 }
 
 void PrintHandler::print()
 {
     QPrinter printer(QPrinter::HighResolution);
-    QPrintDialog dialog(&printer, m_page->view());
+    QPrintDialog dialog(&printer, m_view);
     if (dialog.exec() != QDialog::Accepted)
         return;
     printDocument(&printer);
@@ -83,7 +83,7 @@ void PrintHandler::printDocument(QPrinter *printer)
     QEventLoop loop;
     bool result;
     auto printPreview = [&](bool success) { result = success; loop.quit(); };
-    m_page->print(printer, std::move(printPreview));
+    m_view->page()->print(printer, std::move(printPreview));
     loop.exec();
     if (!result) {
         QPainter painter;
@@ -101,13 +101,13 @@ void PrintHandler::printDocument(QPrinter *printer)
 
 void PrintHandler::printPreview()
 {
-    if (!m_page)
+    if (!m_view)
         return;
     if (m_inPrintPreview)
         return;
     m_inPrintPreview = true;
     QPrinter printer;
-    QPrintPreviewDialog preview(&printer, m_page->view());
+    QPrintPreviewDialog preview(&printer, m_view);
     connect(&preview, &QPrintPreviewDialog::paintRequested,
             this, &PrintHandler::printDocument);
     preview.exec();
diff --git a/examples/webenginewidgets/printme/printhandler.h b/examples/webenginewidgets/printme/printhandler.h
index 69b71f4a8..663fd73d6 100644
--- a/examples/webenginewidgets/printme/printhandler.h
+++ b/examples/webenginewidgets/printme/printhandler.h
@@ -56,7 +56,7 @@
 QT_BEGIN_NAMESPACE
 class QPainter;
 class QPrinter;
-class QWebEnginePage;
+class QWebEngineView;
 QT_END_NAMESPACE
 
 class PrintHandler : public QObject
@@ -64,7 +64,7 @@ class PrintHandler : public QObject
     Q_OBJECT
 public:
     PrintHandler(QObject *parent = nullptr);
-    void setPage(QWebEnginePage *page);
+    void setView(QWebEngineView *view);
 
 public slots:
     void print();
@@ -72,7 +72,7 @@ public slots:
     void printDocument(QPrinter *printer);
 
 private:
-    QWebEnginePage *m_page = nullptr;
+    QWebEngineView *m_view = nullptr;
     bool m_inPrintPreview = false;
 };