From 44d464251b97455c1bc6d11a892ac308dedb3344 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Tue, 13 Dec 2022 02:22:16 +0100
Subject: [PATCH] [Sketch] Gui: Sketch - So: remove unused headers

- also some sorting
---
 src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp   |  7 +-----
 src/Mod/Sketcher/Gui/SketchMirrorDialog.h     |  4 +++-
 .../Sketcher/Gui/SketchOrientationDialog.cpp  |  5 +---
 .../Sketcher/Gui/SketchOrientationDialog.h    |  4 +++-
 .../Gui/SketchRectangularArrayDialog.cpp      |  6 +----
 .../Gui/SketchRectangularArrayDialog.h        |  2 +-
 .../Gui/SketcherRegularPolygonDialog.cpp      |  6 +----
 .../Gui/SketcherRegularPolygonDialog.h        |  2 +-
 src/Mod/Sketcher/Gui/SketcherSettings.cpp     | 18 +++++++--------
 src/Mod/Sketcher/Gui/SketcherSettings.h       |  4 ++--
 src/Mod/Sketcher/Gui/SoDatumLabel.cpp         | 23 ++++++++-----------
 src/Mod/Sketcher/Gui/SoDatumLabel.h           | 19 ++++++++-------
 src/Mod/Sketcher/Gui/SoZoomTranslation.cpp    | 18 ++++-----------
 src/Mod/Sketcher/Gui/SoZoomTranslation.h      |  4 ++--
 14 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp b/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
index 2609e7981d..44884a7f70 100644
--- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
@@ -21,20 +21,15 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif
 
-#include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 
 #include "ui_SketchMirrorDialog.h"
 #include "SketchMirrorDialog.h"
-#include <Mod/Sketcher/App/SketchObject.h>
+
 
 using namespace SketcherGui;
 
diff --git a/src/Mod/Sketcher/Gui/SketchMirrorDialog.h b/src/Mod/Sketcher/Gui/SketchMirrorDialog.h
index 1c117bd653..c0cc513cf4 100644
--- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.h
@@ -24,7 +24,9 @@
 #define SKETCHERGUI_SketchMirrorDialog_H
 
 #include <QDialog>
-#include "../App/Constraint.h"
+
+#include <Mod/Sketcher/App/GeoEnum.h>
+
 
 namespace SketcherGui {
 
diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp b/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
index 9f66cae031..6b1f2ba8d7 100644
--- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
@@ -21,20 +21,17 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif
 
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 
 #include "ui_SketchOrientationDialog.h"
 #include "SketchOrientationDialog.h"
 
+
 using namespace SketcherGui;
 
 SketchOrientationDialog::SketchOrientationDialog()
diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
index 914dde0a19..4ba415b3b1 100644
--- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
@@ -23,10 +23,12 @@
 #ifndef SKETCHERGUI_SketchOrientationDialog_H
 #define SKETCHERGUI_SketchOrientationDialog_H
 
-#include <Base/Placement.h>
 #include <QDialog>
+
+#include <Base/Placement.h>
 #include <Mod/Sketcher/SketcherGlobal.h>
 
+
 namespace SketcherGui {
 
 class Ui_SketchOrientationDialog;
diff --git a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
index f13418f3b7..2e747b2f2f 100644
--- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
@@ -21,20 +21,16 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif
 
-#include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 
 #include "ui_SketchRectangularArrayDialog.h"
 #include "SketchRectangularArrayDialog.h"
 
+
 using namespace SketcherGui;
 
 SketchRectangularArrayDialog::SketchRectangularArrayDialog()
diff --git a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h
index 550dc5a72f..269f9cc057 100644
--- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h
@@ -23,9 +23,9 @@
 #ifndef SKETCHERGUI_SketchRectangularArrayDialog_H
 #define SKETCHERGUI_SketchRectangularArrayDialog_H
 
-#include <Base/Placement.h>
 #include <QDialog>
 
+
 namespace SketcherGui {
 
 class Ui_SketchRectangularArrayDialog;
diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
index ccf0ec3011..7757cd1b45 100644
--- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
@@ -21,20 +21,16 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif
 
-#include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 
 #include "ui_SketcherRegularPolygonDialog.h"
 #include "SketcherRegularPolygonDialog.h"
 
+
 using namespace SketcherGui;
 
 SketcherRegularPolygonDialog::SketcherRegularPolygonDialog()
diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h
index 973d4f5d5b..0001898f49 100644
--- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h
+++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h
@@ -23,9 +23,9 @@
 #ifndef SKETCHERGUI_SketcherRegularPolygonDialog_H
 #define SKETCHERGUI_SketcherRegularPolygonDialog_H
 
-#include <Base/Placement.h>
 #include <QDialog>
 
+
 namespace SketcherGui {
 
 class Ui_SketcherRegularPolygonDialog;
diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.cpp b/src/Mod/Sketcher/Gui/SketcherSettings.cpp
index 5df8205258..721f8411fc 100644
--- a/src/Mod/Sketcher/Gui/SketcherSettings.cpp
+++ b/src/Mod/Sketcher/Gui/SketcherSettings.cpp
@@ -20,26 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <QMessageBox>
 # include <QPainter>
 # include <QPixmap>
-# include <QMessageBox>
 #endif
 
+#include <App/Application.h>
+#include <Base/Console.h>
+#include <Base/Interpreter.h>
+#include <Gui/Command.h>
+
 #include "SketcherSettings.h"
 #include "ui_SketcherSettings.h"
-#include "ui_SketcherSettingsDisplay.h"
 #include "ui_SketcherSettingsColors.h"
+#include "ui_SketcherSettingsDisplay.h"
 #include "TaskSketcherGeneral.h"
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <App/Application.h>
-#include <Gui/PrefWidgets.h>
-#include <Gui/Inventor/MarkerBitmaps.h>
-#include <Gui/Command.h>
+
 
 using namespace SketcherGui;
 
diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.h b/src/Mod/Sketcher/Gui/SketcherSettings.h
index 13e4b3f2b6..08804130a5 100644
--- a/src/Mod/Sketcher/Gui/SketcherSettings.h
+++ b/src/Mod/Sketcher/Gui/SketcherSettings.h
@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_SKETCHERSETTINGS_H
 #define SKETCHERGUI_SKETCHERSETTINGS_H
 
-#include <Gui/PropertyPage.h>
 #include <memory>
+#include <Gui/PropertyPage.h>
+
 
 namespace SketcherGui {
 class Ui_SketcherSettings;
diff --git a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
index bba04eadbb..1c5c4add8d 100644
--- a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
+++ b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
@@ -21,7 +21,6 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # ifdef FC_OS_WIN32
 # include <windows.h>
@@ -33,31 +32,27 @@
 # else
 # include <GL/gl.h>
 # endif
-# include <cfloat>
+
 # include <algorithm>
+# include <cfloat>
+# include <cmath>
 # include <QFontMetrics>
 # include <QPainter>
-# include <QPen>
+
 # include <Inventor/SoPrimitiveVertex.h>
 # include <Inventor/actions/SoGLRenderAction.h>
-# include <Inventor/misc/SoState.h>
-# include <cmath>
-# include <Inventor/actions/SoGetMatrixAction.h>
 # include <Inventor/elements/SoFocalDistanceElement.h>
-# include <Inventor/elements/SoFontNameElement.h>
-# include <Inventor/elements/SoFontSizeElement.h>
-# include <Inventor/elements/SoModelMatrixElement.h>
-# include <Inventor/elements/SoProjectionMatrixElement.h>
-# include <Inventor/elements/SoViewingMatrixElement.h>
-# include <Inventor/elements/SoViewVolumeElement.h>
 # include <Inventor/elements/SoViewportRegionElement.h>
+# include <Inventor/elements/SoViewVolumeElement.h>
+# include <Inventor/misc/SoState.h>
 #endif // _PreComp_
 
-
-#include "SoDatumLabel.h"
 #include <Gui/BitmapFactory.h>
 #include <Gui/Tools.h>
 
+#include "SoDatumLabel.h"
+
+
 #define ZCONSTR 0.006f
 
 using namespace SketcherGui;
diff --git a/src/Mod/Sketcher/Gui/SoDatumLabel.h b/src/Mod/Sketcher/Gui/SoDatumLabel.h
index 05954ae4e2..766979d1e3 100644
--- a/src/Mod/Sketcher/Gui/SoDatumLabel.h
+++ b/src/Mod/Sketcher/Gui/SoDatumLabel.h
@@ -23,22 +23,21 @@
 #ifndef SKETCHERGUI_SODATUMLABEL_H
 #define SKETCHERGUI_SODATUMLABEL_H
 
-#include <Inventor/fields/SoSubField.h>
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/nodes/SoShape.h>
+#include <Inventor/SbBox3f.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFEnum.h>
 #include <Inventor/fields/SoSFFloat.h>
-#include <Inventor/fields/SoSFBool.h>
-#include <Inventor/fields/SoSFName.h>
-#include <Inventor/fields/SoMFString.h>
-#include <Inventor/fields/SoSFInt32.h>
-#include <Inventor/fields/SoSFVec3f.h>
-#include <Inventor/fields/SoMFVec3f.h>
-#include <Inventor/SbBox3f.h>
 #include <Inventor/fields/SoSFImage.h>
+#include <Inventor/fields/SoSFInt32.h>
+#include <Inventor/fields/SoSFName.h>
+#include <Inventor/fields/SoSFVec3f.h>
+#include <Inventor/fields/SoMFString.h>
+#include <Inventor/fields/SoMFVec3f.h>
+#include <Inventor/nodes/SoShape.h>
+
 #include <Mod/Sketcher/SketcherGlobal.h>
 
+
 namespace SketcherGui {
 
 class SketcherGuiExport SoDatumLabel : public SoShape {
diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
index 4109623790..f1431eb9f7 100644
--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
@@ -21,31 +21,21 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Inventor/actions/SoGLRenderAction.h>
-# include <Inventor/misc/SoState.h>
-# include <cmath>
 # include <cfloat>
+# include <cmath>
+
 # include <Inventor/actions/SoGetMatrixAction.h>
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/elements/SoModelMatrixElement.h>
-# include <Inventor/elements/SoProjectionMatrixElement.h>
-# include <Inventor/elements/SoViewingMatrixElement.h>
-# include <Inventor/elements/SoViewVolumeElement.h>
 # include <Inventor/elements/SoViewportRegionElement.h>
+# include <Inventor/elements/SoViewVolumeElement.h>
 # include <Inventor/nodes/SoCamera.h>
 #endif
 
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-
-
 #include "SoZoomTranslation.h"
 
+
 // *************************************************************************
 
 using namespace SketcherGui;
diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.h b/src/Mod/Sketcher/Gui/SoZoomTranslation.h
index 4a2ac1a271..d09fdd4aba 100644
--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.h
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.h
@@ -24,10 +24,10 @@
 #define SKETCHERGUI_SOZOOMTRANSLATION_H
 
 #include <Inventor/nodes/SoTranslation.h>
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/nodes/SoTransformation.h>
+
 #include <Mod/Sketcher/SketcherGlobal.h>
 
+
 namespace SketcherGui {
 
 class SketcherGuiExport SoZoomTranslation : public SoTranslation {