From d6b7b91ab4f41e910e4e59e37cd19ca4b27243c1 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 5 Mar 2022 23:16:28 +0100 Subject: [PATCH] [Gui] View3D*: remove unused includes --- src/Gui/VectorListEditor.cpp | 7 ++-- src/Gui/VectorListEditor.h | 6 ++-- src/Gui/View3DInventor.cpp | 50 ++++++++-------------------- src/Gui/View3DInventor.h | 9 ++--- src/Gui/View3DInventorExamples.cpp | 32 +++++------------- src/Gui/View3DInventorRiftViewer.cpp | 7 ++-- src/Gui/View3DInventorViewer.h | 20 ++++++----- src/Gui/View3DPy.cpp | 5 ++- src/Gui/View3DPy.h | 6 ++-- src/Gui/View3DViewerPy.cpp | 12 +++---- src/Gui/View3DViewerPy.h | 3 +- 11 files changed, 59 insertions(+), 98 deletions(-) diff --git a/src/Gui/VectorListEditor.cpp b/src/Gui/VectorListEditor.cpp index 506259d475..b12d203308 100644 --- a/src/Gui/VectorListEditor.cpp +++ b/src/Gui/VectorListEditor.cpp @@ -20,15 +20,12 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif #include "VectorListEditor.h" #include "ui_VectorListEditor.h" -#include -#include +#include "QuantitySpinBox.h" + using namespace Gui; diff --git a/src/Gui/VectorListEditor.h b/src/Gui/VectorListEditor.h index c6f4f447f1..db986c3948 100644 --- a/src/Gui/VectorListEditor.h +++ b/src/Gui/VectorListEditor.h @@ -23,13 +23,15 @@ #ifndef GUI_VECTORLISTEDITOR_H #define GUI_VECTORLISTEDITOR_H -#include -#include #include +#include #include +#include + #include #include + namespace Gui { class VectorTableModel : public QAbstractTableModel diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index 49a73c3481..6d6582cbb0 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -20,18 +20,16 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include # include # include -# include # include # include # include # include -# include # include # include # include @@ -39,60 +37,38 @@ # 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 -#include #include -#include - #include "View3DInventor.h" -#include "View3DInventorViewer.h" +#include "Application.h" #include "Document.h" #include "FileDialog.h" -#include "Application.h" #include "MainWindow.h" -#include "MenuManager.h" +#include "NavigationStyle.h" +#include "SoFCDB.h" +#include "SoFCSelectionAction.h" +#include "SoFCVectorizeSVGAction.h" +#include "View3DInventorExamples.h" +#include "View3DInventorViewer.h" +#include "View3DPy.h" #include "ViewProvider.h" #include "WaitCursor.h" -#include "SoFCVectorizeSVGAction.h" -// build in Inventor -#include -#include - -#include "View3DInventorExamples.h" -#include "ViewProviderDocumentObject.h" -#include "SoFCSelectionAction.h" -#include "View3DPy.h" -#include "SoFCDB.h" -#include "NavigationStyle.h" -#include "PropertyView.h" -#include "Selection.h" -#include "SelectionObject.h" - -#include using namespace Gui; diff --git a/src/Gui/View3DInventor.h b/src/Gui/View3DInventor.h index 020224fdbf..284d60f853 100644 --- a/src/Gui/View3DInventor.h +++ b/src/Gui/View3DInventor.h @@ -20,16 +20,17 @@ * * ***************************************************************************/ - #ifndef GUI_VIEW3DINVENTOR_H #define GUI_VIEW3DINVENTOR_H -#include "MDIView.h" - -#include #include #include +#include + +#include "MDIView.h" + + class QPrinter; class QStackedWidget; diff --git a/src/Gui/View3DInventorExamples.cpp b/src/Gui/View3DInventorExamples.cpp index 2fc97a7bf3..d1430eda5b 100644 --- a/src/Gui/View3DInventorExamples.cpp +++ b/src/Gui/View3DInventorExamples.cpp @@ -20,45 +20,31 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include +# include # include -# include # include +# include +# include # include # include # include -# include -# include -# include -# include - -# include -# include #endif -#include "../Base/Console.h" - - -#include "View3DInventorExamples.h" - -#include #include +#include #include -#include -#include #include -#include -#include -#include -#include +#include #include +#include +#include +#include #include +#include "View3DInventorExamples.h" unsigned char * generateTexture(int w, int h, int d) diff --git a/src/Gui/View3DInventorRiftViewer.cpp b/src/Gui/View3DInventorRiftViewer.cpp index b0f50d79e2..33c99c519e 100644 --- a/src/Gui/View3DInventorRiftViewer.cpp +++ b/src/Gui/View3DInventorRiftViewer.cpp @@ -20,15 +20,16 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #if BUILD_VR -#include -#include "View3DInventorRiftViewer.h" #include +#include + +#include "View3DInventorRiftViewer.h" + using namespace Gui; diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index 10befc8cd9..c016552c2c 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -29,18 +29,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include +#include +#include +#include + +#include + +#include "Namespace.h" +#include "Selection.h" +#include "Quarter/SoQTQuarterAdaptor.h" + + class SoTranslation; class SoTransform; class SoText2; diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index e2c9f7f65b..022c9127a2 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef __InventorAll__ @@ -39,11 +38,11 @@ #include #include #include -#include #include #include #include "View3DPy.h" + #include "Document.h" #include "NavigationStyle.h" #include "PythonWrapper.h" @@ -55,10 +54,10 @@ #include "SoMouseWheelEvent.h" #include "View3DInventor.h" #include "View3DInventorViewer.h" -#include "View3DViewerPy.h" #include "ViewProviderDocumentObject.h" #include "ViewProviderExtern.h" + using namespace Gui; diff --git a/src/Gui/View3DPy.h b/src/Gui/View3DPy.h index 35d6ab225c..3ce99980e0 100644 --- a/src/Gui/View3DPy.h +++ b/src/Gui/View3DPy.h @@ -20,12 +20,12 @@ * * ***************************************************************************/ - #ifndef GUI_VIEW3DPY_H #define GUI_VIEW3DPY_H -#include -#include +#include "MDIView.h" +#include "MDIViewPy.h" + class SoEventCallback; class SoDragger; diff --git a/src/Gui/View3DViewerPy.cpp b/src/Gui/View3DViewerPy.cpp index 8a177e1984..4799ed04df 100644 --- a/src/Gui/View3DViewerPy.cpp +++ b/src/Gui/View3DViewerPy.cpp @@ -20,21 +20,19 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef __InventorAll__ # include "InventorAll.h" #endif +#include +#include +#include #include "View3DViewerPy.h" -#include -#include -#include -#include -#include -#include +#include "View3DInventorViewer.h" + using namespace Gui; diff --git a/src/Gui/View3DViewerPy.h b/src/Gui/View3DViewerPy.h index cea94d6fc5..e33292bb8b 100644 --- a/src/Gui/View3DViewerPy.h +++ b/src/Gui/View3DViewerPy.h @@ -20,14 +20,13 @@ * * ***************************************************************************/ - #ifndef GUI_VIEW3DVIEWERPY_H #define GUI_VIEW3DVIEWERPY_H -#include #include #include + namespace Gui { class View3DInventorViewer;