From ca5efc5be1b718263b9f3eec354cac8a018f93e5 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 3 Jul 2022 18:39:24 +0200 Subject: [PATCH] [Part] To*: remove unneeded includes - also sort includes --- src/Mod/Part/App/Tools.cpp | 16 +-- src/Mod/Part/App/Tools.h | 9 +- src/Mod/Part/App/TopoShape.cpp | 178 ++++++++++++++------------------- src/Mod/Part/App/TopoShape.h | 10 +- 4 files changed, 94 insertions(+), 119 deletions(-) diff --git a/src/Mod/Part/App/Tools.cpp b/src/Mod/Part/App/Tools.cpp index 514426652e..4639a4d0d7 100644 --- a/src/Mod/Part/App/Tools.cpp +++ b/src/Mod/Part/App/Tools.cpp @@ -23,23 +23,20 @@ #include "PreCompiled.h" #ifndef _PreComp_ # include -# include -# include -# include +# include # include # include # include # include # include # include -# include # include # include +# include # include +# include # include # include -# include -# include # include # include # include @@ -48,14 +45,17 @@ # include # include # include +# include +# include +# include # include # include # include # include # include # include -# include # include +# include # include # include # include @@ -66,8 +66,10 @@ #endif #include + #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 diff --git a/src/Mod/Part/App/Tools.h b/src/Mod/Part/App/Tools.h index 0a5e050bb4..7ca1eee67e 100644 --- a/src/Mod/Part/App/Tools.h +++ b/src/Mod/Part/App/Tools.h @@ -20,27 +20,28 @@ * * ***************************************************************************/ - #ifndef PART_TOOLS_H #define PART_TOOLS_H #include #include +#include + +#include #include #include -#include #include #include #include #include #include -#include #include +#include #include #include #include #include -#include + class gp_Lin; class gp_Pln; diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index a9c07c0197..b833ffb6ce 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -20,60 +20,56 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include # include -# include -# include -# include +# include +# include +# include # include # include # include -# include -# include # include # include +# include +# include # include # include # include # include -# include -# include +# include +# include # include # include # include -# include # include # include # include -# include # include -# include -# include +# include # include # include +# include # include # include -# include -# include +# include # include +# include +# include +# include +# include # include -# include -# include -# include -# include # include +# include # include # include -# include # include +# include # include # include # include @@ -81,53 +77,14 @@ # include # include # include -# include +# include # include -# include # include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include # include # include # include # include -# include -# include +# include # include # include # include @@ -136,41 +93,54 @@ # include # include # include -# include # include +# include +# include # include -# include -# include -# include -# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include # include -# include # include -# include -# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include # include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include # include -# include -# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include # include # include -# include -# include -# include -# include -# include +# include #if OCC_VERSION_HEX < 0x070300 # include @@ -192,32 +162,32 @@ #include +#include #include #include -#include +#include #include #include #include -#include -#include -#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) diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index 1c90cca133..1b9b177583 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -20,19 +20,21 @@ * * ***************************************************************************/ - #ifndef PART_TOPOSHAPE_H #define PART_TOPOSHAPE_H #include #include -#include -#include -#include + #include #include #include +#include +#include +#include + + class gp_Ax1; class gp_Ax2; class gp_Pln;