[Mesh] Gui: ViewProvider*: remove unused includes

- also some sorting
2022-12-04 17:05:07 +01:00
parent 10aff43462
commit 113dce72d7
12 changed files with 46 additions and 155 deletions
--- a/src/Mod/Mesh/Gui/PreCompiled.h
+++ b/src/Mod/Mesh/Gui/PreCompiled.h
@@ -45,6 +45,7 @@
 // standard
 #include <cstdio>
 #include <cassert>
+#include <ios>

 // STL
 #include <algorithm>
--- a/src/Mod/Mesh/Gui/ViewProvider.cpp
+++ b/src/Mod/Mesh/Gui/ViewProvider.cpp
@@ -20,84 +20,70 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <cstdlib>
 # include <QAction>
 # include <QMenu>
-# include <QTimer>
+
 # include <Inventor/SbBox2s.h>
 # include <Inventor/SbLine.h>
 # include <Inventor/SbPlane.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/actions/SoToVRML2Action.h>
-# include <Inventor/VRMLnodes/SoVRMLGroup.h>
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoBaseColor.h>
-# include <Inventor/nodes/SoCallback.h>
 # include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoLightModel.h>
 # include <Inventor/nodes/SoIndexedFaceSet.h>
 # include <Inventor/nodes/SoIndexedLineSet.h>
-# include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
-# include <Inventor/nodes/SoNormalBinding.h>
 # include <Inventor/nodes/SoOrthographicCamera.h>
 # include <Inventor/nodes/SoPerspectiveCamera.h>
 # include <Inventor/nodes/SoPolygonOffset.h>
 # include <Inventor/nodes/SoShapeHints.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTransform.h>
+# include <Inventor/VRMLnodes/SoVRMLGroup.h>
 #endif

+#include <QtConcurrentMap>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QtConcurrentMap>

-/// Here the FreeCAD includes sorted by Base,App,Gui......
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
 #include <Base/Tools.h>
 #include <Base/ViewProj.h>
-
-#include <App/Document.h>
-#include <App/PropertyLinks.h>
-
+#include <Gui/ActionFunction.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/Flag.h>
+#include <Gui/Selection.h>
 #include <Gui/SoFCOffscreenRenderer.h>
 #include <Gui/SoFCSelection.h>
 #include <Gui/SoFCSelectionAction.h>
 #include <Gui/SoFCDB.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Selection.h>
 #include <Gui/Utilities.h>
-#include <Gui/Window.h>
 #include <Gui/WaitCursor.h>
-#include <Gui/View3DInventor.h>
+#include <Gui/Window.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/ActionFunction.h>
-
+#include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
-#include <Mod/Mesh/App/Core/Evaluation.h>
 #include <Mod/Mesh/App/Core/Grid.h>
 #include <Mod/Mesh/App/Core/Iterator.h>
 #include <Mod/Mesh/App/Core/MeshIO.h>
 #include <Mod/Mesh/App/Core/Triangulation.h>
 #include <Mod/Mesh/App/Core/Trim.h>
-#include <Mod/Mesh/App/Core/TopoAlgorithm.h>
 #include <Mod/Mesh/App/Core/Visitor.h>
-#include <Mod/Mesh/App/Mesh.h>
-#include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/Gui/ViewProviderMeshPy.h>
 #include <zipios++/gzipoutputstream.h>

--- a/src/Mod/Mesh/Gui/ViewProvider.h
+++ b/src/Mod/Mesh/Gui/ViewProvider.h
@@ -24,13 +24,11 @@
 #define MESHGUI_VIEWPROVIDERMESH_H

 #include <vector>
-#include <Inventor/fields/SoSFVec2f.h>

-#include <Mod/Mesh/App/Core/Elements.h>
-#include <Mod/Mesh/App/Types.h>
-#include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/ViewProviderBuilder.h>
-#include <App/PropertyStandard.h>
+#include <Gui/ViewProviderGeometryObject.h>
+#include <Mod/Mesh/App/Types.h>
+#include <Mod/Mesh/App/Core/Elements.h>


 class SoGroup;
--- a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp
@@ -20,65 +20,48 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <algorithm>
+# include <ios>
+# include <sstream>
+# include <QCursor>
+# include <QMenu>
+
 # include <Inventor/SoPickedPoint.h>
-# include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/details/SoFaceDetail.h>
-# include <Inventor/details/SoPointDetail.h>
-# include <Inventor/events/SoMouseButtonEvent.h>
-# include <Inventor/events/SoKeyboardEvent.h>
+# include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/events/SoLocation2Event.h>
+# include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoIndexedFaceSet.h>
 # include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoShapeHints.h>
 # include <Inventor/sensors/SoIdleSensor.h>
-# include <algorithm>
-# include <sstream>
-# include <QEvent>
-# include <QMenu>
-# include <QMessageBox>
-# include <QCursor>
-# include <QToolTip>
-# include <QWhatsThis>
 #endif

 # include <boost/range/adaptors.hpp>
-# include <iomanip>
-# include <ios>

-// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
 #include <App/Annotation.h>
-#include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
+#include <Base/Console.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
-#include <Gui/SoFCSelection.h>
 #include <Gui/SoFCColorBar.h>
+#include <Gui/SoFCSelection.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/Widgets.h>

-#include <Mod/Mesh/App/MeshProperties.h>
-#include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/App/FeatureMeshCurvature.h>
-#include <Mod/Mesh/App/MeshProperties.h>
+#include <Mod/Mesh/App/MeshFeature.h>

-#include "ViewProvider.h"
 #include "ViewProviderCurvature.h"

+
 using namespace Mesh;
 using namespace MeshGui;
 using namespace std;
--- a/src/Mod/Mesh/Gui/ViewProviderCurvature.h
+++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.h
@@ -23,10 +23,12 @@
 #ifndef MESHGUI_VIEWPROVIDER_MESH_CURVATURE_H
 #define MESHGUI_VIEWPROVIDER_MESH_CURVATURE_H

-#include <Base/Observer.h>
 #include <App/DocumentObserver.h>
+#include <Base/Observer.h>
+
 #include "ViewProvider.h"

+
 class SoSeparator;
 class SbVec3f;
 class SoSwitch;
--- a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp
@@ -20,9 +20,7 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
@@ -34,24 +32,16 @@
 # include <Inventor/nodes/SoShapeHints.h>
 #endif

-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
 #include <App/Application.h>
-#include <Gui/Selection.h>
+#include <Base/Parameter.h>
 #include <Gui/Inventor/MarkerBitmaps.h>
-
-#include <Mod/Mesh/App/Core/Degeneration.h>
-#include <Mod/Mesh/App/Core/Evaluation.h>
-#include <Mod/Mesh/App/Core/Iterator.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshFeature.h>
+#include <Mod/Mesh/App/Core/Degeneration.h>
+#include <Mod/Mesh/App/Core/Iterator.h>

-#include "ViewProvider.h"
 #include "ViewProviderDefects.h"

+
 using namespace Mesh;
 using namespace MeshGui;

--- a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp
@@ -20,71 +20,32 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <algorithm>
-# include <Inventor/SoPickedPoint.h>
-# include <Inventor/details/SoFaceDetail.h>
+
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoIndexedLineSet.h>
 # include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoMaterialBinding.h>
-# include <Inventor/nodes/SoPolygonOffset.h>
-# include <Inventor/nodes/SoShapeHints.h>
-# include <Inventor/nodes/SoOrthographicCamera.h>
-# include <Inventor/nodes/SoTransform.h>
 # include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/events/SoMouseButtonEvent.h>
-# include <QAction>
-# include <QMenu>
 #endif

-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
-#include <Base/Tools2D.h>
-#include <Base/ViewProj.h>
-
 #include <App/Document.h>
-#include <App/PropertyLinks.h>
-
-#include <Gui/Application.h>
-#include <Gui/Command.h>
-#include <Gui/Document.h>
-#include <Gui/SoFCSelection.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
-#include <Gui/WaitCursor.h>
 #include <Gui/Window.h>
-#include <Gui/Flag.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-
-#include <Mod/Mesh/App/Core/Algorithm.h>
-#include <Mod/Mesh/App/Core/Evaluation.h>
-#include <Mod/Mesh/App/Core/Grid.h>
-#include <Mod/Mesh/App/Core/Iterator.h>
-#include <Mod/Mesh/App/Core/MeshIO.h>
-#include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Mod/Mesh/App/Core/Triangulation.h>
-#include <Mod/Mesh/App/Core/Visitor.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/MeshProperties.h>
+#include <Mod/Mesh/App/Core/Iterator.h>
+#include <Mod/Mesh/App/Core/MeshKernel.h>

 #include "ViewProviderMeshFaceSet.h"
-#include "SoFCMeshObject.h"
 #include "SoFCIndexedFaceSet.h"
+#include "SoFCMeshObject.h"


 using namespace MeshGui;

-
 PROPERTY_SOURCE(MeshGui::ViewProviderMeshFaceSet, MeshGui::ViewProviderMesh)

 ViewProviderMeshFaceSet::ViewProviderMeshFaceSet()
--- a/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp
@@ -20,19 +20,17 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
 #endif

-#include <Mod/Mesh/Gui/ViewProvider.h>
-
+#include "ViewProvider.h"
 // inclusion of the generated files (generated out of ViewProviderMeshPy.xml)
 #include "ViewProviderMeshPy.h"
 #include "ViewProviderMeshPy.cpp"

+
 using namespace MeshGui;

 // returns a string which represents the object e.g. when printed in python
--- a/src/Mod/Mesh/Gui/ViewProviderTransform.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderTransform.cpp
@@ -20,41 +20,26 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoNormalBinding.h>
-# include <Inventor/nodes/SoIndexedFaceSet.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/manips/SoTransformerManip.h>
 #endif

-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <App/Application.h>
-#include <Gui/Selection.h>
 #include <Gui/SoFCSelection.h>
-#include <Base/Sequencer.h>
+#include <Mod/Mesh/App/MeshFeature.h>

-#include "ViewProvider.h"
 #include "ViewProviderTransform.h"

-#include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/Mesh.h>
-#include <Mod/Mesh/App/Core/Iterator.h>

 using namespace MeshGui;
 using Mesh::Feature;

-
 PROPERTY_SOURCE(MeshGui::ViewProviderMeshTransform, MeshGui::ViewProviderMesh)

-
 ViewProviderMeshTransform::ViewProviderMeshTransform()
 {
  pcTransformerDragger = new SoTransformerManip();
--- a/src/Mod/Mesh/Gui/ViewProviderTransform.h
+++ b/src/Mod/Mesh/Gui/ViewProviderTransform.h
@@ -23,6 +23,8 @@
 #ifndef MESHGUI_VIEWPROVIDERMESHTRANSFORM_H
 #define MESHGUI_VIEWPROVIDERMESHTRANSFORM_H

+#include "ViewProvider.h"
+
 class SoSeparator;
 class SbVec3f;
 class SoSwitch;
@@ -38,9 +40,6 @@ namespace Gui {
  class View3DInventorViewer;
 }

-
-#include "ViewProvider.h"
-
 namespace MeshGui {

 /** Like Mesh viewprovider but with manipulator
--- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp
@@ -20,9 +20,7 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoIndexedFaceSet.h>
@@ -35,22 +33,15 @@
 # include <Inventor/manips/SoTransformerManip.h>
 #endif

-#include "ViewProviderTransformDemolding.h"
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <App/Application.h>
-#include <Gui/Selection.h>
 #include <Gui/SoFCSelection.h>
-#include <Base/Sequencer.h>
-

 #include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/Core/Iterator.h>

+#include "ViewProviderTransformDemolding.h"
+
+
 using Mesh::Feature;
 using MeshCore::MeshKernel;
 using MeshCore::MeshFacetIterator;
--- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h
+++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h
@@ -23,7 +23,8 @@
 #ifndef MESGUI_VIEWPROVIDERMESHTRANSFORMDEMOLDING_H
 #define MESGUI_VIEWPROVIDERMESHTRANSFORMDEMOLDING_H

-#include <Inventor/nodes/SoRotation.h>
+#include "ViewProvider.h"
+

 class SoSeparator;
 class SbVec3f;
@@ -42,10 +43,6 @@ namespace Gui {
  class View3DInventorViewer;
 }

-
-#include "ViewProvider.h"
-#include <Base/Vector3D.h>
-
 namespace MeshGui {

 /** Like Mesh viewprovider but with manipulator