From a67f118d7fecf68c9bb72e15ef22225db65a6885 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sat, 8 Oct 2022 12:21:25 +0200
Subject: [PATCH] [TD] DrawR* - DrawT*: remove unused includes

- also sort includes
---
 src/Mod/TechDraw/App/DrawRichAnno.cpp    | 13 ++-------
 src/Mod/TechDraw/App/DrawRichAnno.h      |  6 ++--
 src/Mod/TechDraw/App/DrawSVGTemplate.cpp | 36 ++++++++----------------
 src/Mod/TechDraw/App/DrawSVGTemplate.h   |  3 +-
 src/Mod/TechDraw/App/DrawTemplate.cpp    | 16 ++---------
 src/Mod/TechDraw/App/DrawTemplate.h      |  3 +-
 src/Mod/TechDraw/App/DrawTile.cpp        | 13 ++-------
 src/Mod/TechDraw/App/DrawTile.h          |  6 ++--
 src/Mod/TechDraw/App/DrawTilePyImp.cpp   |  9 +-----
 src/Mod/TechDraw/App/DrawTileWeld.cpp    | 12 ++------
 src/Mod/TechDraw/App/DrawTileWeld.h      |  4 +--
 11 files changed, 31 insertions(+), 90 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawRichAnno.cpp b/src/Mod/TechDraw/App/DrawRichAnno.cpp
index 20a93bfc46..73ba956952 100644
--- a/src/Mod/TechDraw/App/DrawRichAnno.cpp
+++ b/src/Mod/TechDraw/App/DrawRichAnno.cpp
@@ -22,18 +22,9 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include <App/Application.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-
-#include "DrawUtil.h"
-
-#include <Mod/TechDraw/App/DrawRichAnnoPy.h>  // generated from DrawRichAnnoPy.xml
 #include "DrawRichAnno.h"
+#include "DrawRichAnnoPy.h"  // generated from DrawRichAnnoPy.xml
+
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/DrawRichAnno.h b/src/Mod/TechDraw/App/DrawRichAnno.h
index 3a7ab19b0d..0f0131fded 100644
--- a/src/Mod/TechDraw/App/DrawRichAnno.h
+++ b/src/Mod/TechDraw/App/DrawRichAnno.h
@@ -23,13 +23,13 @@
 #ifndef TechDraw_DrawRichAnno_h_
 #define TechDraw_DrawRichAnno_h_
 
+#include <App/DocumentObject.h>
+#include <App/FeaturePython.h>
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-# include <App/DocumentObject.h>
-# include <App/FeaturePython.h>
-
 #include "DrawView.h"
 
+
 namespace TechDraw
 {
 
diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
index 5c32b0adbe..5c83682de1 100644
--- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
@@ -24,40 +24,26 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-  #include <sstream>
-  #include <QDomDocument>
-  #include <QFile>
+# include <sstream>
+# include <QDomDocument>
+# include <QDomNodeModel.h>
+# include <QFile>
+# include <QXmlQuery>
+# include <QXmlResultItems>
 #endif
 
-#include <QXmlQuery>
-#include <QXmlResultItems>
-#include "QDomNodeModel.h"
-
-#include <Base/Exception.h>
+#include <App/Application.h>
 #include <Base/Console.h>
-#include <Base/Interpreter.h>
 #include <Base/FileInfo.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Quantity.h>
 #include <Base/Tools.h>
 
-#include <App/Application.h>
-
-#include <boost/regex.hpp>
-#include <boost/graph/graph_concepts.hpp>
-#include <iostream>
-#include <iterator>
-
-#include <QDebug>
-
-#include "DrawUtil.h"
-#include "DrawPage.h"
 #include "DrawSVGTemplate.h"
+#include "DrawSVGTemplatePy.h"
+#include "DrawUtil.h"
 
-#include <Mod/TechDraw/App/DrawSVGTemplatePy.h>
 
 using namespace TechDraw;
-using namespace std;
 
 PROPERTY_SOURCE(TechDraw::DrawSVGTemplate, TechDraw::DrawTemplate)
 
@@ -163,8 +149,8 @@ App::DocumentObjectExecReturn * DrawSVGTemplate::execute()
 
 	if (!qDocImage.isEmpty()) {
 		// make a temp file for FileIncluded Property
-		string tempName = PageResult.getExchangeTempFile();
-		ofstream outfinal(tempName.c_str());
+		std::string tempName = PageResult.getExchangeTempFile();
+        std::ofstream outfinal(tempName.c_str());
 		std::string result = Base::Tools::toStdString(qDocImage);
 		outfinal << result;
 		outfinal.close();
diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.h b/src/Mod/TechDraw/App/DrawSVGTemplate.h
index ce1412276b..ec95415e43 100644
--- a/src/Mod/TechDraw/App/DrawSVGTemplate.h
+++ b/src/Mod/TechDraw/App/DrawSVGTemplate.h
@@ -23,10 +23,9 @@
 #ifndef TECHDRAW_DrawSVGTemplate_h_
 #define TECHDRAW_DrawSVGTemplate_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/FeaturePython.h>
 #include <App/PropertyFile.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawTemplate.h"
 
diff --git a/src/Mod/TechDraw/App/DrawTemplate.cpp b/src/Mod/TechDraw/App/DrawTemplate.cpp
index 292d002084..9f73dadc79 100644
--- a/src/Mod/TechDraw/App/DrawTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawTemplate.cpp
@@ -26,22 +26,14 @@
 # include <sstream>
 #endif
 
-#include <Base/Exception.h>
 #include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <Base/FileInfo.h>
 
-#include <App/Application.h>
-
-#include <iostream>
-#include <iterator>
-
-#include "DrawPage.h"
 #include "DrawTemplate.h"
-#include <Mod/TechDraw/App/DrawTemplatePy.h>
+#include "DrawTemplatePy.h"
+#include "DrawPage.h"
+
 
 using namespace TechDraw;
-using namespace std;
 
 PROPERTY_SOURCE(TechDraw::DrawTemplate, App::DocumentObject)
 
@@ -50,8 +42,6 @@ const char* DrawTemplate::OrientationEnums[]= {"Portrait",
                                                   "Landscape",
                                                   nullptr};
 
-
-
 DrawTemplate::DrawTemplate()
 {
     const char *group = "Page Properties";
diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h
index 69149c5717..d55b24fd58 100644
--- a/src/Mod/TechDraw/App/DrawTemplate.h
+++ b/src/Mod/TechDraw/App/DrawTemplate.h
@@ -23,11 +23,10 @@
 #ifndef TECHDRAW_DrawTemplate_h_
 #define TECHDRAW_DrawTemplate_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/FeaturePython.h>
 #include <App/PropertyUnits.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 namespace TechDraw
diff --git a/src/Mod/TechDraw/App/DrawTile.cpp b/src/Mod/TechDraw/App/DrawTile.cpp
index 5b395ed0d9..64719d5498 100644
--- a/src/Mod/TechDraw/App/DrawTile.cpp
+++ b/src/Mod/TechDraw/App/DrawTile.cpp
@@ -22,18 +22,9 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include <App/Application.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-
-#include "DrawUtil.h"
-
-#include <Mod/TechDraw/App/DrawTilePy.h>  // generated from DrawTilePy.xml
 #include "DrawTile.h"
+#include "DrawTilePy.h"  // generated from DrawTilePy.xml
+
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/DrawTile.h b/src/Mod/TechDraw/App/DrawTile.h
index 193d119734..ee8c4dbb5c 100644
--- a/src/Mod/TechDraw/App/DrawTile.h
+++ b/src/Mod/TechDraw/App/DrawTile.h
@@ -23,13 +23,13 @@
 #ifndef TechDraw_DrawTile_h_
 #define TechDraw_DrawTile_h_
 
+#include <App/DocumentObject.h>
+#include <App/FeaturePython.h>
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-# include <App/DocumentObject.h>
-# include <App/FeaturePython.h>
-
 #include "DrawView.h"
 
+
 namespace TechDraw
 {
 
diff --git a/src/Mod/TechDraw/App/DrawTilePyImp.cpp b/src/Mod/TechDraw/App/DrawTilePyImp.cpp
index 04f1b7b758..789051e315 100644
--- a/src/Mod/TechDraw/App/DrawTilePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawTilePyImp.cpp
@@ -21,20 +21,13 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
-#include <Base/Vector3D.h>
 
 #include "DrawTile.h"
-
 // inclusion of the generated files (generated out of DrawTilePy.xml)
-#include <Base/VectorPy.h>
 #include <Mod/TechDraw/App/DrawTilePy.h>
 #include <Mod/TechDraw/App/DrawTilePy.cpp>
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/DrawTileWeld.cpp b/src/Mod/TechDraw/App/DrawTileWeld.cpp
index 575bdfd239..e880de919f 100644
--- a/src/Mod/TechDraw/App/DrawTileWeld.cpp
+++ b/src/Mod/TechDraw/App/DrawTileWeld.cpp
@@ -23,22 +23,16 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <sstream>
 #endif
 
-#include <sstream>
-#include <fstream>
-
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-#include <Base/Tools.h>
 
+#include "DrawTileWeld.h"
+#include "DrawTileWeldPy.h"  // generated from DrawTileWeldPy.xml
 #include "DrawUtil.h"
 
-#include <Mod/TechDraw/App/DrawTileWeldPy.h>  // generated from DrawTileWeldPy.xml
-#include "DrawTileWeld.h"
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/DrawTileWeld.h b/src/Mod/TechDraw/App/DrawTileWeld.h
index 9a8f6754a3..b077453edb 100644
--- a/src/Mod/TechDraw/App/DrawTileWeld.h
+++ b/src/Mod/TechDraw/App/DrawTileWeld.h
@@ -23,12 +23,10 @@
 #ifndef TechDraw_DrawTileWeld_h_
 #define TechDraw_DrawTileWeld_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/FeaturePython.h>
 #include <App/PropertyFile.h>
-#include <App/PropertyStandard.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawTile.h"