From 98a01727009ecd4120ad20fae3fb055ecbb06404 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 4 Dec 2022 03:04:11 +0100
Subject: [PATCH] [TD] QGIL - QGIVE:remove unused includes

- also some sorting
---
 src/Mod/TechDraw/Gui/QGILeaderLine.cpp  | 49 ++++++------------
 src/Mod/TechDraw/Gui/QGILeaderLine.h    |  1 -
 src/Mod/TechDraw/Gui/QGIMatting.cpp     | 22 ++++----
 src/Mod/TechDraw/Gui/QGIMatting.h       |  2 +-
 src/Mod/TechDraw/Gui/QGIPrimPath.cpp    | 17 +++----
 src/Mod/TechDraw/Gui/QGIProjGroup.cpp   | 14 ++---
 src/Mod/TechDraw/Gui/QGIProjGroup.h     |  3 +-
 src/Mod/TechDraw/Gui/QGIRichAnno.cpp    | 68 +++++++------------------
 src/Mod/TechDraw/Gui/QGIRichAnno.h      |  3 +-
 src/Mod/TechDraw/Gui/QGISVGTemplate.cpp | 31 +++++------
 src/Mod/TechDraw/Gui/QGISVGTemplate.h   |  1 -
 src/Mod/TechDraw/Gui/QGISectionLine.cpp | 19 +++----
 src/Mod/TechDraw/Gui/QGISectionLine.h   |  6 +--
 src/Mod/TechDraw/Gui/QGITemplate.cpp    | 12 ++---
 src/Mod/TechDraw/Gui/QGITile.cpp        | 18 +------
 src/Mod/TechDraw/Gui/QGIVertex.cpp      | 20 +++-----
 16 files changed, 90 insertions(+), 196 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp
index 48fc11b9f9..751eea3e87 100644
--- a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp
@@ -22,49 +22,30 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRep_Builder.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <Precision.hxx>
+# include <cmath>
 
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPaintDevice>
-#include <QSvgGenerator>
-#include <QVector2D>
-#include <cmath>
+# include <QGraphicsScene>
+# include <QGraphicsSceneMouseEvent>
+# include <QPainter>
+# include <QPainterPath>
+# include <QVector2D>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-#include <Base/UnitsApi.h>
-#include <Gui/Command.h>
-
-#include <Mod/Part/App/PartFeature.h>
-
+#include <Mod/TechDraw/App/ArrowPropEnum.h>
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/Geometry.h>
 #include <Mod/TechDraw/App/LineGroup.h>
-#include <Mod/TechDraw/App/ArrowPropEnum.h>
-
-#include "Rez.h"
-#include "ZVALUE.h"
-#include "PreferencesGui.h"
-#include "QGIArrow.h"
-#include "ViewProviderLeader.h"
-#include "QGIPrimPath.h"
-#include "QGEPath.h"
 
 #include "QGILeaderLine.h"
+#include "PreferencesGui.h"
+#include "QGEPath.h"
+#include "QGIArrow.h"
+#include "QGIPrimPath.h"
+#include "Rez.h"
+#include "ViewProviderLeader.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.h b/src/Mod/TechDraw/Gui/QGILeaderLine.h
index 0db5d95006..1265b598c0 100644
--- a/src/Mod/TechDraw/Gui/QGILeaderLine.h
+++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h
@@ -27,7 +27,6 @@
 
 #include <QColor>
 #include <QGraphicsItem>
-#include <QObject>
 #include <QPainterPath>
 #include <QPointF>
 #include <QStyleOptionGraphicsItem>
diff --git a/src/Mod/TechDraw/Gui/QGIMatting.cpp b/src/Mod/TechDraw/Gui/QGIMatting.cpp
index 29a795e458..dc5c1994bd 100644
--- a/src/Mod/TechDraw/Gui/QGIMatting.cpp
+++ b/src/Mod/TechDraw/Gui/QGIMatting.cpp
@@ -22,25 +22,21 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <qmath.h>
-#include <QPainter>
-#include <QPainterPath>
-#include <QRectF>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainter>
+# include <QPainterPath>
+# include <QRectF>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
-#include <Mod/TechDraw/App/Preferences.h>
 #include <Mod/TechDraw/App/LineGroup.h>
+#include <Mod/TechDraw/App/Preferences.h>
 
+#include "QGIMatting.h"
 #include "Rez.h"
 #include "ZVALUE.h"
-#include "QGIMatting.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIMatting.h b/src/Mod/TechDraw/Gui/QGIMatting.h
index a6d626ddc4..2fb1acb80a 100644
--- a/src/Mod/TechDraw/Gui/QGIMatting.h
+++ b/src/Mod/TechDraw/Gui/QGIMatting.h
@@ -28,8 +28,8 @@
 #include <QGraphicsItem>
 #include <QGraphicsItemGroup>
 #include <QGraphicsPathItem>
-#include <QPen>
 #include <QBrush>
+#include <QPen>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp
index 7d6e221278..4e9998718d 100644
--- a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp
+++ b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp
@@ -22,23 +22,22 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QGraphicsScene>
+# include <QGraphicsSceneHoverEvent>
+# include <QPainter>
+# include <QStyleOptionGraphicsItem>
 #endif
 
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
 
-#include "PreferencesGui.h"
 #include "QGIPrimPath.h"
+#include "PreferencesGui.h"
 #include "QGIView.h"
 
+
 using namespace TechDrawGui;
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp
index c09937973d..474e5c1f63 100644
--- a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp
@@ -22,28 +22,20 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAction>
-# include <QContextMenuEvent>
 # include <QGraphicsScene>
 # include <QGraphicsSceneMouseEvent>
 # include <QList>
-# include <QMenu>
-# include <QMessageBox>
-# include <QMouseEvent>
-# include <QPainter>
 #endif
 
 #include <App/Document.h>
 #include <Base/Console.h>
 #include <Gui/Selection.h>
-#include <Gui/Command.h>
-
-#include <Mod/TechDraw/App/DrawProjGroupItem.h>
 #include <Mod/TechDraw/App/DrawProjGroup.h>
+#include <Mod/TechDraw/App/DrawProjGroupItem.h>
 
-#include "Rez.h"
-#include "DrawGuiUtil.h"
 #include "QGIProjGroup.h"
+#include "Rez.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.h b/src/Mod/TechDraw/Gui/QGIProjGroup.h
index afb345bc2c..549c3769cf 100644
--- a/src/Mod/TechDraw/Gui/QGIProjGroup.h
+++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h
@@ -25,10 +25,9 @@
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <QObject>
-
 #include "QGIViewCollection.h"
 
+
 QT_BEGIN_NAMESPACE
 class QGraphicsScene;
 class QGraphicsSceneMouseEvent;
diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp
index 917c05824b..00fb204c33 100644
--- a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp
@@ -22,66 +22,32 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRep_Builder.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <Precision.hxx>
-
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsItem>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPaintDevice>
-#include <QSvgGenerator>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QTextDocument>
-#include <QTextDocumentFragment>
-#include <QTextFrame>
-#include <QTextBlock>
-#include <QTextCursor>
-#include <QDialog>
-
-
 # include <cmath>
+
+# include <QDialog>
+# include <QGraphicsItem>
+# include <QGraphicsSceneMouseEvent>
+# include <QPainter>
+# include <QRegularExpression>
+# include <QRegularExpressionMatch>
+# include <QTextBlock>
+# include <QTextCursor>
+# include <QTextDocumentFragment>
 #endif
 
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
-#include <Gui/Command.h>
-
-#include <Mod/Part/App/PartFeature.h>
-
-//#include <Mod/TechDraw/App/Preferences.h>
 #include <Mod/TechDraw/App/DrawRichAnno.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/Geometry.h>
-
-#include "Rez.h"
-#include "ZVALUE.h"
-#include "PreferencesGui.h"
-#include "QGIArrow.h"
-#include "ViewProviderRichAnno.h"
-#include "MDIViewPage.h"
-#include "DrawGuiUtil.h"
-#include "QGVPage.h"
-#include "QGIPrimPath.h"
-#include "QGEPath.h"
-#include "QGMText.h"
-#include "QGCustomText.h"
-#include "QGCustomRect.h"
 
 #include "QGIRichAnno.h"
 #include "mrichtextedit.h"
+#include "PreferencesGui.h"
+#include "QGCustomRect.h"
+#include "QGCustomText.h"
+#include "Rez.h"
+#include "ViewProviderRichAnno.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDraw;
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.h b/src/Mod/TechDraw/Gui/QGIRichAnno.h
index ddc9491dd4..3e4499d032 100644
--- a/src/Mod/TechDraw/Gui/QGIRichAnno.h
+++ b/src/Mod/TechDraw/Gui/QGIRichAnno.h
@@ -27,13 +27,12 @@
 
 #include <QFont>
 #include <QGraphicsItem>
-#include <QObject>
-#include <QPainterPath>
 #include <QPen>
 #include <QStyleOptionGraphicsItem>
 
 #include "QGIView.h"
 
+
 namespace TechDraw {
 class DrawRichAnno;
 class DrawLeaderLine;
diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
index f6329ef93c..3b8e6dd04e 100644
--- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
@@ -23,34 +23,29 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <QFile>
-#include <QFont>
-#include <QPen>
-#include <QSvgRenderer>
-#include <QGraphicsSvgItem>
-#include <QDomDocument>
-#include <QFile>
-#include <QXmlQuery>
-#include <QXmlResultItems>
+# include <QDomDocument>
+# include <QFile>
+# include <QGraphicsSvgItem>
+# include <QPen>
+# include <QSvgRenderer>
+# include <QXmlQuery>
+# include <QXmlResultItems>
 #endif // #ifndef _PreComp_
 
-
 #include <App/Application.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Parameter.h>
-#include <Gui/Command.h>
 
-#include <Mod/TechDraw/App/QDomNodeModel.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/Geometry.h>
 #include <Mod/TechDraw/App/DrawSVGTemplate.h>
+#include <Mod/TechDraw/App/QDomNodeModel.h>
 
-#include "Rez.h"
-#include "ZVALUE.h"
-#include "QGSPage.h"
-#include "TemplateTextField.h"
 #include "QGISVGTemplate.h"
+#include "QGSPage.h"
+#include "Rez.h"
+#include "TemplateTextField.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.h b/src/Mod/TechDraw/Gui/QGISVGTemplate.h
index 0bd6284b73..eb4729192d 100644
--- a/src/Mod/TechDraw/Gui/QGISVGTemplate.h
+++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.h
@@ -25,7 +25,6 @@
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <QObject>
 
 class QGraphicsScene;
 class QGraphicsSvgItem;
diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.cpp b/src/Mod/TechDraw/Gui/QGISectionLine.cpp
index 27f896a57a..0f89889d92 100644
--- a/src/Mod/TechDraw/Gui/QGISectionLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGISectionLine.cpp
@@ -22,30 +22,25 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <qmath.h>
-#include <QGraphicsScene>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
+# include <QGraphicsScene>
+# include <QPainter>
+# include <QPainterPath>
+# 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/Preferences.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-
-#include "QGIArrow.h"
 #include "QGISectionLine.h"
-#include "QGIView.h"
 #include "PreferencesGui.h"
+#include "QGIArrow.h"
+#include "QGIView.h"
 #include "Rez.h"
 #include "ZVALUE.h"
 
+
 #define ANSISTANDARD 0
 #define ISOSTANDARD 1
 #define SINGLEDIRECTIONMODE 0       //both arrows point along the section normal
diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.h b/src/Mod/TechDraw/Gui/QGISectionLine.h
index c2bd2e1767..ebb6dbbdec 100644
--- a/src/Mod/TechDraw/Gui/QGISectionLine.h
+++ b/src/Mod/TechDraw/Gui/QGISectionLine.h
@@ -27,16 +27,16 @@
 
 #include <QColor>
 #include <QFont>
-#include <QPointF>
 #include <QPainterPath>
+#include <QPointF>
 
 #include <Base/Vector3D.h>
-
-#include <Mod/TechDraw/App/DrawComplexSection.h>
+#include <Mod/TechDraw/App/DrawViewSection.h>
 
 #include "QGCustomText.h"
 #include "QGIDecoration.h"
 
+
 namespace TechDrawGui
 {
 
diff --git a/src/Mod/TechDraw/Gui/QGITemplate.cpp b/src/Mod/TechDraw/Gui/QGITemplate.cpp
index 90095c305e..dbc971c216 100644
--- a/src/Mod/TechDraw/Gui/QGITemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGITemplate.cpp
@@ -21,19 +21,13 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QGraphicsScene>
-#endif
-
-#include <Base/Console.h>
-#include <Base/Exception.h>
 
 #include <Mod/TechDraw/App/DrawTemplate.h>
 
-#include "ZVALUE.h"
-#include "TemplateTextField.h"
-#include "QGSPage.h"
 #include "QGITemplate.h"
+#include "QGSPage.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGITile.cpp b/src/Mod/TechDraw/Gui/QGITile.cpp
index 6dd33ea6ba..fed25deb3e 100644
--- a/src/Mod/TechDraw/Gui/QGITile.cpp
+++ b/src/Mod/TechDraw/Gui/QGITile.cpp
@@ -22,37 +22,23 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QPainter>
-#include <QGraphicsItem>
-#include <QStyleOptionGraphicsItem>
-#include <QFile>
-#include <QFileInfo>
+# include <QGraphicsItem>
 #endif
 
-#include <qmath.h>
-
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
 #include <Base/Parameter.h>
 #include <Base/Stream.h>
 #include <Base/Tools.h>
 
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/DrawTile.h>
 #include <Mod/TechDraw/App/DrawTileWeld.h>
-#include <Mod/TechDraw/App/DrawWeldSymbol.h>
 
-#include "Rez.h"
+#include "QGITile.h"
 #include "PreferencesGui.h"
-#include "DrawGuiUtil.h"
-#include "QGIView.h"
-#include "QGIWeldSymbol.h"
 #include "QGCustomSvg.h"
 #include "QGCustomText.h"
 
-#include "QGITile.h"
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIVertex.cpp b/src/Mod/TechDraw/Gui/QGIVertex.cpp
index 6c89d52468..817067103b 100644
--- a/src/Mod/TechDraw/Gui/QGIVertex.cpp
+++ b/src/Mod/TechDraw/Gui/QGIVertex.cpp
@@ -22,23 +22,17 @@
 
 #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 "QGIVertex.h"
 #include "PreferencesGui.h"
 #include "QGIPrimPath.h"
-#include "QGIVertex.h"
+
 
 using namespace TechDrawGui;