From 4b5062c0d3854c4a158bd1ca35ea5cf8fe8b23da Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 31 Jul 2022 14:55:19 +0200 Subject: [PATCH] [Part] ViewProvider: P to T: remove unused includes --- .../Part/Gui/ViewProviderPlaneParametric.cpp | 6 +- .../Part/Gui/ViewProviderPointParametric.cpp | 5 -- src/Mod/Part/Gui/ViewProviderPrimitive.cpp | 10 --- src/Mod/Part/Gui/ViewProviderPrism.cpp | 6 +- src/Mod/Part/Gui/ViewProviderPython.cpp | 4 +- src/Mod/Part/Gui/ViewProviderReference.cpp | 67 +++---------------- src/Mod/Part/Gui/ViewProviderReference.h | 8 +-- .../Part/Gui/ViewProviderRegularPolygon.cpp | 6 +- src/Mod/Part/Gui/ViewProviderRuledSurface.cpp | 10 +-- src/Mod/Part/Gui/ViewProviderRuledSurface.h | 5 -- .../Part/Gui/ViewProviderSphereParametric.cpp | 4 -- src/Mod/Part/Gui/ViewProviderSpline.cpp | 18 +++-- .../Part/Gui/ViewProviderTorusParametric.cpp | 5 -- 13 files changed, 27 insertions(+), 127 deletions(-) diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp index da3c999ef3..a333802a2a 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp @@ -20,18 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ViewProviderPlaneParametric.h" #include #include -using namespace PartGui; +using namespace PartGui; //************************************************************************** // Construction/Destruction diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp index f6a44bacfa..587d787997 100644 --- a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp @@ -20,19 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ViewProviderPointParametric.h" using namespace PartGui; using namespace std; - //************************************************************************** // Construction/Destruction diff --git a/src/Mod/Part/Gui/ViewProviderPrimitive.cpp b/src/Mod/Part/Gui/ViewProviderPrimitive.cpp index 97415db6f6..018ac6dd88 100644 --- a/src/Mod/Part/Gui/ViewProviderPrimitive.cpp +++ b/src/Mod/Part/Gui/ViewProviderPrimitive.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ @@ -28,16 +27,8 @@ # include #endif -#include -#include -#include #include -#include -#include #include -#include - -#include #include #include "ViewProviderPrimitive.h" @@ -46,7 +37,6 @@ using namespace PartGui; - PROPERTY_SOURCE(PartGui::ViewProviderPrimitive, PartGui::ViewProviderPart) ViewProviderPrimitive::ViewProviderPrimitive() diff --git a/src/Mod/Part/Gui/ViewProviderPrism.cpp b/src/Mod/Part/Gui/ViewProviderPrism.cpp index b30b291dc2..94815310a9 100644 --- a/src/Mod/Part/Gui/ViewProviderPrism.cpp +++ b/src/Mod/Part/Gui/ViewProviderPrism.cpp @@ -20,18 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ViewProviderPrism.h" + using namespace PartGui; using namespace std; - //************************************************************************** // Construction/Destruction diff --git a/src/Mod/Part/Gui/ViewProviderPython.cpp b/src/Mod/Part/Gui/ViewProviderPython.cpp index e0ce000aad..e7fa75fe1b 100644 --- a/src/Mod/Part/Gui/ViewProviderPython.cpp +++ b/src/Mod/Part/Gui/ViewProviderPython.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #include @@ -28,9 +27,10 @@ # include #endif #include -#include + #include "ViewProviderPython.h" + using namespace PartGui; PROPERTY_SOURCE(PartGui::ViewProviderCustom, PartGui::ViewProviderPart) diff --git a/src/Mod/Part/Gui/ViewProviderReference.cpp b/src/Mod/Part/Gui/ViewProviderReference.cpp index 513138ff07..2d42bf4d89 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.cpp +++ b/src/Mod/Part/Gui/ViewProviderReference.cpp @@ -20,75 +20,24 @@ * * ***************************************************************************/ - #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 +// to avoid compiler warnings of redefining contents of basic.h +// later by #include "ViewProvider.h" +# define _USE_MATH_DEFINES +# include + # include -# include -# include +# include +# include #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include -#include -#include -#include #include -#include -#include - +#include #include "ViewProvider.h" #include "ViewProviderReference.h" -#include "SoFCShapeObject.h" - -#include -#include using namespace PartGui; diff --git a/src/Mod/Part/Gui/ViewProviderReference.h b/src/Mod/Part/Gui/ViewProviderReference.h index 134a6038b7..b7a0219b3b 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.h +++ b/src/Mod/Part/Gui/ViewProviderReference.h @@ -35,12 +35,12 @@ class TopoDS_Shape; class TopoDS_Edge; class TopoDS_Wire; class TopoDS_Face; -class SoSeparator; -class SoGroup; +class SoSeparator; +class SoGroup; class SoSwitch; class SoVertexShape; -class SoPickedPoint; -class SoShapeHints; +class SoPickedPoint; +class SoShapeHints; class SoEventCallback; class SbVec3f; class SoSphere; diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp index 52cceb6722..b2550cf8f2 100644 --- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp +++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp @@ -20,18 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ViewProviderRegularPolygon.h" + using namespace PartGui; using namespace std; - //************************************************************************** // Construction/Destruction diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp index a92941c578..39d96d6729 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp @@ -20,23 +20,17 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include "ViewProviderRuledSurface.h" +#include #include -#include -#include +#include "ViewProviderRuledSurface.h" using namespace PartGui; using namespace std; - //************************************************************************** // Construction/Destruction diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.h b/src/Mod/Part/Gui/ViewProviderRuledSurface.h index 824e7da0c2..447749c031 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.h +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.h @@ -20,15 +20,12 @@ * * ***************************************************************************/ - #ifndef PARTGUI_VIEWPROVIDERRULEDSURFACE_H #define PARTGUI_VIEWPROVIDERRULEDSURFACE_H #include "ViewProvider.h" - - namespace PartGui { @@ -46,7 +43,6 @@ public: std::vector claimChildren() const; void updateData(const App::Property*); bool onDelete(const std::vector &); - protected: @@ -56,4 +52,3 @@ protected: #endif // PARTGUI_VIEWPROVIDERRULEDSURFACE_H - diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp index a1a9e4b83d..4ef6614cf9 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ViewProviderSphereParametric.h" using namespace PartGui; diff --git a/src/Mod/Part/Gui/ViewProviderSpline.cpp b/src/Mod/Part/Gui/ViewProviderSpline.cpp index e876f4a192..5e747dce35 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.cpp +++ b/src/Mod/Part/Gui/ViewProviderSpline.cpp @@ -20,38 +20,36 @@ * * ***************************************************************************/ - #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 #endif -#include -#include #include #include -#include "SoFCShapeObject.h" + #include "ViewProviderSpline.h" +#include "SoFCShapeObject.h" using namespace PartGui; diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp index b32aa05111..4b91fba49e 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp @@ -20,15 +20,10 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ViewProviderTorusParametric.h" - using namespace PartGui; using namespace std;