From 363f9258d876f294eb694ffd4a6064aff73843e4 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sat, 9 Jul 2022 17:13:38 +0200
Subject: [PATCH] [Part] ChFi2d etc.: remove unneeded includes

- also sort includes
---
 src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp   |  6 +++---
 .../App/ChFi2d/ChFi2d_AnaFilletAlgoPyImp.cpp   | 18 ++++++------------
 .../Part/App/ChFi2d/ChFi2d_ChamferAPIPyImp.cpp | 15 +++++----------
 .../Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp  | 17 +++++++----------
 .../Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp | 17 +++++++----------
 .../App/GeomPlate/BuildPlateSurfacePyImp.cpp   |  5 ++---
 .../App/GeomPlate/CurveConstraintPyImp.cpp     |  4 +---
 .../App/GeomPlate/PointConstraintPyImp.cpp     |  8 +++-----
 src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp | 18 +++++++++---------
 .../Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp | 18 +++++++++---------
 src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp   |  7 ++-----
 .../Part/App/HLRBRep/PolyHLRToShapePyImp.cpp   |  7 ++-----
 .../App/ShapeUpgrade/UnifySameDomainPyImp.cpp  |  7 +++----
 13 files changed, 59 insertions(+), 88 deletions(-)

diff --git a/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp b/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp
index a2b1536aa3..b40f331648 100644
--- a/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp
+++ b/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <TopoDS.hxx>
@@ -28,16 +27,17 @@
 # include <TopoDS_Face.hxx>
 #endif
 
+#include <Base/VectorPy.h>
+
 #include "BRepFeat/MakePrismPy.h"
 #include "BRepFeat/MakePrismPy.cpp"
 #include "Geometry.h"
 #include "TopoShapeEdgePy.h"
 #include "TopoShapeFacePy.h"
-#include <Base/VectorPy.h>
+
 
 using namespace Part;
 
-
 PyObject *MakePrismPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // Python wrapper
 {
     // create a new instance of MakePrismPy
diff --git a/src/Mod/Part/App/ChFi2d/ChFi2d_AnaFilletAlgoPyImp.cpp b/src/Mod/Part/App/ChFi2d/ChFi2d_AnaFilletAlgoPyImp.cpp
index 76ed66fce9..be686c7495 100644
--- a/src/Mod/Part/App/ChFi2d/ChFi2d_AnaFilletAlgoPyImp.cpp
+++ b/src/Mod/Part/App/ChFi2d/ChFi2d_AnaFilletAlgoPyImp.cpp
@@ -20,28 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Pln.hxx>
 # include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <TopoDS_Wire.hxx>
 #endif
 
-#include <Mod/Part/App/ChFi2d/ChFi2d_AnaFilletAlgoPy.h>
-#include <Mod/Part/App/ChFi2d/ChFi2d_AnaFilletAlgoPy.cpp>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Part/App/PlanePy.h>
-#include <Base/VectorPy.h>
-#include "Tools.h"
+#include "ChFi2d/ChFi2d_AnaFilletAlgoPy.h"
+#include "ChFi2d/ChFi2d_AnaFilletAlgoPy.cpp"
+#include "PlanePy.h"
+#include "TopoShapeEdgePy.h"
+#include "TopoShapeWirePy.h"
+
 
 using namespace Part;
 
-
 PyObject *ChFi2d_AnaFilletAlgoPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // Python wrapper
 {
     // create a new instance of ChFi2d_AnaFilletAlgoPy and the Twin object
diff --git a/src/Mod/Part/App/ChFi2d/ChFi2d_ChamferAPIPyImp.cpp b/src/Mod/Part/App/ChFi2d/ChFi2d_ChamferAPIPyImp.cpp
index ad790e600c..24e2606a27 100644
--- a/src/Mod/Part/App/ChFi2d/ChFi2d_ChamferAPIPyImp.cpp
+++ b/src/Mod/Part/App/ChFi2d/ChFi2d_ChamferAPIPyImp.cpp
@@ -20,26 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Pln.hxx>
 # include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <TopoDS_Wire.hxx>
 #endif
 
-#include <Mod/Part/App/ChFi2d/ChFi2d_ChamferAPIPy.h>
-#include <Mod/Part/App/ChFi2d/ChFi2d_ChamferAPIPy.cpp>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/Geometry.h>
-#include "Tools.h"
+#include "ChFi2d/ChFi2d_ChamferAPIPy.h"
+#include "ChFi2d/ChFi2d_ChamferAPIPy.cpp"
+#include "TopoShapeEdgePy.h"
+#include "TopoShapeWirePy.h"
+
 
 using namespace Part;
 
-
 PyObject *ChFi2d_ChamferAPIPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // Python wrapper
 {
     // create a new instance of ChFi2d_ChamferAPIPy and the Twin object
diff --git a/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp
index 5c51798b43..485082e6aa 100644
--- a/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp
+++ b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp
@@ -20,27 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Pln.hxx>
 # include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <TopoDS_Wire.hxx>
 #endif
 
-#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.h>
-#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.cpp>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Part/App/PlanePy.h>
 #include <Base/VectorPy.h>
+
+#include "ChFi2d/ChFi2d_FilletAPIPy.h"
+#include "ChFi2d/ChFi2d_FilletAPIPy.cpp"
+#include "TopoShapeEdgePy.h"
+#include "TopoShapeWirePy.h"
+#include "PlanePy.h"
 #include "Tools.h"
 
-using namespace Part;
 
+using namespace Part;
 
 PyObject *ChFi2d_FilletAPIPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // Python wrapper
 {
diff --git a/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp
index def26c0611..dfb86deba0 100644
--- a/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp
+++ b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp
@@ -20,27 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Pln.hxx>
 # include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <TopoDS_Wire.hxx>
 #endif
 
-#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.h>
-#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.cpp>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Part/App/PlanePy.h>
 #include <Base/VectorPy.h>
+
+#include "ChFi2d/ChFi2d_FilletAlgoPy.h"
+#include "ChFi2d/ChFi2d_FilletAlgoPy.cpp"
+#include "TopoShapeEdgePy.h"
+#include "TopoShapeWirePy.h"
+#include "PlanePy.h"
 #include "Tools.h"
 
-using namespace Part;
 
+using namespace Part;
 
 PyObject *ChFi2d_FilletAlgoPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // Python wrapper
 {
diff --git a/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePyImp.cpp b/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePyImp.cpp
index 0db2fab9b3..947eec1a75 100644
--- a/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePyImp.cpp
+++ b/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Standard_Failure.hxx>
@@ -30,9 +29,9 @@
 #include "GeomPlate/BuildPlateSurfacePy.cpp"
 #include "GeomPlate/CurveConstraintPy.h"
 #include "GeomPlate/PointConstraintPy.h"
-#include "GeometryCurvePy.h"
-#include "GeometrySurfacePy.h"
 #include "Geometry2d.h"
+#include "GeometrySurfacePy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp b/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp
index 3011e27405..450a778554 100644
--- a/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp
+++ b/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <GeomAdaptor_Curve.hxx>
@@ -37,8 +36,7 @@
 #include "GeomPlate/CurveConstraintPy.cpp"
 #include "Geom2d/Curve2dPy.h"
 #include "GeometryCurvePy.h"
-#include "GeometrySurfacePy.h"
-#include "Geometry2d.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp b/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp
index 0bc54b5467..dee67db571 100644
--- a/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp
+++ b/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp
@@ -20,18 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Standard_Failure.hxx>
 #endif
 
+#include <Base/VectorPy.h>
+
 #include "GeomPlate/PointConstraintPy.h"
 #include "GeomPlate/PointConstraintPy.cpp"
-#include "GeometryCurvePy.h"
-#include "GeometrySurfacePy.h"
-#include "Geometry2d.h"
-#include <Base/VectorPy.h>
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp
index 2c00d363e1..9cd15a9956 100644
--- a/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp
+++ b/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp
@@ -20,27 +20,27 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <limits>
+
 # include <gp_Ax2.hxx>
 # include <gp_Pnt.hxx>
-# include <limits>
+# include <HLRAlgo_Projector.hxx>
 #endif
 
+#include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
+#include <boost/math/special_functions/fpclassify.hpp>
+
 #include "HLRBRep/HLRBRep_AlgoPy.h"
 #include "HLRBRep/HLRBRep_AlgoPy.cpp"
-#include <Mod/Part/App/TopoShapePy.h>
-#include <Mod/Part/App/Tools.h>
-#include <Base/VectorPy.h>
-#include <Base/GeometryPyCXX.h>
+#include "TopoShapePy.h"
+#include "Tools.h"
 
-#include <boost/math/special_functions/fpclassify.hpp>
-#include <HLRAlgo_Projector.hxx>
 
 using namespace Part;
 
-
 PyObject *HLRBRep_AlgoPy::PyMake(struct _typeobject *, PyObject *, PyObject *)
 {
     // create a new instance of HLRBRep_AlgoPy
diff --git a/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp
index 9d42c31c4c..10103b18c2 100644
--- a/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp
+++ b/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp
@@ -20,28 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <limits>
+
 # include <gp_Ax2.hxx>
 # include <gp_Pnt.hxx>
+# include <HLRAlgo_Projector.hxx>
 # include <Standard_Version.hxx>
-# include <limits>
 #endif
 
+#include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
+#include <boost/math/special_functions/fpclassify.hpp>
+
 #include "HLRBRep/HLRBRep_PolyAlgoPy.h"
 #include "HLRBRep/HLRBRep_PolyAlgoPy.cpp"
-#include <Mod/Part/App/TopoShapePy.h>
-#include <Mod/Part/App/Tools.h>
-#include <Base/VectorPy.h>
-#include <Base/GeometryPyCXX.h>
+#include "TopoShapePy.h"
+#include "Tools.h"
 
-#include <boost/math/special_functions/fpclassify.hpp>
-#include <HLRAlgo_Projector.hxx>
 
 using namespace Part;
 
-
 PyObject *HLRBRep_PolyAlgoPy::PyMake(struct _typeobject *, PyObject *, PyObject *)
 {
     // create a new instance of HLRBRep_AlgoPy
diff --git a/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp
index 88f2c8663e..b8a8fb9ca7 100644
--- a/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp
+++ b/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "HLRBRep/HLRToShapePy.h"
 #include "HLRBRep/HLRToShapePy.cpp"
 #include "HLRBRep/HLRBRep_AlgoPy.h"
-#include <Mod/Part/App/TopoShapePy.h>
+#include "TopoShapePy.h"
+
 
 using namespace Part;
 
-
 PyObject *HLRToShapePy::PyMake(struct _typeobject *, PyObject *, PyObject *)
 {
     // create a new instance of HLRBRep_AlgoPy
diff --git a/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp b/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp
index d2012eed23..d31cc0f34b 100644
--- a/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp
+++ b/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "HLRBRep/PolyHLRToShapePy.h"
 #include "HLRBRep/PolyHLRToShapePy.cpp"
 #include "HLRBRep/HLRBRep_PolyAlgoPy.h"
-#include <Mod/Part/App/TopoShapePy.h>
+#include "TopoShapePy.h"
+
 
 using namespace Part;
 
-
 PyObject *PolyHLRToShapePy::PyMake(struct _typeobject *, PyObject *, PyObject *)
 {
     // create a new instance of HLRBRep_AlgoPy
diff --git a/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp b/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp
index 2943686ecd..82abc3cf60 100644
--- a/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp
+++ b/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp
@@ -20,21 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <memory>
-# include <Precision.hxx>
 # include <Standard_Failure.hxx>
-#endif
 
 // Needed for OCCT 7.5.2
 #include <TopoDS_Edge.hxx>
+#endif
 
 #include "ShapeUpgrade/UnifySameDomainPy.h"
 #include "ShapeUpgrade/UnifySameDomainPy.cpp"
-#include "TopoShapePy.h"
 #include "PartPyCXX.h"
+#include "TopoShapePy.h"
+
 
 using namespace Part;