From 98c36665be716042ba5ec0929ff89d710e6ac033 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 9 Jul 2022 16:57:06 +0200 Subject: [PATCH] [Part] FeaturePart*: remove unneeded includes - also sort includes --- src/Mod/Part/App/FeaturePartBoolean.cpp | 9 +++++---- src/Mod/Part/App/FeaturePartBox.cpp | 5 +---- src/Mod/Part/App/FeaturePartBox.h | 3 +-- src/Mod/Part/App/FeaturePartCircle.cpp | 6 +++--- src/Mod/Part/App/FeaturePartCircle.h | 3 ++- src/Mod/Part/App/FeaturePartCommon.cpp | 10 ++++------ src/Mod/Part/App/FeaturePartCommon.h | 3 +-- src/Mod/Part/App/FeaturePartCurveNet.cpp | 6 +----- src/Mod/Part/App/FeaturePartCurveNet.h | 5 +---- src/Mod/Part/App/FeaturePartCut.cpp | 3 --- src/Mod/Part/App/FeaturePartCut.h | 4 +--- src/Mod/Part/App/FeaturePartFuse.cpp | 9 ++++----- src/Mod/Part/App/FeaturePartFuse.h | 4 +--- src/Mod/Part/App/FeaturePartImportBrep.cpp | 3 +-- src/Mod/Part/App/FeaturePartImportBrep.h | 5 +---- src/Mod/Part/App/FeaturePartImportIges.cpp | 3 +-- src/Mod/Part/App/FeaturePartImportIges.h | 5 +---- src/Mod/Part/App/FeaturePartImportStep.cpp | 2 +- src/Mod/Part/App/FeaturePartImportStep.h | 5 ----- src/Mod/Part/App/FeaturePartPolygon.cpp | 4 +--- src/Mod/Part/App/FeaturePartPolygon.h | 2 +- src/Mod/Part/App/FeaturePartSection.cpp | 2 -- src/Mod/Part/App/FeaturePartSection.h | 4 ++-- src/Mod/Part/App/FeaturePartSpline.cpp | 5 ----- src/Mod/Part/App/FeaturePartSpline.h | 3 +-- 25 files changed, 35 insertions(+), 78 deletions(-) diff --git a/src/Mod/Part/App/FeaturePartBoolean.cpp b/src/Mod/Part/App/FeaturePartBoolean.cpp index e225dd51da..91c6e2e519 100644 --- a/src/Mod/Part/App/FeaturePartBoolean.cpp +++ b/src/Mod/Part/App/FeaturePartBoolean.cpp @@ -20,19 +20,20 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include + # include # include # include -# include #endif +#include +#include + #include "FeaturePartBoolean.h" #include "modelRefine.h" -#include -#include using namespace Part; diff --git a/src/Mod/Part/App/FeaturePartBox.cpp b/src/Mod/Part/App/FeaturePartBox.cpp index c3281aa4cc..eba2e89c0f 100644 --- a/src/Mod/Part/App/FeaturePartBox.cpp +++ b/src/Mod/Part/App/FeaturePartBox.cpp @@ -20,22 +20,19 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include # include #endif - -#include #include + #include "FeaturePartBox.h" using namespace Part; - PROPERTY_SOURCE(Part::Box, Part::Primitive) diff --git a/src/Mod/Part/App/FeaturePartBox.h b/src/Mod/Part/App/FeaturePartBox.h index 82c955b044..f3cea7d1c3 100644 --- a/src/Mod/Part/App/FeaturePartBox.h +++ b/src/Mod/Part/App/FeaturePartBox.h @@ -20,8 +20,6 @@ * * ***************************************************************************/ - - #ifndef PART_FEATUREPARTBOX_H #define PART_FEATUREPARTBOX_H @@ -29,6 +27,7 @@ #include "PrimitiveFeature.h" + namespace Part { diff --git a/src/Mod/Part/App/FeaturePartCircle.cpp b/src/Mod/Part/App/FeaturePartCircle.cpp index a57e7122f2..db55127be5 100644 --- a/src/Mod/Part/App/FeaturePartCircle.cpp +++ b/src/Mod/Part/App/FeaturePartCircle.cpp @@ -20,18 +20,18 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include # include -# include # include #endif -#include "FeaturePartCircle.h" #include +#include "FeaturePartCircle.h" + + using namespace Part; App::PropertyQuantityConstraint::Constraints Circle::angleRange = {0.0,360.0,1.0}; diff --git a/src/Mod/Part/App/FeaturePartCircle.h b/src/Mod/Part/App/FeaturePartCircle.h index 92cf2b8ec2..d1a86403a6 100644 --- a/src/Mod/Part/App/FeaturePartCircle.h +++ b/src/Mod/Part/App/FeaturePartCircle.h @@ -20,13 +20,14 @@ * * ***************************************************************************/ - #ifndef PART_FEATUREPARTCIRCLE_H #define PART_FEATUREPARTCIRCLE_H #include + #include "PrimitiveFeature.h" + namespace Part { class PartExport Circle : public Part::Primitive diff --git a/src/Mod/Part/App/FeaturePartCommon.cpp b/src/Mod/Part/App/FeaturePartCommon.cpp index 155b94a420..94fa3b443f 100644 --- a/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/src/Mod/Part/App/FeaturePartCommon.cpp @@ -20,24 +20,22 @@ * * ***************************************************************************/ - - #include "PreCompiled.h" #ifndef _PreComp_ # include # include # include +# include # include # include -# include #endif +#include +#include #include "FeaturePartCommon.h" #include "modelRefine.h" -#include -#include -#include + using namespace Part; diff --git a/src/Mod/Part/App/FeaturePartCommon.h b/src/Mod/Part/App/FeaturePartCommon.h index fbcb7e6739..8bf4b3685e 100644 --- a/src/Mod/Part/App/FeaturePartCommon.h +++ b/src/Mod/Part/App/FeaturePartCommon.h @@ -20,13 +20,12 @@ * * ***************************************************************************/ - #ifndef PART_FEATUREPARTCOMMON_H #define PART_FEATUREPARTCOMMON_H -#include #include "FeaturePartBoolean.h" + namespace Part { diff --git a/src/Mod/Part/App/FeaturePartCurveNet.cpp b/src/Mod/Part/App/FeaturePartCurveNet.cpp index fcb783561e..39dfcf6958 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.cpp +++ b/src/Mod/Part/App/FeaturePartCurveNet.cpp @@ -20,14 +20,10 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif #include -#include -#include + #include "FeaturePartCurveNet.h" diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h index 725604a1fd..34f8d6c1e6 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.h +++ b/src/Mod/Part/App/FeaturePartCurveNet.h @@ -20,18 +20,15 @@ * * ***************************************************************************/ - - #ifndef PART_FeaturePartCurveNet_H #define PART_FeaturePartCurveNet_H - #include "PartFeature.h" + namespace Part { - class CurveNet :public Part::Feature { PROPERTY_HEADER(Part::FeaturePartCurveNet); diff --git a/src/Mod/Part/App/FeaturePartCut.cpp b/src/Mod/Part/App/FeaturePartCut.cpp index 85d036d13f..41e517dafa 100644 --- a/src/Mod/Part/App/FeaturePartCut.cpp +++ b/src/Mod/Part/App/FeaturePartCut.cpp @@ -20,16 +20,13 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include #endif - #include "FeaturePartCut.h" -#include using namespace Part; diff --git a/src/Mod/Part/App/FeaturePartCut.h b/src/Mod/Part/App/FeaturePartCut.h index cf21c5f16a..42891fba88 100644 --- a/src/Mod/Part/App/FeaturePartCut.h +++ b/src/Mod/Part/App/FeaturePartCut.h @@ -20,14 +20,12 @@ * * ***************************************************************************/ - #ifndef PART_FEATUREPARTCUT_H #define PART_FEATUREPARTCUT_H -#include - #include "FeaturePartBoolean.h" + namespace Part { diff --git a/src/Mod/Part/App/FeaturePartFuse.cpp b/src/Mod/Part/App/FeaturePartFuse.cpp index 3e425309ae..f11ec9ad58 100644 --- a/src/Mod/Part/App/FeaturePartFuse.cpp +++ b/src/Mod/Part/App/FeaturePartFuse.cpp @@ -20,23 +20,22 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include # include # include # include -# include # include +# include #endif +#include +#include #include "FeaturePartFuse.h" #include "modelRefine.h" -#include -#include -#include + using namespace Part; diff --git a/src/Mod/Part/App/FeaturePartFuse.h b/src/Mod/Part/App/FeaturePartFuse.h index 49881d873f..5525374e33 100644 --- a/src/Mod/Part/App/FeaturePartFuse.h +++ b/src/Mod/Part/App/FeaturePartFuse.h @@ -20,14 +20,12 @@ * * ***************************************************************************/ - #ifndef PART_FEATUREPARTFUSE_H #define PART_FEATUREPARTFUSE_H -#include - #include "FeaturePartBoolean.h" + namespace Part { diff --git a/src/Mod/Part/App/FeaturePartImportBrep.cpp b/src/Mod/Part/App/FeaturePartImportBrep.cpp index d697efb32b..be6cec3487 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.cpp +++ b/src/Mod/Part/App/FeaturePartImportBrep.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include #endif #include -#include #include + #include "FeaturePartImportBrep.h" diff --git a/src/Mod/Part/App/FeaturePartImportBrep.h b/src/Mod/Part/App/FeaturePartImportBrep.h index ff80c2e710..dfd2fdea39 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.h +++ b/src/Mod/Part/App/FeaturePartImportBrep.h @@ -20,18 +20,15 @@ * * ***************************************************************************/ - - #ifndef PART_FEATUREPARTIMPORTBREP_H #define PART_FEATUREPARTIMPORTBREP_H - #include "PartFeature.h" + namespace Part { - class ImportBrep :public Part::Feature { PROPERTY_HEADER(Part::ImportBrep); diff --git a/src/Mod/Part/App/FeaturePartImportIges.cpp b/src/Mod/Part/App/FeaturePartImportIges.cpp index 72932ebd3b..837e9275ea 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.cpp +++ b/src/Mod/Part/App/FeaturePartImportIges.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include #endif #include -#include #include + #include "FeaturePartImportIges.h" diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h index 83c96994c4..5593b8dbb5 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.h +++ b/src/Mod/Part/App/FeaturePartImportIges.h @@ -20,18 +20,15 @@ * * ***************************************************************************/ - - #ifndef PART_FEATUREPARTIMPORTIGES_H #define PART_FEATUREPARTIMPORTIGES_H - #include "PartFeature.h" + namespace Part { - class ImportIges :public Part::Feature { PROPERTY_HEADER(Part::FeaturePartImportIges); diff --git a/src/Mod/Part/App/FeaturePartImportStep.cpp b/src/Mod/Part/App/FeaturePartImportStep.cpp index e8f2dfd9b0..201980521a 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.cpp +++ b/src/Mod/Part/App/FeaturePartImportStep.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include @@ -28,6 +27,7 @@ #include #include + #include "FeaturePartImportStep.h" diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h index ffa302f248..1327905ae9 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.h +++ b/src/Mod/Part/App/FeaturePartImportStep.h @@ -20,22 +20,17 @@ * * ***************************************************************************/ - - #ifndef PART_FEATUREPARTIMPORTSTEP_H #define PART_FEATUREPARTIMPORTSTEP_H - #include #include "PartFeature.h" - namespace Part { - class ImportStep :public Part::Feature { PROPERTY_HEADER(Part::FeaturePartImportStep); diff --git a/src/Mod/Part/App/FeaturePartPolygon.cpp b/src/Mod/Part/App/FeaturePartPolygon.cpp index 37819f7f4d..ccc4c83197 100644 --- a/src/Mod/Part/App/FeaturePartPolygon.cpp +++ b/src/Mod/Part/App/FeaturePartPolygon.cpp @@ -20,17 +20,15 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include #endif #include "FeaturePartPolygon.h" -#include + PROPERTY_SOURCE(Part::Polygon, Part::Feature) diff --git a/src/Mod/Part/App/FeaturePartPolygon.h b/src/Mod/Part/App/FeaturePartPolygon.h index 3653b3cde2..64ce124558 100644 --- a/src/Mod/Part/App/FeaturePartPolygon.h +++ b/src/Mod/Part/App/FeaturePartPolygon.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef PART_FEATUREPARTPOLYGON_H #define PART_FEATUREPARTPOLYGON_H @@ -28,6 +27,7 @@ #include "PartFeature.h" + namespace Part { diff --git a/src/Mod/Part/App/FeaturePartSection.cpp b/src/Mod/Part/App/FeaturePartSection.cpp index cd5de1f1ff..9ae4fc7ef8 100644 --- a/src/Mod/Part/App/FeaturePartSection.cpp +++ b/src/Mod/Part/App/FeaturePartSection.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include @@ -29,7 +28,6 @@ #include "FeaturePartSection.h" -#include using namespace Part; diff --git a/src/Mod/Part/App/FeaturePartSection.h b/src/Mod/Part/App/FeaturePartSection.h index 2b5f73c956..8f3d37a7d5 100644 --- a/src/Mod/Part/App/FeaturePartSection.h +++ b/src/Mod/Part/App/FeaturePartSection.h @@ -20,14 +20,14 @@ * * ***************************************************************************/ - #ifndef PART_FEATUREPARTSECTION_H #define PART_FEATUREPARTSECTION_H -#include +#include #include "FeaturePartBoolean.h" + namespace Part { diff --git a/src/Mod/Part/App/FeaturePartSpline.cpp b/src/Mod/Part/App/FeaturePartSpline.cpp index 617ce3538c..1ef3cf6d2d 100644 --- a/src/Mod/Part/App/FeaturePartSpline.cpp +++ b/src/Mod/Part/App/FeaturePartSpline.cpp @@ -20,18 +20,13 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "FeaturePartSpline.h" using namespace Part; - PROPERTY_SOURCE(Part::Spline, Part::Feature) diff --git a/src/Mod/Part/App/FeaturePartSpline.h b/src/Mod/Part/App/FeaturePartSpline.h index a771d890f1..921dcd0317 100644 --- a/src/Mod/Part/App/FeaturePartSpline.h +++ b/src/Mod/Part/App/FeaturePartSpline.h @@ -20,13 +20,12 @@ * * ***************************************************************************/ - - #ifndef PART_FEATUREPARTSPLINE_H #define PART_FEATUREPARTSPLINE_H #include "PartFeature.h" + namespace Part {