From 356ae47332ec015034169c2839a20d4547db0a38 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Fri, 11 Nov 2022 02:49:22 +0100
Subject: [PATCH] [Mesh] Imp* - end: remove unused includes

- also some sorting
---
 src/Mod/Mesh/App/Importer.cpp         |  6 +++---
 src/Mod/Mesh/App/Mesh.cpp             | 23 +++++++++--------------
 src/Mod/Mesh/App/Mesh.h               | 20 ++++++++++----------
 src/Mod/Mesh/App/MeshFeature.cpp      | 12 +-----------
 src/Mod/Mesh/App/MeshFeature.h        |  5 +++--
 src/Mod/Mesh/App/MeshFeaturePyImp.cpp |  6 +-----
 src/Mod/Mesh/App/MeshPoint.h          |  7 +++----
 src/Mod/Mesh/App/MeshPointPyImp.cpp   |  4 ++--
 src/Mod/Mesh/App/MeshProperties.cpp   | 10 +++-------
 src/Mod/Mesh/App/MeshProperties.h     | 14 +++++---------
 src/Mod/Mesh/App/MeshPyImp.cpp        | 22 ++++++++--------------
 src/Mod/Mesh/App/MeshTexture.cpp      |  4 +---
 src/Mod/Mesh/App/MeshTexture.h        |  4 ++--
 src/Mod/Mesh/App/Segment.cpp          |  7 ++-----
 src/Mod/Mesh/App/Segment.h            |  8 +++++---
 src/Mod/Mesh/App/Types.h              |  2 --
 16 files changed, 58 insertions(+), 96 deletions(-)

diff --git a/src/Mod/Mesh/App/Importer.cpp b/src/Mod/Mesh/App/Importer.cpp
index 06ac6c3ea0..133b9423d5 100644
--- a/src/Mod/Mesh/App/Importer.cpp
+++ b/src/Mod/Mesh/App/Importer.cpp
@@ -21,12 +21,12 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
+
+#include <App/Document.h>
 
 #include "Importer.h"
 #include "MeshFeature.h"
-#include <App/Document.h>
+
 
 using namespace Mesh;
 
diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp
index 4fe127f0e1..84033abc0a 100644
--- a/src/Mod/Mesh/App/Mesh.cpp
+++ b/src/Mod/Mesh/App/Mesh.cpp
@@ -20,44 +20,39 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
 # include <sstream>
 #endif
 
-#include <CXX/Objects.hxx>
 #include <Base/Builder3D.h>
 #include <Base/Console.h>
 #include <Base/Converter.h>
 #include <Base/Exception.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
 #include <Base/Interpreter.h>
+#include <Base/Reader.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
 #include <Base/Tools.h>
 #include <Base/ViewProj.h>
+#include <Base/Writer.h>
 
 #include "Core/Builder.h"
-#include "Core/MeshKernel.h"
-#include "Core/Grid.h"
-#include "Core/Iterator.h"
-#include "Core/Info.h"
-#include "Core/TopoAlgorithm.h"
-#include "Core/Evaluation.h"
+#include "Core/Decimation.h"
 #include "Core/Degeneration.h"
+#include "Core/Grid.h"
+#include "Core/Info.h"
+#include "Core/Iterator.h"
+#include "Core/MeshKernel.h"
 #include "Core/Segmentation.h"
 #include "Core/SetOperations.h"
-#include "Core/Triangulation.h"
+#include "Core/TopoAlgorithm.h"
 #include "Core/Trim.h"
 #include "Core/TrimByPlane.h"
-#include "Core/Visitor.h"
-#include "Core/Decimation.h"
 
 #include "Mesh.h"
-#include "MeshPy.h"
+
 
 using namespace Mesh;
 
diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h
index 14328a0da5..c54b74f5fe 100644
--- a/src/Mod/Mesh/App/Mesh.h
+++ b/src/Mod/Mesh/App/Mesh.h
@@ -20,30 +20,30 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_MESH_H
 #define MESH_MESH_H
 
-#include <vector>
 #include <list>
+#include <map>
 #include <set>
 #include <string>
-#include <map>
+#include <vector>
+
+#include <App/ComplexGeoData.h>
+#include <App/PropertyGeo.h>
 
 #include <Base/Matrix.h>
 #include <Base/Tools3D.h>
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyGeo.h>
-#include <App/ComplexGeoData.h>
-
-#include "Core/MeshKernel.h"
-#include "Core/MeshIO.h"
 #include "Core/Iterator.h"
-#include "MeshPoint.h"
+#include "Core/MeshIO.h"
+#include "Core/MeshKernel.h"
+
 #include "Facet.h"
+#include "MeshPoint.h"
 #include "Segment.h"
 
+
 namespace Py {
 class List;
 }
diff --git a/src/Mod/Mesh/App/MeshFeature.cpp b/src/Mod/Mesh/App/MeshFeature.cpp
index b8a6470075..0f1f9399ff 100644
--- a/src/Mod/Mesh/App/MeshFeature.cpp
+++ b/src/Mod/Mesh/App/MeshFeature.cpp
@@ -20,24 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Reader.h>
-#include <Base/Writer.h>
 #include <App/FeaturePythonPyImp.h>
 
-#include "Core/MeshIO.h"
-
 #include "MeshFeature.h"
 #include "MeshFeaturePy.h"
 
+
 using namespace Mesh;
 
 
diff --git a/src/Mod/Mesh/App/MeshFeature.h b/src/Mod/Mesh/App/MeshFeature.h
index 33278447ce..364f02d1c3 100644
--- a/src/Mod/Mesh/App/MeshFeature.h
+++ b/src/Mod/Mesh/App/MeshFeature.h
@@ -20,18 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_FEATURE_H
 #define MESH_FEATURE_H
 
-#include <App/GeoFeature.h>
+#include <App/GeoFeature.h> // must be before FeatureCustom.h
 #include <App/FeatureCustom.h>
 #include <App/FeaturePython.h>
 
 #include "Core/MeshKernel.h"
+
 #include "Mesh.h"
 #include "MeshProperties.h"
 
+
 namespace Base{
   class XMLReader;
   class Writer;
diff --git a/src/Mod/Mesh/App/MeshFeaturePyImp.cpp b/src/Mod/Mesh/App/MeshFeaturePyImp.cpp
index 1190a3a36b..ab7991f89c 100644
--- a/src/Mod/Mesh/App/MeshFeaturePyImp.cpp
+++ b/src/Mod/Mesh/App/MeshFeaturePyImp.cpp
@@ -22,17 +22,13 @@
 
 #include "PreCompiled.h"
 
-#include <Base/Console.h>
-#include <Base/Handle.h>
-
-#include "Core/Evaluation.h"
 #include "MeshFeature.h"
-
 // inclusion of the generated files (generated out of MeshFeaturePy.xml)
 #include <Mod/Mesh/App/MeshPy.h>
 #include <Mod/Mesh/App/MeshFeaturePy.h>
 #include <Mod/Mesh/App/MeshFeaturePy.cpp>
 
+
 using namespace Mesh;
 
 
diff --git a/src/Mod/Mesh/App/MeshPoint.h b/src/Mod/Mesh/App/MeshPoint.h
index 5cf418431d..a2d2372ede 100644
--- a/src/Mod/Mesh/App/MeshPoint.h
+++ b/src/Mod/Mesh/App/MeshPoint.h
@@ -20,16 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_MESHPOINT_H
 #define MESH_MESHPOINT_H
 
 #include <climits>
-#include <Base/Matrix.h>
+
 #include <Base/Vector3D.h>
-#include <Base/Handle.h>
+
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
 
 using Base::Vector3d;
diff --git a/src/Mod/Mesh/App/MeshPointPyImp.cpp b/src/Mod/Mesh/App/MeshPointPyImp.cpp
index 8df6de5ad0..b86fc8c3de 100644
--- a/src/Mod/Mesh/App/MeshPointPyImp.cpp
+++ b/src/Mod/Mesh/App/MeshPointPyImp.cpp
@@ -20,18 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
+#include <Base/VectorPy.h>
+
 #include "Mesh.h"
 #include "MeshPoint.h"
 #include "MeshPointPy.h"
 #include "MeshPointPy.cpp"
 
-#include <Base/VectorPy.h>
 
 using namespace Mesh;
 
diff --git a/src/Mod/Mesh/App/MeshProperties.cpp b/src/Mod/Mesh/App/MeshProperties.cpp
index 06857f9dc2..c2a0b09598 100644
--- a/src/Mod/Mesh/App/MeshProperties.cpp
+++ b/src/Mod/Mesh/App/MeshProperties.cpp
@@ -20,28 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
-#include <CXX/Objects.hxx>
-#include <Base/Console.h>
 #include <Base/Converter.h>
 #include <Base/Exception.h>
-#include <Base/Writer.h>
 #include <Base/Reader.h>
 #include <Base/Stream.h>
 #include <Base/VectorPy.h>
+#include <Base/Writer.h>
 
+#include "Core/Iterator.h"
 #include "Core/MeshKernel.h"
 #include "Core/MeshIO.h"
-#include "Core/Iterator.h"
 
 #include "MeshProperties.h"
 #include "Mesh.h"
 #include "MeshPy.h"
 
+
 using namespace Mesh;
 
 TYPESYSTEM_SOURCE(Mesh::PropertyNormalList, App::PropertyLists)
diff --git a/src/Mod/Mesh/App/MeshProperties.h b/src/Mod/Mesh/App/MeshProperties.h
index eeff7c1e17..c2398d5b0a 100644
--- a/src/Mod/Mesh/App/MeshProperties.h
+++ b/src/Mod/Mesh/App/MeshProperties.h
@@ -20,26 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_MESHPROPERTIES_H
 #define MESH_MESHPROPERTIES_H
 
-#include <vector>
 #include <list>
+#include <map>
 #include <set>
 #include <string>
-#include <map>
+#include <vector>
 
 #include <Base/Handle.h>
 #include <Base/Matrix.h>
-#include <Base/Vector3D.h>
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyGeo.h>
-
-#include <Mod/Mesh/App/Core/MeshKernel.h>
 #include <Mod/Mesh/App/Core/MeshIO.h>
-#include <Mod/Mesh/App/Mesh.h>
+#include <Mod/Mesh/App/Core/MeshKernel.h>
+
+#include "Mesh.h"
 
 
 namespace Mesh
diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp
index 7a5b65fd63..511d7ee6ac 100644
--- a/src/Mod/Mesh/App/MeshPyImp.cpp
+++ b/src/Mod/Mesh/App/MeshPyImp.cpp
@@ -20,16 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include <Base/VectorPy.h>
-#include <Base/Handle.h>
 #include <Base/Converter.h>
 #include <Base/GeometryPyCXX.h>
 #include <Base/MatrixPy.h>
 #include <Base/Stream.h>
 #include <Base/Tools.h>
+#include <Base/VectorPy.h>
+
+#include <boost/algorithm/string.hpp>
+
+#include "Core/Degeneration.h"
+#include "Core/Segmentation.h"
+#include "Core/Smoothing.h"
+#include "Core/Triangulation.h"
 
 #include "Mesh.h"
 #include "MeshPy.h"
@@ -37,18 +42,7 @@
 #include "FacetPy.h"
 #include "MeshPy.cpp"
 #include "MeshProperties.h"
-#include "Core/Algorithm.h"
-#include "Core/Triangulation.h"
-#include "Core/Iterator.h"
-#include "Core/Degeneration.h"
-#include "Core/Elements.h"
-#include "Core/Grid.h"
-#include "Core/MeshKernel.h"
-#include "Core/Segmentation.h"
-#include "Core/Smoothing.h"
-#include "Core/Curvature.h"
 
-#include <boost/algorithm/string.hpp>
 
 using namespace Mesh;
 
diff --git a/src/Mod/Mesh/App/MeshTexture.cpp b/src/Mod/Mesh/App/MeshTexture.cpp
index a8a1f98e43..a799ad4db7 100644
--- a/src/Mod/Mesh/App/MeshTexture.cpp
+++ b/src/Mod/Mesh/App/MeshTexture.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "MeshTexture.h"
 
+
 using namespace Mesh;
 
 MeshTexture::MeshTexture(const Mesh::MeshObject& mesh, const MeshCore::Material &material)
diff --git a/src/Mod/Mesh/App/MeshTexture.h b/src/Mod/Mesh/App/MeshTexture.h
index 4222baf4ed..8b70efba38 100644
--- a/src/Mod/Mesh/App/MeshTexture.h
+++ b/src/Mod/Mesh/App/MeshTexture.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_MESHTEXTURE_H
 #define MESH_MESHTEXTURE_H
 
 #include <memory>
+
 #include "Core/Algorithm.h"
-#include "Core/MeshKernel.h"
 #include "Core/KDTree.h"
+
 #include "Mesh.h"
 
 
diff --git a/src/Mod/Mesh/App/Segment.cpp b/src/Mod/Mesh/App/Segment.cpp
index 04e1a80246..70f6ef910a 100644
--- a/src/Mod/Mesh/App/Segment.cpp
+++ b/src/Mod/Mesh/App/Segment.cpp
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
 # include <sstream>
 #endif
 
-
-#include "Core/MeshKernel.h"
-
 #include "Segment.h"
 #include "Mesh.h"
-#include <Mod/Mesh/App/MeshPy.h>
+#include "MeshPy.h"
+
 
 using namespace Mesh;
 
diff --git a/src/Mod/Mesh/App/Segment.h b/src/Mod/Mesh/App/Segment.h
index 992b3beb90..f11acf8bbe 100644
--- a/src/Mod/Mesh/App/Segment.h
+++ b/src/Mod/Mesh/App/Segment.h
@@ -20,15 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_SEGMENT_H
 #define MESH_SEGMENT_H
 
-#include <vector>
 #include <string>
+#include <vector>
+
+#include "Core/Iterator.h"
+
 #include "Facet.h"
 #include "Types.h"
-#include "Core/Iterator.h"
+
 
 namespace Mesh
 {
diff --git a/src/Mod/Mesh/App/Types.h b/src/Mod/Mesh/App/Types.h
index 061323ffb7..a7d3d2b1f9 100644
--- a/src/Mod/Mesh/App/Types.h
+++ b/src/Mod/Mesh/App/Types.h
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_TYPES_H
 #define MESH_TYPES_H
 
 #include "Core/Definitions.h"
 
-
 namespace Mesh
 {