diff options
-rw-r--r-- | PySide/QtCore/typesystem_core_win.xml | 3 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_win.xml | 9 | ||||
-rw-r--r-- | PySide/typesystem_templates.xml | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/PySide/QtCore/typesystem_core_win.xml b/PySide/QtCore/typesystem_core_win.xml index a9663c9b8..f4b8cab24 100644 --- a/PySide/QtCore/typesystem_core_win.xml +++ b/PySide/QtCore/typesystem_core_win.xml @@ -43,6 +43,9 @@ </target-to-native> </conversion-rule> </primitive-type> + <inject-code class="native" position="beginning"> + <insert-template name="checkPyCapsuleOrPyCObject_func"/> + </inject-code> <value-type name="POINT"> <include file-name="wtypes.h" location="global"/> </value-type> diff --git a/PySide/QtGui/typesystem_gui_win.xml b/PySide/QtGui/typesystem_gui_win.xml index 416c5e5ba..93d422a22 100644 --- a/PySide/QtGui/typesystem_gui_win.xml +++ b/PySide/QtGui/typesystem_gui_win.xml @@ -43,14 +43,7 @@ </conversion-rule> </primitive-type> <inject-code class="native" position="beginning"> - static bool checkPyCapsuleOrPyCObject(PyObject* pyObj) - { - #ifdef IS_PY3K - return PyCapsule_CheckExact(pyObj); - #else - return PyCObject_Check(pyObj); - #endif - } + <insert-template name="checkPyCapsuleOrPyCObject_func"/> </inject-code> <enum-type name="QPixmap::HBitmapFormat" /> </typesystem> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 47615ad02..2903ae408 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -414,4 +414,15 @@ } </template> + <template name="checkPyCapsuleOrPyCObject_func"> + static bool checkPyCapsuleOrPyCObject(PyObject* pyObj) + { + #ifdef IS_PY3K + return PyCapsule_CheckExact(pyObj); + #else + return PyCObject_Check(pyObj); + #endif + } + </template> + </typesystem> |