lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use SWIG_BUILTIN_INIT for passing SWIG ptrs, use SWIG_POINTER_OWN

Browse Source 
* The former is only needed inside tp_init of a new object. Instead when
  we want to pass in and own a pointer, we use SWIG_POINTER_OWN.
* This also removes the need to pass 'self' all the way down in
  ConvertToPy which tidies up a lot of code.
This commit is contained in:
baldurk
2017-09-26 15:30:07 +01:00
parent 0450ea1178
commit 3d11c502f5
7 changed files with 69 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+6 -6
View File
@@ -63,7 +63,7 @@ extern "C" PyObject *PyInit__renderdoc(void);
extern "C" PyObject *PassObjectToPython(const char *type, void *obj);
// this one is in qrenderdoc_python.cpp
extern "C" PyObject *PyInit__qrenderdoc(void);
extern "C" PyObject *WrapBareQWidget(PyObject *, QWidget *);
extern "C" PyObject *WrapBareQWidget(QWidget *);
extern "C" QWidget *UnwrapBareQWidget(PyObject *);
#ifdef WIN32
@@ -642,7 +642,7 @@ QWidget *PythonContext::QWidgetFromPy(PyObject *widget)
#endif
}
PyObject *PythonContext::QtObjectToPython(PyObject *self, const char *typeName, QObject *object)
PyObject *PythonContext::QtObjectToPython(const char *typeName, QObject *object)
{
#if PYSIDE2_ENABLED
if(!initialised())
@@ -651,8 +651,8 @@ PyObject *PythonContext::QtObjectToPython(PyObject *self, const char *typeName,
if(!SbkPySide2_QtCoreTypes || !SbkPySide2_QtGuiTypes || !SbkPySide2_QtWidgetsTypes)
{
QWidget *w = qobject_cast<QWidget *>(object);
if(self && w)
return WrapBareQWidget(self, w);
if(w)
return WrapBareQWidget(w);
Py_RETURN_NONE;
}
@@ -664,8 +664,8 @@ PyObject *PythonContext::QtObjectToPython(PyObject *self, const char *typeName,
return obj;
#else
QWidget *w = qobject_cast<QWidget *>(object);
if(self && w)
return WrapBareQWidget(self, w);
if(w)
return WrapBareQWidget(w);
Py_RETURN_NONE;
#endif