diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-07-08 14:35:56 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-08 22:05:42 +0000 |
commit | c9e296f776cc48741d9ea752294193b5f8384411 (patch) | |
tree | 0df638cfa208a1f77e813bbb33141cfca42dccb9 /src/core | |
parent | 8cdca268eb0e879d135aad677a860936d83dbd71 (diff) |
Clean up includes, forward declarations and friends in core api
Change-Id: I58e2dc2443bca75b0d315694c9f6503251a7be02
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 8c30f95f2a9b5de6d638f68bd3ab2bdaac7e1995)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/api/qwebengineclientcertificatestore.cpp | 1 | ||||
-rw-r--r-- | src/core/api/qwebenginecontextmenurequest.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginecookiestore.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginedownloadrequest.cpp | 1 | ||||
-rw-r--r-- | src/core/api/qwebenginedownloadrequest.h | 1 | ||||
-rw-r--r-- | src/core/api/qwebenginehistory.h | 3 | ||||
-rw-r--r-- | src/core/api/qwebenginehttprequest.h | 1 | ||||
-rw-r--r-- | src/core/api/qwebenginepage.cpp | 4 | ||||
-rw-r--r-- | src/core/api/qwebenginepage.h | 6 | ||||
-rw-r--r-- | src/core/api/qwebengineprofile.cpp | 3 | ||||
-rw-r--r-- | src/core/api/qwebengineprofile.h | 3 | ||||
-rw-r--r-- | src/core/api/qwebengineprofile_p.h | 6 | ||||
-rw-r--r-- | src/core/api/qwebenginescript.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginescriptcollection.cpp | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginescriptcollection.h | 1 | ||||
-rw-r--r-- | src/core/api/qwebenginescriptcollection_p.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginesettings.h | 4 | ||||
-rw-r--r-- | src/core/api/qwebengineurlrequestinterceptor.h | 3 | ||||
-rw-r--r-- | src/core/profile_io_data_qt.h | 1 |
19 files changed, 6 insertions, 42 deletions
diff --git a/src/core/api/qwebengineclientcertificatestore.cpp b/src/core/api/qwebengineclientcertificatestore.cpp index 462a63b26..4d84bd165 100644 --- a/src/core/api/qwebengineclientcertificatestore.cpp +++ b/src/core/api/qwebengineclientcertificatestore.cpp @@ -41,7 +41,6 @@ #include "net/client_cert_store_data.h" -#include <QByteArray> #include <QList> QT_BEGIN_NAMESPACE diff --git a/src/core/api/qwebenginecontextmenurequest.h b/src/core/api/qwebenginecontextmenurequest.h index 62e67fce6..e840a2188 100644 --- a/src/core/api/qwebenginecontextmenurequest.h +++ b/src/core/api/qwebenginecontextmenurequest.h @@ -163,8 +163,6 @@ private: friend class extensions::MimeHandlerViewGuestDelegateQt; friend class QQuickWebEngineViewPrivate; friend class QQuickWebEngineView; - friend class ContextMenuRequestJSWrapper; - friend class QWebEngineViewPrivate; friend class QWebEnginePage; }; diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h index 158c46108..584275ac4 100644 --- a/src/core/api/qwebenginecookiestore.h +++ b/src/core/api/qwebenginecookiestore.h @@ -53,7 +53,6 @@ namespace QtWebEngineCore { class ContentBrowserClientQt; class CookieMonsterDelegateQt; class ProfileAdapter; -class RestrictedCookieManagerQt; } // namespace QtWebEngineCore QT_BEGIN_NAMESPACE @@ -89,7 +88,6 @@ private: friend class QtWebEngineCore::ContentBrowserClientQt; friend class QtWebEngineCore::CookieMonsterDelegateQt; friend class QtWebEngineCore::ProfileAdapter; - friend class QtWebEngineCore::RestrictedCookieManagerQt; Q_DISABLE_COPY(QWebEngineCookieStore) Q_DECLARE_PRIVATE(QWebEngineCookieStore) QScopedPointer<QWebEngineCookieStorePrivate> d_ptr; diff --git a/src/core/api/qwebenginedownloadrequest.cpp b/src/core/api/qwebenginedownloadrequest.cpp index 7e3abed28..a55015f67 100644 --- a/src/core/api/qwebenginedownloadrequest.cpp +++ b/src/core/api/qwebenginedownloadrequest.cpp @@ -45,7 +45,6 @@ #include "profile_adapter.h" #include "web_contents_adapter_client.h" -#include <QDir> #include <QFileInfo> QT_BEGIN_NAMESPACE diff --git a/src/core/api/qwebenginedownloadrequest.h b/src/core/api/qwebenginedownloadrequest.h index f3056a936..29ba47eaf 100644 --- a/src/core/api/qwebenginedownloadrequest.h +++ b/src/core/api/qwebenginedownloadrequest.h @@ -166,7 +166,6 @@ private: Q_DECLARE_PRIVATE(QWebEngineDownloadRequest) friend class QWebEngineProfilePrivate; - friend class QWebEnginePage; protected: QWebEngineDownloadRequest(QWebEngineDownloadRequestPrivate *, QObject *parent = nullptr); diff --git a/src/core/api/qwebenginehistory.h b/src/core/api/qwebenginehistory.h index f572ba011..ef3747330 100644 --- a/src/core/api/qwebenginehistory.h +++ b/src/core/api/qwebenginehistory.h @@ -46,7 +46,6 @@ #include <QtCore/qstring.h> #include <QtCore/qdatetime.h> #include <QtCore/qshareddata.h> -#include <QtGui/qicon.h> QT_BEGIN_NAMESPACE @@ -54,7 +53,6 @@ class QWebEngineHistory; class QWebEngineHistoryPrivate; class QWebEngineHistoryItemPrivate; class QWebEngineHistoryModelPrivate; -class QWebEnginePage; class QWebEnginePagePrivate; class QQuickWebEngineViewPrivate; @@ -164,7 +162,6 @@ private: friend Q_WEBENGINECORE_EXPORT QDataStream &operator>>(QDataStream &, QWebEngineHistory &); friend Q_WEBENGINECORE_EXPORT QDataStream &operator<<(QDataStream &, const QWebEngineHistory &); - friend class QWebEnginePage; friend class QWebEnginePagePrivate; friend class QQuickWebEngineViewPrivate; friend void QScopedPointerDeleter<QWebEngineHistory>::cleanup(QWebEngineHistory *) noexcept; diff --git a/src/core/api/qwebenginehttprequest.h b/src/core/api/qwebenginehttprequest.h index ce77c04dd..e08520889 100644 --- a/src/core/api/qwebenginehttprequest.h +++ b/src/core/api/qwebenginehttprequest.h @@ -94,7 +94,6 @@ public: private: QSharedDataPointer<QWebEngineHttpRequestPrivate> d; - friend class QWebEngineHttpRequestPrivate; }; Q_DECLARE_SHARED(QWebEngineHttpRequest) diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index 57c660020..3b47f12c5 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -41,7 +41,6 @@ #include "qwebenginepage_p.h" #include "qwebenginecertificateerror.h" -#include "qwebenginedownloadrequest_p.h" #include "qwebenginefindtextresult.h" #include "qwebenginefullscreenrequest.h" #include "qwebenginehistory.h" @@ -49,7 +48,6 @@ #include "qwebengineloadinginfo.h" #include "qwebenginenavigationrequest.h" #include "qwebenginenewwindowrequest.h" -#include "qwebenginenotification.h" #include "qwebengineprofile.h" #include "qwebengineprofile_p.h" #include "qwebenginequotarequest.h" @@ -67,9 +65,7 @@ #include "render_view_context_menu_qt.h" #include "render_widget_host_view_qt_delegate.h" #include "render_widget_host_view_qt_delegate_client.h" -#include "user_notification_controller.h" #include "web_contents_adapter.h" -#include "web_engine_settings.h" #include <QAction> #include <QGuiApplication> diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 3eb4147ac..2afc75dc9 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -48,15 +48,13 @@ #include <QtCore/qobject.h> #include <QtCore/qurl.h> #include <QtCore/qvariant.h> -#include <QtGui/qpagelayout.h> #include <QtGui/qaction.h> -#include <QtNetwork/qnetworkaccessmanager.h> #include <functional> QT_BEGIN_NAMESPACE -class QMenu; +class QAuthenticator; class QContextMenuBuilder; class QWebChannel; class QWebEngineCertificateError; @@ -67,7 +65,6 @@ class QWebEngineHistory; class QWebEngineLoadingInfo; class QWebEngineNavigationRequest; class QWebEngineNewWindowRequest; -class QWebEnginePage; class QWebEnginePagePrivate; class QWebEngineProfile; class QWebEngineQuotaRequest; @@ -389,7 +386,6 @@ private: #endif friend class QContextMenuBuilder; - friend class QWebEngineFullScreenRequest; friend class QWebEngineView; friend class QWebEngineViewPrivate; #ifndef QT_NO_ACCESSIBILITY diff --git a/src/core/api/qwebengineprofile.cpp b/src/core/api/qwebengineprofile.cpp index f72e43161..19dfdebdd 100644 --- a/src/core/api/qwebengineprofile.cpp +++ b/src/core/api/qwebengineprofile.cpp @@ -39,17 +39,16 @@ #include "qwebengineprofile.h" #include "qwebengineprofile_p.h" -#include "qwebenginenotification.h" #include "qwebenginecookiestore.h" #include "qwebenginedownloadrequest.h" #include "qwebenginedownloadrequest_p.h" #include "qwebenginenotification.h" #include "qwebenginesettings.h" +#include "qwebenginescriptcollection.h" #include "qwebenginescriptcollection_p.h" #include "qtwebenginecoreglobal.h" #include "profile_adapter.h" #include "visited_links_manager_qt.h" -#include "web_engine_settings.h" #include <QDir> #include <QtWebEngineCore/qwebengineurlscheme.h> diff --git a/src/core/api/qwebengineprofile.h b/src/core/api/qwebengineprofile.h index 9d4572771..1e5b84fc4 100644 --- a/src/core/api/qwebengineprofile.h +++ b/src/core/api/qwebengineprofile.h @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE -class QObject; class QUrl; class QWebEngineClientCertificateStore; class QWebEngineCookieStore; @@ -152,9 +151,7 @@ private: Q_DECLARE_PRIVATE(QWebEngineProfile) QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = nullptr); - friend class QWebEnginePage; friend class QWebEnginePagePrivate; - friend class QWebEngineUrlSchemeHandler; QScopedPointer<QWebEngineProfilePrivate> d_ptr; }; diff --git a/src/core/api/qwebengineprofile_p.h b/src/core/api/qwebengineprofile_p.h index 4bec7d6dc..f39862214 100644 --- a/src/core/api/qwebengineprofile_p.h +++ b/src/core/api/qwebengineprofile_p.h @@ -52,8 +52,6 @@ // #include "profile_adapter_client.h" -#include "qwebengineprofile.h" -#include "qwebenginescriptcollection.h" #include <QMap> #include <QPointer> @@ -68,9 +66,9 @@ class ProfileAdapter; QT_BEGIN_NAMESPACE -class QWebEngineBrowserContext; -class QWebEngineProfilePrivate; class QWebEngineNotification; +class QWebEngineProfile; +class QWebEngineScriptCollection; class QWebEngineSettings; class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient { diff --git a/src/core/api/qwebenginescript.h b/src/core/api/qwebenginescript.h index 0c1849dac..a43f485a1 100644 --- a/src/core/api/qwebenginescript.h +++ b/src/core/api/qwebenginescript.h @@ -109,9 +109,7 @@ public: void swap(QWebEngineScript &other) { qSwap(d, other.d); } private: - friend class QQuickWebEngineScriptCollectionPrivate; friend class QWebEngineScriptCollectionPrivate; - friend class QWebEngineScriptCollection; QWebEngineScript(const QtWebEngineCore::UserScript &); QSharedDataPointer<QtWebEngineCore::UserScript> d; diff --git a/src/core/api/qwebenginescriptcollection.cpp b/src/core/api/qwebenginescriptcollection.cpp index 193c42a79..d19fcaa24 100644 --- a/src/core/api/qwebenginescriptcollection.cpp +++ b/src/core/api/qwebenginescriptcollection.cpp @@ -42,8 +42,6 @@ #include "renderer_host/user_resource_controller_host.h" -using QtWebEngineCore::UserScript; - /*! \class QWebEngineScriptCollection \inmodule QtWebEngineCore diff --git a/src/core/api/qwebenginescriptcollection.h b/src/core/api/qwebenginescriptcollection.h index 2a1ab7dbf..40ac59e62 100644 --- a/src/core/api/qwebenginescriptcollection.h +++ b/src/core/api/qwebenginescriptcollection.h @@ -44,7 +44,6 @@ #include <QtWebEngineCore/qwebenginescript.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qlist.h> -#include <QtCore/qset.h> QT_BEGIN_NAMESPACE class QWebEngineScriptCollectionPrivate; diff --git a/src/core/api/qwebenginescriptcollection_p.h b/src/core/api/qwebenginescriptcollection_p.h index 442f8fe3d..14bb6dab0 100644 --- a/src/core/api/qwebenginescriptcollection_p.h +++ b/src/core/api/qwebenginescriptcollection_p.h @@ -55,7 +55,7 @@ #include "qwebenginescript.h" #include "web_contents_adapter.h" -#include <QtCore/QSet> +#include <QtCore/QList> #include <QtCore/QSharedPointer> namespace QtWebEngineCore { diff --git a/src/core/api/qwebenginesettings.h b/src/core/api/qwebenginesettings.h index f565f8ee2..4ab364d1b 100644 --- a/src/core/api/qwebenginesettings.h +++ b/src/core/api/qwebenginesettings.h @@ -50,10 +50,6 @@ class WebEngineSettings; QT_BEGIN_NAMESPACE -class QIcon; -class QPixmap; -class QUrl; - class Q_WEBENGINECORE_EXPORT QWebEngineSettings { public: enum FontFamily { diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h index 4d3020306..6903a25ff 100644 --- a/src/core/api/qwebengineurlrequestinterceptor.h +++ b/src/core/api/qwebengineurlrequestinterceptor.h @@ -43,10 +43,7 @@ #include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtWebEngineCore/qwebengineurlrequestinfo.h> -#include <QtCore/qbytearray.h> -#include <QtCore/qhash.h> #include <QtCore/qobject.h> -#include <QtCore/qurl.h> QT_BEGIN_NAMESPACE diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h index e44d838dd..ab5c588f5 100644 --- a/src/core/profile_io_data_qt.h +++ b/src/core/profile_io_data_qt.h @@ -62,6 +62,7 @@ class ExtensionSystemQt; namespace QtWebEngineCore { struct ClientCertificateStoreData; +class CookieMonsterDelegateQt; class ProfileIODataQt; class ProfileQt; |