From a65c88d3c5c0c117a8ab24dacf46cf83f2cd2d23 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 6 Mar 2022 01:11:42 +0100 Subject: [PATCH] [Gui] ViewProviderLink etc.: remove unused includes - also put headers to PreCompiled.h --- src/Gui/Document.cpp | 7 +++---- src/Gui/PreCompiled.h | 6 ++++-- src/Gui/ViewProviderGroupExtension.cpp | 19 ++++++++----------- src/Gui/ViewProviderGroupExtension.h | 3 +-- src/Gui/ViewProviderInventorObject.cpp | 12 +++++------- src/Gui/ViewProviderLine.cpp | 4 +--- src/Gui/ViewProviderLink.cpp | 11 +++++------ src/Gui/ViewProviderLink.h | 7 +++---- src/Gui/ViewProviderLinkPyImp.cpp | 4 ++-- 9 files changed, 32 insertions(+), 41 deletions(-) diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 6233922d33..7af3c89179 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -20,10 +20,10 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include # include # include # include @@ -32,8 +32,6 @@ # include #endif -#include - #include #include #include @@ -61,7 +59,8 @@ #include "ViewProviderDocumentObjectGroup.h" #include "WaitCursor.h" -FC_LOG_LEVEL_INIT("Gui",true,true) + +FC_LOG_LEVEL_INIT("Gui", true, true) using namespace Gui; namespace bp = boost::placeholders; diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index e5029b2a6b..f26d2ce569 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -59,12 +59,15 @@ #include #endif +// null-terminated byte string +#include + // streams #include #include - // STL +#include #include #include #include @@ -89,7 +92,6 @@ #include #include - // Python #include diff --git a/src/Gui/ViewProviderGroupExtension.cpp b/src/Gui/ViewProviderGroupExtension.cpp index 5d2ff145a5..f21978c896 100644 --- a/src/Gui/ViewProviderGroupExtension.cpp +++ b/src/Gui/ViewProviderGroupExtension.cpp @@ -20,26 +20,23 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include #endif -//#include "ViewProviderGroupExtensionPy.h" -#include "ViewProviderGroupExtension.h" - -#include "Command.h" -#include "Application.h" -#include "Document.h" -#include "MainWindow.h" -#include #include #include #include -#include #include -#include +#include + +#include "ViewProviderGroupExtension.h" +#include "Command.h" +#include "Document.h" +#include "MainWindow.h" + using namespace Gui; diff --git a/src/Gui/ViewProviderGroupExtension.h b/src/Gui/ViewProviderGroupExtension.h index e2d1e385f6..77f5b0931c 100644 --- a/src/Gui/ViewProviderGroupExtension.h +++ b/src/Gui/ViewProviderGroupExtension.h @@ -20,13 +20,12 @@ * * ***************************************************************************/ - #ifndef GUI_VIEWPROVIDERGROUPEXTENSION_H #define GUI_VIEWPROVIDERGROUPEXTENSION_H -#include #include "ViewProviderExtensionPython.h" + namespace Gui { diff --git a/src/Gui/ViewProviderInventorObject.cpp b/src/Gui/ViewProviderInventorObject.cpp index 0dee18dbe2..7ab56b8184 100644 --- a/src/Gui/ViewProviderInventorObject.cpp +++ b/src/Gui/ViewProviderInventorObject.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ @@ -31,13 +30,12 @@ # include #endif -#include "ViewProviderInventorObject.h" -#include -#include #include -#include -#include -#include +#include + +#include "ViewProviderInventorObject.h" +#include "SoFCSelection.h" + using namespace Gui; diff --git a/src/Gui/ViewProviderLine.cpp b/src/Gui/ViewProviderLine.cpp index 172f6f5356..8e49c61139 100644 --- a/src/Gui/ViewProviderLine.cpp +++ b/src/Gui/ViewProviderLine.cpp @@ -21,22 +21,20 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include # include -# include # include # include # include # include #endif +#include "ViewProviderLine.h" #include "ViewProviderOrigin.h" -#include "ViewProviderLine.h" using namespace Gui; diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp index ec6dc97d3d..0c70fdf07f 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -23,6 +23,9 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include +# include +# include # include # include # include @@ -37,21 +40,17 @@ # include # include # include -# include #include #include #endif -#include #include -#include -#include + #include #include #include #include #include -#include #include "ViewProviderLink.h" #include "ViewProviderLinkPy.h" @@ -69,7 +68,7 @@ #include "ViewProviderGeometryObject.h" -FC_LOG_LEVEL_INIT("App::Link",true,true) +FC_LOG_LEVEL_INIT("App::Link", true, true) using namespace Gui; using namespace Base; diff --git a/src/Gui/ViewProviderLink.h b/src/Gui/ViewProviderLink.h index f679cccb1d..b0e2c7996a 100644 --- a/src/Gui/ViewProviderLink.h +++ b/src/Gui/ViewProviderLink.h @@ -20,17 +20,16 @@ * * ****************************************************************************/ - #ifndef GUI_VIEWPROVIDER_LINK_H #define GUI_VIEWPROVIDER_LINK_H -#include -#include #include + #include "SoFCUnifiedSelection.h" -#include "ViewProviderPythonFeature.h" #include "ViewProviderDocumentObject.h" #include "ViewProviderExtension.h" +#include "ViewProviderPythonFeature.h" + class SoBase; class SoDragger; diff --git a/src/Gui/ViewProviderLinkPyImp.cpp b/src/Gui/ViewProviderLinkPyImp.cpp index b418f0f32f..1d1d0e7577 100644 --- a/src/Gui/ViewProviderLinkPyImp.cpp +++ b/src/Gui/ViewProviderLinkPyImp.cpp @@ -26,13 +26,13 @@ # include #endif -#include "Gui/ViewProviderLink.h" -#include #include + // inclusion of the generated files (generated out of ViewProviderLinkPy.xml) #include "ViewProviderLinkPy.h" #include "ViewProviderLinkPy.cpp" + using namespace Gui; // returns a string which represents the object e.g. when printed in python