Various clean-ups around QWebEngineView

Pick-to: 6.2
Change-Id: I16f27054871f63526946101e07cb0dcf4aa3b390
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 40 insertions, 37 deletions

diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index d8225274a..85c10dd94 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -37,48 +37,52 @@
 **
 ****************************************************************************/
 
+#include "qwebenginenotificationpresenter_p.h"
 #include "qwebengineview.h"
 #include "qwebengineview_p.h"
+#include "render_widget_host_view_qt_delegate_widget.h"
 
 #include <QtWebEngineCore/private/qwebenginepage_p.h>
+#include <QtWebEngineCore/qwebenginecontextmenurequest.h>
+#include <QtWebEngineCore/qwebenginehistory.h>
+#include <QtWebEngineCore/qwebenginehttprequest.h>
 #include <QtWebEngineCore/qwebengineprofile.h>
-#include "render_widget_host_view_qt_delegate_widget.h"
-#include "web_contents_adapter.h"
-#include "file_picker_controller.h"
-#include "qwebenginenotificationpresenter_p.h"
 #include "color_chooser_controller.h"
-#include <QStandardPaths>
-#if QT_CONFIG(action)
-#include <QAction>
-#endif
-#if QT_CONFIG(menu)
-#include <QMenu>
-#endif
+#include "web_contents_adapter.h"
+
 #include <QContextMenuEvent>
 #include <QToolTip>
 #include <QVBoxLayout>
+#include <QKeyEvent>
+#include <QIcon>
+#include <QStyle>
+#include <QGuiApplication>
+
+#if QT_CONFIG(action)
+#include <QAction>
+#endif
+
 #if QT_CONFIG(colordialog)
-#    include <QColorDialog>
+#include <QColorDialog>
 #endif
-#include <QContextMenuEvent>
+
 #if QT_CONFIG(filedialog)
-#    include <QFileDialog>
+#include <QFileDialog>
+#include <QStandardPaths>
+#include "file_picker_controller.h"
 #endif
-#include <QKeyEvent>
-#include <QIcon>
+
 #if QT_CONFIG(inputdialog)
-#    include <QInputDialog>
+#include <QInputDialog>
 #endif
-#include <QLayout>
-#include <QLoggingCategory>
+
 #if QT_CONFIG(menu)
-#    include <QMenu>
+#include <QMenu>
 #endif
+
 #if QT_CONFIG(messagebox)
-#    include <QMessageBox>
+#include <QMessageBox>
 #endif
-#include <QStyle>
-#include <QGuiApplication>
 
 #if QT_CONFIG(webengine_printing_and_pdf)
 #include "printing/printer_worker.h"
@@ -194,7 +198,7 @@ void QWebEngineViewPrivate::contextMenuRequested(QWebEngineContextMenuRequest *r
 
     Q_UNREACHABLE();
 #else
-    Q_UNUSED(data);
+    Q_UNUSED(request);
 #endif // QT_CONFIG(action)
 }
 
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index 005f46c16..27c29ba3a 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -40,22 +40,21 @@
 #ifndef QWEBENGINEVIEW_H
 #define QWEBENGINEVIEW_H
 
-#include <QtGui/qpainter.h>
 #include <QtGui/QPageLayout>
 #include <QtGui/qpageranges.h>
-#include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtWidgets/qwidget.h>
 
 #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtWebEngineCore/qwebenginecontextmenurequest.h>
-#include <QtWebEngineCore/qwebenginehttprequest.h>
 #include <QtWebEngineCore/qwebenginepage.h>
 
 QT_BEGIN_NAMESPACE
+
 class QContextMenuEvent;
 class QPrinter;
 class QUrl;
-class QWebEnginePage;
+class QWebEngineContextMenuRequest;
+class QWebEngineHistory;
+class QWebEngineHttpRequest;
 class QWebEngineSettings;
 class QWebEngineViewAccessible;
 class QWebEngineViewPrivate;
diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index af395fb39..db22c95b5 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -51,21 +51,21 @@
 // We mean it.
 //
 
-#include <QtWebEngineWidgets/qwebengineview.h>
-#include <QtWebEngineCore/private/qwebenginepage_p.h>
-#include <QtWebEngineCore/qwebenginecontextmenurequest.h>
+#include <QtWebEngineCore/private/qwebenginepage_p.h> // PageView
 #include <QtWidgets/qaccessiblewidget.h>
 
 #include "render_view_context_menu_qt.h"
 
 namespace QtWebEngineCore {
-class QPrinter;
+class QWebEngineContextMenuRequest;
 class RenderWidgetHostViewQtDelegateWidget;
 class RenderWidgetHostViewQtDelegate;
 }
 
 QT_BEGIN_NAMESPACE
 
+class QMenu;
+class QPrinter;
 class QWebEngineView;
 
 class QWebEngineViewPrivate : public PageView
@@ -141,7 +141,7 @@ private:
 class QContextMenuBuilder : public QtWebEngineCore::RenderViewContextMenuQt
 {
 public:
-    QContextMenuBuilder(QWebEngineContextMenuRequest *reqeust, QWebEngineView *view, QMenu *menu);
+    QContextMenuBuilder(QWebEngineContextMenuRequest *request, QWebEngineView *view, QMenu *menu);
 
 private:
     virtual bool hasInspector() override;