diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp
index 08979bea734f..3e83afd30186 100644
--- a/src/Mod/TechDraw/App/DrawHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawHatch.cpp
@@ -38,9 +38,10 @@
#include
#include
+#include "DrawViewPart.h"
#include "DrawHatch.h"
-#include "DrawHatchPy.h" // generated from DrawHatchPy.xml
+#include // generated from DrawHatchPy.xml
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h
index 67363a072860..5219bb1e5be9 100644
--- a/src/Mod/TechDraw/App/DrawHatch.h
+++ b/src/Mod/TechDraw/App/DrawHatch.h
@@ -28,11 +28,9 @@
# include
#include
-#include "DrawView.h"
-#include "DrawViewPart.h"
-
namespace TechDraw
{
+class DrawViewPart;
class TechDrawExport DrawHatch : public App::DocumentObject
{
diff --git a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp
index 3ff2e1ac631e..437246e51624 100644
--- a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp
@@ -1,11 +1,11 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawHatch.h"
+#include "DrawHatch.h"
// inclusion of the generated files (generated out of DrawHatchPy.xml)
-#include "DrawHatchPy.h"
-#include "DrawHatchPy.cpp"
+#include
+#include
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawPage.cpp b/src/Mod/TechDraw/App/DrawPage.cpp
index a8e6bd9719fb..de21a766db74 100644
--- a/src/Mod/TechDraw/App/DrawPage.cpp
+++ b/src/Mod/TechDraw/App/DrawPage.cpp
@@ -47,7 +47,7 @@
#include "DrawViewPart.h"
#include "DrawViewDimension.h"
-#include "DrawPagePy.h" // generated from DrawPagePy.xml
+#include // generated from DrawPagePy.xml
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h
index 836f84959729..8f9865a33fe1 100644
--- a/src/Mod/TechDraw/App/DrawPage.h
+++ b/src/Mod/TechDraw/App/DrawPage.h
@@ -24,11 +24,10 @@
#ifndef _DrawPage_h_
#define _DrawPage_h_
-#include "App/DocumentObject.h"
-#include "App/DocumentObjectGroup.h"
-#include "App/PropertyStandard.h"
-#include "App/PropertyFile.h"
-//#include "App/FeaturePython.h"
+#include
+#include
+#include
+#include
namespace TechDraw
{
@@ -38,7 +37,6 @@ class TechDrawExport DrawPage: public App::DocumentObject
PROPERTY_HEADER(TechDraw::DrawPage);
public:
- /// Constructor
DrawPage(void);
virtual ~DrawPage();
@@ -47,13 +45,13 @@ class TechDrawExport DrawPage: public App::DocumentObject
App::PropertyFloat Scale;
App::PropertyEnumeration ProjectionType; // First or Third Angle
-
+
/** @name methods overide Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute(void);
//@}
-
+
int addView(App::DocumentObject *docObj);
int removeView(App::DocumentObject* docObj);
short mustExecute() const;
diff --git a/src/Mod/TechDraw/App/DrawPagePyImp.cpp b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
index e4427b783e33..48cc29af6857 100644
--- a/src/Mod/TechDraw/App/DrawPagePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
@@ -1,15 +1,16 @@
#include "PreCompiled.h"
+
#include
#include
-#include "Mod/TechDraw/App/DrawPage.h"
-#include "Mod/TechDraw/App/DrawView.h"
-#include "DrawViewPy.h"
+#include "DrawPage.h"
+#include "DrawView.h"
-// inclusion of the generated files (generated out of DrawPagePy.xml)
-#include "DrawPagePy.h"
-#include "DrawPagePy.cpp"
+// inclusion of the generated files
+#include
+#include
+#include
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
index bd03fb3f2457..068aad1b8eeb 100644
--- a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
@@ -41,7 +41,7 @@
#include
#include "DrawParametricTemplate.h"
-#include "DrawParametricTemplatePy.h"
+#include
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
index acf5ef6c513d..d4fbea50ee95 100644
--- a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
@@ -25,11 +25,11 @@
# include
#endif
-#include "Mod/TechDraw/App/DrawParametricTemplate.h"
+#include "DrawParametricTemplate.h"
// inclusion of the generated files (generated out of DrawParametricTemplateSFPy.xml)
-#include "DrawParametricTemplatePy.h"
-#include "DrawParametricTemplatePy.cpp"
+#include
+#include
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp
index 5cfc566e34ca..933d5382ac09 100644
--- a/src/Mod/TechDraw/App/DrawProjGroup.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include
+#include
#endif
#include
@@ -34,13 +35,11 @@
#include
#include
-#include
-
-#include
#include "DrawPage.h"
+#include "DrawProjGroupItem.h"
#include "DrawProjGroup.h"
-#include "DrawProjGroupPy.h" // generated from DrawProjGroupPy.xml
+#include // generated from DrawProjGroupPy.xml
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawProjGroup.h b/src/Mod/TechDraw/App/DrawProjGroup.h
index 7dffd827cffa..620a851c7b43 100644
--- a/src/Mod/TechDraw/App/DrawProjGroup.h
+++ b/src/Mod/TechDraw/App/DrawProjGroup.h
@@ -25,16 +25,17 @@
#include
#include
-#include
#include
#include
+
#include "DrawViewCollection.h"
-#include "DrawProjGroupItem.h"
namespace TechDraw
{
+class DrawProjGroupItem;
+
/**
* Class super-container for managing a collection of DrawProjGroupItem
* Page Features
diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
index 7e4cd78abfc5..dc7fc223e881 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
@@ -32,7 +32,7 @@
#include "DrawProjGroupItem.h"
-#include "DrawProjGroupItemPy.h" // generated from DrawProjGroupItemPy.xml
+#include // generated from DrawProjGroupItemPy.xml
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp
index 0b857ce76553..ba56e0bc2547 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp
@@ -1,11 +1,11 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawProjGroupItem.h"
+#include "DrawProjGroupItem.h"
// inclusion of the generated files (generated out of DrawProjGroupItemPy.xml)
-#include "DrawProjGroupItemPy.h"
-#include "DrawProjGroupItemPy.cpp"
+#include
+#include
using namespace TechDraw;
@@ -15,12 +15,6 @@ std::string DrawProjGroupItemPy::representation(void) const
return std::string("");
}
-
-
-
-
-
-
PyObject *DrawProjGroupItemPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@@ -28,7 +22,5 @@ PyObject *DrawProjGroupItemPy::getCustomAttributes(const char* /*attr*/) const
int DrawProjGroupItemPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
- return 0;
+ return 0;
}
-
-
diff --git a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
index bba7328dda42..1b6872434e2d 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
@@ -7,10 +7,9 @@
#include "DrawProjGroupItem.h"
// inclusion of the generated files (generated out of DrawProjGroupPy.xml)
-#include "DrawProjGroupPy.h"
-#include "DrawProjGroupPy.cpp"
-
-#include "DrawProjGroupItemPy.h"
+#include
+#include
+#include
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
index 8019dc43c522..a8c89576ca63 100644
--- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
@@ -48,7 +48,7 @@
#include "DrawPage.h"
#include "DrawSVGTemplate.h"
-#include "DrawSVGTemplatePy.h"
+#include
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
index 0d80b6aabfbe..454526145105 100644
--- a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
@@ -1,11 +1,11 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawSVGTemplate.h"
+#include "DrawSVGTemplate.h"
// inclusion of the generated files (generated out of DrawSVGTemplatePy.xml)
-#include "DrawSVGTemplatePy.h"
-#include "DrawSVGTemplatePy.cpp"
+#include
+#include
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawTemplate.cpp b/src/Mod/TechDraw/App/DrawTemplate.cpp
index 74536907254e..6e241f347af4 100644
--- a/src/Mod/TechDraw/App/DrawTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawTemplate.cpp
@@ -38,7 +38,7 @@
#include "DrawPage.h"
#include "DrawTemplate.h"
-#include "DrawTemplatePy.h"
+#include
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h
index 98effc2873c2..715609b812a1 100644
--- a/src/Mod/TechDraw/App/DrawTemplate.h
+++ b/src/Mod/TechDraw/App/DrawTemplate.h
@@ -30,11 +30,6 @@
#include
#include
-namespace TechDrawGeometry
-{
- class BaseGeom;
-}
-
namespace TechDraw
{
diff --git a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
index 53e09bf03f5f..e3a0e5384436 100644
--- a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
@@ -25,11 +25,11 @@
# include
#endif
-#include "Mod/TechDraw/App/DrawTemplate.h"
+#include "DrawTemplate.h"
// inclusion of the generated files (generated out of DrawTemplateSFPy.xml)
-#include "DrawTemplatePy.h"
-#include "DrawTemplatePy.cpp"
+#include
+#include
using namespace TechDraw;
@@ -62,4 +62,4 @@ int DrawTemplatePy::setCustomAttributes(const char* attr, PyObject* obj)
}
return 0;
-}
+}
diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp
index d2e2dab20416..68e7d63700ac 100644
--- a/src/Mod/TechDraw/App/DrawView.cpp
+++ b/src/Mod/TechDraw/App/DrawView.cpp
@@ -42,7 +42,7 @@
#include "DrawViewCollection.h"
#include "DrawViewClip.h"
-#include "DrawViewPy.h" // generated from DrawViewPy.xml
+#include // generated from DrawViewPy.xml
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h
index f6c4af535870..86dfb72a1e99 100644
--- a/src/Mod/TechDraw/App/DrawViewAnnotation.h
+++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h
@@ -30,7 +30,7 @@
#include
#include
-#include "App/PropertyStandard.h"
+#include
#include
#include "DrawView.h"
diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp
index 27f3a163fa92..4bc3c5e7c7a8 100644
--- a/src/Mod/TechDraw/App/DrawViewClip.cpp
+++ b/src/Mod/TechDraw/App/DrawViewClip.cpp
@@ -36,10 +36,9 @@
#include
#include "DrawViewClip.h"
-#include "DrawView.h"
#include "DrawPage.h"
-#include "DrawViewClipPy.h" // generated from DrawViewClipPy.xml
+#include // generated from DrawViewClipPy.xml
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h
index 436e5ce5e002..d1d91211c73a 100644
--- a/src/Mod/TechDraw/App/DrawViewClip.h
+++ b/src/Mod/TechDraw/App/DrawViewClip.h
@@ -30,9 +30,10 @@
#include
#include
#include
-#include "DrawViewCollection.h"
#include
+#include "DrawView.h"
+
namespace TechDraw
{
diff --git a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
index 4bd34ae3c69a..778c73d27cdd 100644
--- a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
@@ -1,15 +1,16 @@
#include "PreCompiled.h"
+
#include
#include
-#include "Mod/TechDraw/App/DrawViewClip.h"
-#include "Mod/TechDraw/App/DrawView.h"
-#include "DrawViewPy.h"
+#include "DrawViewClip.h"
+#include "DrawView.h"
-// inclusion of the generated files (generated out of DrawViewClipPy.xml)
-#include "DrawViewClipPy.h"
-#include "DrawViewClipPy.cpp"
+// inclusion of the generated files
+#include
+#include
+#include
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
index a215c7f434ca..b507c233c3a6 100644
--- a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
@@ -1,11 +1,11 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawViewCollection.h"
+#include "DrawViewCollection.h"
// inclusion of the generated files (generated out of DrawViewCollectionPy.xml)
-#include "DrawViewCollectionPy.h"
-#include "DrawViewCollectionPy.cpp"
+#include
+#include
using namespace TechDraw;
@@ -16,11 +16,6 @@ std::string DrawViewCollectionPy::representation(void) const
}
-
-
-
-
-
PyObject *DrawViewCollectionPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@@ -28,7 +23,5 @@ PyObject *DrawViewCollectionPy::getCustomAttributes(const char* /*attr*/) const
int DrawViewCollectionPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
- return 0;
+ return 0;
}
-
-
diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index bf6f02d3f7e2..39bc89c8ef61 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -34,6 +34,10 @@
#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -43,15 +47,13 @@
#include
+#include "Geometry.h"
#include "DrawViewPart.h"
#include "DrawViewDimension.h"
#include "DrawUtil.h"
-#include
-#include
-#include
-#include "DrawViewDimensionPy.h" // generated from DrawViewDimensionPy.xml
+#include // generated from DrawViewDimensionPy.xml
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h
index d012ee4620f4..cfa7f22147fe 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.h
+++ b/src/Mod/TechDraw/App/DrawViewDimension.h
@@ -28,7 +28,6 @@
# include
#include "DrawView.h"
-#include "DrawViewPart.h"
namespace Measure {
class Measurement;
@@ -36,6 +35,8 @@ class Measurement;
namespace TechDraw
{
+class DrawViewPart;
+
class TechDrawExport DrawViewDimension : public TechDraw::DrawView
{
PROPERTY_HEADER(TechDraw::DrawViewDimension);
diff --git a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
index ebaefe8a1862..e5db566e3e0c 100644
--- a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
@@ -1,11 +1,11 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawViewDimension.h"
+#include "DrawViewDimension.h"
// inclusion of the generated files (generated out of DrawViewDimensionPy.xml)
-#include "DrawViewDimensionPy.h"
-#include "DrawViewDimensionPy.cpp"
+#include
+#include
using namespace TechDraw;
@@ -16,11 +16,6 @@ std::string DrawViewDimensionPy::representation(void) const
}
-
-
-
-
-
PyObject *DrawViewDimensionPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h
index 42ba15b7f31e..586fb8663eeb 100644
--- a/src/Mod/TechDraw/App/DrawViewDraft.h
+++ b/src/Mod/TechDraw/App/DrawViewDraft.h
@@ -28,7 +28,6 @@
#include
#include
-#include "DrawView.h"
#include "DrawViewSymbol.h"
namespace TechDraw
diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp
index e9d8c08ee227..12e4a011ac75 100644
--- a/src/Mod/TechDraw/App/DrawViewPart.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPart.cpp
@@ -34,7 +34,6 @@
#include
#include
#include
-//#include
#include
#include
#include
@@ -68,7 +67,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -82,12 +80,13 @@
#include
#include "Geometry.h"
+#include "GeometryObject.h"
#include "DrawViewPart.h"
#include "DrawHatch.h"
#include "EdgeWalker.h"
-#include "DrawViewPartPy.h" // generated from DrawViewPartPy.xml
+#include // generated from DrawViewPartPy.xml
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h
index 5ac1e86c6cbb..2cfc7d8a004a 100644
--- a/src/Mod/TechDraw/App/DrawViewPart.h
+++ b/src/Mod/TechDraw/App/DrawViewPart.h
@@ -26,6 +26,7 @@
#include
#include
+#include
#include
#include
@@ -33,7 +34,16 @@
#include
#include
-#include "GeometryObject.h"
+
+class gp_Pnt;
+
+namespace TechDrawGeometry
+{
+class GeometryObject;
+class Vertex;
+class BaseGeom;
+class Face;
+}
namespace TechDraw {
class DrawHatch;
diff --git a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
index 6328e60ad02d..8afe123f35ba 100644
--- a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
@@ -1,11 +1,11 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawViewPart.h"
+#include "DrawViewPart.h"
// inclusion of the generated files (generated out of DrawViewPartPy.xml)
-#include "DrawViewPartPy.h"
-#include "DrawViewPartPy.cpp"
+#include
+#include
using namespace TechDraw;
@@ -16,11 +16,6 @@ std::string DrawViewPartPy::representation(void) const
}
-
-
-
-
-
PyObject *DrawViewPartPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@@ -28,7 +23,5 @@ PyObject *DrawViewPartPy::getCustomAttributes(const char* /*attr*/) const
int DrawViewPartPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
- return 0;
+ return 0;
}
-
-
diff --git a/src/Mod/TechDraw/App/DrawViewPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPyImp.cpp
index dab0ac49374b..406360e13f08 100644
--- a/src/Mod/TechDraw/App/DrawViewPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPyImp.cpp
@@ -1,11 +1,11 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawView.h"
+#include
// inclusion of the generated files (generated out of DrawViewPy.xml)
-#include "DrawViewPy.h"
-#include "DrawViewPy.cpp"
+#include
+#include
using namespace TechDraw;
diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp
index 7f90ce78cf72..c3887191ef21 100644
--- a/src/Mod/TechDraw/App/DrawViewSection.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSection.cpp
@@ -81,15 +81,16 @@
#include
#include
#include
-//#include
#include
#include
#include
#include
-#include "DrawViewSection.h"
+#include "Geometry.h"
+#include "GeometryObject.h"
#include "EdgeWalker.h"
+#include "DrawViewSection.h"
using namespace TechDraw;
using namespace std;
diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h
index 5b4351314d35..15e93325ad1d 100644
--- a/src/Mod/TechDraw/App/DrawViewSection.h
+++ b/src/Mod/TechDraw/App/DrawViewSection.h
@@ -30,12 +30,15 @@
#include
#include "DrawViewPart.h"
-#include "Geometry.h"
class gp_Pln;
-class TopoDS_Compound;
class TopoDS_Face;
+namespace TechDrawGeometry
+{
+class Face;
+}
+
namespace TechDraw
{
diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h
index dc229f17ad14..557727142fb5 100644
--- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h
+++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h
@@ -29,7 +29,7 @@
#include
#include
-#include "App/PropertyStandard.h"
+#include
#include
#include
diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
index 68892ee0b210..d07a36cad163 100644
--- a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
@@ -1,13 +1,13 @@
#include "PreCompiled.h"
-#include "Mod/TechDraw/App/DrawViewSymbol.h"
-#include "Mod/TechDraw/App/DrawView.h"
-#include "Mod/TechDraw/App/DrawViewPy.h"
+#include "DrawViewSymbol.h"
+#include "DrawView.h"
-// inclusion of the generated files (generated out of DrawViewSymbolPy.xml)
-#include "DrawViewSymbolPy.h"
-#include "DrawViewSymbolPy.cpp"
+// inclusion of the generated files
+#include
+#include
+#include
using namespace TechDraw;
@@ -18,11 +18,6 @@ std::string DrawViewSymbolPy::representation(void) const
}
-
-
-
-
-
PyObject *DrawViewSymbolPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@@ -30,7 +25,5 @@ PyObject *DrawViewSymbolPy::getCustomAttributes(const char* /*attr*/) const
int DrawViewSymbolPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
- return 0;
+ return 0;
}
-
-
diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
index c251f9dd9781..b95767e6a88a 100644
--- a/src/Mod/TechDraw/App/Geometry.cpp
+++ b/src/Mod/TechDraw/App/Geometry.cpp
@@ -63,8 +63,6 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
@@ -476,4 +474,3 @@ BaseGeomPtrVector GeometryUtils::chainGeoms(BaseGeomPtrVector geoms)
}
return result;
}
-
diff --git a/src/Mod/TechDraw/App/Geometry.h b/src/Mod/TechDraw/App/Geometry.h
index 53bdd05be2c4..e6cfe9493d77 100644
--- a/src/Mod/TechDraw/App/Geometry.h
+++ b/src/Mod/TechDraw/App/Geometry.h
@@ -29,8 +29,6 @@
#include
#include
-class BRepAdaptor_Curve;
-
namespace TechDrawGeometry {
enum ExtractionType { //obs sb vis/hid + hard/smooth/seam/out(edgeClass?)
diff --git a/src/Mod/TechDraw/App/GeometryObject.cpp b/src/Mod/TechDraw/App/GeometryObject.cpp
index 2b047fbd62e1..e5837a630861 100644
--- a/src/Mod/TechDraw/App/GeometryObject.cpp
+++ b/src/Mod/TechDraw/App/GeometryObject.cpp
@@ -75,18 +75,14 @@
# include
#include
-# include
# include
#include
#include
-// # include
# include
# include
-#include
-#include
# include
# include
# include
diff --git a/src/Mod/TechDraw/App/GeometryObject.h b/src/Mod/TechDraw/App/GeometryObject.h
index 7d15823a1ca9..efe9687db6fb 100644
--- a/src/Mod/TechDraw/App/GeometryObject.h
+++ b/src/Mod/TechDraw/App/GeometryObject.h
@@ -34,16 +34,9 @@
#include "Geometry.h"
-class HLRBRep_Algo;
-class HLRBRep_EdgeData;
-class TopoDS_Wire;
-class HLRBRep_HLRToShape;
-
namespace TechDrawGeometry
{
-class BaseGeom;
-
//! scales & mirrors a shape about a center
TopoDS_Shape TechDrawExport mirrorShape(const TopoDS_Shape &input,
const gp_Pnt& inputCenter,
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index b6f6d956fdb1..face786af5eb 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -56,182 +56,9 @@
// OpenCasCade =====================================================================================
-// Base
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#if OCC_VERSION_HEX < 0x060700
-#include
-#include
-#endif
-
-
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include