[TechDraw] Clean up precompile in Gui

2022-08-05 00:06:56 +02:00
parent 52b3c75eb4
commit aa9a667506
75 changed files with 228 additions and 117 deletions
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -22,23 +22,23 @@

 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <sstream>
-# include <QCoreApplication>
-# include <QDir>
-# include <QFile>
-# include <QFileInfo>
-# include <QMessageBox>
-# include <QRegExp>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QGraphicsView>
+#include <QMessageBox>
+#include <QPainter>
+#include <QRegExp>
+#include <QStringBuilder>
+#include <QSvgGenerator>
+#include <QSvgRenderer>
+#include <sstream>
+#include <vector>
 #endif

-#include <QStringBuilder>

-#include <QGraphicsView>
-#include <QPainter>
-#include <QSvgRenderer>
-#include <QSvgGenerator>

-#include <vector>

 #include <App/Application.h>
 #include <App/Document.h>
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -24,6 +24,7 @@
 #ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
+# include <QGraphicsView>
 # include <iostream>
 # include <string>
 # include <sstream>
@@ -31,7 +32,6 @@
 # include <exception>
 #endif  //#ifndef _PreComp_

-#include <QGraphicsView>

 #include <App/Document.h>
 #include <App/DocumentObject.h>
--- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
+# include <QGraphicsView>
 # include <iostream>
 # include <string>
 # include <sstream>
@@ -30,7 +31,6 @@
 # include <exception>
 #endif  //#ifndef _PreComp_

-#include <QGraphicsView>

 #include <Base/Tools.h>
 #include <App/Document.h>
--- a/src/Mod/TechDraw/Gui/DlgPageChooser.h
+++ b/src/Mod/TechDraw/Gui/DlgPageChooser.h
@@ -22,7 +22,10 @@
 #ifndef GUI_DLGPAGECHOOSER_H
 #define GUI_DLGPAGECHOOSER_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QDialog>
+#endif

 namespace TechDrawGui {

--- a/src/Mod/TechDraw/Gui/DlgTemplateField.h
+++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h
@@ -24,9 +24,12 @@
 #ifndef DRAWINGGUI_DLGTEMPLATEFIELD_H
 #define DRAWINGGUI_DLGTEMPLATEFIELD_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QDialog>
 #include <QString>
 #include <memory>
+#endif

 namespace TechDrawGui {

--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
@@ -23,8 +23,11 @@
 #ifndef _DrawGuiUtil_h_
 #define _DrawGuiUtil_h_

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <string>
 #include <QCoreApplication>
+#endif

 #include <Base/Vector3D.h>

--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -24,6 +24,7 @@

 #include "PreCompiled.h"
 #ifndef _PreComp_
+    #include <cmath>
    #include <QAction>
    #include <QTimer>
    #include <QApplication>
@@ -43,7 +44,6 @@
    #include <boost_signals2.hpp>
 #endif  // #ifndef _PreComp_

-#include <cmath>

 #include "MDIViewPage.h"

--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -23,8 +23,11 @@
 #ifndef TECHDRAWGUI_MDIVIEWPAGE_H
 #define TECHDRAWGUI_MDIVIEWPAGE_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QPointF>
 #include <QPrinter>
+#endif

 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -79,9 +79,12 @@
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
 #endif
+#include <QGLWidget>
 #include <QPaintEngine>
 #include <QSvgGenerator>
-#include <QGLWidget>
+#include <QTextList>
+#include <QXmlQuery>
+#include <QXmlResultItems>

 #include <Inventor/nodes/SoDirectionalLight.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
--- a/src/Mod/TechDraw/Gui/PreferencesGui.h
+++ b/src/Mod/TechDraw/Gui/PreferencesGui.h
@@ -23,6 +23,11 @@
 #ifndef _PreferencesGui_h_
 #define _PreferencesGui_h_

+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QColor>
+#endif
+
 #include <Mod/TechDraw/TechDrawGlobal.h>

 class QFont;
@@ -30,7 +35,6 @@ class QString;
 class QColor;

 #include <Mod/TechDraw/App/Preferences.h>
-#include <QColor>

 namespace TechDrawGui
 {
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
@@ -27,6 +27,7 @@
 #include <QGraphicsSceneHoverEvent>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif

@@ -36,7 +37,6 @@
 #include <Base/Parameter.h>

 #include <qmath.h>
-#include <QRectF>
 #include "QGCustomBorder.h"

 using namespace TechDrawGui;
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.h
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMBORDER_H
 #define DRAWINGGUI_QGCUSTOMBORDER_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QGraphicsRectItem>
 #include <QPointF>
+#endif

 QT_BEGIN_NAMESPACE
 class QPainter;
--- a/src/Mod/TechDraw/Gui/QGCustomClip.h
+++ b/src/Mod/TechDraw/Gui/QGCustomClip.h
@@ -23,11 +23,14 @@
 #ifndef DRAWINGGUI_QGCUSTOMCLIP_H
 #define DRAWINGGUI_QGCUSTOMCLIP_H

-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QPointF>
 #include <QRectF>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>

 #include <Base/Vector3D.h>

--- a/src/Mod/TechDraw/Gui/QGCustomImage.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.cpp
@@ -23,15 +23,14 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <QPainter>
+#include <QPixmap>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #include <QtGlobal>
 #endif

 #include <Base/Console.h>

-#include <QRectF>
-#include <QPixmap>
-
 #include "QGCustomImage.h"

 using namespace TechDrawGui;
--- a/src/Mod/TechDraw/Gui/QGCustomImage.h
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.h
@@ -23,14 +23,17 @@
 #ifndef DRAWINGGUI_QGCUSTOMIMAGE_H
 #define DRAWINGGUI_QGCUSTOMIMAGE_H

-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QByteArray>
 #include <QGraphicsItem>
 #include <QGraphicsPixmapItem>
 #include <QPointF>
 #include <QSize>
 #include <QPixmap>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>


 QT_BEGIN_NAMESPACE
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
@@ -29,6 +29,7 @@
 #include <QPaintDevice>
 #include <QPainter>
 #include <QPrinter>
+#include <QRectF>
 #include <QSvgGenerator>
 #include <QStyleOptionGraphicsItem>
 #endif
@@ -39,7 +40,6 @@
 #include <Base/Parameter.h>

 #include <qmath.h>
-#include <QRectF>
 #include "Rez.h"
 #include "QGCustomLabel.h"

--- a/src/Mod/TechDraw/Gui/QGCustomLabel.h
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMLABEL_H
 #define DRAWINGGUI_QGCUSTOMLABEL_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QGraphicsTextItem>
 #include <QPointF>
+#endif

 QT_BEGIN_NAMESPACE
 class QPainter;
--- a/src/Mod/TechDraw/Gui/QGCustomRect.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
@@ -27,6 +27,7 @@
 #include <QGraphicsSceneHoverEvent>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif

@@ -36,7 +37,6 @@
 #include <Base/Parameter.h>

 #include <qmath.h>
-#include <QRectF>
 #include "QGCustomRect.h"

 using namespace TechDrawGui;
--- a/src/Mod/TechDraw/Gui/QGCustomRect.h
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMRECT_H
 #define DRAWINGGUI_QGCUSTOMRECT_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QGraphicsRectItem>
 #include <QPointF>
+#endif

 QT_BEGIN_NAMESPACE
 class QPainter;
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
@@ -23,12 +23,12 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <QPainter>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif

 #include <Base/Console.h>

-#include <QRectF>
 #include "QGCustomSvg.h"

 using namespace TechDrawGui;
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.h
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.h
@@ -23,11 +23,14 @@
 #ifndef DRAWINGGUI_QGCUSTOMSVG_H
 #define DRAWINGGUI_QGCUSTOMSVG_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QByteArray>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
 #include <QPointF>
 #include <QSvgRenderer>
+#endif


 QT_BEGIN_NAMESPACE
--- a/src/Mod/TechDraw/Gui/QGCustomText.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomText.cpp
@@ -29,6 +29,7 @@
 #include <QPaintDevice>
 #include <QPainter>
 #include <QPrinter>
+#include <QRectF>
 #include <QSvgGenerator>
 #include <QStyleOptionGraphicsItem>
 #endif
@@ -39,7 +40,6 @@
 #include <Base/Parameter.h>

 #include <qmath.h>
-#include <QRectF>
 #include "Rez.h"
 #include "ZVALUE.h"
 #include "DrawGuiUtil.h"
--- a/src/Mod/TechDraw/Gui/QGCustomText.h
+++ b/src/Mod/TechDraw/Gui/QGCustomText.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMTEXT_H
 #define DRAWINGGUI_QGCUSTOMTEXT_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QGraphicsTextItem>
 #include <QPointF>
+#endif

 QT_BEGIN_NAMESPACE
 class QPainter;
--- a/src/Mod/TechDraw/Gui/QGDisplayArea.h
+++ b/src/Mod/TechDraw/Gui/QGDisplayArea.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGDISPLAYAREA_H
 #define DRAWINGGUI_QGDISPLAYAREA_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QPointF>
 #include <QRectF>
+#endif

 QT_BEGIN_NAMESPACE
 class QPainter;
--- a/src/Mod/TechDraw/Gui/QGEPath.h
+++ b/src/Mod/TechDraw/Gui/QGEPath.h
@@ -23,9 +23,12 @@
 #ifndef TECHDRAWGUI_EDITABLEPATH_H
 #define TECHDRAWGUI_EDITABLEPATH_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
 #include <QObject>
+#endif

 #include "QGIPrimPath.h"
 #include "QGIVertex.h"
--- a/src/Mod/TechDraw/Gui/QGICaption.cpp
+++ b/src/Mod/TechDraw/Gui/QGICaption.cpp
@@ -29,6 +29,7 @@
 #include <QPaintDevice>
 #include <QPainter>
 #include <QPrinter>
+#include <QRectF>
 #include <QSvgGenerator>
 #include <QStyleOptionGraphicsItem>
 #endif
@@ -39,7 +40,6 @@
 #include <Base/Parameter.h>

 #include <qmath.h>
-#include <QRectF>
 #include "QGICaption.h"

 using namespace TechDrawGui;
--- a/src/Mod/TechDraw/Gui/QGICenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
@@ -22,12 +22,12 @@

 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <cmath>
 #include <QPainter>
 #include <QPainterPath>
 #include <QStyleOptionGraphicsItem>
 #endif

-#include <cmath>

 #include <App/Application.h>
 #include <App/Material.h>
--- a/src/Mod/TechDraw/Gui/QGICenterLine.h
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.h
@@ -23,8 +23,11 @@
 #ifndef TECHDRAWGUI_QGICENTERLINE_H
 #define TECHDRAWGUI_QGICENTERLINE_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QColor>
 #include <QPointF>
+#endif

 #include "QGIDecoration.h"

--- a/src/Mod/TechDraw/Gui/QGIDecoration.h
+++ b/src/Mod/TechDraw/Gui/QGIDecoration.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGIDECORATION_H
 #define DRAWINGGUI_QGIDECORATION_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QBrush>
 #include <QGraphicsItemGroup>
 #include <QPen>
+#endif


 QT_BEGIN_NAMESPACE
--- a/src/Mod/TechDraw/Gui/QGIFace.cpp
+++ b/src/Mod/TechDraw/Gui/QGIFace.cpp
@@ -22,10 +22,13 @@

 #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>
@@ -34,18 +37,10 @@
 #include <QBitmap>
 #include <QFile>
 #include <QFileInfo>
-#endif
-
-#include <QFile>
 #include <QTextStream>
 #include <QRectF>
 #include <QPointF>
-
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QTransform>
-
-#include <cmath>
+#endif

 #include <App/Application.h>
 #include <App/Material.h>
--- a/src/Mod/TechDraw/Gui/QGIFace.h
+++ b/src/Mod/TechDraw/Gui/QGIFace.h
@@ -23,6 +23,8 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMFACE_H
 #define DRAWINGGUI_QGRAPHICSITEMFACE_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <Qt>
 #include <QGraphicsItem>
 #include <QSvgRenderer>
@@ -30,6 +32,7 @@
 #include <QBrush>
 #include <QPixmap>
 #include <QImage>
+#endif

 #include <App/Material.h>
 #include <Mod/TechDraw/App/HatchLine.h>
--- a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
+++ b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
@@ -23,9 +23,12 @@
 #ifndef TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H
 #define TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsScene>
 #include <QObject>
 #include <QPointF>
+#endif

 #include "QGIHighlight.h"

--- a/src/Mod/TechDraw/Gui/QGIHighlight.h
+++ b/src/Mod/TechDraw/Gui/QGIHighlight.h
@@ -23,11 +23,14 @@
 #ifndef TECHDRAWGUI_QGIHIGHLIGHT_H
 #define TECHDRAWGUI_QGIHIGHLIGHT_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QColor>
 #include <QFont>
 #include <QGraphicsEllipseItem>
 #include <QGraphicsScene>
 #include <QPointF>
+#endif

 #include "QGIArrow.h"
 #include "QGCustomText.h"
--- a/src/Mod/TechDraw/Gui/QGILeaderLine.h
+++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h
@@ -23,12 +23,15 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H
 #define DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QColor>
 #include <QGraphicsItem>
 #include <QObject>
 #include <QPainterPath>
 #include <QPointF>
 #include <QStyleOptionGraphicsItem>
+#endif

 #include <Base/Vector3D.h>

--- a/src/Mod/TechDraw/Gui/QGIMatting.cpp
+++ b/src/Mod/TechDraw/Gui/QGIMatting.cpp
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <QPainter>
 #include <QPainterPath>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif

@@ -34,7 +35,6 @@
 #include <Base/Parameter.h>

 #include <qmath.h>
-#include <QRectF>
 #include "PreferencesGui.h"
 #include "QGCustomRect.h"
 #include "ZVALUE.h"
--- a/src/Mod/TechDraw/Gui/QGIMatting.h
+++ b/src/Mod/TechDraw/Gui/QGIMatting.h
@@ -23,11 +23,14 @@
 #ifndef DRAWINGGUI_QGIMATTING_H
 #define DRAWINGGUI_QGIMATTING_H

-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QGraphicsItemGroup>
 #include <QGraphicsPathItem>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>


 QT_BEGIN_NAMESPACE
--- a/src/Mod/TechDraw/Gui/QGIPrimPath.h
+++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h
@@ -23,7 +23,11 @@
 #ifndef DRAWINGGUI_QGIPRIMPATH_H
 #define DRAWINGGUI_QGIPRIMPATH_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
+#endif
+
 #include <Base/Parameter.h>
 #include <Mod/TechDraw/TechDrawGlobal.h>

--- a/src/Mod/TechDraw/Gui/QGIProjGroup.h
+++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h
@@ -23,8 +23,12 @@
 #ifndef DRAWINGGUI_QGIProjGroup_H
 #define DRAWINGGUI_QGIProjGroup_H

-#include "QGIViewCollection.h"
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QObject>
+#endif
+
+#include "QGIViewCollection.h"


 QT_BEGIN_NAMESPACE
--- a/src/Mod/TechDraw/Gui/QGIRichAnno.h
+++ b/src/Mod/TechDraw/Gui/QGIRichAnno.h
@@ -23,12 +23,15 @@
 #ifndef TECHDRAWGUI_QGIRICHANNO_H
 #define TECHDRAWGUI_QGIRICHANNO_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QFont>
 #include <QGraphicsItem>
 #include <QObject>
 #include <QPainterPath>
 #include <QPen>
 #include <QStyleOptionGraphicsItem>
+#endif


 namespace TechDraw {
--- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
@@ -29,11 +29,11 @@
 #include <QSvgRenderer>
 #include <QGraphicsSvgItem>
 #include <QDomDocument>
-#endif // #ifndef _PreComp_
-
 #include <QFile>
 #include <QXmlQuery>
 #include <QXmlResultItems>
+#endif // #ifndef _PreComp_
+

 #include <App/Application.h>
 #include <Base/Console.h>
--- a/src/Mod/TechDraw/Gui/QGISectionLine.h
+++ b/src/Mod/TechDraw/Gui/QGISectionLine.h
@@ -23,9 +23,14 @@
 #ifndef TECHDRAWGUI_QGISECTIONLINE_H
 #define TECHDRAWGUI_QGISECTIONLINE_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QGraphicsItemGroup>
+#include <QObject>
 #include <QColor>
 #include <QFont>
 #include <QPointF>
+#endif

 #include <Base/Vector3D.h>

--- a/src/Mod/TechDraw/Gui/QGITemplate.h
+++ b/src/Mod/TechDraw/Gui/QGITemplate.h
@@ -23,9 +23,10 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H
 #define DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H

+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItemGroup>
 #include <QObject>
-#include <Mod/TechDraw/TechDrawGlobal.h>

 QT_BEGIN_NAMESPACE
 class QGraphicsScene;
@@ -69,6 +70,6 @@ protected:
    std::vector<TemplateTextField *> textFields;
 };

-} // namespace MDIViewPageGui
+} // namespace

 #endif // DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H
--- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
@@ -36,18 +36,18 @@
 #include <QString>
 #include <QTextOption>
 #include <QVBoxLayout>
-#include <sstream>
-#endif
-
 #include <string>
-#include <regex>
-
-#include <qmath.h>
 #include <QTextDocument>
 #include <QTextBlock>
 #include <QTextBlockFormat>
 #include <QTextFrame>
 #include <QSizeF>
+#endif
+
+#include <sstream>
+#include <regex>
+
+#include <qmath.h>

 #include <App/Application.h>
 #include <App/Material.h>
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h
@@ -24,12 +24,15 @@
 #ifndef TECHDRAWGUI_QGIVBALLOON_H
 #define TECHDRAWGUI_QGIVBALLOON_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QColor>
 #include <QFont>
 #include <QGraphicsItem>
 #include <QGraphicsObject>
 #include <QObject>
 #include <QStyleOptionGraphicsItem>
+#endif

 #include <Base/Vector3D.h>

--- a/src/Mod/TechDraw/Gui/QGIViewDimension.h
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h
@@ -23,13 +23,16 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H

-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QColor>
 #include <QFont>
 #include <QGraphicsItem>
 #include <QGraphicsObject>
 #include <QStyleOptionGraphicsItem>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>

 #include <Base/Vector3D.h>

--- a/src/Mod/TechDraw/Gui/QGIViewPart.h
+++ b/src/Mod/TechDraw/Gui/QGIViewPart.h
@@ -23,8 +23,12 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWPART_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWPART_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
+#endif
+
 #include <Mod/TechDraw/App/Geometry.h>

 #include "QGIView.h"
--- a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
@@ -21,8 +21,6 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif

 #include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
 #include "QGIViewSpreadsheet.h"
--- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h
+++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h
@@ -24,7 +24,10 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QByteArray>
+#endif

 #include "QGIView.h"

--- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
+++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
@@ -23,12 +23,15 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H
 #define DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QColor>
 #include <QFont>
 #include <QGraphicsItem>
 #include <QPainterPath>
 #include <QPointF>
 #include <QStyleOptionGraphicsItem>
+#endif

 #include "QGIView.h"

--- a/src/Mod/TechDraw/Gui/QGMText.h
+++ b/src/Mod/TechDraw/Gui/QGMText.h
@@ -26,8 +26,12 @@
 #ifndef TECHDRAWGUI_MOVABLETEXT_H
 #define TECHDRAWGUI_MOVABLETEXT_H

-#include "QGCustomText.h"
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QObject>
+#endif
+
+#include "QGCustomText.h"


 QT_BEGIN_NAMESPACE
--- a/src/Mod/TechDraw/Gui/QGVNavStyle.h
+++ b/src/Mod/TechDraw/Gui/QGVNavStyle.h
@@ -22,11 +22,15 @@


 #ifndef TECHDRAW_NAVIGATIONSTYLE_H
-#include <QPoint>
 #define TECHDRAW_NAVIGATIONSTYLE_H

-#include <Mod/TechDraw/TechDrawGlobal.h>
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QCursor>
+#include <QPoint>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>

 class QEvent;
 class QFocusEvent;
--- a/src/Mod/TechDraw/Gui/QGVPage.h
+++ b/src/Mod/TechDraw/Gui/QGVPage.h
@@ -23,12 +23,16 @@
 #ifndef TECHDRAWGUI_QGVIEW_H
 #define TECHDRAWGUI_QGVIEW_H

-#include <memory>
-#include <Mod/TechDraw/TechDrawGlobal.h>

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsView>
 #include <QLabel>
 #include <QPainterPath>
+#endif
+
+#include <memory>
+#include <Mod/TechDraw/TechDrawGlobal.h>

 #include <Base/Type.h>

--- a/src/Mod/TechDraw/Gui/Rez.cpp
+++ b/src/Mod/TechDraw/Gui/Rez.cpp
@@ -21,10 +21,6 @@
 ***************************************************************************/
 #include "PreCompiled.h"

-#ifndef _PreComp_
-
-#endif
-
 #include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
--- a/src/Mod/TechDraw/Gui/Rez.h
+++ b/src/Mod/TechDraw/Gui/Rez.h
@@ -23,9 +23,13 @@
 #ifndef DRAWINGGUI_REZ_H
 #define DRAWINGGUI_REZ_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QPointF>
 #include <QRectF>
 #include <QSize>
+#endif
+
 #include <Base/Tools2D.h>
 #include <Base/Vector3D.h>

--- a/src/Mod/TechDraw/Gui/SymbolChooser.cpp
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
@@ -21,7 +21,9 @@
 ***************************************************************************/

 #include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QListWidget>
+#endif

 #include <App/Application.h>
 #include <Mod/TechDraw/Gui/ui_SymbolChooser.h>
--- a/src/Mod/TechDraw/Gui/SymbolChooser.h
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.h
@@ -22,7 +22,10 @@
 #ifndef TECHDRAWGUI_SYMBOLCHOOSER_H
 #define TECHDRAWGUI_SYMBOLCHOOSER_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QDialog>
+#endif

 class QListWidgetItem;

--- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
@@ -26,14 +26,13 @@
 #include <cmath>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
-
-#endif // #ifndef _PreComp_
-
-#include <BRepBuilderAPI_MakeEdge.hxx>
-
 #include <QButtonGroup>
 #include <QStatusBar>
 #include <QGraphicsScene>
+#endif
+
+#include <BRepBuilderAPI_MakeEdge.hxx>
+

 #include <Base/Console.h>
 #include <Base/Tools.h>
--- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
@@ -26,14 +26,12 @@
 #include <cmath>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
-
-#endif // #ifndef _PreComp_
-
-#include <BRepBuilderAPI_MakeEdge.hxx>
-
 #include <QButtonGroup>
 #include <QStatusBar>
 #include <QGraphicsScene>
+#endif
+
+#include <BRepBuilderAPI_MakeEdge.hxx>

 #include <Base/Console.h>
 #include <Base/Tools.h>
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -24,10 +24,10 @@

 #ifndef _PreComp_
 #include <cmath>
-#endif
-
 #include <QStatusBar>
 #include <QGraphicsScene>
+#endif
+

 #include <Base/Console.h>
 #include <Base/Tools.h>
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.h
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h
@@ -24,7 +24,10 @@
 #ifndef GUI_TASKVIEW_TASKVIEWGROUP_H
 #define GUI_TASKVIEW_TASKVIEWGROUP_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QString>
+#endif

 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
--- a/src/Mod/TechDraw/Gui/TaskProjection.h
+++ b/src/Mod/TechDraw/Gui/TaskProjection.h
@@ -26,7 +26,11 @@
 #ifndef TECHDRAWGUI_TASKDIALOG
 #define TECHDRAWGUI_TASKDIALOG

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QWidget>
+#endif
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>

--- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
@@ -24,12 +24,12 @@

 #ifndef _PreComp_
 #include <cmath>
-#endif // #ifndef _PreComp_
-
 #include <QApplication>
 #include <QStatusBar>
 #include <QGraphicsScene>
 #include <QMessageBox>
+#endif // #ifndef _PreComp_
+

 #include <Base/Console.h>
 #include <Base/Tools.h>
--- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
@@ -21,6 +21,13 @@
 ***************************************************************************/

 #include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QGraphicsScene>
+#include <QLineEdit>
+#include <QGraphicsProxyWidget>
+#include <QComboBox>
+#endif
+
 #include <App/Document.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
@@ -28,10 +35,6 @@
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/Gui/ui_TaskSurfaceFinishSymbols.h>
 #include "TaskSurfaceFinishSymbols.h"
-#include <QGraphicsScene>
-#include <QLineEdit>
-#include <QGraphicsProxyWidget>
-#include <QComboBox>

 using namespace Gui;
 using namespace TechDraw;
--- a/src/Mod/TechDraw/Gui/TemplateTextField.h
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.h
@@ -23,7 +23,10 @@
 #ifndef DRAWINGGUI_TEMPLATETEXTFIELD_H
 #define DRAWINGGUI_TEMPLATETEXTFIELD_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsRectItem>
+#endif

 namespace TechDraw {
 class DrawTemplate;
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
@@ -24,9 +24,6 @@

 #include "PreCompiled.h"

-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderAnnotation.h"
 #include "QGIView.h"
--- a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
@@ -20,12 +20,8 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"

-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>

 #include "ViewProviderImage.h"
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h
@@ -24,10 +24,14 @@
 #ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H
 #define DRAWINGGUI_VIEWPROVIDERPAGE_H

+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QPointer>
+#endif
+
 #include <Mod/TechDraw/TechDrawGlobal.h>

-#include <boost_signals2.hpp> 
-#include <QPointer>
+#include <boost_signals2.hpp>

 #include <App/PropertyUnits.h>
 #include <Gui/ViewProviderDocumentObject.h>
--- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
@@ -21,12 +21,8 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"

-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include <Gui/Control.h>
 #include <Gui/Selection.h>
--- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
@@ -20,12 +20,8 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"

-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderSpreadsheet.h"

--- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
@@ -21,12 +21,8 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"

-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderSymbol.h"

--- a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
@@ -20,12 +20,8 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"

-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderTile.h"

--- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
@@ -25,8 +25,11 @@
 * includes changes by wandererfan@gmail.com
 * for FreeCAD project https://www.freecadweb.org/
 ********************************/
-#include "PreCompiled.h"

+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <algorithm>
+#include <iostream>
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
@@ -44,9 +47,7 @@
 #include <QMenu>
 #include <QDialog>
 #include <QBitmap>
-
-#include <iostream>
-#include <algorithm>
+#endif

 #include <Base/Console.h>
 #include <Base/Parameter.h>
--- a/src/Mod/TechDraw/Gui/mrichtextedit.h
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.h
@@ -29,7 +29,11 @@
 #ifndef _MRICHTEXTEDIT_H_
 #define _MRICHTEXTEDIT_H_

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QPointer>
+#endif
+
 #include "ui_mrichtextedit.h"

 /**
--- a/src/Mod/TechDraw/Gui/mtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mtextedit.cpp
@@ -21,14 +21,17 @@
 ** $QT_END_LICENSE$
 */
 // clazy:excludeall=qstring-arg
-#include "PreCompiled.h"

-#include "mtextedit.h"
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QTextDocument>
 #include <QTextCursor>
 #include <QImage>
 #include <QByteArray>
 #include <QBuffer>
+#endif
+
+#include "mtextedit.h"
 #include <cstdlib>


--- a/src/Mod/TechDraw/Gui/mtextedit.h
+++ b/src/Mod/TechDraw/Gui/mtextedit.h
@@ -23,9 +23,12 @@
 #ifndef _MTEXTEDIT_H_
 #define _MTEXTEDIT_H_

+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QImage>
 #include <QMimeData>
 #include <QTextEdit>
+#endif


 class MTextEdit : public QTextEdit {