From 08932bd92df537afb7e7cc8746095184c6bd52e3 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 11 Dec 2022 21:51:14 +0100 Subject: [PATCH] [Sketch] Gui: A - D: remove unused headers - also some sorting --- src/Mod/Sketcher/Gui/AppSketcherGui.cpp | 15 ++--- src/Mod/Sketcher/Gui/Command.cpp | 17 ++--- src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp | 11 ++- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 32 ++++----- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 67 +++++++------------ .../Sketcher/Gui/CommandSketcherBSpline.cpp | 30 ++++----- src/Mod/Sketcher/Gui/CommandSketcherTools.cpp | 24 +++---- .../Gui/CommandSketcherVirtualSpace.cpp | 6 +- src/Mod/Sketcher/Gui/DrawSketchHandler.cpp | 24 ++----- src/Mod/Sketcher/Gui/DrawSketchHandler.h | 7 +- src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h | 4 +- .../Gui/DrawSketchHandlerArcOfEllipse.h | 4 +- .../Gui/DrawSketchHandlerArcOfHyperbola.h | 14 ++-- .../Gui/DrawSketchHandlerArcOfParabola.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerBSpline.h | 5 +- .../Gui/DrawSketchHandlerCarbonCopy.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerCircle.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerEllipse.h | 5 +- .../Sketcher/Gui/DrawSketchHandlerExtend.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerExternal.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerFillet.h | 5 +- src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerLineSet.h | 5 +- src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h | 3 +- .../Sketcher/Gui/DrawSketchHandlerPolygon.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerRectangle.h | 4 +- src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h | 3 +- .../Sketcher/Gui/DrawSketchHandlerSplitting.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerTrimming.h | 4 +- 29 files changed, 120 insertions(+), 201 deletions(-) diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp index e5afafc317..3d8f11b284 100644 --- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp +++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp @@ -22,9 +22,6 @@ #include "PreCompiled.h" -#include -#include - #include #include #include @@ -32,14 +29,15 @@ #include #include #include -#include "Workbench.h" -#include "ViewProviderSketch.h" -#include "ViewProviderPython.h" + +#include "PropertyConstraintListItem.h" +#include "SketcherSettings.h" #include "SoDatumLabel.h" #include "SoZoomTranslation.h" -#include "SketcherSettings.h" -#include "PropertyConstraintListItem.h" +#include "ViewProviderPython.h" +#include "ViewProviderSketch.h" #include "ViewProviderSketchGeometryExtension.h" +#include "Workbench.h" // create the commands @@ -58,7 +56,6 @@ void loadSketcherResource() Gui::Translator::instance()->refresh(); } - namespace SketcherGui { class Module : public Py::ExtensionModule { diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 339d4100e4..196fa7b900 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -20,38 +20,31 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include -# include -# include # include # include # include #endif #include -#include #include -#include #include #include +#include #include #include #include - -#include +#include #include #include #include -#include "SketchOrientationDialog.h" #include "SketchMirrorDialog.h" -#include "ViewProviderSketch.h" +#include "SketchOrientationDialog.h" #include "TaskSketcherValidation.h" -#include "../App/Constraint.h" +#include "ViewProviderSketch.h" + using namespace std; using namespace SketcherGui; diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp index 3deab8df8f..c1cfc9c551 100644 --- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp +++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include @@ -28,19 +27,17 @@ #include #include +#include #include +#include #include #include -#include -#include -#include - -#include #include -#include "ViewProviderSketch.h" #include "GeometryCreationMode.h" #include "Utils.h" +#include "ViewProviderSketch.h" + using namespace std; using namespace SketcherGui; diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 6afa2a92c6..4b3d717a9a 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -20,41 +20,37 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # 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 "Utils.h" - -#include "ViewProviderSketch.h" -#include "DrawSketchHandler.h" -#include "ui_InsertDatum.h" -#include "EditDatumDialog.h" #include "CommandConstraints.h" +#include "DrawSketchHandler.h" +#include "EditDatumDialog.h" +#include "ui_InsertDatum.h" +#include "Utils.h" +#include "ViewProviderSketch.h" + using namespace std; using namespace SketcherGui; diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 82404f6bc9..33ab5e4c6b 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -20,72 +20,57 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include -# include -# include -# include -# include # include -# include -# include -# include # include -#endif -#include -#include -#include +# include +# include +#endif #include #include #include #include -#include #include +#include #include -#include #include -#include -#include -#include -#include -#include - -#include "ViewProviderSketch.h" -#include "DrawSketchHandler.h" -#include "Utils.h" - +#include #include #include -#include - -#include +#include +#include +#include +#include #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" -#include "DrawSketchHandlerLine.h" -#include "DrawSketchHandlerRectangle.h" -#include "DrawSketchHandlerPolygon.h" -#include "DrawSketchHandlerLineSet.h" -#include "DrawSketchHandlerCircle.h" -#include "DrawSketchHandlerEllipse.h" +// DrawSketchHandler* must be last includes +#include "DrawSketchHandler.h" #include "DrawSketchHandlerArc.h" #include "DrawSketchHandlerArcOfEllipse.h" #include "DrawSketchHandlerArcOfHyperbola.h" #include "DrawSketchHandlerArcOfParabola.h" #include "DrawSketchHandlerBSpline.h" -#include "DrawSketchHandlerPoint.h" -#include "DrawSketchHandlerFillet.h" -#include "DrawSketchHandlerTrimming.h" -#include "DrawSketchHandlerExtend.h" -#include "DrawSketchHandlerSplitting.h" -#include "DrawSketchHandlerExternal.h" #include "DrawSketchHandlerCarbonCopy.h" +#include "DrawSketchHandlerCircle.h" +#include "DrawSketchHandlerEllipse.h" +#include "DrawSketchHandlerExtend.h" +#include "DrawSketchHandlerExternal.h" +#include "DrawSketchHandlerFillet.h" +#include "DrawSketchHandlerLine.h" +#include "DrawSketchHandlerLineSet.h" +#include "DrawSketchHandlerPoint.h" +#include "DrawSketchHandlerPolygon.h" +#include "DrawSketchHandlerRectangle.h" #include "DrawSketchHandlerSlot.h" +#include "DrawSketchHandlerSplitting.h" +#include "DrawSketchHandlerTrimming.h" + using namespace std; using namespace SketcherGui; diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index 4150d5dcc5..7fd3b59630 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -20,38 +20,32 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # 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 "ViewProviderSketch.h" -#include "DrawSketchHandler.h" - -#include #include +#include "DrawSketchHandler.h" #include "Utils.h" +#include "ViewProviderSketch.h" + using namespace std; using namespace SketcherGui; diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index 2363eb89d4..d18c92d50b 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -20,41 +20,35 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include # include -# include -# include + # include # include # include #endif -#include #include +#include +#include #include +#include +#include #include +#include #include #include -#include -#include - -#include -#include - -#include "ViewProviderSketch.h" -#include "DrawSketchHandler.h" - -#include #include #include -#include "ViewProviderSketch.h" +#include "DrawSketchHandler.h" #include "SketchRectangularArrayDialog.h" #include "Utils.h" +#include "ViewProviderSketch.h" + using namespace std; using namespace SketcherGui; diff --git a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp index ad0c3719c2..fd67808574 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp @@ -20,15 +20,10 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include # include -# include -# include -# include -# include #endif #include @@ -51,6 +46,7 @@ #include "Utils.h" + using namespace std; using namespace SketcherGui; using namespace Sketcher; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index da7dda9f92..d38773c272 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -20,45 +20,33 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ -# include -# include -# include -# include -# include -# include # include + +# include +# include #endif // #ifndef _PreComp_ -/// Here the FreeCAD includes sorted by Base,App,Gui...... #include #include -#include -#include #include #include #include -#include -#include #include -#include #include - -#include +#include #include #include "DrawSketchHandler.h" -#include "ViewProviderSketch.h" #include "CommandConstraints.h" #include "Utils.h" +#include "ViewProviderSketch.h" + using namespace SketcherGui; using namespace Sketcher; - /************************************ Attorney *******************************************/ inline void ViewProviderSketchDrawSketchHandlerAttorney::setConstraintSelectability(ViewProviderSketch &vp, bool enabled /*= true*/) diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index 455f162d3c..2cd1cf4c5d 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -20,16 +20,17 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandler_H #define SKETCHERGUI_DrawSketchHandler_H -#include -#include +#include + #include +#include #include "AutoConstraint.h" + class QPixmap; namespace Sketcher { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h index 0d72b7fe3f..c0cd8ce294 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerArc_H #define SKETCHERGUI_DrawSketchHandlerArc_H - #include "GeometryCreationMode.h" -#include "Utils.h" + using namespace std; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h index b83383543a..dfe28a105d 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerArcOfEllipse_H #define SKETCHERGUI_DrawSketchHandlerArcOfEllipse_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h index 77f41f7deb..9dd3aec13c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h @@ -20,13 +20,13 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerArcOfHyperbola_H #define SKETCHERGUI_DrawSketchHandlerArcOfHyperbola_H +#include #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { @@ -53,9 +53,9 @@ public: void mouseMove(Base::Vector2d onSketchPos) override { - if (Mode==STATUS_SEEK_First) { + if (Mode == STATUS_SEEK_First) { setPositionText(onSketchPos); - if (seekAutoConstraint(sugConstr1, onSketchPos, Base::Vector2d(0.f,0.f))) { + if (seekAutoConstraint(sugConstr1, onSketchPos, Base::Vector2d(0.f, 0.f))) { renderSuggestConstraintsCursor(sugConstr1); return; } @@ -73,7 +73,7 @@ public: } drawEdit(EditCurve); - if (seekAutoConstraint(sugConstr2, onSketchPos, Base::Vector2d(0.f,0.f), + if (seekAutoConstraint(sugConstr2, onSketchPos, Base::Vector2d(0.f, 0.f), AutoConstraint::CURVE)) { renderSuggestConstraintsCursor(sugConstr2); return; @@ -88,7 +88,7 @@ public: double angleatpoint = acosh(((onSketchPos.x-centerPoint.x)*cos(phi)+(onSketchPos.y-centerPoint.y)*sin(phi))/a); double b=(onSketchPos.y-centerPoint.y-a*cosh(angleatpoint)*sin(phi))/(sinh(angleatpoint)*cos(phi)); - if(!boost::math::isnan(b)){ + if (!boost::math::isnan(b)) { for (int i=15; i >= -15; i--) { // P(U) = O + MajRad*Cosh(U)*XDir + MinRad*Sinh(U)*YDir //double angle = i*M_PI/16.0; @@ -108,7 +108,7 @@ public: } drawEdit(EditCurve); - if (seekAutoConstraint(sugConstr3, onSketchPos, Base::Vector2d(0.f,0.f))) { + if (seekAutoConstraint(sugConstr3, onSketchPos, Base::Vector2d(0.f, 0.f))) { renderSuggestConstraintsCursor(sugConstr3); return; } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h index b7bde44e99..7864c0ba43 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerArcOfParabola_H #define SKETCHERGUI_DrawSketchHandlerArcOfParabola_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 0dfc2ae329..a617946a25 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -20,13 +20,14 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerBSpline_H #define SKETCHERGUI_DrawSketchHandlerBSpline_H +#include +#include #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h index 7e1c44a1b3..af92e5b88c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerCarbonCopy_H #define SKETCHERGUI_DrawSketchHandlerCarbonCopy_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h index 1f542385ca..6c7c07c8ed 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerCircle_H #define SKETCHERGUI_DrawSketchHandlerCircle_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index db3e4daa93..0c2ddc335a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -20,14 +20,15 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerEllipse_H #define SKETCHERGUI_DrawSketchHandlerEllipse_H #include +#include +#include #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h index cd4a736d9e..1d9d770751 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerExtend_H #define SKETCHERGUI_DrawSketchHandlerExtend_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h index cf438a188a..0512451a81 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerExternal_H #define SKETCHERGUI_DrawSketchHandlerExternal_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h index 6920eb8858..1d97b3c407 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h @@ -20,12 +20,13 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerFillet_H #define SKETCHERGUI_DrawSketchHandlerFillet_H +#include + #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h index d7b9291acd..b8772a3250 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h @@ -19,13 +19,11 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ - - #ifndef SKETCHERGUI_DrawSketchHandlerLine_H #define SKETCHERGUI_DrawSketchHandlerLine_H #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index ea6759de21..d4f10b3be3 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -20,13 +20,14 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerLineSet_H #define SKETCHERGUI_DrawSketchHandlerLineSet_H +#include +#include #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h index b8fbcf6b33..ddebd78bd1 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h @@ -20,12 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerPoint_H #define SKETCHERGUI_DrawSketchHandlerPoint_H #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h index ee6fa48f85..c25073a72a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h @@ -20,15 +20,13 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerPolygon_H #define SKETCHERGUI_DrawSketchHandlerPolygon_H #include "GeometryCreationMode.h" -#include "Utils.h" - #include "SketcherRegularPolygonDialog.h" + namespace SketcherGui { extern GeometryCreationMode geometryCreationMode; // defined in CommandCreateGeo.cpp diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 5b869a966a..6dd62a71e5 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerRectangle_H #define SKETCHERGUI_DrawSketchHandlerRectangle_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h index 9701438372..02950201f3 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h @@ -20,12 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerSlot_H #define SKETCHERGUI_DrawSketchHandlerSlot_H #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h index 9a0630ea78..a251d2eb0e 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerSplitting_H #define SKETCHERGUI_DrawSketchHandlerSplitting_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h index bee6475dfb..b034ffed16 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h @@ -20,13 +20,11 @@ * * ***************************************************************************/ - #ifndef SKETCHERGUI_DrawSketchHandlerTrimming_H #define SKETCHERGUI_DrawSketchHandlerTrimming_H - #include "GeometryCreationMode.h" -#include "Utils.h" + namespace SketcherGui {