From e64a2ce6758cd1578b5fe8565ffe212154f80659 Mon Sep 17 00:00:00 2001 From: Uwe Date: Wed, 7 Dec 2022 04:55:48 +0100 Subject: [PATCH] [Web] remove unused includes - also some sorting --- src/Mod/Web/App/PreCompiled.h | 13 ------------- src/Mod/Web/Gui/AppWebGui.cpp | 1 + src/Mod/Web/Gui/BrowserView.cpp | 8 ++++---- src/Mod/Web/Gui/BrowserView.h | 26 ++++++++++++-------------- src/Mod/Web/Gui/CookieJar.cpp | 5 ++--- src/Mod/Web/Gui/PreCompiled.h | 14 +------------- src/Mod/Web/Gui/Workbench.cpp | 5 ++--- 7 files changed, 22 insertions(+), 50 deletions(-) diff --git a/src/Mod/Web/App/PreCompiled.h b/src/Mod/Web/App/PreCompiled.h index 61806b6b0d..99df2613e2 100644 --- a/src/Mod/Web/App/PreCompiled.h +++ b/src/Mod/Web/App/PreCompiled.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef APP_PRECOMPILED_H #define APP_PRECOMPILED_H @@ -29,24 +28,12 @@ #ifdef _PreComp_ // standard -#include -#include #include -#include #include // STL -#include -#include -#include -#include #include -#include -#include #include -#include -#include -#include // Qt #include diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index f872b334a2..4f09f2150b 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -22,6 +22,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include # include # include #endif diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index 1f8d1860b9..1bec2eb39b 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -21,8 +21,9 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ +# include + # include # include # include @@ -34,16 +35,15 @@ # include # include # include -# include # include # include #endif #if defined(QTWEBENGINE) # if QT_VERSION < QT_VERSION_CHECK(6,0,0) -# include +# include # else -# include +# include # endif # include # include diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h index 5eab164722..d5e6990f36 100644 --- a/src/Mod/Web/Gui/BrowserView.h +++ b/src/Mod/Web/Gui/BrowserView.h @@ -23,26 +23,24 @@ #ifndef WEBGUI_BROWSERVIEW_H #define WEBGUI_BROWSERVIEW_H +#include +#include +#if defined(QTWEBENGINE) +# include +namespace WebGui { + class WebEngineUrlRequestInterceptor; +} +#elif defined(QTWEBKIT) +# include +#endif #include #include #include -#include -#include -#if defined(QTWEBENGINE) -#include - -namespace WebGui { -class WebEngineUrlRequestInterceptor; -} -#elif defined(QTWEBKIT) -#include -#endif - -class QUrl; -class QNetworkRequest; class QNetworkReply; +class QNetworkRequest; +class QUrl; namespace WebGui { class UrlWidget; diff --git a/src/Mod/Web/Gui/CookieJar.cpp b/src/Mod/Web/Gui/CookieJar.cpp index 3d8a5f6d69..4fc4677c26 100644 --- a/src/Mod/Web/Gui/CookieJar.cpp +++ b/src/Mod/Web/Gui/CookieJar.cpp @@ -21,10 +21,9 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ -#include -#include +# include +# include #endif #include diff --git a/src/Mod/Web/Gui/PreCompiled.h b/src/Mod/Web/Gui/PreCompiled.h index ca89614c13..3b8c9bffea 100644 --- a/src/Mod/Web/Gui/PreCompiled.h +++ b/src/Mod/Web/Gui/PreCompiled.h @@ -28,21 +28,9 @@ #ifdef _PreComp_ -// standard -#include -#include -#include - // STL -#include -#include #include -#include -#include -#include -#include -#include -#include +#include #ifdef FC_OS_WIN32 # include diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp index 17f303a701..9012f34152 100644 --- a/src/Mod/Web/Gui/Workbench.cpp +++ b/src/Mod/Web/Gui/Workbench.cpp @@ -22,14 +22,13 @@ #include "PreCompiled.h" -#include "Workbench.h" - #include #include -#include #include #include +#include "Workbench.h" + using namespace WebGui;