From 7a2d0037ffa326ee801647a0dcd593558b751db1 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 4 Dec 2022 03:56:28 +0100
Subject: [PATCH] [TD] QGIView*: remove unused includes

- also some sorting
---
 src/Mod/TechDraw/Gui/PreCompiled.h          |  1 +
 src/Mod/TechDraw/Gui/QGIView.cpp            | 62 ++++++++-------------
 src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp  | 44 +++++----------
 src/Mod/TechDraw/Gui/QGIViewBalloon.cpp     | 39 +++++--------
 src/Mod/TechDraw/Gui/QGIViewBalloon.h       |  1 -
 src/Mod/TechDraw/Gui/QGIViewClip.cpp        | 16 ++----
 src/Mod/TechDraw/Gui/QGIViewCollection.cpp  | 17 +-----
 src/Mod/TechDraw/Gui/QGIViewDimension.cpp   | 37 ++++--------
 src/Mod/TechDraw/Gui/QGIViewImage.cpp       | 29 ++++------
 src/Mod/TechDraw/Gui/QGIViewPart.cpp        | 58 ++++++-------------
 src/Mod/TechDraw/Gui/QGIViewPart.h          |  1 -
 src/Mod/TechDraw/Gui/QGIViewSection.cpp     | 29 ++--------
 src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp |  2 +
 src/Mod/TechDraw/Gui/QGIViewSymbol.cpp      | 27 +++------
 14 files changed, 115 insertions(+), 248 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index be5676ee4b..d88f6de2bf 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -47,6 +47,7 @@
 #include <list>
 #include <map>
 #include <queue>
+#include <regex>
 #include <set>
 #include <stack>
 #include <string>
diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp
index 58f9f250a2..186bd6fb6a 100644
--- a/src/Mod/TechDraw/Gui/QGIView.cpp
+++ b/src/Mod/TechDraw/Gui/QGIView.cpp
@@ -22,60 +22,44 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QAction>
-#include <QApplication>
-#include <QContextMenuEvent>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QMenu>
-#include <QMessageBox>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
-#include <QTextOption>
-#include <QTransform>
+# include <QGraphicsSceneHoverEvent>
+# include <QGraphicsSceneMouseEvent>
+# include <QPainter>
+# include <QStyleOptionGraphicsItem>
+# include <QTransform>
 #endif
 
 #include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Tools.h>
-#include <Gui/Selection.h>
-#include <Gui/Command.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
+#include <Gui/Selection.h>
 #include <Gui/Tools.h>
 #include <Gui/ViewProvider.h>
-
-#include "Rez.h"
-#include "ZVALUE.h"
-#include "QGSPage.h"
-#include "QGVPage.h"
-#include "QGCustomLabel.h"
-#include "QGCustomBorder.h"
-#include "QGCustomText.h"
-#include "QGICaption.h"
-#include "QGCustomClip.h"
-#include "QGCustomImage.h"
-#include "QGIVertex.h"
-#include "QGIViewClip.h"
-#include "ViewProviderDrawingView.h"
-#include "ViewProviderPage.h"
-#include "MDIViewPage.h"
-
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawViewClip.h>
 #include <Mod/TechDraw/App/DrawProjGroup.h>
 #include <Mod/TechDraw/App/DrawProjGroupItem.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
+#include <Mod/TechDraw/App/DrawView.h>
 
-#include "PreferencesGui.h"
 #include "QGIView.h"
+#include "MDIViewPage.h"
+#include "PreferencesGui.h"
+#include "QGCustomBorder.h"
+#include "QGCustomClip.h"
+#include "QGCustomImage.h"
+#include "QGCustomLabel.h"
+#include "QGICaption.h"
+#include "QGIVertex.h"
+#include "QGIViewClip.h"
+#include "QGSPage.h"
+#include "QGVPage.h"
+#include "Rez.h"
+#include "ViewProviderDrawingView.h"
+#include "ViewProviderPage.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
index ceab31712c..7b0e989b99 100644
--- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
@@ -23,43 +23,29 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <string>
-#include <sstream>
-#include <QDialogButtonBox>
-#include <QGraphicsScene>
-#include <qmath.h>
-#include <QMouseEvent>
-#include <QGraphicsSceneHoverEvent>
-#include <QGraphicsItem>
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsTextItem>
-#include <QPainterPathStroker>
-#include <QPainter>
-#include <QString>
-#include <QTextOption>
-#include <QVBoxLayout>
-#include <QTextDocument>
-#include <QTextBlock>
-#include <QTextBlockFormat>
-#include <QTextFrame>
-#include <QSizeF>
+# include <cmath>
+# include <regex>
+# include <sstream>
+# include <string>
+
+# include <QDialog>
+# include <QDialogButtonBox>
+# include <QGraphicsScene>
+# include <QGraphicsItem>
+# include <QGraphicsTextItem>
+# include <QString>
+# include <QVBoxLayout>
 #endif
 
-#include <regex>
-
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Tools.h>
 #include <Gui/Widgets.h>
-
-
 #include <Mod/TechDraw/App/DrawViewAnnotation.h>
-#include "Rez.h"
+
 #include "QGIViewAnnotation.h"
 #include "QGCustomText.h"
+#include "Rez.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
index 0b4bd266f8..3c23fee8dd 100644
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
@@ -23,51 +23,38 @@
 
 #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 <string>
 
-  # include <QDebug>
-  # include <QGraphicsScene>
-  # include <QGraphicsSceneMouseEvent>
-  # include <QPainter>
-  # include <QPainterPath>
-  # include <QPaintDevice>
-  # include <QSvgGenerator>
-  # include <QApplication>
-
-  # include <cmath>
+# include <QGraphicsScene>
+# include <QGraphicsSceneMouseEvent>
+# include <QPaintDevice>
+# include <QPainter>
+# include <QPainterPath>
+# include <QSvgGenerator>
 #endif
 
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Parameter.h>
 #include <Gui/Command.h>
 #include <Gui/Tools.h>
-#include <string>
-
+#include <Mod/TechDraw/App/ArrowPropEnum.h>
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawViewBalloon.h>
 #include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawView.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
 #include <Mod/TechDraw/App/Geometry.h>
-#include <Mod/TechDraw/App/ArrowPropEnum.h>
 
-#include "Rez.h"
-#include "ZVALUE.h"
+#include "QGIViewBalloon.h"
 #include "PreferencesGui.h"
 #include "QGIArrow.h"
 #include "QGIDimLines.h"
-#include "QGIViewBalloon.h"
+#include "Rez.h"
 #include "ViewProviderBalloon.h"
 #include "ViewProviderViewPart.h"
+#include "ZVALUE.h"
+
 
 //TODO: hide the Qt coord system (+y down).
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h
index fd97846bb9..e553ecff9b 100644
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h
@@ -30,7 +30,6 @@
 #include <QFont>
 #include <QGraphicsItem>
 #include <QGraphicsObject>
-#include <QObject>
 #include <QStyleOptionGraphicsItem>
 
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.cpp b/src/Mod/TechDraw/Gui/QGIViewClip.cpp
index a40bdb3cae..cc85e6457a 100644
--- a/src/Mod/TechDraw/Gui/QGIViewClip.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewClip.cpp
@@ -23,22 +23,18 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <algorithm>    // std::find
-#include <QGraphicsScene>
+# include <algorithm>    // std::find
+# include <QGraphicsScene>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include <Mod/TechDraw/App/DrawViewClip.h>
 
-#include "Rez.h"
-#include "QGCustomRect.h"
-#include "QGCustomClip.h"
-#include "DrawGuiUtil.h"
 #include "QGIViewClip.h"
+#include "QGCustomClip.h"
+#include "QGCustomRect.h"
+#include "Rez.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewCollection.cpp b/src/Mod/TechDraw/Gui/QGIViewCollection.cpp
index ddbdb1c365..0ff8856323 100644
--- a/src/Mod/TechDraw/Gui/QGIViewCollection.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewCollection.cpp
@@ -21,25 +21,10 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QAction>
-# include <QContextMenuEvent>
-# include <QGraphicsScene>
-# include <QGraphicsSceneMouseEvent>
-# 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/DrawViewCollection.h>
 #include "QGIViewCollection.h"
 
+
 using namespace TechDrawGui;
 
 QGIViewCollection::QGIViewCollection()
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index 5d613a29dd..44f65d183e 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -23,53 +23,40 @@
 #include "PreCompiled.h"
 
 #ifdef FC_OS_WIN32
-#define _USE_MATH_DEFINES            //re Windows & M_PI issues
+# define _USE_MATH_DEFINES            //re Windows & M_PI issues
 #endif
-#include <cmath>
 
 #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 <QApplication>
-#include <QDebug>
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPaintDevice>
-#include <QSvgGenerator>
+# include <QGraphicsScene>
+# include <QGraphicsSceneMouseEvent>
+# include <QPaintDevice>
+# include <QPainter>
+# include <QPainterPath>
+# include <QSvgGenerator>
 #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/DrawUtil.h>
 #include <Mod/TechDraw/App/DrawViewDimension.h>
 #include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
 #include <Mod/TechDraw/App/Geometry.h>
 
-#include "ZVALUE.h"
-
+#include "QGIViewDimension.h"
 #include "PreferencesGui.h"
 #include "QGIArrow.h"
 #include "QGIDimLines.h"
 #include "QGIVertex.h"
 #include "ViewProviderDimension.h"
+#include "ZVALUE.h"
 
-#include "QGIViewDimension.h"
 
 #define NORMAL 0
 #define PRE 1
diff --git a/src/Mod/TechDraw/Gui/QGIViewImage.cpp b/src/Mod/TechDraw/Gui/QGIViewImage.cpp
index 083560578b..46545d0f35 100644
--- a/src/Mod/TechDraw/Gui/QGIViewImage.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewImage.cpp
@@ -22,31 +22,22 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QString>
-#include <sstream>
-#include <QRectF>
+# include <cmath>
+# include <sstream>
+
+# include <QGraphicsItem>
+# include <QRectF>
+# include <QString>
 #endif
 
-//#include <qmath.h>
-
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include <Mod/TechDraw/App/DrawViewImage.h>
 
+#include "QGIViewImage.h"
+#include "QGCustomClip.h"
+#include "QGCustomImage.h"
 #include "Rez.h"
 #include "ViewProviderImage.h"
-#include "QGCustomImage.h"
-#include "QGCustomClip.h"
-#include "QGIViewImage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp
index dfbabfe08f..01de03ea7d 100644
--- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp
@@ -22,66 +22,44 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <qmath.h>
-#include <QAction>
-#include <QApplication>
-#include <QContextMenuEvent>
-#include <QGraphicsScene>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QGraphicsSceneHoverEvent>
-#include <QPainterPathStroker>
-#include <QPainter>
-#include <QPainterPath>
-#include <QTextOption>
-#include <QBitmap>
-#include <QImage>
-#include <QString>
-#include <QSvgRenderer>
+# include <cmath>
+
+# include <qmath.h>
+# include <QPainterPath>
 #endif // #ifndef _PreComp_
 
-#include <chrono>
 #include <App/Application.h>
 #include <App/Document.h>
-#include <App/DocumentObject.h>
-#include <App/Material.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
-#include <Base/Tools.h>
 #include <Base/Vector3D.h>
-#include <Gui/ViewProvider.h>
-
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawViewSection.h>
+#include <Mod/TechDraw/App/Cosmetic.h>
 #include <Mod/TechDraw/App/DrawComplexSection.h>
 #include <Mod/TechDraw/App/DrawHatch.h>
 #include <Mod/TechDraw/App/DrawGeomHatch.h>
+#include <Mod/TechDraw/App/DrawUtil.h>
 #include <Mod/TechDraw/App/DrawViewDetail.h>
-#include <Mod/TechDraw/App/DrawProjGroupItem.h>
-#include <Mod/TechDraw/App/DrawProjGroup.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
+#include <Mod/TechDraw/App/DrawViewSection.h>
 #include <Mod/TechDraw/App/Geometry.h>
-#include <Mod/TechDraw/App/Cosmetic.h>
-//#include <Mod/TechDraw/App/Preferences.h>
 
-#include "Rez.h"
-#include "ZVALUE.h"
+#include "QGIViewPart.h"
+#include "MDIViewPage.h"
 #include "PreferencesGui.h"
-#include "QGIFace.h"
-#include "QGIEdge.h"
-#include "QGIVertex.h"
-#include "QGICMark.h"
-#include "QGISectionLine.h"
 #include "QGICenterLine.h"
+#include "QGICMark.h"
+#include "QGIEdge.h"
+#include "QGIFace.h"
 #include "QGIHighlight.h"
 #include "QGIMatting.h"
-#include "QGIViewPart.h"
+#include "QGISectionLine.h"
+#include "QGIVertex.h"
+#include "Rez.h"
 #include "ViewProviderGeomHatch.h"
 #include "ViewProviderHatch.h"
 #include "ViewProviderViewPart.h"
-#include "MDIViewPage.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDraw;
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h
index 46d7c1e7df..ac77d3362b 100644
--- a/src/Mod/TechDraw/Gui/QGIViewPart.h
+++ b/src/Mod/TechDraw/Gui/QGIViewPart.h
@@ -27,7 +27,6 @@
 
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
-#include <Mod/TechDraw/App/Geometry.h>
 
 #include "QGIView.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewSection.cpp b/src/Mod/TechDraw/Gui/QGIViewSection.cpp
index 68b1600829..c4f8676d3e 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSection.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSection.cpp
@@ -22,35 +22,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <QAction>
-#include <QApplication>
-#include <QContextMenuEvent>
-#include <QFile>
-#include <QFileInfo>
-#include <QGraphicsScene>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QGraphicsSceneHoverEvent>
-#include <QPainterPathStroker>
-#include <QPainter>
-#include <QPainterPath>
-#include <QTextOption>
+# include <cmath>
 #endif
 
-#include <qmath.h>
-
-#include <Base/Console.h>
-#include <App/Material.h>
-
-#include <Mod/TechDraw/App/DrawGeomHatch.h>
 #include <Mod/TechDraw/App/DrawViewSection.h>
 
-
-#include "ZVALUE.h"
-#include "ViewProviderViewSection.h"
-#include "QGIFace.h"
 #include "QGIViewSection.h"
+#include "QGIFace.h"
+#include "ViewProviderViewSection.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
index 1696e4d6e8..5bbb2a68e2 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
@@ -23,8 +23,10 @@
 #include "PreCompiled.h"
 
 #include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
+
 #include "QGIViewSpreadsheet.h"
 
+
 using namespace TechDrawGui;
 
 QGIViewSpreadsheet::QGIViewSpreadsheet()
diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
index 74dbb63871..a3c84ec6a0 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
@@ -23,34 +23,25 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QString>
-#include <sstream>
-#include <QRectF>
+# include <cmath>
+# include <sstream>
+
+# include <QGraphicsItem>
+# include <QRectF>
 #endif
 
-//#include <qmath.h>
-
-#include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Parameter.h>
 
-#include <Mod/TechDraw/App/DrawViewSymbol.h>
-#include <Mod/TechDraw/App/DrawViewDraft.h>
 #include <Mod/TechDraw/App/DrawViewArch.h>
+#include <Mod/TechDraw/App/DrawViewDraft.h>
+#include <Mod/TechDraw/App/DrawViewSymbol.h>
 
+#include "QGIViewSymbol.h"
 #include "QGCustomSvg.h"
 #include "QGDisplayArea.h"
-#include "QGIViewSymbol.h"
-#include "DrawGuiUtil.h"
 #include "Rez.h"
 
+
 using namespace TechDrawGui;
 
 QGIViewSymbol::QGIViewSymbol()