From ce4a91687506dd990fb7bf88e2634a03a346f94f Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Mon, 9 Jan 2023 11:33:23 +0100
Subject: [PATCH] [TD] minor fixes

- typos and code formatting as reported by the CI
- some more re-sorting
---
 src/Mod/TechDraw/App/AppTechDrawPy.cpp     | 13 +++++++------
 src/Mod/TechDraw/App/DrawUtil.cpp          |  2 +-
 src/Mod/TechDraw/App/DrawViewSymbol.cpp    | 16 ++++++++--------
 src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp |  3 ++-
 src/Mod/TechDraw/Gui/QGIViewSymbol.cpp     | 15 ++++++++-------
 src/Mod/TechDraw/Gui/ViewProviderPage.cpp  | 21 ++++++++++-----------
 6 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
index ca8cb9b9c6..e2e5dca25c 100644
--- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp
+++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
@@ -266,11 +266,12 @@ private:
             throw Py::Exception();
         }
 
-        if(sortedWires.empty()) {
+        if (sortedWires.empty()) {
             Base::Console().Warning("ATDP::edgeWalker: Wire detection failed\n");
             return Py::None();
-        } else {
-            for (auto& w:sortedWires) {
+        }
+        else {
+            for (auto& w : sortedWires) {
                 PyObject* wire = new TopoShapeWirePy(new TopoShape(w));
                 result.append(Py::asObject(wire));
             }
@@ -598,7 +599,7 @@ private:
         //add the cosmetic edges also
         std::vector<TechDraw::BaseGeomPtr> geoms = dvp->getEdgeGeometry();
         std::vector<TopoDS_Edge> cosmeticEdges;
-        for (auto& g: geoms) {
+        for (auto& g : geoms) {
             if (g->hlrVisible && g->cosmetic) {
                 cosmeticEdges.push_back(g->occEdge);
             }
@@ -1015,9 +1016,9 @@ private:
             TopoDS_Compound comp;
             builder.MakeCompound(comp);
             try {
-                for (auto& lsr:lsresult) {
+                for (auto& lsr : lsresult) {
                     std::vector<TopoDS_Edge> edgeList = lsr.getEdges();
-                    for (auto& edge:edgeList) {
+                    for (auto& edge : edgeList) {
                         if (!edge.IsNull()) {
                             builder.Add(comp, edge);
                         }
diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp
index 14f702f3b5..ef2fd0a417 100644
--- a/src/Mod/TechDraw/App/DrawUtil.cpp
+++ b/src/Mod/TechDraw/App/DrawUtil.cpp
@@ -404,7 +404,7 @@ bool DrawUtil::apparentIntersection(TopoDS_Edge& edge0, TopoDS_Edge& edge1, gp_P
         return true;
     }
 
-    gp_Vec g(D - C);//betwen a point on each line
+    gp_Vec g(D - C);//between a point on each line
     Base::Console().Message("DU::apparentInter - C: %s  D: %s  g: %s\n", formatVector(C).c_str(),
                             formatVector(D).c_str(), formatVector(g).c_str());
 
diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp
index aeaaf76c38..288aebf75d 100644
--- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp
@@ -21,21 +21,21 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include "QDomNodeModel.h"
-#include <QDomDocument>
-#include <QXmlQuery>
-#include <QXmlResultItems>
-#include <sstream>
+# include <sstream>
+
+# include "QDomNodeModel.h"
+# include <QDomDocument>
+# include <QXmlResultItems>
+# include <QXmlQuery>
 #endif
 
 #include <Base/Console.h>
 
-#include "DrawPage.h"
-#include "DrawUtil.h"
 #include "DrawViewSymbol.h"
 #include "DrawViewSymbolPy.h"// generated from DrawViewSymbolPy.xml
+#include "DrawPage.h"
+#include "DrawUtil.h"
 
 
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
index 8140a43699..517484ccb2 100644
--- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
@@ -44,10 +44,11 @@
 #include <Mod/TechDraw/App/DrawViewAnnotation.h>
 #include <Mod/TechDraw/App/Preferences.h>
 
+#include "DlgStringListEditor.h"
 #include "QGIViewAnnotation.h"
 #include "QGCustomText.h"
 #include "Rez.h"
-#include "DlgStringListEditor.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
index da8b684950..b466c946a7 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
@@ -23,16 +23,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QGraphicsColorizeEffect>
-#include <QGraphicsEffect>
-#include <QGraphicsItem>
-#include <QRectF>
-#include <cmath>
-#include <sstream>
+# include <cmath>
+# include <sstream>
+
+# include <QGraphicsColorizeEffect>
+# include <QGraphicsEffect>
+# include <QGraphicsItem>
+# include <QRectF>
 #endif
 
 #include <Base/Console.h>
-
 #include <Mod/TechDraw/App/DrawViewArch.h>
 #include <Mod/TechDraw/App/DrawViewDraft.h>
 #include <Mod/TechDraw/App/DrawViewSymbol.h>
@@ -43,6 +43,7 @@
 #include "QGIViewSymbol.h"
 #include "Rez.h"
 
+
 using namespace TechDrawGui;
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
index 0c218716ea..f840da4565 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
@@ -21,18 +21,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <QAction>
-#include <QList>
-#include <QMenu>
-#include <QMessageBox>
-#include <QPointer>
-#include <QTextStream>
-#include <boost/signals2/connection.hpp>
-#include <boost_signals2.hpp>
+# include <QAction>
+# include <QList>
+# include <QMenu>
+# include <QMessageBox>
+# include <QPointer>
+# include <QTextStream>
+
+# include <boost_signals2.hpp>
+# include <boost/signals2/connection.hpp>
 #endif
 
 #include <App/Document.h>
@@ -43,7 +42,6 @@
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/ViewProviderDocumentObject.h>
-
 #include <Mod/TechDraw/App/DrawHatch.h>
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
 #include <Mod/TechDraw/App/DrawPage.h>
@@ -64,6 +62,7 @@
 #include "ViewProviderPageExtension.h"
 #include "ViewProviderTemplate.h"
 
+
 using namespace TechDrawGui;
 using namespace TechDraw;
 namespace bp = boost::placeholders;