From 3f0291dfe49cdf15325600aba362a0fc5662d19d Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Tue, 21 Dec 2010 12:17:56 -0300
Subject: Fixed global functions from QT_TR_NOOP and QT_TRANSLATE_NOOP family.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These function just return one of their arguments as result, and the
buggy implementation was forgetting to increment the reference count for
the returned object.

A new unit test was added.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
---
 PySide/QtCore/typesystem_core.xml | 30 ++++++++++++++++++++----------
 PySide/typesystem_templates.xml   |  6 ++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'PySide')

diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 76bcaeb7b..e416e575a 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -2895,20 +2895,30 @@
     </inject-code>
   </add-function>
 
-  <add-function signature="QT_TR_NOOP(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
+  <add-function signature="QT_TR_NOOP(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TR_NOOP_UTF8(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
+  <add-function signature="QT_TR_NOOP_UTF8(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP(const char*, const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;(void)%2;%PYARG_0 = %PYARG_2;</inject-code>
+  <add-function signature="QT_TRANSLATE_NOOP(PyObject, PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP3(const char*, const char*, const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;(void)%2;(void)%3;%PYARG_0 = %PYARG_2;</inject-code>
+  <add-function signature="QT_TRANSLATE_NOOP3(PyObject, PyObject, PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP_UTF8(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
+  <add-function signature="QT_TRANSLATE_NOOP_UTF8(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
   </add-function>
 
   <inject-code class="native" position="beginning">
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index 9d39bb481..4604fda95 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -238,5 +238,11 @@
         return %CONVERTTOPYTHON[%TRANSPOSED_TYPE](%CPPSELF.transposed());
     </template>
 
+    <!-- Replace '#' for the argument number you want. -->
+    <template name="return_argument">
+        Py_INCREF(%PYARG_#);
+        %PYARG_0 = %PYARG_#;
+    </template>
+
 </typesystem>
 
-- 
cgit v1.2.3