Include file cleanup per cppclean analysis

FreeCAD · Jul 14, 2016 · 1996820 · 1996820
1 parent 161f418
commit 1996820
Show file tree

Hide file tree

Showing 91 changed files with 230 additions and 635 deletions.
diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp
@@ -38,9 +38,10 @@
 #include <Base/FileInfo.h>
 #include <Base/Parameter.h>
 
+#include "DrawViewPart.h"
 #include "DrawHatch.h"
 
-#include "DrawHatchPy.h"  // generated from DrawHatchPy.xml
+#include <Mod/TechDraw/App/DrawHatchPy.h>  // 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
@@ -28,11 +28,9 @@
 # include <App/PropertyLinks.h>
 #include <App/PropertyFile.h>
 
-#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
@@ -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 <Mod/TechDraw/App/DrawHatchPy.h>
+#include <Mod/TechDraw/App/DrawHatchPy.cpp>
 
 using namespace TechDraw;
 

diff --git 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 <Mod/TechDraw/App/DrawPagePy.h>  // 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
@@ -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 <App/DocumentObject.h>
+#include <App/DocumentObjectGroup.h>
+#include <App/PropertyStandard.h>
+#include <App/PropertyFile.h>
 
 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
@@ -1,15 +1,16 @@
 
 #include "PreCompiled.h"
+
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
 
-#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 <Mod/TechDraw/App/DrawViewPy.h>
+#include <Mod/TechDraw/App/DrawPagePy.h>
+#include <Mod/TechDraw/App/DrawPagePy.cpp>
 
 using namespace TechDraw;
 

diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
@@ -41,7 +41,7 @@
 #include <iterator>
 
 #include "DrawParametricTemplate.h"
-#include "DrawParametricTemplatePy.h"
+#include <Mod/TechDraw/App/DrawParametricTemplatePy.h>
 
 using namespace TechDraw;
 using namespace std;

diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
@@ -25,11 +25,11 @@
 # include <sstream>
 #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 <Mod/TechDraw/App/DrawParametricTemplatePy.h>
+#include <Mod/TechDraw/App/DrawParametricTemplatePy.cpp>
 
 using namespace TechDraw;
 

diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp
@@ -25,6 +25,7 @@
 
 #ifndef _PreComp_
 # include <sstream>
+#include <QRectF>
 #endif
 
 #include <App/Document.h>
@@ -34,13 +35,11 @@
 #include <Base/Console.h>
 #include <Base/Exception.h>
 
-#include <QRectF>
-
-#include <Mod/Part/App/PartFeature.h>
 #include "DrawPage.h"
+#include "DrawProjGroupItem.h"
 #include "DrawProjGroup.h"
 
-#include "DrawProjGroupPy.h"  // generated from DrawProjGroupPy.xml
+#include <Mod/TechDraw/App/DrawProjGroupPy.h>  // generated from DrawProjGroupPy.xml
 
 using namespace TechDraw;
 

diff --git a/src/Mod/TechDraw/App/DrawProjGroup.h b/src/Mod/TechDraw/App/DrawProjGroup.h
@@ -25,16 +25,17 @@
 
 #include <App/DocumentObject.h>
 #include <App/PropertyStandard.h>
-#include <App/FeaturePython.h>
 
 #include <Base/BoundBox.h>
 #include <Base/Matrix.h>
+
 #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
@@ -32,7 +32,7 @@
 
 #include "DrawProjGroupItem.h"
 
-#include "DrawProjGroupItemPy.h"  // generated from DrawProjGroupItemPy.xml
+#include <Mod/TechDraw/App/DrawProjGroupItemPy.h>  // generated from DrawProjGroupItemPy.xml
 
 using namespace TechDraw;
 

diff --git 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 <Mod/TechDraw/App/DrawProjGroupItemPy.h>
+#include <Mod/TechDraw/App/DrawProjGroupItemPy.cpp>
 
 using namespace TechDraw;
 
@@ -15,20 +15,12 @@ std::string DrawProjGroupItemPy::representation(void) const
     return std::string("<DrawProjGroupItem object>");
 }
 
-
-
-
-
-
-
 PyObject *DrawProjGroupItemPy::getCustomAttributes(const char* /*attr*/) const
 {
     return 0;
 }
 
 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
@@ -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 <Mod/TechDraw/App/DrawProjGroupPy.h>
+#include <Mod/TechDraw/App/DrawProjGroupPy.cpp>
+#include <Mod/TechDraw/App/DrawProjGroupItemPy.h>
 
 using namespace TechDraw;
 

diff --git 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 <Mod/TechDraw/App/DrawSVGTemplatePy.h>
 
 using namespace TechDraw;
 using namespace std;

diff --git 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 <Mod/TechDraw/App/DrawSVGTemplatePy.h>
+#include <Mod/TechDraw/App/DrawSVGTemplatePy.cpp>
 
 using namespace TechDraw;
 

diff --git 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 <Mod/TechDraw/App/DrawTemplatePy.h>
 
 using namespace TechDraw;
 using namespace std;

diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h
@@ -30,11 +30,6 @@
 #include <App/PropertyUnits.h>
 #include <App/FeaturePython.h>
 
-namespace TechDrawGeometry
-{
-    class BaseGeom;
-}
-
 namespace TechDraw
 {
 

diff --git a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
@@ -25,11 +25,11 @@
 # include <sstream>
 #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 <Mod/TechDraw/App/DrawTemplatePy.h>
+#include <Mod/TechDraw/App/DrawTemplatePy.cpp>
 
 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
@@ -42,7 +42,7 @@
 #include "DrawViewCollection.h"
 #include "DrawViewClip.h"
 
-#include "DrawViewPy.h"  // generated from DrawViewPy.xml
+#include <Mod/TechDraw/App/DrawViewPy.h>  // generated from DrawViewPy.xml
 
 using namespace TechDraw;
 

diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h
@@ -30,7 +30,7 @@
 
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include "App/PropertyStandard.h"
+#include <App/PropertyStandard.h>
 #include <App/FeaturePython.h>
 
 #include "DrawView.h"

diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp
@@ -36,10 +36,9 @@
 #include <iostream>
 
 #include "DrawViewClip.h"
-#include "DrawView.h"
 #include "DrawPage.h"
 
-#include "DrawViewClipPy.h"  // generated from DrawViewClipPy.xml
+#include <Mod/TechDraw/App/DrawViewClipPy.h>  // 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
@@ -30,9 +30,10 @@
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyLinks.h>
 #include <App/PropertyStandard.h>
-#include "DrawViewCollection.h"
 #include <App/FeaturePython.h>
 
+#include "DrawView.h"
+
 namespace TechDraw
 {
 

diff --git a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
@@ -1,15 +1,16 @@
 
 #include "PreCompiled.h"
+
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
 
-#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 <Mod/TechDraw/App/DrawViewPy.h>
+#include <Mod/TechDraw/App/DrawViewClipPy.h>
+#include <Mod/TechDraw/App/DrawViewClipPy.cpp>
 
 using namespace TechDraw;