[TD] attempt to fix compilation with PCH after #8141

- also resort includes
2023-01-09 11:04:45 +01:00
parent a1e295e92d
commit e42f46a47b
13 changed files with 97 additions and 92 deletions
--- a/src/Gui/QtAll.h
+++ b/src/Gui/QtAll.h
@@ -189,6 +189,7 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QStackedWidget>
+#include <QTableWidgetItem>
 #include <QWidget>

 // QtXML
--- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp
+++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
@@ -23,15 +23,15 @@

 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Vec.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Wire.hxx>
+# include <BRep_Builder.hxx>
+# include <BRepBuilderAPI_Transform.hxx>
+# include <gp_Trsf.hxx>
+# include <gp_Vec.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Compound.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS_Wire.hxx>
 #endif

 #include <boost_regex.hpp>
@@ -52,6 +52,7 @@
 #include <Mod/Part/App/TopoShapeWirePy.h>
 #include <Mod/TechDraw/TechDrawGlobal.h>

+#include "DimensionGeometry.h"
 #include "DrawDimHelper.h"
 #include "DrawGeomHatch.h"
 #include "DrawPage.h"
@@ -62,7 +63,6 @@
 #include "DrawUtil.h"
 #include "DrawViewAnnotation.h"
 #include "DrawViewDimension.h"
-#include "DimensionGeometry.h"
 #include "DrawViewPart.h"
 #include "DrawViewPartPy.h"
 #include "EdgeWalker.h"
--- a/src/Mod/TechDraw/App/DimensionFormatter.cpp
+++ b/src/Mod/TechDraw/App/DimensionFormatter.cpp
@@ -21,16 +21,18 @@
 ***************************************************************************/

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

+#include <Base/Console.h>
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>

-#include "Preferences.h"
-#include "DrawViewDimension.h"
 #include "DimensionFormatter.h"
+#include "DrawViewDimension.h"
+#include "Preferences.h"
+

 using namespace TechDraw;

--- a/src/Mod/TechDraw/App/DimensionGeometry.cpp
+++ b/src/Mod/TechDraw/App/DimensionGeometry.cpp
@@ -21,19 +21,18 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <gp_Ax3.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Vec.hxx>
+# include <gp_Ax3.hxx>
+# include <gp_Trsf.hxx>
+# include <gp_Vec.hxx>
 #endif

 #include <Base/Console.h>

+#include "DimensionGeometry.h"
 #include "DrawUtil.h"
 #include "DrawViewPart.h"

-#include "DimensionGeometry.h"

 using namespace TechDraw;
 using DU = DrawUtil;
--- a/src/Mod/TechDraw/App/DimensionReferences.cpp
+++ b/src/Mod/TechDraw/App/DimensionReferences.cpp
@@ -19,19 +19,21 @@
 *   Suite 330, Boston, MA  02111-1307, USA                                *
 *                                                                         *
 ***************************************************************************/
+
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <TopoDS_Shape.hxx>
 #endif
-#include <TopoDS_Shape.hxx>

 #include <App/GeoFeature.h>
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Part/App/TopoShape.h>

-#include "DrawViewPart.h"
-#include "DrawUtil.h"
-#include "Geometry.h"
 #include "DimensionReferences.h"
+#include "DrawUtil.h"
+#include "DrawViewPart.h"
+#include "Geometry.h"
+

 using namespace TechDraw;

--- a/src/Mod/TechDraw/App/DrawDimHelper.cpp
+++ b/src/Mod/TechDraw/App/DrawDimHelper.cpp
@@ -23,17 +23,17 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
-#include <cstdlib>
-#include <sstream>
+# include <cstdlib>
+# include <sstream>

-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <BRep_Builder.hxx>
-#include <Bnd_Box.hxx>
-#include <Geom_Line.hxx>
-#include <TopoDS_Edge.hxx>
-#include <gp_Pln.hxx>
+# include <Bnd_Box.hxx>
+# include <BRepBndLib.hxx>
+# include <BRep_Builder.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <Geom_Line.hxx>
+# include <gp_Pln.hxx>
+# include <TopoDS_Edge.hxx>
 #endif

 #include <App/Document.h>
--- a/src/Mod/TechDraw/App/DrawDimHelper.h
+++ b/src/Mod/TechDraw/App/DrawDimHelper.h
@@ -31,7 +31,9 @@

 #include <Base/Vector3D.h>
 #include <Mod/TechDraw/TechDrawGlobal.h>
-#include <Mod/TechDraw/App/DimensionReferences.h>
+
+#include "DimensionReferences.h"
+

 namespace TechDraw
 {
--- a/src/Mod/TechDraw/App/DrawUtil.cpp
+++ b/src/Mod/TechDraw/App/DrawUtil.cpp
@@ -21,41 +21,40 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-#include <sstream>
+# include <cmath>
+# include <cstdlib>
+# include <cstring>
+# include <sstream>

-#include <boost_regex.hpp>
+# include <boost_regex.hpp>

-#include <QChar>
-#include <QPointF>
-#include <QString>
+# include <QChar>
+# include <QPointF>
+# include <QString>

-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepLProp_CLProps.hxx>
-#include <BRepLProp_CurveTool.hxx>
-#include <BRepLProp_SLProps.hxx>
-#include <BRepTools.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
-#include <GeomAPI_ExtremaCurveCurve.hxx>
-#include <Precision.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Elips.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepAdaptor_Surface.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepLProp_CLProps.hxx>
+# include <BRepLProp_CurveTool.hxx>
+# include <BRepLProp_SLProps.hxx>
+# include <BRepTools.hxx>
+# include <BRep_Builder.hxx>
+# include <BRep_Tool.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
+# include <GeomAPI_ExtremaCurveCurve.hxx>
+# include <gp_Ax3.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Elips.hxx>
+# include <gp_Pnt.hxx>
+# include <gp_Vec.hxx>
+# include <Precision.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopTools_IndexedMapOfShape.hxx>
 #endif

 #include <App/Application.h>
--- a/src/Mod/TechDraw/App/DrawViewDimension.h
+++ b/src/Mod/TechDraw/App/DrawViewDimension.h
@@ -28,7 +28,6 @@
 #include <gp_Ax3.hxx>

 #include <App/DocumentObject.h>
-#include <Base/Console.h>
 #include <Base/UnitsApi.h>
 #include <Mod/TechDraw/TechDrawGlobal.h>

--- a/src/Mod/TechDraw/Gui/DimensionValidators.cpp
+++ b/src/Mod/TechDraw/Gui/DimensionValidators.cpp
@@ -19,12 +19,14 @@
 *   Suite 330, Boston, MA  02111-1307, USA                                *
 *                                                                         *
 ***************************************************************************/
+
+#include "PreCompiled.h"
 #ifndef _PreComp_
-#include <BRepAdaptor_Curve.hxx>
-#include <BRep_Tool.hxx>
-#include <GeomAbs_CurveType.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <TopExp.hxx>
+# include <BRep_Tool.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <GeomAbs_CurveType.hxx>
+# include <TopAbs_ShapeEnum.hxx>
+# include <TopExp.hxx>
 #endif  //#ifndef _PreComp_

 #include <App/DocumentObject.h>
@@ -40,6 +42,7 @@

 #include "DimensionValidators.h"

+
 using namespace TechDraw;
 using DU = DrawUtil;

--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
@@ -23,17 +23,17 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
-#include <sstream>
+# include <sstream>

-#include <QComboBox>
-#include <QMessageBox>
-#include <QPointF>
-#include <QRectF>
-#include <QString>
+# include <QComboBox>
+# include <QMessageBox>
+# include <QPointF>
+# include <QRectF>
+# include <QString>

-#include <BRepAdaptor_Surface.hxx>
-#include <BRepLProp_SLProps.hxx>
-#include <gp_Dir.hxx>
+# include <BRepAdaptor_Surface.hxx>
+# include <BRepLProp_SLProps.hxx>
+# include <gp_Dir.hxx>
 #endif

 #include <App/Application.h>
@@ -47,8 +47,8 @@
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
-#include <Gui/MDIView.h>
 #include <Gui/MainWindow.h>
+#include <Gui/MDIView.h>
 #include <Gui/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -66,6 +66,7 @@
 #include <BRepLProp_SLProps.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
+#include <TopoDS_Shape.hxx>

 // Open Inventor
 #include <Inventor/SbVec3f.h>
--- a/src/Mod/TechDraw/Gui/TaskDimRepair.cpp
+++ b/src/Mod/TechDraw/Gui/TaskDimRepair.cpp
@@ -21,18 +21,19 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
-#include <QMessageBox>
-#include <QTableWidgetItem>
-
 #ifndef _PreComp_
-#include <cmath>
+# include <cmath>
+
+# include <QMessageBox>
+# include <QTableWidgetItem>
 #endif // #ifndef _PreComp_

+#include <App/Application.h>
+#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <Base/Console.h>
 #include <Base/Tools.h>
 #include <Base/Vector3D.h>
-
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
@@ -40,18 +41,14 @@
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
-
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
-
 #include <Mod/TechDraw/App/DrawView.h>
 #include <Mod/TechDraw/App/DrawViewPart.h>
 #include <Mod/TechDraw/App/DrawUtil.h>

 #include "DimensionValidators.h"
+#include "ui_TaskDimRepair.h"
 #include "TaskDimRepair.h"
-#include <Mod/TechDraw/Gui/ui_TaskDimRepair.h>
+

 using namespace Gui;
 using namespace TechDraw;