From f706adc2c23d3651c64b9f002566ce7a69b7467a Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 6 Mar 2022 00:01:37 +0100 Subject: [PATCH] [Gui] ViewProviderDocument* etc.: remove unused includes --- src/Gui/ViewProvider.cpp | 33 +++++++---------- src/Gui/ViewProvider.h | 12 +++---- src/Gui/ViewProviderAnnotation.cpp | 26 +++++++------- src/Gui/ViewProviderBuilder.cpp | 5 +-- src/Gui/ViewProviderBuilder.h | 6 ++-- src/Gui/ViewProviderDocumentObject.cpp | 40 +++++++-------------- src/Gui/ViewProviderDocumentObjectGroup.cpp | 14 -------- src/Gui/ViewProviderDocumentObjectGroup.h | 5 ++- src/Gui/ViewProviderDocumentObjectPyImp.cpp | 5 ++- src/Gui/ViewProviderDragger.cpp | 15 +++----- src/Gui/WaitCursor.h | 2 -- 11 files changed, 55 insertions(+), 108 deletions(-) diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index 074b74562a..739603070f 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -20,50 +20,41 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include # include # include +# include +# include +# include +# include # include # include -# include # include -# include -# include -# include -# include -# include -# include -# include #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... +#include #include #include -#include #include -#include #include "ViewProvider.h" -#include "Application.h" #include "ActionFunction.h" -#include "Document.h" -#include "ViewProviderPy.h" +#include "Application.h" #include "BitmapFactory.h" +#include "Document.h" +#include "SoFCDB.h" #include "View3DInventor.h" #include "View3DInventorViewer.h" -#include "SoFCDB.h" -#include "ViewProviderExtension.h" -#include "SoFCUnifiedSelection.h" -#include "ViewProviderLink.h" #include "ViewParams.h" +#include "ViewProviderExtension.h" +#include "ViewProviderLink.h" +#include "ViewProviderPy.h" -FC_LOG_LEVEL_INIT("ViewProvider",true,true) +FC_LOG_LEVEL_INIT("ViewProvider", true, true) using namespace std; using namespace Gui; diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 1d5761a87e..cca5f8e442 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -20,22 +20,22 @@ * * ***************************************************************************/ - #ifndef GUI_VIEWPROVIDER_H #define GUI_VIEWPROVIDER_H -#include -#include -#include #include +#include +#include +#include #include #include #include -#include #include -#include +#include #include +#include + class SbVec2s; class SbVec3f; diff --git a/src/Gui/ViewProviderAnnotation.cpp b/src/Gui/ViewProviderAnnotation.cpp index 3c5c9fb41a..576e53a106 100644 --- a/src/Gui/ViewProviderAnnotation.cpp +++ b/src/Gui/ViewProviderAnnotation.cpp @@ -20,11 +20,9 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include @@ -32,33 +30,33 @@ # include # include # include +# include # include +# include # include # include -# include -# include -# include -# include # include -# include # include # include +# include +# include +# include #endif # include -#include "ViewProviderAnnotation.h" #include -#include -#include #include #include -#include + +#include "ViewProviderAnnotation.h" +#include "Application.h" +#include "BitmapFactory.h" +#include "Document.h" #include "SoFCSelection.h" #include "SoTextLabel.h" -#include "Application.h" -#include "Document.h" -#include "Window.h" #include "Tools.h" +#include "Window.h" + using namespace Gui; diff --git a/src/Gui/ViewProviderBuilder.cpp b/src/Gui/ViewProviderBuilder.cpp index 58b8bd54d7..920be874c5 100644 --- a/src/Gui/ViewProviderBuilder.cpp +++ b/src/Gui/ViewProviderBuilder.cpp @@ -20,17 +20,18 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include #endif +#include + #include "ViewProviderBuilder.h" #include "SoFCSelection.h" #include "Window.h" -#include + using namespace Gui; diff --git a/src/Gui/ViewProviderBuilder.h b/src/Gui/ViewProviderBuilder.h index 0cd3dbf0a7..ec27ac9f01 100644 --- a/src/Gui/ViewProviderBuilder.h +++ b/src/Gui/ViewProviderBuilder.h @@ -20,15 +20,13 @@ * * ***************************************************************************/ - #ifndef GUI_VIEWPROVIDERBUILDER_H #define GUI_VIEWPROVIDERBUILDER_H -#include #include -#include +#include #include -#include + class SoNode; diff --git a/src/Gui/ViewProviderDocumentObject.cpp b/src/Gui/ViewProviderDocumentObject.cpp index 2c245d9bea..3c95b9a27b 100644 --- a/src/Gui/ViewProviderDocumentObject.cpp +++ b/src/Gui/ViewProviderDocumentObject.cpp @@ -20,52 +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 #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include -#include -#include -#include -#include -#include -#include #include +#include + +#include "ViewProviderDocumentObjectPy.h" #include "ActionFunction.h" #include "Application.h" #include "Command.h" #include "Document.h" -#include "Selection.h" -#include "MainWindow.h" #include "MDIView.h" -#include "View3DInventor.h" -#include "View3DInventorViewer.h" -#include "TaskView/TaskAppearance.h" -#include "ViewProviderDocumentObject.h" -#include "ViewProviderExtension.h" #include "SoFCUnifiedSelection.h" #include "Tree.h" -#include +#include "ViewProviderDocumentObject.h" +#include "ViewProviderExtension.h" +#include "TaskView/TaskAppearance.h" -FC_LOG_LEVEL_INIT("Gui",true,true) + +FC_LOG_LEVEL_INIT("Gui", true, true) using namespace Gui; diff --git a/src/Gui/ViewProviderDocumentObjectGroup.cpp b/src/Gui/ViewProviderDocumentObjectGroup.cpp index 635d9ee495..d5bb582816 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.cpp +++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp @@ -20,28 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -# include -#endif - #include -#include -/// Here the FreeCAD includes sorted by Base,App,Gui...... #include "ViewProviderDocumentObjectGroup.h" #include "Application.h" -#include "Command.h" #include "BitmapFactory.h" #include "Document.h" -#include "Tree.h" -#include "View3DInventor.h" -#include "View3DInventorViewer.h" -#include using namespace Gui; diff --git a/src/Gui/ViewProviderDocumentObjectGroup.h b/src/Gui/ViewProviderDocumentObjectGroup.h index f78cd676a4..5bcf7a5aa8 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.h +++ b/src/Gui/ViewProviderDocumentObjectGroup.h @@ -20,14 +20,13 @@ * * ***************************************************************************/ - #ifndef GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H #define GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H - #include "ViewProviderDocumentObject.h" -#include "ViewProviderPythonFeature.h" #include "ViewProviderGroupExtension.h" +#include "ViewProviderPythonFeature.h" + namespace Gui { diff --git a/src/Gui/ViewProviderDocumentObjectPyImp.cpp b/src/Gui/ViewProviderDocumentObjectPyImp.cpp index 0dba4eff87..04c356cc95 100644 --- a/src/Gui/ViewProviderDocumentObjectPyImp.cpp +++ b/src/Gui/ViewProviderDocumentObjectPyImp.cpp @@ -20,21 +20,20 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include #endif -#include -#include #include +#include "Document.h" // inclusion of the generated files (generated out of ViewProviderDocumentObjectPy.xml) #include "ViewProviderDocumentObjectPy.h" #include "ViewProviderDocumentObjectPy.cpp" + using namespace Gui; // returns a string which represents the object e.g. when printed in python diff --git a/src/Gui/ViewProviderDragger.cpp b/src/Gui/ViewProviderDragger.cpp index 34e4b8b1fe..e34116d287 100644 --- a/src/Gui/ViewProviderDragger.cpp +++ b/src/Gui/ViewProviderDragger.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include # include # include # include @@ -32,17 +31,11 @@ # include #endif -#include #include -#include #include -#include -#include -#if (COIN_MAJOR_VERSION > 2) -#include -#endif -#include + #include "Application.h" +#include "BitmapFactory.h" #include "Control.h" #include "Document.h" #include "SoFCCSysDragger.h" @@ -50,7 +43,7 @@ #include "TaskCSysDragger.h" #include "View3DInventorViewer.h" #include "ViewProviderDragger.h" -#include "Window.h" + using namespace Gui; diff --git a/src/Gui/WaitCursor.h b/src/Gui/WaitCursor.h index f3db88d5d2..6031b55a36 100644 --- a/src/Gui/WaitCursor.h +++ b/src/Gui/WaitCursor.h @@ -20,11 +20,9 @@ * * ***************************************************************************/ - #ifndef GUI_WAIT_CURSOR_H #define GUI_WAIT_CURSOR_H -#include namespace Gui {