[Sketch] Gui: U - End: remove unused headers

- also some sorting
2022-12-13 03:05:55 +01:00
parent 44d464251b
commit 0e062212b5
14 changed files with 45 additions and 82 deletions
--- a/src/Base/Tools2D.h
+++ b/src/Base/Tools2D.h
@@ -20,11 +20,9 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef BASE_TOOLS2D_H
 #define BASE_TOOLS2D_H

-
 #include <algorithm>
 #include <cmath>
 #include <cfloat>
@@ -34,9 +32,10 @@

 #include "Vector3D.h"
 #ifndef FC_GLOBAL_H
-#include <FCGlobal.h>
+# include <FCGlobal.h>
 #endif

+
 namespace Base {

 class Vector2d;
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -69,10 +69,12 @@

 // Qt
 # include <QApplication>
+# include <QCursor>
 # include <QDebug>
 # include <QGuiApplication>
 # include <QInputDialog>
 # include <QKeyEvent>
+# include <QLocale>
 # include <QMenu>
 # include <QMessageBox>
 # include <QPainter>
@@ -82,6 +84,7 @@
 # include <QShortcut>
 # include <QString>
 # include <QStyledItemDelegate>
+# include <QTextStream>

 // all of Inventor
 #ifndef __InventorAll__
--- a/src/Mod/Sketcher/Gui/Utils.cpp
+++ b/src/Mod/Sketcher/Gui/Utils.cpp
@@ -20,39 +20,29 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cfloat>
-# include <QMessageBox>
-# include <Precision.hxx>
-# include <QPainter>
+
+# include <QCursor>
+# include <QLocale>
+# include <QRegularExpression>
 #endif

+#include <App/Application.h>
 #include <Base/Quantity.h>
 #include <Base/Tools.h>
-#include <Base/Tools2D.h>
 #include <Base/UnitsApi.h>
-#include <Base/UnitsSchema.h>
-#include <App/Application.h>
-#include <Gui/Application.h>
+#include <Gui/CommandT.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
-#include <Gui/SelectionFilter.h>
-#include <Gui/CommandT.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Action.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/DlgCheckableMessageBox.h>
-
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Sketcher/App/SketchObject.h>
-#include <Mod/Sketcher/App/Sketch.h>
 #include <Mod/Sketcher/App/GeometryFacade.h>
+#include <Mod/Sketcher/App/SketchObject.h>

-#include "ViewProviderSketch.h"
-#include "DrawSketchHandler.h"
 #include "Utils.h"
+#include "DrawSketchHandler.h"
+#include "ViewProviderSketch.h"
+

 using namespace std;
 using namespace SketcherGui;
--- a/src/Mod/Sketcher/Gui/Utils.h
+++ b/src/Mod/Sketcher/Gui/Utils.h
@@ -20,7 +20,6 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef SKETCHERGUI_Recompute_H
 #define SKETCHERGUI_Recompute_H

@@ -28,8 +27,10 @@
 #include <Base/Tools.h>
 #include <Base/Tools2D.h>
 #include <Mod/Sketcher/App/GeoEnum.h>
+
 #include "AutoConstraint.h"

+
 namespace App {
    class DocumentObject;
 }
--- a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
@@ -20,17 +20,16 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
-#include <Standard_math.hxx>
 #ifndef _PreComp_
 # include <Inventor/nodes/SoSeparator.h>
 #endif
+
 #include <Gui/ViewProviderBuilder.h>
-#include <Mod/Sketcher/App/SketchObject.h>
+
 #include "ViewProviderPython.h"

+
 using namespace SketcherGui;

 PROPERTY_SOURCE(SketcherGui::ViewProviderCustom, SketcherGui::ViewProviderSketch)
--- a/src/Mod/Sketcher/Gui/ViewProviderPython.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderPython.h
@@ -20,13 +20,13 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef SketcherGui_VIEWPROVIDERPYTHON_H
 #define SketcherGui_VIEWPROVIDERPYTHON_H

 #include <Gui/ViewProviderPythonFeature.h>
 #include <Mod/Sketcher/Gui/ViewProviderSketch.h>

+
 namespace SketcherGui {

 class SketcherGuiExport ViewProviderCustom : public ViewProviderSketch
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -20,38 +20,25 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Standard_math.hxx>
-
-# include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/SbBox3f.h>
+# include <Inventor/SbLine.h>
+# include <Inventor/SbTime.h>
 # include <Inventor/SoPickedPoint.h>
+# include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/details/SoPointDetail.h>
 # include <Inventor/events/SoKeyboardEvent.h>
 # include <Inventor/nodes/SoCamera.h>
-# include <Inventor/SbLine.h>
-# include <Inventor/SbTime.h>

-/// Qt Include Files
-# include <QAction>
 # include <QApplication>
-# include <QColor>
-# include <QDialog>
-# include <QFont>
-# include <QKeyEvent>
 # include <QMenu>
 # include <QMessageBox>
-# include <QPainter>
 # include <QScreen>
 # include <QTextStream>
 #endif

-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include <Base/Console.h>
-#include <Base/Tools.h>
 #include <Base/Vector3D.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
@@ -63,29 +50,26 @@
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
 #include <Gui/SoFCUnifiedSelection.h>
+#include "Gui/ToolBarManager.h"
 #include <Gui/Utilities.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include "Gui/ToolBarManager.h"
-
 #include <Mod/Part/App/Geometry.h>
 #include <Mod/Sketcher/App/GeoList.h>
 #include <Mod/Sketcher/App/GeometryFacade.h>
-#include <Mod/Sketcher/App/Sketch.h>
 #include <Mod/Sketcher/App/SketchObject.h>
 #include <Mod/Sketcher/App/SolverGeometryExtension.h>

 #include "ViewProviderSketch.h"
 #include "DrawSketchHandler.h"
-#include "EditModeCoinManager.h"
 #include "EditDatumDialog.h"
+#include "EditModeCoinManager.h"
 #include "TaskDlgEditSketch.h"
 #include "TaskSketcherValidation.h"
 #include "Utils.h"
 #include "ViewProviderSketchGeometryExtension.h"


-
 FC_LOG_LEVEL_INIT("Sketch",true,true)

 using namespace SketcherGui;
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
@@ -20,30 +20,26 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef SKETCHERGUI_VIEWPROVIDERSKETCH_H
 #define SKETCHERGUI_VIEWPROVIDERSKETCH_H

 #include <memory>
+#include <QCoreApplication>
+#include <boost_signals2.hpp>
+#include <Inventor/SoRenderManager.h>
+#include <Inventor/sensors/SoNodeSensor.h>

-#include <Mod/Part/Gui/ViewProvider2DObject.h>
-#include <Mod/Part/Gui/ViewProviderAttachExtension.h>
-#include <Mod/Part/App/BodyBase.h>
-#include <Base/Tools2D.h>
 #include <Base/Parameter.h>
 #include <Base/Placement.h>
-#include <Gui/Selection.h>
-#include <Gui/GLPainter.h>
-#include <App/Part.h>
-#include <boost_signals2.hpp>
-#include <QCoreApplication>
 #include <Gui/Document.h>
-#include "ShortcutListener.h"
-
+#include <Gui/GLPainter.h>
+#include <Gui/Selection.h>
+#include <Mod/Part/Gui/ViewProvider2DObject.h>
+#include <Mod/Part/Gui/ViewProviderAttachExtension.h>
 #include <Mod/Sketcher/App/GeoList.h>

-#include <Inventor/sensors/SoNodeSensor.h>
-#include <Inventor/SoRenderManager.h>
+#include "ShortcutListener.h"
+

 class TopoDS_Shape;
 class TopoDS_Face;
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.cpp
@@ -20,16 +20,10 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"

-#ifndef _PreComp_
-
-#endif  // #ifndef _PreComp_
-
-#include "ViewProviderSketch.h"
-
 #include "ViewProviderSketchCoinAttorney.h"

+
 using namespace SketcherGui;
 using namespace Sketcher;
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h
@@ -30,6 +30,8 @@
 #include <Inventor/SbVec3f.h>
 #include <Inventor/actions/SoRayPickAction.h>

+#include "ViewProviderSketch.h"
+

 namespace Base {
    template< typename T >
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
@@ -22,12 +22,11 @@

 #include "PreCompiled.h"

-#include <Base/Writer.h>
-#include <Base/Reader.h>
 #include <Base/Exception.h>

 #include "ViewProviderSketchGeometryExtension.h"

+
 using namespace SketcherGui;

 //---------- Geometry Extension
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h
@@ -26,6 +26,7 @@
 #include <Mod/Part/App/Geometry.h>
 #include <Mod/Sketcher/SketcherGlobal.h>

+
 namespace SketcherGui {

 class SketcherGuiExport ViewProviderSketchGeometryExtension : public Part::GeometryExtension
--- a/src/Mod/Sketcher/Gui/Workbench.cpp
+++ b/src/Mod/Sketcher/Gui/Workbench.cpp
@@ -20,16 +20,10 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"

-#ifndef _PreComp_
-# include <qobject.h>
-#endif
-
 #include "Workbench.h"
-#include <Gui/MenuManager.h>
-#include <Gui/ToolBarManager.h>
+

 using namespace SketcherGui;

--- a/src/Mod/Sketcher/Gui/Workbench.h
+++ b/src/Mod/Sketcher/Gui/Workbench.h
@@ -20,15 +20,16 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef SKETCHER_WORKBENCH_H
 #define SKETCHER_WORKBENCH_H

-#include <Gui/Workbench.h>
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
+#include <Gui/Workbench.h>
+
 #include <Mod/Sketcher/SketcherGlobal.h>

+
 namespace SketcherGui {

 /**