From c585fc565b413281644878b4f831400907f659d4 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 4 Dec 2022 02:25:15 +0100
Subject: [PATCH] [TD] QGIA - QGIH:remove unused includes

- also some sorting
---
 src/Mod/TechDraw/Gui/QGIArrow.cpp           | 20 +++-------
 src/Mod/TechDraw/Gui/QGICMark.cpp           | 14 +++----
 src/Mod/TechDraw/Gui/QGICaption.cpp         | 18 +--------
 src/Mod/TechDraw/Gui/QGICenterLine.cpp      | 13 +++---
 src/Mod/TechDraw/Gui/QGIDecoration.cpp      | 23 ++++-------
 src/Mod/TechDraw/Gui/QGIDimLines.cpp        | 20 +++-------
 src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp | 16 +-------
 src/Mod/TechDraw/Gui/QGIEdge.cpp            | 14 +++----
 src/Mod/TechDraw/Gui/QGIFace.cpp            | 44 +++++++--------------
 src/Mod/TechDraw/Gui/QGIFace.h              |  2 -
 src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp  | 21 ++--------
 src/Mod/TechDraw/Gui/QGIHighlight.cpp       | 17 +++-----
 src/Mod/TechDraw/Gui/QGIHighlight.h         |  1 -
 13 files changed, 63 insertions(+), 160 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/QGIArrow.cpp b/src/Mod/TechDraw/Gui/QGIArrow.cpp
index 1a07efcce0..145793d324 100644
--- a/src/Mod/TechDraw/Gui/QGIArrow.cpp
+++ b/src/Mod/TechDraw/Gui/QGIArrow.cpp
@@ -22,26 +22,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QGraphicsSceneHoverEvent>
-#include <QStyleOptionGraphicsItem>
-#include <QPainterPathStroker>
-#include <QPainter>
-#include <QPainterPath>
+# include <cassert>
+# include <QPainterPath>
 #endif
 
-#include <App/Application.h>
-#include <Base/Parameter.h>
-#include <Base/Console.h>
-
 #include <Mod/TechDraw/App/ArrowPropEnum.h>
 
-#include "Rez.h"
-#include "PreferencesGui.h"
 #include "QGIArrow.h"
+#include "PreferencesGui.h"
+#include "Rez.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGICMark.cpp b/src/Mod/TechDraw/Gui/QGICMark.cpp
index efd495d8f3..b837ea868d 100644
--- a/src/Mod/TechDraw/Gui/QGICMark.cpp
+++ b/src/Mod/TechDraw/Gui/QGICMark.cpp
@@ -22,22 +22,20 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainter>
+# include <QPainterPath>
+# include <QStyleOptionGraphicsItem>
 #endif
 
 #include <App/Application.h>
 #include <App/Material.h>
-#include <Base/Console.h>
 #include <Base/Parameter.h>
 
 #include "QGICMark.h"
 
+
 using namespace TechDrawGui;
 
 QGICMark::QGICMark(int index) : QGIVertex(index)
diff --git a/src/Mod/TechDraw/Gui/QGICaption.cpp b/src/Mod/TechDraw/Gui/QGICaption.cpp
index e6451e1bfe..4ae7438d65 100644
--- a/src/Mod/TechDraw/Gui/QGICaption.cpp
+++ b/src/Mod/TechDraw/Gui/QGICaption.cpp
@@ -22,26 +22,12 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <qmath.h>
-#include <QMouseEvent>
-#include <QPaintDevice>
-#include <QPainter>
-#include <QPrinter>
-#include <QRectF>
-#include <QSvgGenerator>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include "QGICaption.h"
 
+
 using namespace TechDrawGui;
 
 QGICaption::QGICaption()
diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.cpp b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
index e37701eb65..b2350173fd 100644
--- a/src/Mod/TechDraw/Gui/QGICenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
@@ -22,20 +22,19 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <QPainter>
-#include <QPainterPath>
-#include <QStyleOptionGraphicsItem>
+# include <cmath>
+
+# include <QPainter>
+# include <QPainterPath>
+# include <QStyleOptionGraphicsItem>
 #endif
 
 #include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
 #include <Base/Parameter.h>
 
+#include "QGICenterLine.h"
 #include "PreferencesGui.h"
 
-#include "QGICenterLine.h"
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIDecoration.cpp b/src/Mod/TechDraw/Gui/QGIDecoration.cpp
index f15f725ca1..b14a724200 100644
--- a/src/Mod/TechDraw/Gui/QGIDecoration.cpp
+++ b/src/Mod/TechDraw/Gui/QGIDecoration.cpp
@@ -22,26 +22,17 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-//#include <QGraphicsScene>
-//#include <QGraphicsSceneHoverEvent>
-//#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainter>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
-#include "Rez.h"
+#include "QGIDecoration.h"
+#include "QGICMark.h"
 #include "PreferencesGui.h"
 #include "ZVALUE.h"
-#include "DrawGuiUtil.h"
-#include "QGICMark.h"
-#include "QGIDecoration.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIDimLines.cpp b/src/Mod/TechDraw/Gui/QGIDimLines.cpp
index 3cc7045375..8da0c20bc1 100644
--- a/src/Mod/TechDraw/Gui/QGIDimLines.cpp
+++ b/src/Mod/TechDraw/Gui/QGIDimLines.cpp
@@ -22,23 +22,15 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QGraphicsSceneHoverEvent>
-#include <QStyleOptionGraphicsItem>
-#include <QPainterPathStroker>
-#include <QPainter>
-#include <QPainterPath>
+# include <cassert>
+
+# include <QPainterPath>
+# include <QPainterPathStroker>
 #endif
 
-#include <App/Application.h>
-#include <Base/Parameter.h>
-#include <Base/Console.h>
-
-#include "PreferencesGui.h"
 #include "QGIDimLines.h"
+#include "PreferencesGui.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp
index 58926f3289..ed8ceb32a7 100644
--- a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp
@@ -22,29 +22,15 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAction>
-# include <QContextMenuEvent>
-# include <QGraphicsScene>
-# include <QGraphicsSceneMouseEvent>
-# include <QMenu>
-# include <QMessageBox>
-# include <QMouseEvent>
-# include <QPainter>
 # include <QPainterPath>
 #endif
 
-#include <App/Document.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Tools2D.h>
-#include <Gui/Selection.h>
-#include <Gui/Command.h>
-
 #include <Mod/TechDraw/App/Geometry.h>
 #include <Mod/TechDraw/App/DrawParametricTemplate.h>
 
 #include "QGIDrawingTemplate.h"
 
+
 using namespace TechDrawGui;
 
 QGIDrawingTemplate::QGIDrawingTemplate(QGSPage* scene) : QGITemplate(scene),
diff --git a/src/Mod/TechDraw/Gui/QGIEdge.cpp b/src/Mod/TechDraw/Gui/QGIEdge.cpp
index fc454acaf2..1806f9d435 100644
--- a/src/Mod/TechDraw/Gui/QGIEdge.cpp
+++ b/src/Mod/TechDraw/Gui/QGIEdge.cpp
@@ -22,13 +22,10 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainterPath>
+# include <QPainterPathStroker>
 #endif
 
 #include <App/Application.h>
@@ -36,8 +33,9 @@
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include "PreferencesGui.h"
 #include "QGIEdge.h"
+#include "PreferencesGui.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp
index 0208aaafc5..0fd6ed706d 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.cpp
+++ b/src/Mod/TechDraw/Gui/QGIFace.cpp
@@ -22,46 +22,32 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <QAction>
-#include <QApplication>
-#include <QContextMenuEvent>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QTransform>
-#include <QMouseEvent>
-#include <QPainterPathStroker>
-#include <QPainter>
-#include <QPainterPath>
-#include <QStyleOptionGraphicsItem>
-#include <QBitmap>
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
-#include <QRectF>
-#include <QPointF>
+# include <cmath>
+
+# include <QFileInfo>
+# include <QGraphicsView>
+# include <QPainter>
+# include <QPainterPath>
+# include <QPointF>
+# include <QRectF>
+# include <QTransform>
 #endif
 
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
-
 #include <Mod/TechDraw/App/DrawUtil.h>
 
-//debug
-#include "QGICMark.h"
-#include "ZVALUE.h"
-//
-#include "Rez.h"
-#include "DrawGuiUtil.h"
+#include "QGIFace.h"
 #include <QByteArrayMatcher>
-#include "QGCustomSvg.h"
 #include "QGCustomImage.h"
 #include "QGCustomRect.h"
-#include "QGIViewPart.h"
+#include "QGCustomSvg.h"
+#include "QGICMark.h"
 #include "QGIPrimPath.h"
-#include "QGIFace.h"
+#include "Rez.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h
index d26e55a1e7..48f58dad54 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.h
+++ b/src/Mod/TechDraw/Gui/QGIFace.h
@@ -28,9 +28,7 @@
 #include <QByteArray>
 #include <QPixmap>
 
-#include <App/Material.h>
 #include <Mod/TechDraw/App/HatchLine.h>
-#include <Mod/TechDraw/App/Geometry.h>
 
 #include "QGIPrimPath.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp b/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp
index 5be1ac6eb3..8077026d6c 100644
--- a/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp
+++ b/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp
@@ -22,28 +22,15 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QGraphicsSceneEvent>
-#include <QPainter>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
-#include <QPen>
-#include <QColor>
+# include <QGraphicsSceneEvent>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include <Mod/TechDraw/App/DrawUtil.h>
-//#include <Mod/TechDraw/App/Preferences.h>
 
-#include <qmath.h>
-#include "Rez.h"
-#include "DrawGuiUtil.h"
-#include "PreferencesGui.h"
-#include "QGIView.h"
 #include "QGIGhostHighlight.h"
+#include "PreferencesGui.h"
+#include "Rez.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.cpp b/src/Mod/TechDraw/Gui/QGIHighlight.cpp
index 6dc18bb0aa..072007c6a8 100644
--- a/src/Mod/TechDraw/Gui/QGIHighlight.cpp
+++ b/src/Mod/TechDraw/Gui/QGIHighlight.cpp
@@ -22,25 +22,18 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QPainter>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
+# include <QPainter>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
 #include <Base/Tools.h>
-
 #include <Mod/TechDraw/App/DrawUtil.h>
 
-#include <qmath.h>
-#include "Rez.h"
-#include "DrawGuiUtil.h"
+#include "QGIHighlight.h"
 #include "PreferencesGui.h"
 #include "QGIView.h"
-#include "QGIHighlight.h"
+#include "Rez.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.h b/src/Mod/TechDraw/Gui/QGIHighlight.h
index e48c25715b..3d412c9324 100644
--- a/src/Mod/TechDraw/Gui/QGIHighlight.h
+++ b/src/Mod/TechDraw/Gui/QGIHighlight.h
@@ -31,7 +31,6 @@
 #include <QGraphicsScene>
 #include <QPointF>
 
-#include "QGIArrow.h"
 #include "QGCustomText.h"
 #include "QGCustomRect.h"
 #include "QGIDecoration.h"