From 4e55c4b46d422b44ca572595ee2147f28f8ea157 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Wed, 14 Dec 2022 03:13:59 +0100
Subject: [PATCH] [Sketch] Gui:Task*: remove unused headers

- also some sorting
---
 src/Mod/Sketcher/Gui/PreCompiled.h            | 38 ++++++++++---------
 src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp    |  5 +--
 src/Mod/Sketcher/Gui/TaskDlgEditSketch.h      |  7 ++--
 .../Sketcher/Gui/TaskSketcherConstraints.cpp  | 34 +++++++----------
 .../Sketcher/Gui/TaskSketcherConstraints.h    |  9 ++---
 .../Gui/TaskSketcherCreateCommands.cpp        | 11 ++----
 .../Sketcher/Gui/TaskSketcherCreateCommands.h |  5 +--
 src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 28 +++++---------
 src/Mod/Sketcher/Gui/TaskSketcherElements.h   | 13 ++++---
 src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp  | 20 ++++------
 src/Mod/Sketcher/Gui/TaskSketcherGeneral.h    |  7 ++--
 src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp | 17 +++------
 src/Mod/Sketcher/Gui/TaskSketcherMessages.h   |  6 +--
 .../Gui/TaskSketcherSolverAdvanced.cpp        | 13 ++-----
 .../Sketcher/Gui/TaskSketcherSolverAdvanced.h |  3 +-
 .../Sketcher/Gui/TaskSketcherValidation.cpp   | 29 +++++---------
 src/Mod/Sketcher/Gui/TaskSketcherValidation.h |  7 ++--
 17 files changed, 104 insertions(+), 148 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h
index d663fc1d51..357c418c32 100644
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -68,23 +68,27 @@
 #include <TopoDS_Vertex.hxx>
 
 // Qt
-# include <QApplication>
-# include <QCursor>
-# include <QDebug>
-# include <QGuiApplication>
-# include <QInputDialog>
-# include <QKeyEvent>
-# include <QLocale>
-# include <QMenu>
-# include <QMessageBox>
-# include <QPainter>
-# include <QPixmapCache>
-# include <QRegularExpression>
-# include <QScreen>
-# include <QShortcut>
-# include <QString>
-# include <QStyledItemDelegate>
-# include <QTextStream>
+#include <QApplication>
+#include <QContextMenuEvent>
+#include <QCursor>
+#include <QDebug>
+#include <QEvent>
+#include <QGuiApplication>
+#include <QInputDialog>
+#include <QKeyEvent>
+#include <QLocale>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPainter>
+#include <QPixmapCache>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QScreen>
+#include <QShortcut>
+#include <QString>
+#include <QStyledItemDelegate>
+#include <QTextStream>
+#include <QWidgetAction>
 
 // all of Inventor
 #ifndef __InventorAll__
diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
index 54ba18009c..e322522560 100644
--- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
+++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
@@ -20,17 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
+#include <Gui/Command.h>
 
 #include "TaskDlgEditSketch.h"
 #include "ViewProviderSketch.h"
-#include <Gui/Command.h>
+
 
 using namespace SketcherGui;
 
-
 //**************************************************************************
 //**************************************************************************
 // TaskDialog
diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h
index 4946a410fb..c360af92e9 100644
--- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h
+++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h
@@ -20,19 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_TaskDlgEditSketch_H
 #define SKETCHERGUI_TaskDlgEditSketch_H
 
+#include <boost_signals2.hpp>
+
 #include <Gui/TaskView/TaskDialog.h>
 
-#include "ViewProviderSketch.h"
 #include "TaskSketcherConstraints.h"
 #include "TaskSketcherElements.h"
 #include "TaskSketcherGeneral.h"
 #include "TaskSketcherMessages.h"
 #include "TaskSketcherSolverAdvanced.h"
-#include <boost_signals2.hpp>
+#include "ViewProviderSketch.h"
+
 
 using Connection = boost::signals2::connection;
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
index 02ed6976a6..160e21757c 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
@@ -20,47 +20,41 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <cmath>
+
 # include <QContextMenuEvent>
 # include <QMenu>
+# include <QMessageBox>
+# include <QPainter>
+# include <QPixmapCache>
 # include <QRegularExpression>
 # include <QRegularExpressionMatch>
 # include <QString>
-# include <QMessageBox>
 # include <QStyledItemDelegate>
-# include <QPainter>
-# include <QPixmapCache>
-# include <QStringListModel>
+# include <QWidgetAction>
 #endif
 
-#include "TaskSketcherConstraints.h"
-#include "ui_TaskSketcherConstraints.h"
-#include "EditDatumDialog.h"
-#include "ViewProviderSketch.h"
-
-#include <Mod/Sketcher/App/SketchObject.h>
-#include <Mod/Sketcher/Gui/CommandConstraints.h>
-
-#include <Base/Tools.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/Expression.h>
 #include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/CommandT.h>
 #include <Gui/Document.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/CommandT.h>
-#include <Gui/MainWindow.h>
-#include <Gui/PrefWidgets.h>
-#include <QWidgetAction>
+#include <Mod/Sketcher/App/SketchObject.h>
 
+#include "TaskSketcherConstraints.h"
+#include "ui_TaskSketcherConstraints.h"
+#include "EditDatumDialog.h"
 #include "Utils.h"
+#include "ViewProviderSketch.h"
+
 
 using namespace SketcherGui;
 using namespace Gui::TaskView;
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h
index 04d01f255c..177211c6f3 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskSketcherConstraints_H
 #define GUI_TASKVIEW_TaskSketcherConstraints_H
 
-#include <Base/Parameter.h>
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-#include <boost_signals2.hpp>
 #include <QListWidget>
 
+#include <Base/Parameter.h>
+#include <Gui/Selection.h>
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/Sketcher/App/Constraint.h>
 
 #include "ConstraintFilters.h"
 
+
 namespace App {
 class Property;
 }
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp
index 96fac9eea9..646641c422 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp
@@ -20,20 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QEvent>
 #endif
 
-#include "TaskSketcherCreateCommands.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Base/Console.h>
+
+#include "TaskSketcherCreateCommands.h"
+
 
 using namespace Gui::TaskView;
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h
index a77bfef635..3e96ac6389 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskSketcherCreateCommands_H
 #define GUI_TASKVIEW_TaskSketcherCreateCommands_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Selection.h>
-
-
+#include <Gui/TaskView/TaskView.h>
 
 
 namespace App {
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
index 815f8bb757..5f7b193814 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
@@ -20,44 +20,36 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QContextMenuEvent>
+# include <QImage>
 # include <QMenu>
 # include <QRegularExpression>
 # include <QRegularExpressionMatch>
 # include <QShortcut>
 # include <QString>
-# include <QImage>
-# include <QPixmap>
 # include <QPainter>
+# include <QPixmap>
+# include <QWidgetAction>
 #endif
 
-#include "TaskSketcherElements.h"
-#include "ui_TaskSketcherElements.h"
-#include "EditDatumDialog.h"
-#include "ViewProviderSketch.h"
-
-#include <Mod/Sketcher/App/SketchObject.h>
-#include <Mod/Sketcher/App/GeometryFacade.h>
-
-#include <Base/Tools.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/BitmapFactory.h>
+#include <Mod/Sketcher/App/GeometryFacade.h>
+#include <Mod/Sketcher/App/SketchObject.h>
 
-#include <Gui/Command.h>
+#include "TaskSketcherElements.h"
+#include "ui_TaskSketcherElements.h"
+#include "ViewProviderSketch.h"
 
-#include <QWidgetAction> //to be put in _PreComp_ once grid PR merge.
 
 using namespace SketcherGui;
 using namespace Gui::TaskView;
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h
index 43ff1f1413..e15071f773 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h
@@ -20,16 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskSketcherElements_H
 #define GUI_TASKVIEW_TaskSketcherElements_H
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-#include <boost_signals2.hpp>
-#include <QListWidget>
-#include <QIcon>
 #include <QStyledItemDelegate>
+#include <QListWidget>
+
+#include <boost_signals2.hpp>
+
+#include <Gui/Selection.h>
+#include <Gui/TaskView/TaskView.h>
+
 
 namespace App {
 class Property;
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
index a57a465d1a..75e55e76fa 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
@@ -20,24 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-
-#include "ui_TaskSketcherGeneral.h"
-#include "TaskSketcherGeneral.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
-
 #include <QEvent>
 
+#include <Base/Tools.h>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/ViewProvider.h>
+
+#include "ui_TaskSketcherGeneral.h"
+#include "TaskSketcherGeneral.h"
 #include "ViewProviderSketch.h"
 
+
 using namespace SketcherGui;
 using namespace Gui::TaskView;
 namespace bp = boost::placeholders;
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
index 509a323140..a62d65a200 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskSketcherGerneral_H
 #define GUI_TASKVIEW_TaskSketcherGerneral_H
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
 #include <boost_signals2.hpp>
 
+#include <Gui/Selection.h>
+#include <Gui/TaskView/TaskView.h>
+
+
 namespace App {
 class Property;
 }
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
index 57c7356560..aa15f3accd 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
@@ -20,23 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+#include <Mod/Sketcher/App/SketchObject.h>
+
 #include "ui_TaskSketcherMessages.h"
 #include "TaskSketcherMessages.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Gui/Selection.h>
-#include <Gui/Command.h>
-
-#include <Mod/Sketcher/App/SketchObject.h>
-
 #include "ViewProviderSketch.h"
 
+
 using namespace SketcherGui;
 using namespace Gui::TaskView;
 namespace bp = boost::placeholders;
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h
index 79208c22b2..7d3a462a2d 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskSketcherMessages_H
 #define GUI_TASKVIEW_TaskSketcherMessages_H
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
 #include <boost_signals2.hpp>
 
+#include <Gui/TaskView/TaskView.h>
+
+
 class Ui_TaskSketcherMessages;
 using Connection = boost::signals2::connection;
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp
index 239e600978..7658de2c86 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp
@@ -20,27 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QString>
 #endif
 
-#include "ui_TaskSketcherSolverAdvanced.h"
-#include "TaskSketcherSolverAdvanced.h"
 #include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Gui/Selection.h>
-#include <Gui/Command.h>
-
 #include <Mod/Sketcher/App/SketchObject.h>
 
+#include "ui_TaskSketcherSolverAdvanced.h"
+#include "TaskSketcherSolverAdvanced.h"
 #include "ViewProviderSketch.h"
 
+
 #define LM_EPS  1E-10
 #define LM_EPS1 1E-80
 #define LM_TAU  1E-3
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h
index 652df7f770..587e6e88d6 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskSketcherSolverAdvanced_H
 #define GUI_TASKVIEW_TaskSketcherSolverAdvanced_H
 
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
+
 
 class Ui_TaskSketcherSolverAdvanced;
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
index 293efc1a1c..b75b1df566 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
@@ -20,43 +20,32 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Standard_math.hxx>
+# include <algorithm>
 # include <QDoubleValidator>
 # include <QLocale>
 # include <QMessageBox>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoMarkerSet.h>
 # include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoShapeHints.h>
-# include <BRep_Tool.hxx>
-# include <gp_Pnt.hxx>
-# include <Precision.hxx>
-# include <TopTools_IndexedMapOfShape.hxx>
-# include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Edge.hxx>
-# include <TopoDS_Vertex.hxx>
-# include <algorithm>
 #endif
 
-#include "ui_TaskSketcherValidation.h"
-#include "TaskSketcherValidation.h"
-#include <Mod/Sketcher/App/SketchObject.h>
-#include <Mod/Part/App/Geometry.h>
 #include <App/Document.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Application.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 #include <Gui/Inventor/MarkerBitmaps.h>
+#include <Gui/TaskView/TaskView.h>
+#include <Mod/Sketcher/App/SketchObject.h>
+
+#include "ui_TaskSketcherValidation.h"
+#include "TaskSketcherValidation.h"
+
 
 using namespace SketcherGui;
 using namespace Gui::TaskView;
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h
index fdcb49c65b..8d830590dd 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h
@@ -20,17 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_TASKSKETCHERVALIDATION_H
 #define SKETCHERGUI_TASKSKETCHERVALIDATION_H
 
-#include <vector>
 #include <memory>
-#include <Base/Vector3D.h>
+#include <vector>
+
 #include <App/DocumentObserver.h>
+#include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Mod/Sketcher/App/SketchAnalysis.h>
 
+
 class SoGroup;
 namespace Sketcher { class SketchObject; }