From 046bccece9b01656489f1f83bf55a575bb461239 Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Tue, 31 May 2011 12:29:52 -0300
Subject: [PATCH] Moved internalPointer methods code injection into a code
 template.

---
 PySide/QtCore/typesystem_core.xml | 10 ++--------
 PySide/typesystem_templates.xml   |  6 ++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 1032b58..5bb6922 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -993,10 +993,7 @@
   <value-type name="QPersistentModelIndex">
     <modify-function signature="internalPointer()const">
         <inject-code class="target" position="beginning">
-            %PYARG_0 = (PyObject*)%CPPSELF.%FUNCTION_NAME();
-            if (!%PYARG_0)
-                %PYARG_0 = Py_None;
-            Py_XINCREF(%PYARG_0);
+            <insert-template name="return_internal_pointer" />
         </inject-code>
     </modify-function>
     <modify-function signature="operator const QModelIndex&amp;()const">
@@ -2833,10 +2830,7 @@
   <value-type name="QModelIndex">
     <modify-function signature="internalPointer()const">
         <inject-code class="target" position="beginning">
-            %PYARG_0 = (PyObject*)%CPPSELF.%FUNCTION_NAME();
-            if (!%PYARG_0)
-                %PYARG_0 = Py_None;
-            Py_XINCREF(%PYARG_0);
+            <insert-template name="return_internal_pointer" />
         </inject-code>
     </modify-function>
     <modify-function signature="model()const">
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index 8a26281..3a46c62 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -272,6 +272,12 @@
         %PYARG_0 = PyString_FromString(qPrintable(format));
     </template>
 
+    <template name="return_internal_pointer">
+        %PYARG_0 = reinterpret_cast&lt;PyObject*>(%CPPSELF.%FUNCTION_NAME());
+        if (!%PYARG_0)
+            %PYARG_0 = Py_None;
+        Py_INCREF(%PYARG_0);
+    </template>
 
     <!-- templates for __reduce__ -->
     <template name="reduce_code">