From c6b3d2f688036206b221b4b7adde4ecda4513bc0 Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 26 Sep 2022 03:05:23 +0200 Subject: [PATCH] [Part] Task*: remove unused includes - part 1 - also some sorting --- src/Mod/Part/Gui/TaskAttacher.cpp | 27 ++++------ src/Mod/Part/Gui/TaskCheckGeometry.cpp | 46 ++++++++--------- src/Mod/Part/Gui/TaskCheckGeometry.h | 7 +-- src/Mod/Part/Gui/TaskDimension.cpp | 70 +++++++++++++------------- src/Mod/Part/Gui/TaskDimension.h | 19 +++---- src/Mod/Part/Gui/TaskOffset.cpp | 20 +++----- src/Mod/Part/Gui/TaskShapeBuilder.h | 6 +-- src/Mod/Part/Gui/TaskThickness.cpp | 21 +++----- 8 files changed, 97 insertions(+), 119 deletions(-) diff --git a/src/Mod/Part/Gui/TaskAttacher.cpp b/src/Mod/Part/Gui/TaskAttacher.cpp index 28ce2ac5ff..688f126420 100644 --- a/src/Mod/Part/Gui/TaskAttacher.cpp +++ b/src/Mod/Part/Gui/TaskAttacher.cpp @@ -21,43 +21,36 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include -# include # include -# include +# include # include # include #endif -#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 "ui_TaskAttacher.h" #include "TaskAttacher.h" +#include "ui_TaskAttacher.h" + using namespace PartGui; using namespace Gui; diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index 322d0e3fb6..e49a5b440d 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -22,23 +22,26 @@ #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 # if OCC_VERSION_HEX >= 0x060600 # include # include @@ -49,31 +52,28 @@ # include # include # include -# include -# include -# include -# include +# include +# include +# include +# include # include # include -# include -# include -# include # include -# include #endif //_PreComp_ -#include "../App/PartFeature.h" -#include "../App/TopoShapePy.h" #include -#include -#include -#include #include +#include +#include +#include +#include #include #include -#include +#include + #include "TaskCheckGeometry.h" + using namespace PartGui; QVector buildShapeEnumVector() diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index 8df262de4f..21be76ee3b 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -24,6 +24,9 @@ #define TASKCHECKGEOMETRY_H #include +#include +#include +#include #include #include #include @@ -31,9 +34,7 @@ #include #include #include -#include -#include -#include + class SoSeparator; class SoSwitch; diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp index b9c217c5bf..bec88a77f5 100644 --- a/src/Mod/Part/Gui/TaskDimension.cpp +++ b/src/Mod/Part/Gui/TaskDimension.cpp @@ -20,67 +20,65 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreCpmp_ # 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 #endif +#include #include #include #include -#include "../App/PartFeature.h" -#include #include -#include #include -#include -#include #include #include +#include +#include +#include +#include #include "TaskDimension.h" + namespace bp = boost::placeholders; static bool _MeasureInfoInited; diff --git a/src/Mod/Part/Gui/TaskDimension.h b/src/Mod/Part/Gui/TaskDimension.h index b1a9729831..af3d0d877a 100644 --- a/src/Mod/Part/Gui/TaskDimension.h +++ b/src/Mod/Part/Gui/TaskDimension.h @@ -23,22 +23,23 @@ #ifndef TASKDIMENSION_H #define TASKDIMENSION_H -#include #include +#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include + class TopoDS_Shape; class TopoDS_Face; diff --git a/src/Mod/Part/Gui/TaskOffset.cpp b/src/Mod/Part/Gui/TaskOffset.cpp index 2cfdf4f74d..0701a0e7fc 100644 --- a/src/Mod/Part/Gui/TaskOffset.cpp +++ b/src/Mod/Part/Gui/TaskOffset.cpp @@ -20,33 +20,25 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include #endif -#include "ui_TaskOffset.h" -#include "TaskOffset.h" - +#include +#include +#include #include #include #include #include -#include -#include #include - -#include -#include -#include -#include -#include -#include #include +#include "TaskOffset.h" +#include "ui_TaskOffset.h" + using namespace PartGui; diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.h b/src/Mod/Part/Gui/TaskShapeBuilder.h index 718e86d271..f75ffe8f8f 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.h +++ b/src/Mod/Part/Gui/TaskShapeBuilder.h @@ -20,13 +20,13 @@ * * ***************************************************************************/ - #ifndef PARTGUI_TASKSHAPEBUILDER_H #define PARTGUI_TASKSHAPEBUILDER_H -#include -#include #include +#include +#include + namespace PartGui { diff --git a/src/Mod/Part/Gui/TaskThickness.cpp b/src/Mod/Part/Gui/TaskThickness.cpp index 5c6f7146ff..c8c835c323 100644 --- a/src/Mod/Part/Gui/TaskThickness.cpp +++ b/src/Mod/Part/Gui/TaskThickness.cpp @@ -20,35 +20,28 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include -# include #endif -#include "ui_TaskOffset.h" -#include "TaskThickness.h" - +#include +#include +#include #include #include +#include #include #include #include #include #include #include - -#include -#include -#include -#include -#include -#include -#include #include +#include "TaskThickness.h" +#include "ui_TaskOffset.h" + using namespace PartGui;