From 8620c1a730fefc092121c758dc6e016ae615783c Mon Sep 17 00:00:00 2001 From: Uwe Date: Thu, 24 Nov 2022 01:47:05 +0100 Subject: [PATCH] [MeshPart] Gui: remove unused includes - also some sorting --- src/Mod/MeshPart/Gui/AppMeshPartGui.cpp | 5 ++--- src/Mod/MeshPart/Gui/Command.cpp | 11 +++++------ src/Mod/MeshPart/Gui/CrossSections.cpp | 23 +++++++++++------------ src/Mod/MeshPart/Gui/CrossSections.h | 8 +++++--- src/Mod/MeshPart/Gui/CurveOnMesh.cpp | 14 ++++++-------- src/Mod/MeshPart/Gui/CurveOnMesh.h | 4 +++- src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp | 6 +----- src/Mod/MeshPart/Gui/TaskCurveOnMesh.h | 4 +++- src/Mod/MeshPart/Gui/Tessellation.cpp | 12 +++++------- src/Mod/MeshPart/Gui/Tessellation.h | 11 +++++------ src/Mod/MeshPart/Gui/Workbench.cpp | 6 +++--- 11 files changed, 49 insertions(+), 55 deletions(-) diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index 3d1af7f5bc..1b28dd4627 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -22,17 +22,16 @@ #include "PreCompiled.h" -#include -#include - #include #include #include #include #include + #include "CurveOnMesh.h" #include "Workbench.h" + // use a different name to CreateCommand() void CreateMeshPartCommands(); diff --git a/src/Mod/MeshPart/Gui/Command.cpp b/src/Mod/MeshPart/Gui/Command.cpp index 445397411d..b9fed8806e 100644 --- a/src/Mod/MeshPart/Gui/Command.cpp +++ b/src/Mod/MeshPart/Gui/Command.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include @@ -28,22 +27,22 @@ # include #endif -#include - -#include #include #include +#include #include #include #include #include #include -#include #include #include -#include "Tessellation.h" +#include + #include "CrossSections.h" #include "TaskCurveOnMesh.h" +#include "Tessellation.h" + using namespace std; diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index f1a20b0ef9..79ecddba41 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -20,46 +20,45 @@ * * ***************************************************************************/ - #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 #endif -#include "ui_CrossSections.h" -#include "CrossSections.h" #include #include #include #include #include -#include -#include +#include #include +#include #include #include +#include #include #include -#include -#include + +#include "CrossSections.h" +#include "ui_CrossSections.h" + using namespace MeshPartGui; namespace bp = boost::placeholders; diff --git a/src/Mod/MeshPart/Gui/CrossSections.h b/src/Mod/MeshPart/Gui/CrossSections.h index d089e6ac57..dfb139771b 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.h +++ b/src/Mod/MeshPart/Gui/CrossSections.h @@ -23,12 +23,14 @@ #ifndef MESHPARTGUI_CROSSSECTIONS_H #define MESHPARTGUI_CROSSSECTIONS_H -#include -#include -#include #include #include +#include +#include +#include + + namespace Gui { class View3DInventor; } diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp index fd11115ee1..4abb5f5f20 100644 --- a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp +++ b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp @@ -27,38 +27,36 @@ # include # include # include +# include # include -# include # include -# include -# include # include # include # include # include -# include # include # include # include -# include #endif -#include "CurveOnMesh.h" -#include #include +#include #include #include #include #include #include +#include #include #include #include #include -#include #include #include +#include "CurveOnMesh.h" + + #ifndef HAVE_ACOSH #define HAVE_ACOSH #endif diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.h b/src/Mod/MeshPart/Gui/CurveOnMesh.h index d98bbe1faa..f683c0b2b3 100644 --- a/src/Mod/MeshPart/Gui/CurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/CurveOnMesh.h @@ -23,11 +23,13 @@ #ifndef MESHPARTGUI_CURVEONMESH_H #define MESHPARTGUI_CURVEONMESH_H +#include #include #include #include + #include -#include + class SbVec3f; class SoCoordinate3; diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp index 7786df1ef4..ad07bced3a 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp @@ -22,16 +22,12 @@ #include "PreCompiled.h" +#include #include "TaskCurveOnMesh.h" #include "ui_TaskCurveOnMesh.h" #include "CurveOnMesh.h" -#include -#include -#include -#include - using namespace MeshPartGui; diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h index d82869f315..8f6f88923b 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h @@ -23,9 +23,11 @@ #ifndef MESHPART_GUI_TASKCURVEONMESH_H #define MESHPART_GUI_TASKCURVEONMESH_H +#include + #include #include -#include + namespace Gui { class View3DInventor; diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp index 8b8d8d6cf2..11d94c908f 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.cpp +++ b/src/Mod/MeshPart/Gui/Tessellation.cpp @@ -20,15 +20,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include #endif -#include "Tessellation.h" -#include "ui_Tessellation.h" #include #include #include @@ -36,19 +32,21 @@ #include #include #include +#include #include #include #include -#include #include -#include #include -#include #include #include #include #include +#include "Tessellation.h" +#include "ui_Tessellation.h" + + using namespace MeshPartGui; /* TRANSLATOR MeshPartGui::Tessellation */ diff --git a/src/Mod/MeshPart/Gui/Tessellation.h b/src/Mod/MeshPart/Gui/Tessellation.h index bee0b1f1eb..e0ffbde1c8 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.h +++ b/src/Mod/MeshPart/Gui/Tessellation.h @@ -20,18 +20,17 @@ * * ***************************************************************************/ - #ifndef MESHPARTGUI_TESSELLATION_H #define MESHPARTGUI_TESSELLATION_H -#include -#include -#include -#include -#include #include #include +#include +#include +#include + + namespace App { class Document; class SubObjectT; diff --git a/src/Mod/MeshPart/Gui/Workbench.cpp b/src/Mod/MeshPart/Gui/Workbench.cpp index abe4cdf911..a51518a43a 100644 --- a/src/Mod/MeshPart/Gui/Workbench.cpp +++ b/src/Mod/MeshPart/Gui/Workbench.cpp @@ -20,16 +20,16 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include #endif -#include "Workbench.h" #include +#include "Workbench.h" + + using namespace MeshPartGui; #if 0 // needed for Qt's lupdate utility