aboutsummaryrefslogtreecommitdiffstats
path: root/PySide/QtGui/glue/wid_conversions.h
diff options
context:
space:
mode:
Diffstat (limited to 'PySide/QtGui/glue/wid_conversions.h')
-rw-r--r--PySide/QtGui/glue/wid_conversions.h25
1 files changed, 3 insertions, 22 deletions
diff --git a/PySide/QtGui/glue/wid_conversions.h b/PySide/QtGui/glue/wid_conversions.h
index 183e682fe..68d752884 100644
--- a/PySide/QtGui/glue/wid_conversions.h
+++ b/PySide/QtGui/glue/wid_conversions.h
@@ -11,14 +11,7 @@ struct Converter<WId>
static bool isConvertible(PyObject* pyobj)
{
- if (pyobj == Py_None)
- return true;
-
-#ifdef IS_PY3K
- return PyCapsule_CheckExact(pyobj);
-#else
- return PyCObject_Check(pyobj);
-#endif
+ return pyobj == Py_None || PyNumber_Check(pyobj);
}
static inline PyObject* toPython(void* cppobj)
@@ -30,26 +23,14 @@ struct Converter<WId>
static PyObject* toPython(WId cppobj)
{
- if (!cppobj)
- Py_RETURN_NONE;
-
-#ifdef IS_PY3K
- return PyCapsule_New(cppobj, 0, 0);
-#else
- return PyCObject_FromVoidPtr(cppobj, 0);
-#endif
+ return PyLong_FromVoidPtr((void*)cppobj);
}
static WId toCpp(PyObject* pyobj)
{
if (pyobj == Py_None)
return 0;
-
-#ifdef IS_PY3K
- return (WId)PyCapsule_GetPointer(pyobj, 0);
-#else
- return (WId)PyCObject_AsVoidPtr(pyobj);
-#endif
+ return (WId)PyLong_AsVoidPtr(pyobj);
}
};