From f23fa31f4287cda0289a41d7148b60479abf137f Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 20 Mar 2022 23:06:56 +0100 Subject: [PATCH] [Path] remove Python.h and Xerces they are not needed anymore --- src/Mod/Path/App/AppPath.cpp | 5 +---- src/Mod/Path/App/AppPathPy.cpp | 5 +---- src/Mod/Path/App/CMakeLists.txt | 1 - src/Mod/Path/App/PreCompiled.h | 3 --- src/Mod/Path/Gui/AppPathGui.cpp | 5 +---- src/Mod/Path/Gui/AppPathGuiPy.cpp | 6 ++---- src/Mod/Path/Gui/CMakeLists.txt | 1 - src/Mod/Path/Gui/PreCompiled.h | 3 --- src/Mod/Path/Gui/ViewProviderPath.cpp | 2 -- 9 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/Mod/Path/App/AppPath.cpp b/src/Mod/Path/App/AppPath.cpp index a02fa9d552..1bde60a8f1 100644 --- a/src/Mod/Path/App/AppPath.cpp +++ b/src/Mod/Path/App/AppPath.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include #include @@ -55,6 +51,7 @@ #include "VoronoiVertex.h" #include "VoronoiVertexPy.h" + namespace Path { extern PyObject* initModule(); } diff --git a/src/Mod/Path/App/AppPathPy.cpp b/src/Mod/Path/App/AppPathPy.cpp index 9dd25a9c2d..cae1a934cd 100644 --- a/src/Mod/Path/App/AppPathPy.cpp +++ b/src/Mod/Path/App/AppPathPy.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include #include @@ -58,6 +54,7 @@ #include "FeaturePathCompound.h" #include "Area.h" + #define PATH_CATCH catch (Standard_Failure &e) \ { \ std::string str; \ diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/Path/App/CMakeLists.txt index fa9a52c302..1d1110350c 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/src/Mod/Path/App/CMakeLists.txt @@ -18,7 +18,6 @@ include_directories( ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Path/App/PreCompiled.h b/src/Mod/Path/App/PreCompiled.h index 7a787a15ab..c65af103cf 100644 --- a/src/Mod/Path/App/PreCompiled.h +++ b/src/Mod/Path/App/PreCompiled.h @@ -54,9 +54,6 @@ #include #include -// Python -#include - // Boost #include #include diff --git a/src/Mod/Path/Gui/AppPathGui.cpp b/src/Mod/Path/Gui/AppPathGui.cpp index 83664ee97a..536da4af20 100644 --- a/src/Mod/Path/Gui/AppPathGui.cpp +++ b/src/Mod/Path/Gui/AppPathGui.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include #include @@ -38,6 +34,7 @@ #include "ViewProviderPathShape.h" #include "ViewProviderArea.h" + // use a different name to CreateCommand() void CreatePathCommands(void); diff --git a/src/Mod/Path/Gui/AppPathGuiPy.cpp b/src/Mod/Path/Gui/AppPathGuiPy.cpp index 8cf6f6f116..6a865d4928 100644 --- a/src/Mod/Path/Gui/AppPathGuiPy.cpp +++ b/src/Mod/Path/Gui/AppPathGuiPy.cpp @@ -21,10 +21,7 @@ ***************************************************************************/ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - +# #include #include @@ -47,6 +44,7 @@ #include "DlgProcessorChooser.h" #include "ui_DlgProcessorChooser.h" + namespace PathGui { class Module : public Py::ExtensionModule { diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt index e0c8d919f9..89d6e72ae1 100644 --- a/src/Mod/Path/Gui/CMakeLists.txt +++ b/src/Mod/Path/Gui/CMakeLists.txt @@ -14,7 +14,6 @@ include_directories( ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Path/Gui/PreCompiled.h b/src/Mod/Path/Gui/PreCompiled.h index e4ece02752..0bb8a878ec 100644 --- a/src/Mod/Path/Gui/PreCompiled.h +++ b/src/Mod/Path/Gui/PreCompiled.h @@ -46,9 +46,6 @@ #ifdef _PreComp_ -// Python -#include - // standard #include #include diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index 75793330e8..7da1871e71 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -20,11 +20,9 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include