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

---
 src/Mod/Image/App/AppImage.cpp               |  7 +-
 src/Mod/Image/App/CMakeLists.txt             | 77 ++++++++++----------
 src/Mod/Image/App/ImageBase.cpp              |  7 +-
 src/Mod/Image/App/ImageBase.h                |  2 -
 src/Mod/Image/App/ImagePlane.cpp             |  7 +-
 src/Mod/Image/App/ImagePlane.h               |  2 -
 src/Mod/Image/App/PreCompiled.h              |  3 -
 src/Mod/Image/Gui/AppImageGui.cpp            |  6 +-
 src/Mod/Image/Gui/CMakeLists.txt             |  1 -
 src/Mod/Image/Gui/Command.cpp                | 13 ++--
 src/Mod/Image/Gui/ImageOrientationDialog.cpp |  8 +-
 src/Mod/Image/Gui/ImageView.cpp              | 11 ++-
 src/Mod/Image/Gui/ImageView.h                |  5 +-
 src/Mod/Image/Gui/OpenGLImageBox.cpp         |  8 +-
 src/Mod/Image/Gui/PreCompiled.h              | 31 ++++----
 src/Mod/Image/Gui/ViewProviderImagePlane.cpp | 22 ++----
 src/Mod/Image/Gui/ViewProviderImagePlane.h   |  3 +-
 src/Mod/Image/Gui/Workbench.cpp              |  6 +-
 src/Mod/Image/Gui/Workbench.h                |  2 -
 19 files changed, 93 insertions(+), 128 deletions(-)

diff --git a/src/Mod/Image/App/AppImage.cpp b/src/Mod/Image/App/AppImage.cpp
index d1ead645c8..9bb298e64c 100644
--- a/src/Mod/Image/App/AppImage.cpp
+++ b/src/Mod/Image/App/AppImage.cpp
@@ -10,16 +10,11 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
+
 #include "ImagePlane.h"
 
 
diff --git a/src/Mod/Image/App/CMakeLists.txt b/src/Mod/Image/App/CMakeLists.txt
index ce790e55c4..500ed9f8c7 100644
--- a/src/Mod/Image/App/CMakeLists.txt
+++ b/src/Mod/Image/App/CMakeLists.txt
@@ -1,39 +1,38 @@
-if(WIN32)
-    add_definitions(-DFCAppImage)
-endif(WIN32)
-
-if(OPENCV2_FOUND)
-    add_definitions(-DHAVE_OPENCV2)
-endif(OPENCV2_FOUND)
-
-include_directories(
-    ${OPENCV_INCLUDE2_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-set(Image_LIBS
-    ${OPENCV2_LIBRARIES}
-    FreeCADApp
-)
-
-set(Image_SRCS
-    ImageBase.cpp
-    ImageBase.h
-    ImagePlane.cpp
-    ImagePlane.h
-    PreCompiled.cpp
-    PreCompiled.h
-    AppImage.cpp
-)
-
-add_library(Image SHARED ${Image_SRCS})
-target_link_libraries(Image ${Image_LIBS})
-
-
-SET_BIN_DIR(Image Image /Mod/Image)
-SET_PYTHON_PREFIX_SUFFIX(Image)
-
-INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(WIN32)
+    add_definitions(-DFCAppImage)
+endif(WIN32)
+
+if(OPENCV2_FOUND)
+    add_definitions(-DHAVE_OPENCV2)
+endif(OPENCV2_FOUND)
+
+include_directories(
+    ${OPENCV_INCLUDE2_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
+)
+
+set(Image_LIBS
+    ${OPENCV2_LIBRARIES}
+    FreeCADApp
+)
+
+set(Image_SRCS
+    ImageBase.cpp
+    ImageBase.h
+    ImagePlane.cpp
+    ImagePlane.h
+    PreCompiled.cpp
+    PreCompiled.h
+    AppImage.cpp
+)
+
+add_library(Image SHARED ${Image_SRCS})
+target_link_libraries(Image ${Image_LIBS})
+
+
+SET_BIN_DIR(Image Image /Mod/Image)
+SET_PYTHON_PREFIX_SUFFIX(Image)
+
+INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/Mod/Image/App/ImageBase.cpp b/src/Mod/Image/App/ImageBase.cpp
index c489c30668..f96ab4fcb5 100644
--- a/src/Mod/Image/App/ImageBase.cpp
+++ b/src/Mod/Image/App/ImageBase.cpp
@@ -16,13 +16,10 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <cmath>
-# include <cstring>
-#endif
 
-#include "ImageBase.h"
 #include <Base/Exception.h>
+#include "ImageBase.h"
+
 
 using namespace Image;
 
diff --git a/src/Mod/Image/App/ImageBase.h b/src/Mod/Image/App/ImageBase.h
index bb013316be..144699c717 100644
--- a/src/Mod/Image/App/ImageBase.h
+++ b/src/Mod/Image/App/ImageBase.h
@@ -18,8 +18,6 @@
 #ifndef IMAGEBASE_H
 #define IMAGEBASE_H
 
-#include <Mod/Image/ImageGlobal.h>
-
 namespace Image
 {
 
diff --git a/src/Mod/Image/App/ImagePlane.cpp b/src/Mod/Image/App/ImagePlane.cpp
index cfdbd96ae4..9883241d6b 100644
--- a/src/Mod/Image/App/ImagePlane.cpp
+++ b/src/Mod/Image/App/ImagePlane.cpp
@@ -20,15 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "ImagePlane.h"
-#include <App/DocumentObjectPy.h>
-#include <Base/Placement.h>
+
 
 using namespace Image;
 using namespace App;
diff --git a/src/Mod/Image/App/ImagePlane.h b/src/Mod/Image/App/ImagePlane.h
index 1e6dad1110..38d2cf871c 100644
--- a/src/Mod/Image/App/ImagePlane.h
+++ b/src/Mod/Image/App/ImagePlane.h
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef Image_ImagePlane_H
 #define Image_ImagePlane_H
 
 #include <App/GeoFeature.h>
 #include <App/PropertyFile.h>
 #include <App/PropertyUnits.h>
-#include <Mod/Image/ImageGlobal.h>
 
 namespace Image
 {
diff --git a/src/Mod/Image/App/PreCompiled.h b/src/Mod/Image/App/PreCompiled.h
index 725e6894d8..40dd25fef1 100644
--- a/src/Mod/Image/App/PreCompiled.h
+++ b/src/Mod/Image/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED__
 #define __PRECOMPILED__
 
@@ -52,8 +51,6 @@
 #include <set>
 #include <bitset>
 
-#include <Python.h>
-
 #endif // _PreComp_
 #endif
 
diff --git a/src/Mod/Image/Gui/AppImageGui.cpp b/src/Mod/Image/Gui/AppImageGui.cpp
index 7a8db012ef..1da37a2954 100644
--- a/src/Mod/Image/Gui/AppImageGui.cpp
+++ b/src/Mod/Image/Gui/AppImageGui.cpp
@@ -9,20 +9,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
+
 #include "ImageView.h"
 #include "Workbench.h"
 #include "ViewProviderImagePlane.h"
 
+
 // use a different name to CreateCommand()
 void CreateImageCommands();
 
diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt
index a3a76ca2d7..0132d5b9c6 100644
--- a/src/Mod/Image/Gui/CMakeLists.txt
+++ b/src/Mod/Image/Gui/CMakeLists.txt
@@ -11,7 +11,6 @@ include_directories(
     ${OPENCV2_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
 )
 
 if(MSVC)
diff --git a/src/Mod/Image/Gui/Command.cpp b/src/Mod/Image/Gui/Command.cpp
index 07959c570d..34df3fcf97 100644
--- a/src/Mod/Image/Gui/Command.cpp
+++ b/src/Mod/Image/Gui/Command.cpp
@@ -11,7 +11,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAction>
 # include <QFileDialog>
 # include <QImage>
 # include <QImageReader>
@@ -24,16 +23,18 @@
 #include <sys/timeb.h>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/Tools.h>
-#include <Base/Interpreter.h>
 #include <App/Document.h>
+#include <Base/Exception.h>
+#include <Base/Interpreter.h>
+#include <Base/Tools.h>
+
 #include <Gui/Application.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Command.h>
-#include <Gui/BitmapFactory.h>
+#include <Gui/MainWindow.h>
+
 #include "ImageOrientationDialog.h"
 
+
 #if HAVE_OPENCV2
 #  include "opencv2/opencv.hpp"
 #endif
diff --git a/src/Mod/Image/Gui/ImageOrientationDialog.cpp b/src/Mod/Image/Gui/ImageOrientationDialog.cpp
index f51a2e2f03..58febfb163 100644
--- a/src/Mod/Image/Gui/ImageOrientationDialog.cpp
+++ b/src/Mod/Image/Gui/ImageOrientationDialog.cpp
@@ -21,19 +21,17 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif
 
+#include <Base/Tools.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 
-#include "ui_ImageOrientationDialog.h"
 #include "ImageOrientationDialog.h"
+#include "ui_ImageOrientationDialog.h"
+
 
 using namespace ImageGui;
 
diff --git a/src/Mod/Image/Gui/ImageView.cpp b/src/Mod/Image/Gui/ImageView.cpp
index b2a65e8cb3..066e3372a4 100644
--- a/src/Mod/Image/Gui/ImageView.cpp
+++ b/src/Mod/Image/Gui/ImageView.cpp
@@ -21,17 +21,16 @@
 # include <QApplication>
 # include <QMenu>
 # include <QMouseEvent>
-# include <QSlider>
 # include <QStatusBar>
 # include <QToolBar>
-# include <cmath>
 #endif
 
-#include "ImageView.h"
-#include "../App/ImageBase.h"
-#include "XpmImages.h"
-#include <Base/Parameter.h>
 #include <App/Application.h>
+#include <Base/Parameter.h>
+
+#include "ImageView.h"
+#include "XpmImages.h"
+
 
 using namespace ImageGui;
 
diff --git a/src/Mod/Image/Gui/ImageView.h b/src/Mod/Image/Gui/ImageView.h
index d136ab69de..75fd2b2514 100644
--- a/src/Mod/Image/Gui/ImageView.h
+++ b/src/Mod/Image/Gui/ImageView.h
@@ -20,8 +20,9 @@
 
 #include <QMouseEvent>
 #include <Gui/MDIView.h>
-#include <Mod/Image/Gui/OpenGLImageBox.h>
-#include <Mod/Image/ImageGlobal.h>
+
+#include "OpenGLImageBox.h"
+
 
 class QSlider;
 class QAction;
diff --git a/src/Mod/Image/Gui/OpenGLImageBox.cpp b/src/Mod/Image/Gui/OpenGLImageBox.cpp
index 3c4a6e2441..aa1484e70c 100644
--- a/src/Mod/Image/Gui/OpenGLImageBox.cpp
+++ b/src/Mod/Image/Gui/OpenGLImageBox.cpp
@@ -20,13 +20,13 @@
 #ifndef _PreComp_
 # include <cmath>
 # include <QDebug>
-# include <QOpenGLDebugMessage>
-# include <QOpenGLContext>
-# include <QOpenGLFunctions>
-# include <QSurfaceFormat>
 # include <QMessageBox>
+# include <QOpenGLContext>
+# include <QOpenGLDebugMessage>
+# include <QOpenGLFunctions>
 # include <QPainter>
 # include <QPainterPath>
+# include <QSurfaceFormat>
 #endif
 
 #if defined(__MINGW32__)
diff --git a/src/Mod/Image/Gui/PreCompiled.h b/src/Mod/Image/Gui/PreCompiled.h
index f2a22f290f..0f9fea35c2 100644
--- a/src/Mod/Image/Gui/PreCompiled.h
+++ b/src/Mod/Image/Gui/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED_GUI__
 #define __PRECOMPILED_GUI__
 
@@ -35,7 +34,6 @@
 # define ImageGuiExport
 #endif
 
-
 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
 # pragma warning(disable : 4005)
@@ -46,35 +44,40 @@
 
 #ifdef _PreComp_
 
-// Python
-#include <Python.h>
-
 // standard
-#include <iostream>
 #include <assert.h>
 #include <cmath>
+#include <iostream>
+#include <sstream>
 
 // STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
 #include <algorithm>
-#include <stack>
-#include <queue>
 #include <bitset>
+#include <list>
+#include <map>
+#include <queue>
+#include <set>
+#include <stack>
+#include <string>
+#include <vector>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
+// Inventor
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoFaceSet.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoTexture2.h>
+# include <Inventor/nodes/SoTextureCoordinate2.h>
+
 // Qt Toolkit
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
 #endif
 
-
 #endif //_PreComp_
 
 #endif // __PRECOMPILED_GUI__
diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
index 29e2c2f961..1ecbb16c35 100644
--- a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
+++ b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
@@ -20,35 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Inventor/SbVec3f.h>
-# include <Inventor/nodes/SoSeparator.h>
+ #include <sstream>
 # include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoFaceSet.h>
-# include <Inventor/nodes/SoShapeHints.h>
-# include <Inventor/nodes/SoImage.h>
 # include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoTextureCoordinate2.h>
+# include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTexture2.h>
+# include <Inventor/nodes/SoTextureCoordinate2.h>
 # include <QFile>
 # include <QFileInfo>
 # include <QImage>
 # include <QString>
 #endif
 
+#include <App/Document.h>
+#include <Base/FileInfo.h>
+#include <Gui/BitmapFactory.h>
+#include <Mod/Image/App/ImagePlane.h>
+
 #include "ViewProviderImagePlane.h"
 
-#include <Mod/Image/App/ImagePlane.h>
-#include <App/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <Base/Console.h>
-#include <sstream>
 
 using namespace Gui;
 using namespace ImageGui;
diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.h b/src/Mod/Image/Gui/ViewProviderImagePlane.h
index c4e3bba7f6..286c8b5b3f 100644
--- a/src/Mod/Image/Gui/ViewProviderImagePlane.h
+++ b/src/Mod/Image/Gui/ViewProviderImagePlane.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef IMAGE_ViewProviderImagePlane_H
 #define IMAGE_ViewProviderImagePlane_H
 
 #include <Gui/ViewProviderGeometryObject.h>
-#include <Mod/Image/ImageGlobal.h>
+
 
 class SoCoordinate3;
 class SoDrawStyle;
diff --git a/src/Mod/Image/Gui/Workbench.cpp b/src/Mod/Image/Gui/Workbench.cpp
index b902c4678d..c332ba9398 100644
--- a/src/Mod/Image/Gui/Workbench.cpp
+++ b/src/Mod/Image/Gui/Workbench.cpp
@@ -20,16 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <qobject.h>
-#endif
-
 #include "Workbench.h"
 #include <Gui/ToolBarManager.h>
 
+
 using namespace ImageGui;
 
 #if 0 // needed for Qt's lupdate utility
diff --git a/src/Mod/Image/Gui/Workbench.h b/src/Mod/Image/Gui/Workbench.h
index 16f8eb2dde..70b0579ec3 100644
--- a/src/Mod/Image/Gui/Workbench.h
+++ b/src/Mod/Image/Gui/Workbench.h
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef IMAGE_WORKBENCH_H
 #define IMAGE_WORKBENCH_H
 
 #include <Gui/Workbench.h>
-#include <Mod/Image/ImageGlobal.h>
 
 namespace ImageGui {