+ simplify porting of Raytracing module to Python3

FreeCAD · Jan 18, 2016 · 05279d2 · 05279d2
1 parent 1081492
commit 05279d2
Show file tree

Hide file tree

Showing 4 changed files with 379 additions and 370 deletions.
diff --git a/src/Mod/Raytracing/App/AppRaytracing.cpp b/src/Mod/Raytracing/App/AppRaytracing.cpp
@@ -35,11 +35,12 @@
 #include "LuxFeature.h"
 #include "LuxProject.h"
 
-extern struct PyMethodDef Raytracing_methods[];
+namespace Raytracing {
+    extern PyObject* initModule();
+}
 
 
-extern "C" {
-void AppRaytracingExport initRaytracing()
+PyMODINIT_FUNC initRaytracing()
 {
     // load dependent module
     try {
@@ -50,16 +51,13 @@ void AppRaytracingExport initRaytracing()
         return;
     }
 
-	Raytracing::RaySegment       ::init();
-	Raytracing::RayFeature       ::init();
-	Raytracing::RayProject       ::init();
+    Raytracing::RaySegment       ::init();
+    Raytracing::RayFeature       ::init();
+    Raytracing::RayProject       ::init();
     Raytracing::LuxFeature       ::init();
     Raytracing::LuxProject       ::init();
 
 
-    (void) Py_InitModule("Raytracing", Raytracing_methods);   /* mod name, table ptr */
+    (void) Raytracing::initModule();
     Base::Console().Log("Loading Raytracing module... done\n");
-
 }
-
-} // extern "C" {