From 9694ac02974c19c53f2590eb661735ae681448d5 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sat, 9 Jul 2022 03:52:17 +0200
Subject: [PATCH] [Part] B*: remove unneeded includes

- also sort includes
---
 .../Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp |  7 ++++---
 .../Part/App/BRepOffsetAPI_MakeOffsetFix.cpp    |  9 +++++----
 src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h  | 10 ++++++----
 .../App/BRepOffsetAPI_MakePipeShellPyImp.cpp    | 17 ++++++++---------
 src/Mod/Part/App/BezierCurvePyImp.cpp           | 15 +++++++--------
 src/Mod/Part/App/BezierSurfacePyImp.cpp         | 13 +++++--------
 src/Mod/Part/App/BodyBase.cpp                   |  8 +-------
 src/Mod/Part/App/BodyBase.h                     |  4 ++--
 src/Mod/Part/App/BodyBasePyImp.cpp              |  5 ++---
 src/Mod/Part/App/BoundedCurvePyImp.cpp          |  3 ---
 10 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp
index b6eef7f8fd..d82bc4c591 100644
--- a/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp
+++ b/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp
@@ -20,22 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <memory>
 # include <BRepOffsetAPI_MakeFilling.hxx>
-# include <gp_Pnt.hxx>
 # include <GeomAbs_Shape.hxx>
+# include <gp_Pnt.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Face.hxx>
 #endif
 
+#include <Base/VectorPy.h>
+
 #include "BRepOffsetAPI_MakeFillingPy.h"
 #include "BRepOffsetAPI_MakeFillingPy.cpp"
 #include "TopoShapeEdgePy.h"
 #include "TopoShapeFacePy.h"
-#include <Base/VectorPy.h>
+
 
 using namespace Part;
 /*!
diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp
index 8c160c76c9..85273198ba 100644
--- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp
+++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRep_Builder.hxx>
@@ -30,20 +29,22 @@
 # include <Geom_BSplineCurve.hxx>
 # include <Precision.hxx>
 # include <ShapeConstruct_Curve.hxx>
-# include <Standard_Version.hxx>
 # include <Standard_ConstructionError.hxx>
+# include <Standard_Version.hxx>
 # include <TopExp_Explorer.hxx>
+# include <TopLoc_Location.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Compound.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Wire.hxx>
-# include <TopLoc_Location.hxx>
-# include <TopTools_ListOfShape.hxx>
 # include <TopTools_ListIteratorOfListOfShape.hxx>
+# include <TopTools_ListOfShape.hxx>
 # include <TopTools_MapOfShape.hxx>
 #endif
+
 #include "BRepOffsetAPI_MakeOffsetFix.h"
 
+
 using namespace Part;
 
 BRepOffsetAPI_MakeOffsetFix::BRepOffsetAPI_MakeOffsetFix()
diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h
index 7b0d55f9eb..2f6af6f189 100644
--- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h
+++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h
@@ -20,16 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_BREPOFFSETAPI_MAKEOFFSETFIX_H
 #define PART_BREPOFFSETAPI_MAKEOFFSETFIX_H
 
-#include <Mod/Part/PartGlobal.h>
-#include <BRepOffsetAPI_MakeOffset.hxx>
-#include <GeomAbs_CurveType.hxx>
 #include <list>
 #include <map>
 
+#include <Mod/Part/PartGlobal.h>
+
+#include <BRepOffsetAPI_MakeOffset.hxx>
+#include <GeomAbs_CurveType.hxx>
+
+
 namespace Part {
 /*!
  * \brief The BRepOffsetAPI_MakeOffsetFix class
diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp
index f09b9e6145..616a031e82 100644
--- a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp
+++ b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp
@@ -20,27 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <BRepOffsetAPI_MakePipeShell.hxx>
 # include <gp_Ax2.hxx>
 # include <gp_Dir.hxx>
 # include <gp_Pnt.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Wire.hxx>
-# include <BRepOffsetAPI_MakePipeShell.hxx>
-# include <Standard_Version.hxx>
 # include <TopTools_ListIteratorOfListOfShape.hxx>
 #endif
 
-#include "TopoShapePy.h"
-#include "TopoShapeVertexPy.h"
+#include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
+
 #include "BRepOffsetAPI_MakePipeShellPy.h"
 #include "BRepOffsetAPI_MakePipeShellPy.cpp"
-#include "Tools.h"
 #include "OCCError.h"
-#include <Base/VectorPy.h>
-#include <Base/GeometryPyCXX.h>
+#include "Tools.h"
+#include "TopoShapePy.h"
+#include "TopoShapeVertexPy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/BezierCurvePyImp.cpp b/src/Mod/Part/App/BezierCurvePyImp.cpp
index 8228189366..089e13ff8f 100644
--- a/src/Mod/Part/App/BezierCurvePyImp.cpp
+++ b/src/Mod/Part/App/BezierCurvePyImp.cpp
@@ -20,25 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <BSplCLib.hxx>
 # include <Geom_BezierCurve.hxx>
 # include <gp_Pnt.hxx>
-# include <TColStd_Array1OfReal.hxx>
-# include <TColgp_Array1OfPnt.hxx>
-# include <math_Matrix.hxx>
 # include <math_Gauss.hxx>
-# include <BSplCLib.hxx>
+# include <math_Matrix.hxx>
+# include <TColgp_Array1OfPnt.hxx>
+# include <TColStd_Array1OfReal.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
-#include "OCCError.h"
-#include "Geometry.h"
 #include "BezierCurvePy.h"
 #include "BezierCurvePy.cpp"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/BezierSurfacePyImp.cpp b/src/Mod/Part/App/BezierSurfacePyImp.cpp
index 7a28255547..0b8c570f51 100644
--- a/src/Mod/Part/App/BezierSurfacePyImp.cpp
+++ b/src/Mod/Part/App/BezierSurfacePyImp.cpp
@@ -20,26 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Geom_BezierCurve.hxx>
 # include <Geom_BezierSurface.hxx>
-# include <Geom_BezierCurve.hxx>
-# include <TColStd_Array1OfReal.hxx>
-# include <TColStd_Array2OfReal.hxx>
 # include <TColgp_Array1OfPnt.hxx>
 # include <TColgp_Array2OfPnt.hxx>
+# include <TColStd_Array1OfReal.hxx>
+# include <TColStd_Array2OfReal.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
-#include "OCCError.h"
-#include "Geometry.h"
 #include "BezierCurvePy.h"
 #include "BezierSurfacePy.h"
 #include "BezierSurfacePy.cpp"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/BodyBase.cpp b/src/Mod/Part/App/BodyBase.cpp
index fd18c9bb8e..20d86a6ab1 100644
--- a/src/Mod/Part/App/BodyBase.cpp
+++ b/src/Mod/Part/App/BodyBase.cpp
@@ -20,22 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
-#include <Mod/Part/App/BodyBasePy.h>
-#include <App/Application.h>
 #include <App/Document.h>
-#include <Base/Placement.h>
 
 #include "BodyBase.h"
+#include "BodyBasePy.h"
 
 
 namespace Part {
 
-
 PROPERTY_SOURCE_WITH_EXTENSIONS(Part::BodyBase, Part::Feature)
 
 BodyBase::BodyBase()
diff --git a/src/Mod/Part/App/BodyBase.h b/src/Mod/Part/App/BodyBase.h
index caed513cd2..829a4a8b1d 100644
--- a/src/Mod/Part/App/BodyBase.h
+++ b/src/Mod/Part/App/BodyBase.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_BodyBase_H
 #define PART_BodyBase_H
 
 #include <App/PropertyStandard.h>
 #include <App/OriginGroupExtension.h>
-#include <Mod/Part/App/PartFeature.h>
+
+#include "PartFeature.h"
 
 
 namespace Part
diff --git a/src/Mod/Part/App/BodyBasePyImp.cpp b/src/Mod/Part/App/BodyBasePyImp.cpp
index 88091eaa97..00b3db4670 100644
--- a/src/Mod/Part/App/BodyBasePyImp.cpp
+++ b/src/Mod/Part/App/BodyBasePyImp.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "Mod/Part/App/BodyBase.h"
-
+#include "BodyBase.h"
 // inclusion of the generated files (generated out of ItemPy.xml)
 #include "BodyBasePy.h"
 #include "BodyBasePy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/BoundedCurvePyImp.cpp b/src/Mod/Part/App/BoundedCurvePyImp.cpp
index d9c7c6a92c..cfd4ddead4 100644
--- a/src/Mod/Part/App/BoundedCurvePyImp.cpp
+++ b/src/Mod/Part/App/BoundedCurvePyImp.cpp
@@ -20,16 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
 #include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
 
-#include "Geometry.h"
 #include "BoundedCurvePy.h"
 #include "BoundedCurvePy.cpp"