From 19968205d228460b16a9aa5c299417c660f6a237 Mon Sep 17 00:00:00 2001 From: WandererFan Date: Wed, 13 Jul 2016 11:34:09 -0400 Subject: [PATCH] Include file cleanup per cppclean analysis --- src/Mod/TechDraw/App/DrawHatch.cpp | 3 +- src/Mod/TechDraw/App/DrawHatch.h | 4 +- src/Mod/TechDraw/App/DrawHatchPyImp.cpp | 6 +- src/Mod/TechDraw/App/DrawPage.cpp | 2 +- src/Mod/TechDraw/App/DrawPage.h | 14 +- src/Mod/TechDraw/App/DrawPagePyImp.cpp | 13 +- .../TechDraw/App/DrawParametricTemplate.cpp | 2 +- .../App/DrawParametricTemplatePyImp.cpp | 6 +- src/Mod/TechDraw/App/DrawProjGroup.cpp | 7 +- src/Mod/TechDraw/App/DrawProjGroup.h | 5 +- src/Mod/TechDraw/App/DrawProjGroupItem.cpp | 2 +- .../TechDraw/App/DrawProjGroupItemPyImp.cpp | 16 +- src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp | 7 +- src/Mod/TechDraw/App/DrawSVGTemplate.cpp | 2 +- src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp | 6 +- src/Mod/TechDraw/App/DrawTemplate.cpp | 2 +- src/Mod/TechDraw/App/DrawTemplate.h | 5 - src/Mod/TechDraw/App/DrawTemplatePyImp.cpp | 8 +- src/Mod/TechDraw/App/DrawView.cpp | 2 +- src/Mod/TechDraw/App/DrawViewAnnotation.h | 2 +- src/Mod/TechDraw/App/DrawViewClip.cpp | 3 +- src/Mod/TechDraw/App/DrawViewClip.h | 3 +- src/Mod/TechDraw/App/DrawViewClipPyImp.cpp | 13 +- .../TechDraw/App/DrawViewCollectionPyImp.cpp | 15 +- src/Mod/TechDraw/App/DrawViewDimension.cpp | 10 +- src/Mod/TechDraw/App/DrawViewDimension.h | 3 +- .../TechDraw/App/DrawViewDimensionPyImp.cpp | 11 +- src/Mod/TechDraw/App/DrawViewDraft.h | 1 - src/Mod/TechDraw/App/DrawViewPart.cpp | 5 +- src/Mod/TechDraw/App/DrawViewPart.h | 12 +- src/Mod/TechDraw/App/DrawViewPartPyImp.cpp | 15 +- src/Mod/TechDraw/App/DrawViewPyImp.cpp | 6 +- src/Mod/TechDraw/App/DrawViewSection.cpp | 5 +- src/Mod/TechDraw/App/DrawViewSection.h | 7 +- src/Mod/TechDraw/App/DrawViewSpreadsheet.h | 2 +- src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp | 21 +-- src/Mod/TechDraw/App/Geometry.cpp | 3 - src/Mod/TechDraw/App/Geometry.h | 2 - src/Mod/TechDraw/App/GeometryObject.cpp | 4 - src/Mod/TechDraw/App/GeometryObject.h | 7 - src/Mod/TechDraw/App/PreCompiled.h | 177 +----------------- src/Mod/TechDraw/Gui/AppTechDrawGui.cpp | 3 +- src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp | 154 +-------------- src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 2 + src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp | 2 +- src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h | 2 +- src/Mod/TechDraw/Gui/DlgTemplateField.cpp | 2 +- src/Mod/TechDraw/Gui/DlgTemplateField.h | 2 +- src/Mod/TechDraw/Gui/MDIViewPage.cpp | 68 +++---- src/Mod/TechDraw/Gui/MDIViewPage.h | 4 +- src/Mod/TechDraw/Gui/QGIArrow.h | 4 - src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp | 2 +- src/Mod/TechDraw/Gui/QGIDrawingTemplate.h | 1 - src/Mod/TechDraw/Gui/QGIEdge.h | 4 - src/Mod/TechDraw/Gui/QGIFace.cpp | 2 + src/Mod/TechDraw/Gui/QGIFace.h | 8 +- src/Mod/TechDraw/Gui/QGIPrimPath.h | 4 - src/Mod/TechDraw/Gui/QGIProjGroup.h | 4 - src/Mod/TechDraw/Gui/QGISVGTemplate.cpp | 3 +- src/Mod/TechDraw/Gui/QGISVGTemplate.h | 4 +- src/Mod/TechDraw/Gui/QGITemplate.cpp | 3 +- src/Mod/TechDraw/Gui/QGITemplate.h | 3 +- src/Mod/TechDraw/Gui/QGIVertex.h | 4 - src/Mod/TechDraw/Gui/QGIView.cpp | 2 +- src/Mod/TechDraw/Gui/QGIView.h | 2 +- src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewAnnotation.h | 2 +- src/Mod/TechDraw/Gui/QGIViewClip.cpp | 6 +- src/Mod/TechDraw/Gui/QGIViewClip.h | 8 +- src/Mod/TechDraw/Gui/QGIViewCollection.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewCollection.h | 5 - src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 3 +- src/Mod/TechDraw/Gui/QGIViewPart.cpp | 10 +- src/Mod/TechDraw/Gui/QGIViewPart.h | 6 +- src/Mod/TechDraw/Gui/QGIViewSection.cpp | 3 +- src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewSymbol.cpp | 4 +- src/Mod/TechDraw/Gui/QGIViewSymbol.h | 2 +- src/Mod/TechDraw/Gui/QGVPage.cpp | 13 +- src/Mod/TechDraw/Gui/QGVPage.h | 7 +- src/Mod/TechDraw/Gui/TaskLinkDim.cpp | 4 +- src/Mod/TechDraw/Gui/TaskLinkDim.h | 15 +- src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 5 +- src/Mod/TechDraw/Gui/TaskProjGroup.h | 15 +- src/Mod/TechDraw/Gui/TemplateTextField.cpp | 1 + src/Mod/TechDraw/Gui/TemplateTextField.h | 5 +- .../TechDraw/Gui/ViewProviderDrawingView.cpp | 4 +- .../TechDraw/Gui/ViewProviderDrawingView.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 1 - src/Mod/TechDraw/Gui/ViewProviderPage.h | 6 - src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp | 4 +- 91 files changed, 230 insertions(+), 635 deletions(-) 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 -#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 +// Python #include diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp index 481e28c48b50..f502a9d6bcb6 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp @@ -46,9 +46,8 @@ #include "ViewProviderAnnotation.h" #include "ViewProviderSymbol.h" #include "ViewProviderViewClip.h" -#include "ViewProviderHatch.h" +#include "ViewProviderHatch.h" #include "ViewProviderSpreadsheet.h" -//#include "resources/qrc_TechDraw.cpp" // use a different name to CreateCommand() void CreateTechDrawCommands(void); diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp index a64f2d2b742f..e159d0e44cb7 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp @@ -49,7 +49,7 @@ using namespace TechDrawGui; // /* module functions */ static PyObject * -open(PyObject *self, PyObject *args) +tdGuiPlaceholder(PyObject *self, PyObject *args) { char* Name; if (!PyArg_ParseTuple(args, "et","utf-8",&Name)) @@ -58,154 +58,6 @@ open(PyObject *self, PyObject *args) PyMem_Free(Name); PY_TRY { - Base::FileInfo file(EncodedName.c_str()); - if (file.hasExtension("svg") || file.hasExtension("svgz")) { - QString fileName = QString::fromUtf8(EncodedName.c_str()); -#if 0 - // Displaying the image in a view - MDIViewPage* view = new MDIViewPage(0, 0, Gui::getMainWindow()); //TODO: hack to get a compile - view->load(fileName); - view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/techdraw-landscape")); - QFileInfo fi(fileName); - view->setWindowTitle(fi.fileName()); - view->resize( 400, 300 ); - Gui::getMainWindow()->addWindow(view); -#endif - } - else { - PyErr_SetString(Base::BaseExceptionFreeCADError, "unknown filetype"); - return NULL; - } - } PY_CATCH; - - Py_Return; -} - -/* module functions */ -static PyObject * -importer(PyObject *self, PyObject *args) -{ - char* Name; - const char* dummy; - if (!PyArg_ParseTuple(args, "et|s","utf-8",&Name,&dummy)) - return NULL; - std::string EncodedName = std::string(Name); - PyMem_Free(Name); - - PY_TRY { - Base::FileInfo file(EncodedName.c_str()); - if (file.hasExtension("svg") || file.hasExtension("svgz")) { - QString fileName = QString::fromUtf8(EncodedName.c_str()); - -#if 0 - // Displaying the image in a view - MDIViewPage* view = new MDIViewPage(0, 0, Gui::getMainWindow()); //TODO: hack to get a compile - view->load(fileName); - view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/techdraw-landscape")); - QFileInfo fi(fileName); - view->setWindowTitle(fi.fileName()); - view->resize( 400, 300 ); - Gui::getMainWindow()->addWindow(view); -#endif - } else { - PyErr_SetString(Base::BaseExceptionFreeCADError, "unknown filetype"); - return NULL; - } - } PY_CATCH; - - Py_Return; -} - -static PyObject * -exporter(PyObject *self, PyObject *args) -{ - PyObject* object; - char* Name; - if (!PyArg_ParseTuple(args, "Oet",&object,"utf-8",&Name)) - return NULL; - std::string EncodedName = std::string(Name); - PyMem_Free(Name); - - PY_TRY { - Py::Sequence list(object); - for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { - PyObject* item = (*it).ptr(); - if (PyObject_TypeCheck(item, &(App::DocumentObjectPy::Type))) { - App::DocumentObject* obj = static_cast(item)->getDocumentObjectPtr(); - if (obj->getTypeId().isDerivedFrom(TechDraw::DrawPage::getClassTypeId())) { - Base::FileInfo fi_out(EncodedName.c_str()); - Base::ofstream str_out(fi_out, std::ios::out | std::ios::binary); - if (!str_out) { - std::stringstream str; - str << "Cannot open file '" << EncodedName << "' for writing"; - PyErr_SetString(PyExc_IOError, str.str().c_str()); - return NULL; - } - if (fi_out.hasExtension("svg")) { -// std::string fn = static_cast(obj)->PageResult.getValue(); - std::string fn; - Base::FileInfo fi_in(fn); - Base::ifstream str_in(fi_in, std::ios::in | std::ios::binary); - if (!str_in) { - std::stringstream str; - str << "Cannot open file '" << fn << "' for reading"; - PyErr_SetString(PyExc_IOError, str.str().c_str()); - return NULL; - } - - str_in >> str_out.rdbuf(); - str_in.close(); - str_out.close(); - break; - } - else if (fi_out.hasExtension("dxf")) { - const std::vector& views = static_cast(obj)->Views.getValues(); - for (std::vector::const_iterator it = views.begin(); it != views.end(); ++it) { - if ((*it)->getTypeId().isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId())) { - TechDraw::DrawViewPart* view = static_cast(*it); - std::string viewName = view->Label.getValue(); - App::DocumentObject* link = view->Source.getValue(); - if (!link) { - PyErr_SetString(Base::BaseExceptionFreeCADError, "No object linked"); - return 0; - } - if (!link->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) { - PyErr_SetString(PyExc_TypeError, "Linked object is not a Part object"); - return 0; - } - TopoDS_Shape shape = static_cast(link)->Shape.getShape()._Shape; - if (!shape.IsNull()) { -#if 0 - Base::Vector3d dir = view->Direction.getValue(); - bool hidden = view->ShowHiddenLines.getValue(); - bool smooth = view->ShowSmoothLines.getValue(); - Drawing::ProjectionAlgos::ExtractionType type = Drawing::ProjectionAlgos::Plain; - if (hidden) type = (Drawing::ProjectionAlgos::ExtractionType)(type|Drawing::ProjectionAlgos::WithHidden); - if (smooth) type = (Drawing::ProjectionAlgos::ExtractionType)(type|Drawing::ProjectionAlgos::WithSmooth); - float scale = view->Scale.getValue(); - float tol = view->Tolerance.getValue(); - - Drawing::ProjectionAlgos project(shape, dir); - str_out << project.getDXF(type, scale, tol); -#endif - break; // TODO: How to add several shapes? - } - } - } - str_out.close(); - break; - } - else { - PyErr_SetString(PyExc_TypeError, "Export of page object as this file format is not supported by Drawing module"); - return 0; - } - } - else { - PyErr_SetString(PyExc_TypeError, "Export of this object type is not supported by Drawing module"); - return 0; - } - } - } } PY_CATCH; Py_Return; @@ -213,8 +65,6 @@ exporter(PyObject *self, PyObject *args) /* registration table */ struct PyMethodDef TechDrawGui_Import_methods[] = { - {"open" ,open , METH_VARARGS}, /* method name, C func ptr, always-tuple */ - {"insert" ,importer, METH_VARARGS}, - {"export" ,exporter, METH_VARARGS}, + {"tdGuiPlaceholder" ,tdGuiPlaceholder , METH_VARARGS}, /* method name, C func ptr, always-tuple */ {NULL, NULL} /* end of table marker */ }; diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index 1a5fc5c818ea..6e5af062f2d4 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -52,6 +52,8 @@ # include # include # include +# include + #include diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp index b6b3579285e1..db59942952a5 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp @@ -86,4 +86,4 @@ void DlgPrefsTechDrawImp::changeEvent(QEvent *e) } } -#include "moc_DlgPrefsTechDrawImp.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h index a5362628e8ff..5db5c6a05227 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h @@ -26,7 +26,7 @@ #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMP_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMP_H -#include "ui_DlgPrefsTechDraw.h" +#include #include namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp index 9de42b8950ce..4a5669a20fc5 100644 --- a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp +++ b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp @@ -76,4 +76,4 @@ void DlgTemplateField::reject() QDialog::reject(); } -#include "moc_DlgTemplateField.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.h b/src/Mod/TechDraw/Gui/DlgTemplateField.h index 80fd4dee75f7..2e5e7fc10144 100644 --- a/src/Mod/TechDraw/Gui/DlgTemplateField.h +++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h @@ -26,7 +26,7 @@ #include -#include "ui_DlgTemplateField.h" +#include namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 46f6465a84d8..fe09291cc23c 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -42,44 +42,46 @@ #include "MDIViewPage.h" -#include "Base/Stream.h" -#include "Base/gzstream.h" -#include "Base/PyObjectBase.h" -#include "Base/Console.h" - -#include "App/Document.h" -#include "App/DocumentObject.h" - -#include "Gui/Document.h" -#include "Gui/ViewProvider.h" -#include "Gui/FileDialog.h" -#include "Gui/WaitCursor.h" -#include "Gui/Application.h" -#include "Gui/Command.h" -#include "Gui/Document.h" -#include "Gui/Window.h" -#include "Gui/MainWindow.h" -#include "Gui/Selection.h" - -#include "../App/DrawHatch.h" -#include "../App/DrawPage.h" -#include "../App/DrawProjGroup.h" -#include "../App/DrawTemplate.h" -#include "../App/DrawView.h" -#include "../App/DrawViewAnnotation.h" -#include "../App/DrawViewClip.h" -#include "../App/DrawViewCollection.h" -#include "../App/DrawViewDimension.h" -#include "../App/DrawViewPart.h" -#include "../App/DrawViewSection.h" -#include "../App/DrawViewSpreadsheet.h" -#include "../App/DrawViewSymbol.h" +#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 "QGIDrawingTemplate.h" #include "QGIView.h" #include "QGIViewPart.h" #include "QGIViewDimension.h" #include "QGIViewClip.h" +#include "QGIVertex.h" +#include "QGIEdge.h" +#include "QGIFace.h" #include "ViewProviderPage.h" #include "QGVPage.h" @@ -1130,4 +1132,4 @@ void MDIViewPage::showStatusMsg(const char* s1, const char* s2, const char* s3) } } -#include "moc_MDIViewPage.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 44e6e0b7d88f..9d08bd4621e1 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -24,8 +24,8 @@ #ifndef DRAWINGGUI_DRAWINGVIEW_H #define DRAWINGGUI_DRAWINGVIEW_H -#include "Gui/MDIView.h" -#include "Gui/Selection.h" +#include +#include #include #include diff --git a/src/Mod/TechDraw/Gui/QGIArrow.h b/src/Mod/TechDraw/Gui/QGIArrow.h index 8f083fb1398f..db903557317a 100644 --- a/src/Mod/TechDraw/Gui/QGIArrow.h +++ b/src/Mod/TechDraw/Gui/QGIArrow.h @@ -30,10 +30,6 @@ class QPainter; class QStyleOptionGraphicsItem; QT_END_NAMESPACE -namespace TechDrawGeometry { -class BaseGeom; -} - namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp index 4fcd2316810d..79a38b79691c 100644 --- a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp @@ -132,4 +132,4 @@ void QGIDrawingTemplate::updateView(bool update) draw(); } -#include "moc_QGIDrawingTemplate.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h index b1fb84b6bc55..06e423b6f04a 100644 --- a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h +++ b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h @@ -27,7 +27,6 @@ QT_BEGIN_NAMESPACE class QGraphicsScene; -class QGraphicsSceneMouseEvent; class QGraphicsPathItem; QT_END_NAMESPACE diff --git a/src/Mod/TechDraw/Gui/QGIEdge.h b/src/Mod/TechDraw/Gui/QGIEdge.h index 90f834822f43..866709d01c5c 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.h +++ b/src/Mod/TechDraw/Gui/QGIEdge.h @@ -25,10 +25,6 @@ #include "QGIPrimPath.h" -namespace TechDrawGeometry { -class BaseGeom; -} - namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp index 9adfe0f91d9f..f2dbbf704a3f 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.cpp +++ b/src/Mod/TechDraw/Gui/QGIFace.cpp @@ -45,6 +45,8 @@ #include #include +#include "QGCustomSvg.h" +#include "QGCustomRect.h" #include "QGIView.h" #include "QGIFace.h" diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index 8e19fc3b988c..3eb7addcba42 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -29,15 +29,11 @@ #include #include "QGIPrimPath.h" -#include "QGCustomSvg.h" -#include "QGCustomRect.h" - -namespace TechDrawGeometry { -class BaseGeom; -} namespace TechDrawGui { +class QGCustomSvg; +class QGCustomRect; const double SVGSIZEW = 64.0; //width and height of standard FC SVG pattern const double SVGSIZEH = 64.0; diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.h b/src/Mod/TechDraw/Gui/QGIPrimPath.h index aa47da2c650a..afc15dcf35dc 100644 --- a/src/Mod/TechDraw/Gui/QGIPrimPath.h +++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h @@ -30,10 +30,6 @@ class QPainter; class QStyleOptionGraphicsItem; QT_END_NAMESPACE -namespace TechDrawGeometry { -class BaseGeom; -} - namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.h b/src/Mod/TechDraw/Gui/QGIProjGroup.h index 2b01d3137059..bff9d138d945 100644 --- a/src/Mod/TechDraw/Gui/QGIProjGroup.h +++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h @@ -35,10 +35,6 @@ class QGraphicsSceneMouseEvent; class QEvent; QT_END_NAMESPACE -namespace TechDraw { -class DrawView; -} - namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp index 0d8b01df6151..c7a21425c3a5 100644 --- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp @@ -42,6 +42,7 @@ #include #include "ZVALUE.h" +#include "TemplateTextField.h" #include "QGISVGTemplate.h" using namespace TechDrawGui; @@ -220,4 +221,4 @@ void QGISVGTemplate::updateView(bool update) draw(); } -#include "moc_QGISVGTemplate.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.h b/src/Mod/TechDraw/Gui/QGISVGTemplate.h index 4c91ad088649..24a034ae981a 100644 --- a/src/Mod/TechDraw/Gui/QGISVGTemplate.h +++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.h @@ -23,19 +23,19 @@ #ifndef DRAWINGGUI_QGRAPHICSITEMSVGTEMPLATE_H #define DRAWINGGUI_QGRAPHICSITEMSVGTEMPLATE_H -#include "QGITemplate.h" #include #include QT_BEGIN_NAMESPACE class QGraphicsScene; -class QGraphicsSceneMouseEvent; QT_END_NAMESPACE namespace TechDraw { class DrawSVGTemplate; } +#include "QGITemplate.h" + namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGITemplate.cpp b/src/Mod/TechDraw/Gui/QGITemplate.cpp index 2d0c167b5986..b949b0885ca0 100644 --- a/src/Mod/TechDraw/Gui/QGITemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGITemplate.cpp @@ -31,6 +31,7 @@ #include #include "ZVALUE.h" +#include "TemplateTextField.h" #include "QGITemplate.h" using namespace TechDrawGui; @@ -73,4 +74,4 @@ void QGITemplate::updateView(bool update) draw(); } -#include "moc_QGITemplate.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/QGITemplate.h b/src/Mod/TechDraw/Gui/QGITemplate.h index f3a074112905..68c79e7b0787 100644 --- a/src/Mod/TechDraw/Gui/QGITemplate.h +++ b/src/Mod/TechDraw/Gui/QGITemplate.h @@ -26,8 +26,6 @@ #include #include -#include "TemplateTextField.h" - QT_BEGIN_NAMESPACE class QGraphicsScene; QT_END_NAMESPACE @@ -38,6 +36,7 @@ class DrawTemplate; namespace TechDrawGui { +class TemplateTextField; class TechDrawGuiExport QGITemplate : public QObject, public QGraphicsItemGroup { diff --git a/src/Mod/TechDraw/Gui/QGIVertex.h b/src/Mod/TechDraw/Gui/QGIVertex.h index 7fc22c09ab53..5cd90e41aa56 100644 --- a/src/Mod/TechDraw/Gui/QGIVertex.h +++ b/src/Mod/TechDraw/Gui/QGIVertex.h @@ -25,10 +25,6 @@ # include "QGIPrimPath.h" -namespace TechDrawGeometry { -class BaseGeom; -} - namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index 8729ea4c3f26..659f1f32d106 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -54,7 +54,7 @@ #include "QGCustomClip.h" #include "QGIViewClip.h" -#include "../App/DrawViewClip.h" +#include using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index 1e30ef15d2ca..414759e00ef9 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -29,7 +29,7 @@ #include #include -#include "../App/DrawView.h" +#include QT_BEGIN_NAMESPACE class QGraphicsScene; diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp index 5e6612a97b5a..6b7dde94c6b8 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp @@ -49,7 +49,7 @@ #include #include -#include "../App/DrawViewAnnotation.h" +#include #include "QGIViewAnnotation.h" #include "QGCustomText.h" diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h index 38f8303c52cf..85e3a611ad74 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h @@ -25,7 +25,6 @@ #define DRAWINGGUI_QGRAPHICSITEMVIEWANNOTATION_H #include "QGIView.h" -#include "QGCustomText.h" namespace TechDraw { class DrawViewAnnotation; @@ -33,6 +32,7 @@ class DrawViewAnnotation; namespace TechDrawGui { +class QGCustomText; class TechDrawGuiExport QGIViewAnnotation : public QGIView { diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.cpp b/src/Mod/TechDraw/Gui/QGIViewClip.cpp index c8cf00990dd8..c5e0aeea8002 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewClip.cpp @@ -45,7 +45,10 @@ #include #include -#include "../App/DrawViewClip.h" +#include + +#include "QGCustomRect.h" +#include "QGCustomClip.h" #include "QGIViewClip.h" using namespace TechDrawGui; @@ -189,4 +192,3 @@ QRectF QGIViewClip::boundingRect() const { return childrenBoundingRect(); } - diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.h b/src/Mod/TechDraw/Gui/QGIViewClip.h index 4f335461a8f4..08df897dc581 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.h +++ b/src/Mod/TechDraw/Gui/QGIViewClip.h @@ -27,15 +27,11 @@ #include #include "QGIView.h" -#include "QGCustomRect.h" -#include "QGCustomClip.h" - -namespace TechDraw { -class DrawViewPart; -} namespace TechDrawGui { +class QGCustomRect; +class QGCustomClip; class TechDrawGuiExport QGIViewClip : public QGIView { diff --git a/src/Mod/TechDraw/Gui/QGIViewCollection.cpp b/src/Mod/TechDraw/Gui/QGIViewCollection.cpp index 4dce298e8afa..ddcdbc98a0be 100644 --- a/src/Mod/TechDraw/Gui/QGIViewCollection.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewCollection.cpp @@ -38,7 +38,7 @@ #include #include -#include "../App/DrawViewCollection.h" +#include #include "QGIViewCollection.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/QGIViewCollection.h b/src/Mod/TechDraw/Gui/QGIViewCollection.h index 38c281f9c438..06c0d91b5db7 100644 --- a/src/Mod/TechDraw/Gui/QGIViewCollection.h +++ b/src/Mod/TechDraw/Gui/QGIViewCollection.h @@ -34,11 +34,6 @@ class QGraphicsScene; class QGraphicsSceneMouseEvent; QT_END_NAMESPACE -namespace TechDraw { -class DrawView; -class DrawViewCollection; -} - namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index eca10e8ed057..68d12223db18 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -62,6 +62,7 @@ #include #include #include +#include #include "QGIViewDimension.h" #include "QGIArrow.h" @@ -1290,4 +1291,4 @@ void QGIViewDimension::paint(QPainter *painter, const QStyleOptionGraphicsItem * QGIView::paint(painter, &myOption, widget); } -#include "moc_QGIViewDimension.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp index 9ec221209d7f..02fc5d082b00 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp @@ -40,7 +40,6 @@ #include #include -#include #include #include @@ -51,11 +50,14 @@ #include #include -#include "../App/DrawUtil.h" -#include "../App/DrawViewPart.h" -#include "../App/DrawHatch.h" +#include +#include +#include #include "ZVALUE.h" +#include "QGIFace.h" +#include "QGIEdge.h" +#include "QGIVertex.h" #include "QGIViewPart.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h index 62e040ba0b67..5d25f3e5a775 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.h +++ b/src/Mod/TechDraw/Gui/QGIViewPart.h @@ -27,10 +27,7 @@ #include #include "QGIView.h" -#include "QGIFace.h" -#include "QGIEdge.h" -#include "QGIVertex.h" -#include "../App/Geometry.h" +#include namespace TechDraw { @@ -40,6 +37,7 @@ class DrawHatch; namespace TechDrawGui { +class QGIFace; class TechDrawGuiExport QGIViewPart : public QGIView { diff --git a/src/Mod/TechDraw/Gui/QGIViewSection.cpp b/src/Mod/TechDraw/Gui/QGIViewSection.cpp index ae58397bb358..f60bb19f6a0a 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSection.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewSection.cpp @@ -40,9 +40,10 @@ #include -#include "../App/DrawViewSection.h" +#include #include "ZVALUE.h" +#include "QGIFace.h" #include "QGIViewSection.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp index 8e070bb20ffc..8e411055280c 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp @@ -24,7 +24,7 @@ #ifndef _PreComp_ #endif -#include "../App/DrawViewSpreadsheet.h" +#include #include "QGIViewSpreadsheet.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp index c794637a580c..8c0cee2d7a90 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp @@ -40,7 +40,9 @@ #include #include -#include "../App/DrawViewSymbol.h" +#include + +#include "QGCustomSvg.h" #include "QGIViewSymbol.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h index eef5a0d257ad..9a18a3cf026e 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h @@ -32,7 +32,6 @@ #include #include "QGIView.h" -#include "QGCustomSvg.h" namespace TechDraw { class DrawViewSymbol; @@ -40,6 +39,7 @@ class DrawViewSymbol; namespace TechDrawGui { +class QGCustomSvg; class TechDrawGuiExport QGIViewSymbol : public QGIView { diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp index 150e9d29a27d..58dde4486921 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.cpp +++ b/src/Mod/TechDraw/Gui/QGVPage.cpp @@ -56,8 +56,8 @@ #include #include #include -#include "../App/DrawHatch.h" -#include "../App/DrawViewSpreadsheet.h" +#include +#include #include "QGIDrawingTemplate.h" @@ -73,6 +73,7 @@ #include "QGIViewSpreadsheet.h" #include "ZVALUE.h" +#include "ViewProviderPage.h" #include "QGVPage.h" using namespace TechDrawGui; @@ -612,4 +613,10 @@ void QGVPage::mouseReleaseEvent(QMouseEvent *event) viewport()->setCursor(Qt::ArrowCursor); } -#include "moc_QGVPage.cpp" +TechDraw::DrawPage* QGVPage::getDrawPage() +{ + return pageGui->getPageObject(); +} + + +#include diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index 1af75907119e..ef6224488848 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -26,8 +26,6 @@ #include #include -#include "ViewProviderPage.h" - namespace TechDraw { class DrawViewPart; class DrawProjGroup; @@ -37,7 +35,6 @@ class DrawTemplate; class DrawViewAnnotation; class DrawViewSymbol; class DrawViewClip; -class DrawHatch; class DrawViewCollection; class DrawViewSpreadsheet; } @@ -47,6 +44,7 @@ namespace TechDrawGui class QGIView; class QGIViewDimension; class QGITemplate; +class ViewProviderPage; class TechDrawGuiExport QGVPage : public QGraphicsView { @@ -85,8 +83,7 @@ class TechDrawGuiExport QGVPage : public QGraphicsView QGITemplate * getTemplate() const; void removeTemplate(); - /// Getter for DrawPage feature - TechDraw::DrawPage * getDrawPage() { return pageGui->getPageObject(); } + TechDraw::DrawPage * getDrawPage(); void toggleEdit(bool enable); diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp index 529bb62e5bb3..dffaefc98dce 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp @@ -46,7 +46,7 @@ #include #include "TaskLinkDim.h" -#include "ui_TaskLinkDim.h" +#include using namespace Gui; using namespace TechDrawGui; @@ -202,4 +202,4 @@ bool TaskDlgLinkDim::reject() return true; } -#include "moc_TaskLinkDim.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.h b/src/Mod/TechDraw/Gui/TaskLinkDim.h index efab4df87ecd..ba884d2617fe 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.h +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.h @@ -26,24 +26,13 @@ #include #include -#include "ui_TaskLinkDim.h" +#include -#include "ViewProviderDimension.h" -#include "../App/DrawViewDimension.h" +#include class Ui_TaskLinkDim; -namespace App { - class Document; - class DocumentObject; -} - -namespace TechDraw { - class DrawViewPart; - class DrawViewDimension; -} - namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index 21a6d7b7af12..7042e67e4334 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -41,8 +41,9 @@ #include #include +#include "ViewProviderProjGroup.h" #include "TaskProjGroup.h" -#include "ui_TaskProjGroup.h" +#include using namespace Gui; using namespace TechDrawGui; @@ -410,4 +411,4 @@ bool TaskDlgProjGroup::reject() } -#include "moc_TaskProjGroup.cpp" +#include diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h index 68d72a8ee5c2..fca0c220eed1 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.h +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h @@ -28,26 +28,20 @@ #include #include -#include "ui_TaskProjGroup.h" +#include -#include "ViewProviderProjGroup.h" -#include "../App/DrawProjGroup.h" +#include class Ui_TaskProjGroup; -namespace App { - class Document; - class DocumentObject; -} - namespace TechDraw { - class DrawViewPart; class DrawProjGroup; } namespace TechDrawGui { +class ViewProviderProjGroup; class TaskProjGroup : public QWidget { @@ -125,7 +119,7 @@ class TaskDlgProjGroup : public Gui::TaskView::TaskDialog protected: const ViewProviderProjGroup *viewProvider; TechDraw::DrawProjGroup *multiView; - + private: TaskProjGroup * widget; Gui::TaskView::TaskBox* taskbox; @@ -134,4 +128,3 @@ class TaskDlgProjGroup : public Gui::TaskView::TaskDialog } //namespace TechDrawGui #endif // #ifndef GUI_TASKVIEW_TASKVIEWGROUP_H - diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.cpp b/src/Mod/TechDraw/Gui/TemplateTextField.cpp index 5e6670ad9926..559896a38f96 100644 --- a/src/Mod/TechDraw/Gui/TemplateTextField.cpp +++ b/src/Mod/TechDraw/Gui/TemplateTextField.cpp @@ -31,6 +31,7 @@ #include +#include "DlgTemplateField.h" #include "TemplateTextField.h" //#include diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h index 9218ac216d6a..9d82490acf97 100644 --- a/src/Mod/TechDraw/Gui/TemplateTextField.h +++ b/src/Mod/TechDraw/Gui/TemplateTextField.h @@ -27,11 +27,12 @@ #include -#include "DlgTemplateField.h" -#include "../App/DrawTemplate.h" + +#include namespace TechDrawGui { +class DlgTemplateField; /// QGraphicsRectItem-derived class for the text fields in title blocks /*! * This essentially just a way for us to make a rectangular area which diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index 2f6547c7d86a..b5587664250b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -46,10 +46,12 @@ #include #include #include + #include "ViewProviderPage.h" -#include "ViewProviderDrawingView.h" +#include "QGIView.h" #include "QGVPage.h" #include "MDIViewPage.h" +#include "ViewProviderDrawingView.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index e4d1baae6b2e..6eb2750af0b9 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -27,13 +27,13 @@ #include #include -#include "QGIView.h" namespace TechDraw{ class DrawView; } namespace TechDrawGui { +class QGIView; class TechDrawGuiExport ViewProviderDrawingView : public Gui::ViewProviderDocumentObject { diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 6711b7c682b0..2cc2ed05bf4e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index 18945c74cd65..32466be5849e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -30,16 +30,10 @@ #include #include -#include "MDIViewPage.h" - namespace TechDraw{ class DrawPage; } -namespace Gui { //TODO: Inventor here?? - class SoFCSelection; -} - namespace TechDrawGui { class MDIViewPage; diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp index 5d7c1faaeff6..8513ce3f1731 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp @@ -38,13 +38,11 @@ #include #include #include -//#include #include #include -#include "ViewProviderDrawingView.h" -#include "ViewProviderViewClip.h" +#include "ViewProviderViewClip.h" using namespace TechDrawGui;