From 43bdef67d6a59ec42b2aebcda4d666c8b6852d1e Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 1 May 2019 16:10:38 +0200 Subject: [PATCH] continue PCH on Part module --- src/Mod/Part/App/AppPartPy.cpp | 17 +++++---- src/Mod/Part/App/Attacher.cpp | 4 +-- src/Mod/Part/App/OpenCascadeAll.h | 36 +++++++++++++++++++- src/Mod/Part/App/TopoShape.cpp | 2 +- src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp | 2 ++ src/Mod/Part/App/TopoShapeCompoundPyImp.cpp | 2 ++ src/Mod/Part/App/TopoShapeEdgePyImp.cpp | 17 +++++---- src/Mod/Part/App/TopoShapeFacePyImp.cpp | 19 +++++------ src/Mod/Part/App/TopoShapePyImp.cpp | 15 ++++---- src/Mod/Part/App/TopoShapeShellPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeSolidPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeWirePyImp.cpp | 17 +++++---- src/Mod/Part/App/edgecluster.cpp | 24 +++++++------ src/Mod/Part/App/modelRefine.cpp | 4 ++- 14 files changed, 100 insertions(+), 63 deletions(-) diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 9b2ab078ee..47d67360bb 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -79,20 +79,19 @@ # include # include # include +# include +# include +# include +# include +# include +# include +# include +# include #endif #include #include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include diff --git a/src/Mod/Part/App/Attacher.cpp b/src/Mod/Part/App/Attacher.cpp index 1b928a2529..e6988570f0 100644 --- a/src/Mod/Part/App/Attacher.cpp +++ b/src/Mod/Part/App/Attacher.cpp @@ -55,9 +55,9 @@ # include # include # include +# include +# include #endif -#include -#include #include "Attacher.h" #include "AttachExtension.h" diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h index 4ccdb3bfb2..ff3a00315f 100644 --- a/src/Mod/Part/App/OpenCascadeAll.h +++ b/src/Mod/Part/App/OpenCascadeAll.h @@ -114,7 +114,10 @@ #include #include #include +#include +#include +#include #include #include #include @@ -126,8 +129,12 @@ #include #include #if OCC_VERSION_HEX < 0x070300 -# include +#include #endif +#if OCC_VERSION_HEX >= 0x070300 +#include +#endif +#include #include #include #include @@ -140,22 +147,31 @@ #include #include #include +#include #include #include +#if OCC_VERSION_HEX >= 0x060600 +#include +#endif #include #include #include +#if OCC_VERSION_HEX >= 0x060801 #include +#endif #include #include #include #include +#include #include +#include #include #include #include #include #include +#include #include #include #include @@ -179,6 +195,7 @@ #include #include #include +#include #include #include #include @@ -241,6 +258,7 @@ #include #include #include +#include #include #include #include @@ -284,6 +302,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -323,10 +344,13 @@ #include +#include + #include #include #include +#include #include #include #include @@ -343,18 +367,23 @@ // Shape #include #include +#include #include #include #include #include +#include +#include #include #include #include +#include #include #include #include // Import +#include #include #include #include @@ -366,6 +395,11 @@ #include #include #include +#include +#include +#include +#include +#include #endif // __OpenCascadeAll__ diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 44116a27c9..d9ead545c4 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -155,7 +155,6 @@ #if OCC_VERSION_HEX < 0x070300 # include #endif -#endif # include # include # include @@ -178,6 +177,7 @@ #if OCC_VERSION_HEX >= 0x070300 #include #endif +#endif // _PreComp_ #include #include diff --git a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp index e1b15d9bbd..097b3fde89 100644 --- a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp @@ -22,9 +22,11 @@ #include "PreCompiled.h" +#ifndef _PreComp_ #include #include #include +#endif #include "OCCError.h" #include "TopoShape.h" diff --git a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp index b323c713e3..8046a3c265 100644 --- a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp @@ -24,6 +24,7 @@ #include "PreCompiled.h" #include "TopoShape.h" +#ifndef _PreComp_ #include #include #include @@ -31,6 +32,7 @@ #include #include #include +#endif #include "OCCError.h" diff --git a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp index d93ae68683..b18148cf0f 100644 --- a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp @@ -63,17 +63,16 @@ # include # include # include +# include +# include +# include +# include +# include +# include +# include +# include #endif -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp index a3be2714c9..4b69f5f6ca 100644 --- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp @@ -60,18 +60,17 @@ # include # include # include +# include +# include +# include +# include +# include +# include +# include +# include +# include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp index d23dec348b..e44225db6d 100644 --- a/src/Mod/Part/App/TopoShapePyImp.cpp +++ b/src/Mod/Part/App/TopoShapePyImp.cpp @@ -58,16 +58,15 @@ # include # include # include +# include +# include +# include +# include +# include +# include +# include #endif -#include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/src/Mod/Part/App/TopoShapeShellPyImp.cpp b/src/Mod/Part/App/TopoShapeShellPyImp.cpp index 8cc4cd7d16..8178569b28 100644 --- a/src/Mod/Part/App/TopoShapeShellPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeShellPyImp.cpp @@ -27,6 +27,7 @@ # include # include # include +# include # include # include # include @@ -35,7 +36,6 @@ # include #endif -#include #include #include diff --git a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp index b749d43023..39efae0454 100644 --- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp @@ -34,7 +34,7 @@ #include #include #include -# include +#include #include #include #include diff --git a/src/Mod/Part/App/TopoShapeWirePyImp.cpp b/src/Mod/Part/App/TopoShapeWirePyImp.cpp index 79f98d9aac..8d813da0d7 100644 --- a/src/Mod/Part/App/TopoShapeWirePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeWirePyImp.cpp @@ -36,17 +36,16 @@ # include # include # include +# include +# include +# include +# include +# include +# include +# include +# include #endif -#include -#include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/src/Mod/Part/App/edgecluster.cpp b/src/Mod/Part/App/edgecluster.cpp index 4732df81c7..3425d0f1e9 100644 --- a/src/Mod/Part/App/edgecluster.cpp +++ b/src/Mod/Part/App/edgecluster.cpp @@ -23,19 +23,21 @@ #include "PreCompiled.h" +#ifndef _PreComp_ +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +#endif #include "edgecluster.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace Part; diff --git a/src/Mod/Part/App/modelRefine.cpp b/src/Mod/Part/App/modelRefine.cpp index cb224c8f9b..fa42f2e68e 100644 --- a/src/Mod/Part/App/modelRefine.cpp +++ b/src/Mod/Part/App/modelRefine.cpp @@ -22,7 +22,7 @@ #include "PreCompiled.h" -#include +#ifndef _PreComp_ #include #include #include @@ -65,6 +65,8 @@ #include #include #include +#endif +#include #include #include "modelRefine.h"