diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-07-12 16:15:08 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-20 09:21:44 +0000 |
commit | 8f7ad43d9da54f7baba3de5093f11235158f8066 (patch) | |
tree | 4e76a3a20cf58832bba2f7015bd24e45ecb32d99 | |
parent | 4c7b47a3b46594fa54dda993eebc08c74d1b3a3c (diff) |
Various clean-ups around QWebEngineView
Change-Id: I16f27054871f63526946101e07cb0dcf4aa3b390
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit e4bb4b8bc443fa78c0cd4509cc8ec1251e8296ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/core/api/qwebenginepage_p.h | 1 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 54 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 11 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview_p.h | 12 | ||||
-rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 2 | ||||
-rw-r--r-- | tests/auto/widgets/spellchecking/tst_spellchecking.cpp | 5 |
6 files changed, 43 insertions, 42 deletions
diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h index 8aebc2951..811bec52e 100644 --- a/src/core/api/qwebenginepage_p.h +++ b/src/core/api/qwebenginepage_p.h @@ -75,7 +75,6 @@ class QWebEngineHistory; class QWebEnginePage; class QWebEngineProfile; class QWebEngineSettings; -class QWebEngineView; class PageView { diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index d72673225..89cc356fe 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 417dff43e..fbb230dda 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; diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index 0869b254e..9bfa49065 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -46,9 +46,7 @@ #include "qwebengineview_p.h" #include <QGuiApplication> -#include <QLayout> #include <QMouseEvent> -#include <QOpenGLContext> #include <QResizeEvent> #include <QSGImageNode> #include <QWindow> diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp index ab79ff6cb..7263904ce 100644 --- a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp +++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp @@ -28,8 +28,9 @@ #include <util.h> #include <QtTest/QtTest> -#include <QtWebEngineCore/qwebengineprofile.h> +#include <QtWebEngineCore/qwebenginecontextmenurequest.h> #include <QtWebEngineCore/qwebenginepage.h> +#include <QtWebEngineCore/qwebengineprofile.h> #include <QtWebEngineCore/qwebenginesettings.h> #include <QtWebEngineWidgets/qwebengineview.h> @@ -52,7 +53,7 @@ signals: void menuReady(); protected: - void contextMenuEvent(QContextMenuEvent *) + void contextMenuEvent(QContextMenuEvent *) override { m_data = lastContextMenuRequest(); emit menuReady(); |