From 3b4cbbb9430368205ccd5b11cd29b44e2c7925f4 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Mon, 3 Oct 2022 00:47:24 +0200
Subject: [PATCH] [FEM] FemMesh*: remove unused includes

- also sort includes
---
 src/Mod/Fem/App/FemMesh.cpp                  | 48 ++++++++------------
 src/Mod/Fem/App/FemMesh.h                    | 11 +++--
 src/Mod/Fem/App/FemMeshObject.cpp            |  5 +-
 src/Mod/Fem/App/FemMeshProperty.cpp          | 10 ++--
 src/Mod/Fem/App/FemMeshPyImp.cpp             | 24 ++++------
 src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp | 17 ++-----
 src/Mod/Fem/App/FemMeshShapeObject.cpp       | 31 +++----------
 src/Mod/Fem/App/FemMeshShapeObject.h         |  3 +-
 8 files changed, 52 insertions(+), 97 deletions(-)

diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp
index 0e94c0e73e..efd2ec2bc6 100644
--- a/src/Mod/Fem/App/FemMesh.cpp
+++ b/src/Mod/Fem/App/FemMesh.cpp
@@ -20,37 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <Python.h>
 # include <cstdlib>
 # include <memory>
+
 # include <Bnd_Box.hxx>
 # include <BRep_Tool.hxx>
 # include <BRepBndLib.hxx>
-# include <BRepExtrema_DistShapeShape.hxx>
-# include <TopoDS_Vertex.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
 # include <gp_Pnt.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Solid.hxx>
-# include <TopoDS_Shape.hxx>
 # include <ShapeAnalysis_ShapeTolerance.hxx>
-
-# include <boost/assign/list_of.hpp>
-# include <boost/tokenizer.hpp> //to simplify parsing input files we use the boost lib
-
+# include <SMDS_MeshGroup.hxx>
 # include <SMESH_Gen.hxx>
+# include <SMESH_Group.hxx>
 # include <SMESH_Mesh.hxx>
 # include <SMESH_MeshEditor.hxx>
-# include <SMESH_Group.hxx>
-# include <SMDS_MeshGroup.hxx>
-# include <SMESHDS_GroupBase.hxx>
 # include <SMESHDS_Group.hxx>
+# include <SMESHDS_GroupBase.hxx>
 # include <SMESHDS_Mesh.hxx>
-# include <SMDS_VolumeTool.hxx>
 # include <StdMeshers_MaxLength.hxx>
 # include <StdMeshers_LocalLength.hxx>
 # include <StdMeshers_MaxElementArea.hxx>
@@ -60,33 +51,32 @@
 # include <StdMeshers_StartEndLength.hxx>
 # include <StdMeshers_QuadranglePreference.hxx>
 # include <StdMeshers_Quadrangle_2D.hxx>
-# include <StdMeshers_QuadraticMesh.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Solid.hxx>
+# include <TopoDS_Vertex.hxx>
 
+# include <boost/assign/list_of.hpp>
+# include <boost/tokenizer.hpp> //to simplify parsing input files we use the boost lib
 #endif
 
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Stream.h>
+#include <App/Application.h>
+#include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
+#include <Base/Reader.h>
+#include <Base/Stream.h>
 #include <Base/TimeInfo.h>
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <App/Application.h>
-
-#include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Mod/Mesh/App/Core/Evaluation.h>
+#include <Base/Writer.h>
 #include <Mod/Mesh/App/Core/Iterator.h>
 
 #include "FemMesh.h"
+#include <FemMeshPy.h>
+
 #ifdef FC_USE_VTK
-#include "FemVTKTools.h"
+# include "FemVTKTools.h"
 #endif
 
-# include <FemMeshPy.h>
-
-
-
 
 using namespace Fem;
 using namespace Base;
diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h
index e5fc207d58..72d3894f93 100644
--- a/src/Mod/Fem/App/FemMesh.h
+++ b/src/Mod/Fem/App/FemMesh.h
@@ -23,15 +23,16 @@
 #ifndef FEM_FEMMESH_H
 #define FEM_FEMMESH_H
 
+#include <list>
+#include <memory>
+#include <vector>
+
+#include <SMESH_Version.h>
+
 #include <App/ComplexGeoData.h>
 #include <Base/Quantity.h>
 #include <Mod/Fem/FemGlobal.h>
 
-#include <vector>
-#include <list>
-#include <memory>
-#include <SMESH_Version.h>
-
 
 class SMESH_Gen;
 class SMESH_Mesh;
diff --git a/src/Mod/Fem/App/FemMeshObject.cpp b/src/Mod/Fem/App/FemMeshObject.cpp
index 662be2417c..a6c86f6797 100644
--- a/src/Mod/Fem/App/FemMeshObject.cpp
+++ b/src/Mod/Fem/App/FemMeshObject.cpp
@@ -22,12 +22,13 @@
 
 #include "PreCompiled.h"
 
-#include "FemMeshObject.h"
-#include "FemMesh.h"
 #include <App/DocumentObjectPy.h>
 #include <App/FeaturePythonPyImp.h>
 #include <Base/Placement.h>
 
+#include "FemMeshObject.h"
+#include "FemMesh.h"
+
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemMeshProperty.cpp b/src/Mod/Fem/App/FemMeshProperty.cpp
index 847ad209af..7d82b34674 100644
--- a/src/Mod/Fem/App/FemMeshProperty.cpp
+++ b/src/Mod/Fem/App/FemMeshProperty.cpp
@@ -20,24 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-#include <Base/Console.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
 #include <Base/PlacementPy.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
 
 #include "FemMeshProperty.h"
 #include "FemMeshPy.h"
 
+
 using namespace Fem;
 
 TYPESYSTEM_SOURCE(Fem::PropertyFemMesh , App::PropertyComplexGeoData)
diff --git a/src/Mod/Fem/App/FemMeshPyImp.cpp b/src/Mod/Fem/App/FemMeshPyImp.cpp
index 5158d467f5..e5c8cb8dfa 100644
--- a/src/Mod/Fem/App/FemMeshPyImp.cpp
+++ b/src/Mod/Fem/App/FemMeshPyImp.cpp
@@ -20,39 +20,32 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <algorithm>
 # include <stdexcept>
 # include <Python.h>
-# include <SMESH_Gen.hxx>
 # include <SMESH_Group.hxx>
 # include <SMESH_Mesh.hxx>
 # include <SMESHDS_Group.hxx>
 # include <SMDSAbs_ElementType.hxx>
 # include <SMDS_MeshElement.hxx>
-# include <SMDS_VolumeTool.hxx>
 # include <SMESHDS_Mesh.hxx>
-
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Face.hxx>
 # include <TopoDS.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS_Shape.hxx>
 #endif
 
-#include <Base/VectorPy.h>
-#include <Base/MatrixPy.h>
 #include <Base/PlacementPy.h>
 #include <Base/QuantityPy.h>
-
-#include <Mod/Part/App/TopoShapePy.h>
-#include <Mod/Part/App/TopoShapeSolidPy.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeVertexPy.h>
+#include <Base/VectorPy.h>
 #include <Mod/Part/App/TopoShape.h>
-
+#include <Mod/Part/App/TopoShapePy.h>
+#include <Mod/Part/App/TopoShapeEdgePy.h>
+#include <Mod/Part/App/TopoShapeFacePy.h>
+#include <Mod/Part/App/TopoShapeSolidPy.h>
+#include <Mod/Part/App/TopoShapeVertexPy.h>
 #include "Mod/Fem/App/FemMesh.h"
 
 // inclusion of the generated files (generated out of FemMeshPy.xml)
@@ -60,6 +53,7 @@
 #include "FemMeshPy.cpp"
 #include "HypothesisPy.h"
 
+
 using namespace Fem;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
index a90d41489b..c19bf3ba6f 100644
--- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
+++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
@@ -20,34 +20,27 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #include <SMESH_Version.h>
 
 #ifndef _PreComp_
 # include <Python.h>
-# include <SMESH_Gen.hxx>
 # include <SMESHDS_Mesh.hxx>
 # include <SMESH_Mesh.hxx>
-# include <SMDS_VolumeTool.hxx>
-
-# include <BRepBuilderAPI_Copy.hxx>
-# include <BRepTools.hxx>
 
 # ifdef FCWithNetgen
-#  include <NETGENPlugin_SimpleHypothesis_3D.hxx>
 #  include <NETGENPlugin_Hypothesis.hxx>
 #  include <NETGENPlugin_Mesher.hxx>
 # endif
-
 #endif
 
+#include <App/DocumentObjectPy.h>
+#include <Base/Console.h>
+#include <Mod/Part/App/PartFeature.h>
+
 #include "FemMeshShapeNetgenObject.h"
 #include "FemMesh.h"
-#include <App/DocumentObjectPy.h>
-#include <Base/Placement.h>
-#include <Mod/Part/App/PartFeature.h>
-#include <Base/Console.h>
+
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemMeshShapeObject.cpp b/src/Mod/Fem/App/FemMeshShapeObject.cpp
index af4e4760cb..cb92fade63 100644
--- a/src/Mod/Fem/App/FemMeshShapeObject.cpp
+++ b/src/Mod/Fem/App/FemMeshShapeObject.cpp
@@ -25,51 +25,32 @@
 
 #ifndef _PreComp_
 # include <Python.h>
+# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepTools.hxx>
 # include <SMESH_Gen.hxx>
-# include <SMESH_Mesh.hxx>
-# include <SMDS_VolumeTool.hxx>
-# include <StdMeshers_Arithmetic1D.hxx>
-# include <StdMeshers_AutomaticLength.hxx>
 # include <StdMeshers_MaxLength.hxx>
 # include <StdMeshers_LocalLength.hxx>
 # include <StdMeshers_MaxElementArea.hxx>
-# include <StdMeshers_NotConformAllowed.hxx>
 # include <StdMeshers_QuadranglePreference.hxx>
 # include <StdMeshers_Quadrangle_2D.hxx>
 # include <StdMeshers_Regular_1D.hxx>
-# include <StdMeshers_UseExisting_1D2D.hxx>
-# include <StdMeshers_CompositeSegment_1D.hxx>
 # include <StdMeshers_Deflection1D.hxx>
 # include <StdMeshers_Hexa_3D.hxx>
-# include <StdMeshers_LayerDistribution.hxx>
-# include <StdMeshers_LengthFromEdges.hxx>
-# include <StdMeshers_MaxElementVolume.hxx>
-# include <StdMeshers_MEFISTO_2D.hxx>
-# include <StdMeshers_NumberOfLayers.hxx>
 # include <StdMeshers_NumberOfSegments.hxx>
-# include <StdMeshers_Prism_3D.hxx>
-# include <StdMeshers_Projection_1D.hxx>
-# include <StdMeshers_Projection_2D.hxx>
-# include <StdMeshers_Projection_3D.hxx>
-# include <StdMeshers_QuadraticMesh.hxx>
 # include <StdMeshers_RadialPrism_3D.hxx>
 # include <StdMeshers_SegmentAroundVertex_0D.hxx>
 # include <StdMeshers_ProjectionSource1D.hxx>
 # include <StdMeshers_ProjectionSource2D.hxx>
 # include <StdMeshers_ProjectionSource3D.hxx>
-# include <StdMeshers_SegmentLengthAroundVertex.hxx>
 # include <StdMeshers_StartEndLength.hxx>
-# include <StdMeshers_CompositeHexa_3D.hxx>
-
-# include <BRepBuilderAPI_Copy.hxx>
-# include <BRepTools.hxx>
 #endif
 
+#include <App/DocumentObjectPy.h>
+#include <Mod/Part/App/PartFeature.h>
+
 #include "FemMeshShapeObject.h"
 #include "FemMesh.h"
-#include <App/DocumentObjectPy.h>
-#include <Base/Placement.h>
-#include <Mod/Part/App/PartFeature.h>
+
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemMeshShapeObject.h b/src/Mod/Fem/App/FemMeshShapeObject.h
index 7f38c76d36..7bd2c09f7d 100644
--- a/src/Mod/Fem/App/FemMeshShapeObject.h
+++ b/src/Mod/Fem/App/FemMeshShapeObject.h
@@ -20,13 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef Fem_FemMeshShapeObject_H
 #define Fem_FemMeshShapeObject_H
 
-
 #include "FemMeshObject.h"
 
+
 namespace Fem
 {