From ee6d631531faeff2bfb1180f74587e004320f240 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 20 Mar 2022 21:16:27 +0100
Subject: [PATCH] [Web] remove unused headers and Xerces

---
 src/Mod/Web/App/AppWeb.cpp      |  5 +--
 src/Mod/Web/App/CMakeLists.txt  |  1 -
 src/Mod/Web/App/PreCompiled.h   |  8 +++-
 src/Mod/Web/App/Server.cpp      | 16 ++++---
 src/Mod/Web/App/Server.h        |  4 +-
 src/Mod/Web/Gui/AppWebGui.cpp   |  9 +---
 src/Mod/Web/Gui/BrowserView.cpp | 76 ++++++++++++---------------------
 src/Mod/Web/Gui/BrowserView.h   |  2 +-
 src/Mod/Web/Gui/CMakeLists.txt  |  1 -
 src/Mod/Web/Gui/Command.cpp     |  6 +--
 src/Mod/Web/Gui/CookieJar.cpp   |  8 ++--
 src/Mod/Web/Gui/CookieJar.h     |  2 +
 src/Mod/Web/Gui/PreCompiled.h   |  5 +--
 src/Mod/Web/Gui/Workbench.cpp   | 17 ++------
 14 files changed, 60 insertions(+), 100 deletions(-)

diff --git a/src/Mod/Web/App/AppWeb.cpp b/src/Mod/Web/App/AppWeb.cpp
index 4192fb0cff..6dc1b479be 100644
--- a/src/Mod/Web/App/AppWeb.cpp
+++ b/src/Mod/Web/App/AppWeb.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Python.h>
 # include <climits>
 # include <sstream>
 #endif
@@ -32,10 +30,9 @@
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
 #include "Server.h"
 
+
 // See http://docs.python.org/2/library/socketserver.html
 /*
 import socket
diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt
index 9f777aff3e..8ac451b4d0 100644
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
     ${OCC_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
 )
 
 if(BUILD_QT5)
diff --git a/src/Mod/Web/App/PreCompiled.h b/src/Mod/Web/App/PreCompiled.h
index 2ca1cbb6cf..6e063c2507 100644
--- a/src/Mod/Web/App/PreCompiled.h
+++ b/src/Mod/Web/App/PreCompiled.h
@@ -38,13 +38,16 @@
 // standard
 #include <cstdio>
 #include <cassert>
+#include <climits>
 #include <iostream>
+#include <stdexcept>
 
 // STL
 #include <algorithm>
 #include <iostream>
 #include <list>
 #include <map>
+#include <memory>
 #include <queue>
 #include <set>
 #include <sstream>
@@ -52,8 +55,9 @@
 #include <string>
 #include <vector>
 
-// Xerces
-#include <xercesc/util/XercesDefs.hpp>
+// Qt
+#include <QCoreApplication>
+#include <QTcpSocket>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Web/App/Server.cpp b/src/Mod/Web/App/Server.cpp
index 091c4a1480..1e2a3de8e1 100644
--- a/src/Mod/Web/App/Server.cpp
+++ b/src/Mod/Web/App/Server.cpp
@@ -20,18 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <stdexcept>
+# include <memory>
+# include <QCoreApplication>
+# include <QTcpSocket>
+#endif
 
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <stdexcept>
-#include <memory>
-
-#include "Server.h"
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>
 
+#include "Server.h"
+
+
 using namespace Web;
 
 Firewall* Firewall::instance = 0;
diff --git a/src/Mod/Web/App/Server.h b/src/Mod/Web/App/Server.h
index 6dd913b1e8..6469238607 100644
--- a/src/Mod/Web/App/Server.h
+++ b/src/Mod/Web/App/Server.h
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef WEB_SERVER_H
 #define WEB_SERVER_H
 
 #include <QByteArray>
-#include <QObject>
 #include <QEvent>
+#include <QObject>
 #include <QTcpSocket>
 #include <QTcpServer>
-#include <CXX/Objects.hxx>
 
 
 namespace Web {
diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp
index 23fb455289..6277307431 100644
--- a/src/Mod/Web/Gui/AppWebGui.cpp
+++ b/src/Mod/Web/Gui/AppWebGui.cpp
@@ -20,14 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Python.h>
-# include <QMdiArea>
-# include <QMdiSubWindow>
-# include <QUrl>
 # include <QIcon>
+# include <QUrl>
 #endif
 
 #include <Base/Console.h>
@@ -35,13 +31,12 @@
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/MainWindow.h>
-#include <Gui/WorkbenchManager.h>
 #include <Gui/Language/Translator.h>
+
 #include "BrowserView.h"
 #include "Workbench.h"
 
 
-
 // use a different name to CreateCommand()
 void CreateWebCommands(void);
 
diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp
index 59c7124f7f..6f4df0a6a4 100644
--- a/src/Mod/Web/Gui/BrowserView.cpp
+++ b/src/Mod/Web/Gui/BrowserView.cpp
@@ -20,75 +20,55 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QAbstractTextDocumentLayout>
 # include <QApplication>
-# include <QClipboard>
-# include <QDateTime>
-# include <QHBoxLayout>
-# include <QMessageBox>
-# include <QNetworkRequest>
-# include <QPainter>
-# include <QPrinter>
-# include <QPrintDialog>
-# include <QScrollBar>
-# include <QMouseEvent>
-# include <QStatusBar>
-# include <QTextBlock>
-# include <QTextCodec>
-# include <QTextStream>
-# include <QTimer>
-# include <QFileInfo>
 # include <QDesktopServices>
-# include <QMenu>
-# include <QDesktopWidget>
-# include <QSignalMapper>
-# include <QPointer>
-# include <QDir>
+# include <QFileInfo>
+# include <QLatin1String>
 # include <QLineEdit>
+# include <QMenu>
+# include <QMessageBox>
+# include <QMouseEvent>
+# include <QNetworkRequest>
+# include <QRegExp>
+# include <QSignalMapper>
+# include <QStatusBar>
 #endif
 
-
 #if defined(QTWEBENGINE)
-# include <QWebEnginePage>
-# include <QWebEngineView>
-# include <QWebEngineSettings>
-# include <QWebEngineProfile>
 # include <QWebEngineContextMenuData>
-# include <QWebEngineUrlRequestInterceptor>
+# include <QWebEnginePage>
+# include <QWebEngineProfile>
+# include <QWebEngineSettings>
 # include <QWebEngineUrlRequestInfo>
+# include <QWebEngineUrlRequestInterceptor>
+# include <QWebEngineView>
 #elif defined(QTWEBKIT)
 # include <QWebFrame>
-# include <QWebView>
-# include <QWebSettings>
 # include <QNetworkAccessManager>
+# include <QWebSettings>
+# include <QWebView>
 using QWebEngineView = QWebView;
 using QWebEnginePage = QWebPage;
 #endif
 
-#include <QScreen>
-
-#include <QLatin1String>
-#include <QRegExp>
-#include "BrowserView.h"
-#include "CookieJar.h"
-#include <Gui/Application.h>
-#include <Gui/MainWindow.h>
-#include <Gui/MDIViewPy.h>
-#include <Gui/ProgressBar.h>
-#include <Gui/Command.h>
-#include <Gui/OnlineDocumentation.h>
-#include <Gui/DownloadManager.h>
-#include <Gui/TextDocumentEditorView.h>
-
+#include <App/Document.h>
 #include <Base/Parameter.h>
 #include <Base/Exception.h>
 #include <Base/Tools.h>
-#include <App/Document.h>
-#include <CXX/Extensions.hxx>
+#include <Gui/Application.h>
+#include <Gui/Command.h>
+#include <Gui/DownloadManager.h>
+#include <Gui/MainWindow.h>
+#include <Gui/MDIViewPy.h>
+#include <Gui/ProgressBar.h>
+#include <Gui/TextDocumentEditorView.h>
+
+#include "BrowserView.h"
+#include "CookieJar.h"
+
 
 using namespace WebGui;
 using namespace Gui;
diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h
index 9ce249eddf..75f7640013 100644
--- a/src/Mod/Web/Gui/BrowserView.h
+++ b/src/Mod/Web/Gui/BrowserView.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef WEBGUI_BROWSERVIEW_H
 #define WEBGUI_BROWSERVIEW_H
 
@@ -31,6 +30,7 @@
 
 #if defined(QTWEBENGINE)
 #include <QWebEngineView>
+
 namespace WebGui {
 class WebEngineUrlRequestInterceptor;
 }
diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt
index 8167f35779..e1aac2d4ac 100644
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
     ${COIN3D_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
 )
 
 if (Qt5WebEngineWidgets_FOUND)
diff --git a/src/Mod/Web/Gui/Command.cpp b/src/Mod/Web/Gui/Command.cpp
index 9052830378..2272b6d93b 100644
--- a/src/Mod/Web/Gui/Command.cpp
+++ b/src/Mod/Web/Gui/Command.cpp
@@ -20,18 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
 
 #include "BrowserView.h"
 
+
 using namespace std;
 using namespace Gui;
 using namespace WebGui;
diff --git a/src/Mod/Web/Gui/CookieJar.cpp b/src/Mod/Web/Gui/CookieJar.cpp
index 95f7d1301e..3d8a5f6d69 100644
--- a/src/Mod/Web/Gui/CookieJar.cpp
+++ b/src/Mod/Web/Gui/CookieJar.cpp
@@ -20,20 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 #include <QTextStream>
-#include <QFile>
-#include <QTimer>
 #include <QNetworkCookie>
 #endif
 
+#include <App/Application.h>
+#include <Base/FileInfo.h>
+
 #include "CookieJar.h"
 
-#include <Base/FileInfo.h>
-#include <App/Application.h>
 
 using namespace WebGui;
 
diff --git a/src/Mod/Web/Gui/CookieJar.h b/src/Mod/Web/Gui/CookieJar.h
index d6c45ddbbe..425612eb44 100644
--- a/src/Mod/Web/Gui/CookieJar.h
+++ b/src/Mod/Web/Gui/CookieJar.h
@@ -24,7 +24,9 @@
 #ifndef WEBGUI_COOKIEJAR_H
 #define WEBGUI_COOKIEJAR_H
 
+#include <QFile>
 #include <QNetworkCookieJar>
+#include <QTimer>
 
 class QNetworkCookieJar;
 
diff --git a/src/Mod/Web/Gui/PreCompiled.h b/src/Mod/Web/Gui/PreCompiled.h
index b2314ecd92..7d45cbc756 100644
--- a/src/Mod/Web/Gui/PreCompiled.h
+++ b/src/Mod/Web/Gui/PreCompiled.h
@@ -36,9 +36,6 @@
 
 #ifdef _PreComp_
 
-// Python
-#include <Python.h>
-
 // standard
 #include <iostream>
 #include <assert.h>
@@ -59,6 +56,8 @@
 # include <windows.h>
 #endif
 
+// Qt Core
+#include <QLatin1String>
 
 // Qt Toolkit
 #ifndef __QtAll__
diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp
index e20a392040..17f303a701 100644
--- a/src/Mod/Web/Gui/Workbench.cpp
+++ b/src/Mod/Web/Gui/Workbench.cpp
@@ -20,25 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <qobject.h>
-#endif
-
 #include "Workbench.h"
-#include <Gui/ToolBarManager.h>
-#include <Gui/MenuManager.h>
-#include <Gui/ToolBarManager.h>
-#include <Gui/DockWindowManager.h>
+
 #include <Gui/Application.h>
-#include <Gui/Action.h>
 #include <Gui/Command.h>
+#include <Gui/MenuManager.h>
 #include <Gui/Selection.h>
-#include <Gui/ToolBoxManager.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
+#include <Gui/ToolBarManager.h>
+
 
 using namespace WebGui;