From 12fe2a44f83ddd3ddf1d2978a406c9881b890b9f Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Mon, 1 Aug 2011 13:12:49 -0300
Subject: [PATCH] Replaced hard coded variables by type system variables in
 QtCore and QtGui.

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

diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index b082791..2f553d6 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1672,7 +1672,7 @@
     <modify-function signature="operator+(QByteArray,QString)" remove="all" />
     <add-function signature="operator+(PyUnicode)">
         <inject-code>
-            Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(arg));
+            Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(%PYARG_1));
             if (!str.isNull()) {
                 QByteArray b(PyString_AS_STRING(str.object()), PyString_GET_SIZE(str.object()));
                 b.prepend(*%CPPSELF);
@@ -1682,7 +1682,7 @@
     </add-function>
     <add-function signature="operator+(PyUnicode, QByteArray)">
         <inject-code>
-            Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(arg));
+            Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(%PYARG_1));
             if (!str.isNull()) {
                 QByteArray b(PyString_AS_STRING(str.object()), PyString_GET_SIZE(str.object()));
                 b.append(*%CPPSELF);
@@ -1692,7 +1692,7 @@
     </add-function>
     <add-function signature="operator+(PyString, QByteArray)">
         <inject-code>
-            QByteArray b(PyString_AS_STRING(arg), PyString_GET_SIZE(arg));
+            QByteArray b(PyString_AS_STRING(%PYARG_1), PyString_GET_SIZE(%PYARG_1));
             %PYARG_0 = %CONVERTTOPYTHON[QByteArray](b + *%CPPSELF);
         </inject-code>
     </add-function>
@@ -1720,7 +1720,7 @@
     <modify-function signature="QByteArray(const char *)">
         <!-- Keep \x00 bytes passed in python strings -->
         <inject-code class="target" position="beginning">
-            int size = PyString_GET_SIZE(pyargs[0]);
+            int size = PyString_GET_SIZE(%PYARG_1);
             %0 = new QByteArray(%1, size);
         </inject-code>
     </modify-function>
@@ -2252,7 +2252,7 @@
                                     const_cast&lt;char*>("OsO"),
                                     pyTimer,
                                     SIGNAL(timeout()),
-                                    pyargs[1])
+                                    %PYARG_2)
             );
         }
 
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 69929e8..2796708 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -562,7 +562,7 @@
             </conversion-rule>
             <conversion-rule class="native">
                 Py_ssize_t bufferLen;
-                char* %out = (char*) Shiboken::Buffer::getPointer(arg, &amp;bufferLen);
+                char* %out = (char*) Shiboken::Buffer::getPointer(%PYARG_1, &amp;bufferLen);
             </conversion-rule>
         </modify-argument>
         <modify-argument index="2">