From 792504f978441d0a7708ebdaabc4b4baf24fdff4 Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Thu, 1 Dec 2011 17:32:48 -0300
Subject: Removed the remaining occurrences of Shiboken::makeTuple.

---
 PySide/QtXml/typesystem_xml.xml | 45 +++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

(limited to 'PySide/QtXml')

diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml
index 1bf07debb..19b1520f7 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -33,14 +33,17 @@
     <value-type name="QDomComment" />
 
     <template name="qdomdocument_setcontent">
-        QString _errorMsg_;
-        int _errorLine_ = 0;
-        int _errorColumn_ = 0;
-
-        %BEGIN_ALLOW_THREADS
-        bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_);
-        %END_ALLOW_THREADS
-        %PYARG_0 = Shiboken::makeTuple(_ret_, _errorMsg_, _errorLine_, _errorColumn_);
+    QString _errorMsg_;
+    int _errorLine_ = 0;
+    int _errorColumn_ = 0;
+    %BEGIN_ALLOW_THREADS
+    bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(4);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](_ret_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](_errorMsg_));
+    PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](_errorLine_));
+    PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](_errorColumn_));
     </template>
 
     <value-type name="QDomDocument">
@@ -269,13 +272,13 @@
                 </conversion-rule>
             </modify-argument>
             <inject-code class="target" position="end">
-                QXmlInputSource* _qxmlinputsource_arg_ = 0;
-
-                %BEGIN_ALLOW_THREADS
-                %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
-                %END_ALLOW_THREADS
-
-                %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
+            QXmlInputSource* _qxmlinputsource_arg_ = 0;
+            %BEGIN_ALLOW_THREADS
+            %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
+            %END_ALLOW_THREADS
+            %PYARG_0 = PyTuple_New(2);
+            PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
+            PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
             </inject-code>
         </modify-function>
     </object-type>
@@ -296,11 +299,13 @@
                 </conversion-rule>
             </modify-argument>
             <inject-code class="target" position="end">
-                QXmlInputSource* _qxmlinputsource_arg_ = 0;
-                %BEGIN_ALLOW_THREADS
-                %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
-                %END_ALLOW_THREADS
-                %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
+            QXmlInputSource* _qxmlinputsource_arg_ = 0;
+            %BEGIN_ALLOW_THREADS
+            %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
+            %END_ALLOW_THREADS
+            %PYARG_0 = PyTuple_New(2);
+            PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
+            PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
             </inject-code>
         </modify-function>
     </object-type>
-- 
cgit v1.2.3