[Part] To*: remove unneeded includes

- also sort includes

src/Mod/Part/App/Tools.cpp

@@ -23,23 +23,20 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cassert>
-# include <gp_Pln.hxx>
-# include <gp_Lin.hxx>
-# include <gp_Quaternion.hxx>
+# include <BRep_Tool.hxx>
 # include <BRepAdaptor_Curve.hxx>
 # include <BRepAdaptor_Surface.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepLProp_SLProps.hxx>
 # include <BRepMesh_IncrementalMesh.hxx>
-# include <BRep_Tool.hxx>
 # include <CSLib.hxx>
 # include <Geom_BSplineSurface.hxx>
+# include <Geom_Line.hxx>
 # include <Geom_Plane.hxx>
+# include <Geom_Point.hxx>
 # include <GeomAPI_IntSS.hxx>
 # include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <Geom_Line.hxx>
-# include <Geom_Point.hxx>
 # include <GeomAdaptor_Curve.hxx>
 # include <GeomLib.hxx>
 # include <GeomLProp_SLProps.hxx>
@@ -48,14 +45,17 @@
 # include <GeomPlate_MakeApprox.hxx>
 # include <GeomPlate_PlateG0Criterion.hxx>
 # include <GeomPlate_PointConstraint.hxx>
+# include <gp_Lin.hxx>
+# include <gp_Pln.hxx>
+# include <gp_Quaternion.hxx>
 # include <Poly_Connect.hxx>
 # include <Poly_Triangulation.hxx>
 # include <Precision.hxx>
 # include <Standard_Mutex.hxx>
 # include <Standard_TypeMismatch.hxx>
 # include <Standard_Version.hxx>
-# include <TColStd_ListOfTransient.hxx>
 # include <TColStd_ListIteratorOfListOfTransient.hxx>
+# include <TColStd_ListOfTransient.hxx>
 # include <TColgp_SequenceOfXY.hxx>
 # include <TColgp_SequenceOfXYZ.hxx>
 # include <TopoDS.hxx>
@@ -66,8 +66,10 @@
 #endif
 
 #include <Base/Vector3D.h>
+
 #include "Tools.h"
 
+
 void Part::closestPointsOnLines(const gp_Lin& lin1, const gp_Lin& lin2, gp_Pnt& p1, gp_Pnt& p2)
 {
     // they might be the same point

src/Mod/Part/App/Tools.h

@@ -20,27 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_TOOLS_H
 #define PART_TOOLS_H
 
 #include <Base/Converter.h>
 #include <Base/Placement.h>
+#include <Mod/Part/PartGlobal.h>
+
+#include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <gp_Dir.hxx>
 #include <gp_XYZ.hxx>
 #include <Geom_Surface.hxx>
 #include <Poly_Polygon3D.hxx>
 #include <Poly_Triangle.hxx>
 #include <Poly_Triangulation.hxx>
-#include <TColStd_ListOfTransient.hxx>
 #include <TColgp_Array1OfDir.hxx>
+#include <TColStd_ListOfTransient.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <vector>
-#include <Mod/Part/PartGlobal.h>
+
 
 class gp_Lin;
 class gp_Pln;

src/Mod/Part/App/TopoShape.cpp

@@ -20,60 +20,56 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <algorithm>
 # include <array>
 # include <cmath>
 # include <cstdlib>
 # include <sstream>
-# include <QString>
 
-# include <BRepLib.hxx>
-# include <BSplCLib.hxx>
+# include <APIHeaderSection_MakeHeader.hxx>
+# include <BinTools.hxx>
+# include <BinTools_ShapeSet.hxx>
 # include <Bnd_Box.hxx>
 # include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
-# include <BRepAdaptor_Curve.hxx>
-# include <BRepAdaptor_CompCurve.hxx>
 # include <BRepAdaptor_Surface.hxx>
 # include <BRepAlgoAPI_Common.hxx>
+# include <BRepAdaptor_CompCurve.hxx>
+# include <BRepAdaptor_Curve.hxx>
 # include <BRepAlgoAPI_Cut.hxx>
 # include <BRepAlgoAPI_Fuse.hxx>
 # include <BRepAlgoAPI_Section.hxx>
 # include <BRepBndLib.hxx>
-# include <BRepBuilderAPI_FindPlane.hxx>
-# include <BRepLib_FindSurface.hxx>
+# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepBuilderAPI_FaceError.hxx>
 # include <BRepBuilderAPI_GTransform.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
-# include <BRepBuilderAPI_MakePolygon.hxx>
 # include <BRepBuilderAPI_MakeSolid.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
-# include <BRepBuilderAPI_MakeShell.hxx>
 # include <BRepBuilderAPI_NurbsConvert.hxx>
-# include <BRepBuilderAPI_FaceError.hxx>
-# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepBuilderAPI_Sewing.hxx>
 # include <BRepBuilderAPI_Transform.hxx>
 # include <BRepCheck_Analyzer.hxx>
+# include <BRepClass_FaceClassifier.hxx>
 # include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 # include <BRepCheck_Result.hxx>
-# include <BRepClass_FaceClassifier.hxx>
-# include <BRepFilletAPI_MakeFillet.hxx>
+# include <BRepFill_CompatibleWires.hxx>
 # include <BRepGProp.hxx>
+# include <BRepGProp_Face.hxx>
+# include <BRepLib.hxx>
+# include <BRepLib_FindSurface.hxx>
+# include <BRepLProp_SLProps.hxx>
 # include <BRepMesh_IncrementalMesh.hxx>
-# include <BRepMesh_Triangle.hxx>
-# include <BRepMesh_Edge.hxx>
-# include <BRepOffsetAPI_MakeThickSolid.hxx>
-# include <BRepOffsetAPI_MakeOffsetShape.hxx>
 # include <BRepOffsetAPI_MakeOffset.hxx>
+# include <BRepOffsetAPI_MakeOffsetShape.hxx>
 # include <BRepOffsetAPI_MakePipe.hxx>
 # include <BRepOffsetAPI_MakePipeShell.hxx>
-# include <BRepOffsetAPI_Sewing.hxx>
 # include <BRepOffsetAPI_ThruSections.hxx>
+# include <BRepOffsetAPI_MakeThickSolid.hxx>
 # include <BRepPrimAPI_MakePrism.hxx>
 # include <BRepPrimAPI_MakeRevol.hxx>
 # include <BRepPrimAPI_MakeTorus.hxx>
@@ -81,53 +77,14 @@
 # include <BRepTools_ReShape.hxx>
 # include <BRepTools_ShapeSet.hxx>
 # include <BRepTools_WireExplorer.hxx>
-# include <BRepFill_CompatibleWires.hxx>
+# include <BSplCLib.hxx>
 # include <GCE2d_MakeSegment.hxx>
-# include <GCPnts_AbscissaPoint.hxx>
 # include <GCPnts_UniformAbscissa.hxx>
-# include <Geom2d_Line.hxx>
-# include <Geom2d_TrimmedCurve.hxx>
-# include <GeomLProp_SLProps.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <GeomFill_CorrectedFrenet.hxx>
-# include <GeomFill_CurveAndTrihedron.hxx>
-# include <GeomFill_EvolvedSection.hxx>
-# include <GeomFill_Pipe.hxx>
-# include <GeomFill_SectionLaw.hxx>
-# include <GeomFill_Sweep.hxx>
-# include <GeomLib.hxx>
-# include <GProp_GProps.hxx>
-# include <Law_BSpFunc.hxx>
-# include <Law_BSpline.hxx>
-# include <Law_BSpFunc.hxx>
-# include <Law_Constant.hxx>
-# include <Law_Linear.hxx>
-# include <Law_S.hxx>
-# include <TopTools_HSequenceOfShape.hxx>
-# include <Interface_Static.hxx>
-# include <IGESControl_Controller.hxx>
-# include <IGESControl_Writer.hxx>
-# include <IGESControl_Reader.hxx>
-# include <IGESData_GlobalSection.hxx>
-# include <IGESData_IGESModel.hxx>
-# include <STEPControl_Writer.hxx>
-# include <STEPControl_Reader.hxx>
-# include <TopTools_MapOfShape.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Compound.hxx>
-# include <TopoDS_Iterator.hxx>
-# include <TopoDS_Solid.hxx>
-# include <TopoDS_Vertex.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TopTools_ListIteratorOfListOfShape.hxx>
-# include <Geom2d_Ellipse.hxx>
 # include <Geom_BezierCurve.hxx>
 # include <Geom_BezierSurface.hxx>
 # include <Geom_BSplineCurve.hxx>
 # include <Geom_BSplineSurface.hxx>
-# include <Geom_SurfaceOfLinearExtrusion.hxx>
-# include <Geom_SurfaceOfRevolution.hxx>
+# include <Geom_CartesianPoint.hxx>
 # include <Geom_Circle.hxx>
 # include <Geom_ConicalSurface.hxx>
 # include <Geom_CylindricalSurface.hxx>
@@ -136,41 +93,54 @@
 # include <Geom_Line.hxx>
 # include <Geom_Parabola.hxx>
 # include <Geom_Plane.hxx>
-# include <Geom_CartesianPoint.hxx>
 # include <Geom_SphericalSurface.hxx>
+# include <Geom_SurfaceOfLinearExtrusion.hxx>
+# include <Geom_SurfaceOfRevolution.hxx>
 # include <Geom_ToroidalSurface.hxx>
-# include <Poly_Triangulation.hxx>
-# include <Standard_Failure.hxx>
-# include <StlAPI_Writer.hxx>
-# include <Standard_Failure.hxx>
+# include <Geom2d_Ellipse.hxx>
+# include <Geom2d_Line.hxx>
+# include <Geom2d_TrimmedCurve.hxx>
+# include <GeomFill_CorrectedFrenet.hxx>
+# include <GeomFill_CurveAndTrihedron.hxx>
+# include <GeomFill_EvolvedSection.hxx>
+# include <GeomFill_Pipe.hxx>
+# include <GeomFill_SectionLaw.hxx>
+# include <GeomFill_Sweep.hxx>
+# include <GeomLib.hxx>
 # include <gp_Circ.hxx>
-# include <gp_GTrsf.hxx>
 # include <gp_Pln.hxx>
-# include <ShapeAnalysis_Shell.hxx>
-# include <ShapeBuild_ReShape.hxx>
+# include <GProp_GProps.hxx>
+# include <IGESControl_Controller.hxx>
+# include <IGESControl_Reader.hxx>
+# include <IGESControl_Writer.hxx>
+# include <IGESData_GlobalSection.hxx>
+# include <IGESData_IGESModel.hxx>
+# include <Interface_Static.hxx>
+# include <Law_BSpline.hxx>
+# include <Law_BSpFunc.hxx>
+# include <Law_Constant.hxx>
+# include <ShapeAnalysis_FreeBoundsProperties.hxx>
 # include <ShapeExtend_Explorer.hxx>
-# include <ShapeFix_Edge.hxx>
-# include <ShapeFix_Face.hxx>
-# include <ShapeFix_Shell.hxx>
-# include <ShapeFix_Solid.hxx>
-# include <ShapeUpgrade_ShellSewing.hxx>
-# include <ShapeUpgrade_RemoveInternalWires.hxx>
-# include <Standard_Version.hxx>
-# include <BinTools.hxx>
-# include <BinTools_ShapeSet.hxx>
-# include <Poly_Polygon3D.hxx>
-# include <Poly_PolygonOnTriangulation.hxx>
-# include <BRepBuilderAPI_Sewing.hxx>
 # include <ShapeFix_Shape.hxx>
-# include <XSControl_WorkSession.hxx>
-# include <Transfer_TransientProcess.hxx>
+# include <ShapeUpgrade_RemoveInternalWires.hxx>
+# include <ShapeUpgrade_ShellSewing.hxx>
+# include <Standard_Failure.hxx>
+# include <Standard_Version.hxx>
+# include <STEPControl_Reader.hxx>
+# include <STEPControl_Writer.hxx>
+# include <StlAPI_Writer.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Compound.hxx>
+# include <TopoDS_Iterator.hxx>
+# include <TopoDS_Solid.hxx>
+# include <TopoDS_Vertex.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopTools_ListIteratorOfListOfShape.hxx>
+# include <TopTools_HSequenceOfShape.hxx>
 # include <Transfer_FinderProcess.hxx>
 # include <XSControl_TransferWriter.hxx>
-# include <APIHeaderSection_MakeHeader.hxx>
-# include <ShapeAnalysis_FreeBoundsProperties.hxx>
-# include <ShapeAnalysis_FreeBoundData.hxx>
-# include <BRepLProp_SLProps.hxx>
-# include <BRepGProp_Face.hxx>
+# include <XSControl_WorkSession.hxx>
 
 #if OCC_VERSION_HEX < 0x070300
 # include <BRepAlgo_Fuse.hxx>
@@ -192,32 +162,32 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <App/Material.h>
 #include <Base/BoundBox.h>
 #include <Base/Builder3D.h>
-#include <Base/FileInfo.h>
+#include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Placement.h>
 #include <Base/Tools.h>
-#include <Base/Console.h>
-#include <App/Material.h>
 
-#include "PartPyCXX.h"
 #include "TopoShape.h"
+#include "BRepOffsetAPI_MakeOffsetFix.h"
 #include "CrossSection.h"
-#include "TopoShapeFacePy.h"
-#include "TopoShapeEdgePy.h"
-#include "TopoShapeVertexPy.h"
-#include "TopoShapeWirePy.h"
-#include "TopoShapeShellPy.h"
-#include "TopoShapeSolidPy.h"
-#include "TopoShapeCompoundPy.h"
-#include "TopoShapeCompSolidPy.h"
-#include "ProgressIndicator.h"
-#include "modelRefine.h"
-#include "Tools.h"
 #include "encodeFilename.h"
 #include "FaceMakerBullseye.h"
-#include "BRepOffsetAPI_MakeOffsetFix.h"
+#include "modelRefine.h"
+#include "PartPyCXX.h"
+#include "ProgressIndicator.h"
+#include "Tools.h"
+#include "TopoShapeCompoundPy.h"
+#include "TopoShapeCompSolidPy.h"
+#include "TopoShapeEdgePy.h"
+#include "TopoShapeFacePy.h"
+#include "TopoShapeShellPy.h"
+#include "TopoShapeSolidPy.h"
+#include "TopoShapeVertexPy.h"
+#include "TopoShapeWirePy.h"
+
 
 FC_LOG_LEVEL_INIT("TopoShape",true,true)
 

src/Mod/Part/App/TopoShape.h

@@ -20,19 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_TOPOSHAPE_H
 #define PART_TOPOSHAPE_H
 
 #include <iosfwd>
 #include <list>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopTools_ListOfShape.hxx>
+
 #include <App/ComplexGeoData.h>
 #include <Base/Exception.h>
 #include <Mod/Part/PartGlobal.h>
 
+#include <TopoDS_Compound.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopTools_ListOfShape.hxx>
+
+
 class gp_Ax1;
 class gp_Ax2;
 class gp_Pln;