From 101ac1175d342bd818bdea8eb11d17bd54844b66 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Wed, 7 Dec 2022 23:46:21 +0100
Subject: [PATCH] [Surface] App:: remove unused includes

- also some sorting
---
 src/Gui/InventorAll.h                         |  8 +++++
 src/Mod/Part/App/OpenCascadeAll.h             |  1 +
 src/Mod/Surface/App/AppSurface.cpp            |  7 ++--
 src/Mod/Surface/App/FeatureCut.cpp            | 13 ++------
 src/Mod/Surface/App/FeatureCut.h              |  3 +-
 src/Mod/Surface/App/FeatureExtend.cpp         | 33 ++++++++++---------
 src/Mod/Surface/App/FeatureExtend.h           |  3 +-
 src/Mod/Surface/App/FeatureFilling.cpp        | 22 +++++--------
 src/Mod/Surface/App/FeatureFilling.h          |  3 +-
 .../Surface/App/FeatureGeomFillSurface.cpp    | 16 ++++-----
 src/Mod/Surface/App/FeatureGeomFillSurface.h  |  9 +++--
 src/Mod/Surface/App/FeatureSections.cpp       | 23 ++++++-------
 src/Mod/Surface/App/FeatureSections.h         |  3 +-
 src/Mod/Surface/App/FeatureSewing.cpp         | 13 +++-----
 src/Mod/Surface/App/FeatureSewing.h           |  3 +-
 src/Mod/Surface/App/PreCompiled.cpp           |  1 -
 src/Mod/Surface/App/PreCompiled.h             | 18 +---------
 17 files changed, 70 insertions(+), 109 deletions(-)

diff --git a/src/Gui/InventorAll.h b/src/Gui/InventorAll.h
index bf30ee87e2..b0310a850d 100644
--- a/src/Gui/InventorAll.h
+++ b/src/Gui/InventorAll.h
@@ -98,6 +98,7 @@
 #include <Inventor/elements/SoNormalBindingElement.h>
 #include <Inventor/elements/SoNormalElement.h>
 #include <Inventor/elements/SoOverrideElement.h>
+#include <Inventor/elements/SoPointSizeElement.h>
 #include <Inventor/elements/SoProfileCoordinateElement.h>
 #include <Inventor/elements/SoProfileElement.h>
 #include <Inventor/elements/SoProjectionMatrixElement.h>
@@ -110,9 +111,11 @@
 #include <Inventor/elements/SoViewportRegionElement.h>
 #include <Inventor/elements/SoViewVolumeElement.h>
 #include <Inventor/elements/SoWindowElement.h>
+#include <Inventor/engines/SoCalculator.h>
 #include <Inventor/engines/SoComposeVec3f.h>
 #include <Inventor/engines/SoComposeRotationFromTo.h>
 #include <Inventor/engines/SoComposeRotation.h>
+#include <Inventor/engines/SoConcatenate.h>
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/errors/SoError.h>
 #include <Inventor/errors/SoReadError.h>
@@ -136,6 +139,7 @@
 #include <Inventor/manips/SoClipPlaneManip.h>
 #include <Inventor/manips/SoTransformerManip.h>
 #include <Inventor/misc/SoChildList.h>
+#include <Inventor/misc/SoContextHandler.h>
 #include <Inventor/misc/SoState.h>
 #include <Inventor/nodes/SoAnnotation.h>
 #include <Inventor/nodes/SoAntiSquish.h>
@@ -149,6 +153,7 @@
 #include <Inventor/nodes/SoCoordinate4.h>
 #include <Inventor/nodes/SoCube.h>
 #include <Inventor/nodes/SoCylinder.h>
+#include <Inventor/nodes/SoDepthBuffer.h>
 #include <Inventor/nodes/SoDirectionalLight.h>
 #include <Inventor/nodes/SoDrawStyle.h>
 #include <Inventor/nodes/SoEnvironment.h>
@@ -173,6 +178,7 @@
 #include <Inventor/nodes/SoNode.h>
 #include <Inventor/nodes/SoNormal.h>
 #include <Inventor/nodes/SoNormalBinding.h>
+#include <Inventor/nodes/SoNurbsCurve.h>
 #include <Inventor/nodes/SoNurbsSurface.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
 #include <Inventor/nodes/SoPerspectiveCamera.h>
@@ -183,6 +189,7 @@
 #include <Inventor/nodes/SoProfileCoordinate2.h>
 #include <Inventor/nodes/SoProfileCoordinate3.h>
 #include <Inventor/nodes/SoQuadMesh.h>
+#include <Inventor/nodes/SoResetTransform.h>
 #include <Inventor/nodes/SoRotation.h>
 #include <Inventor/nodes/SoRotationXYZ.h>
 #include <Inventor/nodes/SoSelection.h>
@@ -201,6 +208,7 @@
 #include <Inventor/nodes/SoTransformation.h>
 #include <Inventor/nodes/SoTranslation.h>
 #include <Inventor/nodes/SoTransparencyType.h>
+#include <Inventor/nodes/SoVertexProperty.h>
 #include <Inventor/nodekits/SoShapeKit.h>
 #include <Inventor/manips/SoTransformBoxManip.h>
 #include <Inventor/projectors/SbLineProjector.h>
diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index 475b1704ee..fa9716129d 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -308,6 +308,7 @@
 #include <GeomFill_EvolvedSection.hxx>
 #include <GeomFill_Line.hxx>
 #include <GeomFill_LocationLaw.hxx>
+#include <GeomFill_NSections.hxx>
 #include <GeomFill_Pipe.hxx>
 #include <GeomFill_SectionGenerator.hxx>
 #include <GeomFill_Sweep.hxx>
diff --git a/src/Mod/Surface/App/AppSurface.cpp b/src/Mod/Surface/App/AppSurface.cpp
index 02349b5af6..cb5ab8282e 100644
--- a/src/Mod/Surface/App/AppSurface.cpp
+++ b/src/Mod/Surface/App/AppSurface.cpp
@@ -23,11 +23,13 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
+#include <Base/Interpreter.h>
+#include <Base/Parameter.h>
 
 #include "Blending/BlendCurvePy.h"
 #include "Blending/BlendPointPy.h"
 #include "Blending/FeatureBlendCurve.h"
+
 #include "FeatureCut.h"
 #include "FeatureExtend.h"
 #include "FeatureFilling.h"
@@ -35,9 +37,6 @@
 #include "FeatureSections.h"
 #include "FeatureSewing.h"
 
-#include <Base/Interpreter.h>
-#include <Base/Parameter.h>
-
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/App/FeatureCut.cpp b/src/Mod/Surface/App/FeatureCut.cpp
index fbc7711a6e..1d3401728d 100644
--- a/src/Mod/Surface/App/FeatureCut.cpp
+++ b/src/Mod/Surface/App/FeatureCut.cpp
@@ -22,20 +22,11 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <Precision.hxx>
+# include <TopoDS.hxx>
 #endif
 
 #include "FeatureCut.h"
-#include <BRepAlgoAPI_Cut.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Pnt.hxx>
-#include <Base/Tools.h>
-#include <Base/Exception.h>
+
 
 using namespace Surface;
 
diff --git a/src/Mod/Surface/App/FeatureCut.h b/src/Mod/Surface/App/FeatureCut.h
index 12dfc1fe4a..3f5227dbc0 100644
--- a/src/Mod/Surface/App/FeatureCut.h
+++ b/src/Mod/Surface/App/FeatureCut.h
@@ -23,12 +23,11 @@
 #ifndef SURFACE_FEATURECUT_H
 #define SURFACE_FEATURECUT_H
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Surface/SurfaceGlobal.h>
 
+
 namespace Surface
 {
 
diff --git a/src/Mod/Surface/App/FeatureExtend.cpp b/src/Mod/Surface/App/FeatureExtend.cpp
index 87877785d0..d2c14d7792 100644
--- a/src/Mod/Surface/App/FeatureExtend.cpp
+++ b/src/Mod/Surface/App/FeatureExtend.cpp
@@ -22,28 +22,29 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepLProp_SLProps.hxx>
-#include <TColgp_Array2OfPnt.hxx>
-#include <gp_Pnt.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <GeomAPI_PointsToBSplineSurface.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <Precision.hxx>
-#include <Standard_Version.hxx>
+# include <BRepAdaptor_Surface.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRepLProp_SLProps.hxx>
+# include <Geom_BSplineSurface.hxx>
+# include <GeomAPI_PointsToBSplineSurface.hxx>
+# include <gp_Pnt.hxx>
+# include <Precision.hxx>
+# include <Standard_Version.hxx>
+# include <TColgp_Array2OfPnt.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Face.hxx>
 #endif
 
-#include "FeatureExtend.h"
 #include <Base/Tools.h>
-#include <Base/Exception.h>
+
+#include "FeatureExtend.h"
+
 
 using namespace Surface;
 
-const App::PropertyIntegerConstraint::Constraints SampleRange = {2,INT_MAX,1};
-const App::PropertyFloatConstraint::Constraints ToleranceRange = {0.0,10.0,0.01};
-const App::PropertyFloatConstraint::Constraints ExtendRange = {-0.5,10.0,0.01};
+const App::PropertyIntegerConstraint::Constraints SampleRange = {2, INT_MAX, 1};
+const App::PropertyFloatConstraint::Constraints ToleranceRange = {0.0, 10.0, 0.01};
+const App::PropertyFloatConstraint::Constraints ExtendRange = {-0.5, 10.0, 0.01};
 PROPERTY_SOURCE(Surface::Extend, Part::Spline)
 
 Extend::Extend() : lockOnChangeMutex(false)
diff --git a/src/Mod/Surface/App/FeatureExtend.h b/src/Mod/Surface/App/FeatureExtend.h
index b682531a25..c80d483d46 100644
--- a/src/Mod/Surface/App/FeatureExtend.h
+++ b/src/Mod/Surface/App/FeatureExtend.h
@@ -23,12 +23,11 @@
 #ifndef SURFACE_FEATUREEXTEND_H
 #define SURFACE_FEATUREEXTEND_H
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
 #include <Mod/Surface/SurfaceGlobal.h>
 
+
 namespace Surface
 {
 
diff --git a/src/Mod/Surface/App/FeatureFilling.cpp b/src/Mod/Surface/App/FeatureFilling.cpp
index eee6ef5476..a3d6512fbf 100644
--- a/src/Mod/Surface/App/FeatureFilling.cpp
+++ b/src/Mod/Surface/App/FeatureFilling.cpp
@@ -22,22 +22,18 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepFill_Filling.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Pnt.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <Precision.hxx>
+# include <string>
+
+# include <BRepBuilderAPI_MakeWire.hxx>
+# include <BRepFill_Filling.hxx>
+# include <BRep_Tool.hxx>
+# include <gp_Pnt.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Face.hxx>
 #endif
 
 #include "FeatureFilling.h"
-#include <Base/Tools.h>
-#include <Base/Exception.h>
-#include <string>
+
 
 using namespace Surface;
 
diff --git a/src/Mod/Surface/App/FeatureFilling.h b/src/Mod/Surface/App/FeatureFilling.h
index f757918d9a..902d5f2d46 100644
--- a/src/Mod/Surface/App/FeatureFilling.h
+++ b/src/Mod/Surface/App/FeatureFilling.h
@@ -23,12 +23,11 @@
 #ifndef SURFACE_FEATUREFILLING_H
 #define SURFACE_FEATUREFILLING_H
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
 #include <Mod/Surface/SurfaceGlobal.h>
 
+
 class BRepFill_Filling;
 
 namespace Surface
diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp
index 0171a01fc2..1b5e5b4fa3 100644
--- a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp
+++ b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp
@@ -25,14 +25,8 @@
 
 #ifndef _PreComp_
 #include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_NurbsConvert.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Wire.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineCurve.hxx>
@@ -49,13 +43,15 @@
 #include <Standard_ConstructionError.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TopExp_Explorer.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Wire.hxx>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/Tools.h>
-
 #include "FeatureGeomFillSurface.h"
 
+
 using namespace Surface;
 
 ShapeValidator::ShapeValidator()
diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.h b/src/Mod/Surface/App/FeatureGeomFillSurface.h
index 908ef9413c..bf1dc2974b 100644
--- a/src/Mod/Surface/App/FeatureGeomFillSurface.h
+++ b/src/Mod/Surface/App/FeatureGeomFillSurface.h
@@ -24,15 +24,14 @@
 #ifndef FEATUREGEOMFILLSURFACE_H
 #define FEATUREGEOMFILLSURFACE_H
 
+#include <App/PropertyLinks.h>
+#include <Mod/Part/App/FeaturePartSpline.h>
+#include <Mod/Surface/SurfaceGlobal.h>
+
 #include <Geom_BoundedSurface.hxx>
 #include <GeomFill_FillingStyle.hxx>
 #include <ShapeExtend_WireData.hxx>
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
-#include <App/PropertyLinks.h>
-#include <Mod/Part/App/FeaturePartSpline.h>
-#include <Mod/Surface/SurfaceGlobal.h>
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/App/FeatureSections.cpp b/src/Mod/Surface/App/FeatureSections.cpp
index 313569784d..e38dff8ec0 100644
--- a/src/Mod/Surface/App/FeatureSections.cpp
+++ b/src/Mod/Surface/App/FeatureSections.cpp
@@ -22,22 +22,19 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomFill_NSections.hxx>
-#include <TopLoc_Location.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <Precision.hxx>
-#include <Standard_Version.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <Geom_BSplineSurface.hxx>
+# include <Geom_TrimmedCurve.hxx>
+# include <GeomFill_NSections.hxx>
+# include <Precision.hxx>
+# include <Standard_Version.hxx>
+# include <TopLoc_Location.hxx>
+# include <TopoDS.hxx>
 #endif
 
 #include "FeatureSections.h"
-#include <Base/Tools.h>
-#include <Base/Exception.h>
+
 
 using namespace Surface;
 
diff --git a/src/Mod/Surface/App/FeatureSections.h b/src/Mod/Surface/App/FeatureSections.h
index 250af07359..f7abbc457b 100644
--- a/src/Mod/Surface/App/FeatureSections.h
+++ b/src/Mod/Surface/App/FeatureSections.h
@@ -23,12 +23,11 @@
 #ifndef SURFACE_FEATURESECTIONS_H
 #define SURFACE_FEATURESECTIONS_H
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
 #include <Mod/Surface/SurfaceGlobal.h>
 
+
 namespace Surface
 {
 
diff --git a/src/Mod/Surface/App/FeatureSewing.cpp b/src/Mod/Surface/App/FeatureSewing.cpp
index 0c6be1a676..52670653d6 100644
--- a/src/Mod/Surface/App/FeatureSewing.cpp
+++ b/src/Mod/Surface/App/FeatureSewing.cpp
@@ -22,18 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <Precision.hxx>
+# include <BRepBuilderAPI_Sewing.hxx>
+# include <Precision.hxx>
+# include <TopoDS.hxx>
 #endif
 
 #include "FeatureSewing.h"
-#include <BRepBuilderAPI_Sewing.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Pnt.hxx>
-#include <Base/Tools.h>
-#include <Base/Exception.h>
+
 
 using namespace Surface;
 
diff --git a/src/Mod/Surface/App/FeatureSewing.h b/src/Mod/Surface/App/FeatureSewing.h
index 1f0b7a0f92..d2b8cd262f 100644
--- a/src/Mod/Surface/App/FeatureSewing.h
+++ b/src/Mod/Surface/App/FeatureSewing.h
@@ -24,11 +24,10 @@
 #define SURFACE_FEATURESEWING_H
 
 #include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
-#include <App/PropertyLinks.h>
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Surface/SurfaceGlobal.h>
 
+
 namespace Surface
 {
 
diff --git a/src/Mod/Surface/App/PreCompiled.cpp b/src/Mod/Surface/App/PreCompiled.cpp
index cfd0e9a769..a6ded796a3 100644
--- a/src/Mod/Surface/App/PreCompiled.cpp
+++ b/src/Mod/Surface/App/PreCompiled.cpp
@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
diff --git a/src/Mod/Surface/App/PreCompiled.h b/src/Mod/Surface/App/PreCompiled.h
index edc8ffc830..0ae0ad59e7 100644
--- a/src/Mod/Surface/App/PreCompiled.h
+++ b/src/Mod/Surface/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PRECOMPILED_H
 #define PRECOMPILED_H
 
@@ -28,26 +27,11 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <cstdio>
-#include <cassert>
-#include <iostream>
-
 // STL
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <sstream>
-#include <stack>
 #include <string>
-#include <vector>
 
 //opencascade
-#include "OpenCascadeAll.h"
-#include <GeomFill_NSections.hxx>
+#include <Mod/Part/App/OpenCascadeAll.h>
 
 #endif //_PreComp_