Update VTK wrapping to work for VTK <= 5.6

Author: patmarion

CMakeLists.txt

@@ -45,7 +45,11 @@ if(PythonQt_USE_VTK)
   find_package(VTK REQUIRED)
   include(${VTK_USE_FILE})
   add_definitions(-DPYTHONQT_USE_VTK)
-  set(VTK_LIBRARIES vtkPythonCore)
+  if(${VTK_VERSION_MAJOR}.${VTK_VERSION_MINOR} VERSION_GREATER 5.6)
+    set(VTK_LIBRARIES vtkPythonCore)
+  else()
+    set(VTK_LIBRARIES vtkCommon)
+  endif()
 else()
   remove_definitions(-DPYTHONQT_USE_VTK)
 endif()

src/PythonQt.cpp

@@ -415,7 +415,11 @@ PyObject* PythonQtPrivate::wrapPtr(void* ptr, const QByteArray& name)
     if (name.startsWith("vtk"))
       {
       vtkObject * _vtkObj = reinterpret_cast<vtkObject*>(ptr);
+#if (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION <= 6) || VTK_MAJOR_VERSION < 5
+      return vtkPythonGetObjectFromPointer(_vtkObj);
+#else
       return vtkPythonUtil::GetObjectFromPointer(_vtkObj);
+#endif
       }
 #endif
     wrap = createNewPythonQtInstanceWrapper(wrapper, info, ptr);

src/PythonQtConversion.cpp

@@ -394,7 +394,11 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
      }
 #ifdef PYTHONQT_USE_VTK
      else if (info.name.startsWith("vtk")) {
+#if (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION <= 6) || VTK_MAJOR_VERSION < 5
+       vtkObjectBase * vtkObj = vtkPythonGetPointerFromObject(obj, info.name.data());
+#else
        vtkObjectBase * vtkObj = vtkPythonUtil::GetPointerFromObject(obj, info.name.data());
+#endif
        if (vtkObj) {
          PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, vtkObj, ptr);
        }