From 00f696e3c7305a9283932be00af6cb72f7268f3b Mon Sep 17 00:00:00 2001
From: Renato Araujo Oliveira Filho <renato.filho@openbossa.org>
Date: Wed, 9 Feb 2011 18:24:26 -0300
Subject: Fixed function 'QToolBar.addAction' to support callback in the
 arguments.

Create unit test for bug #635.

Fixes bug #635.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
---
 PySide/QtGui/typesystem_gui_common.xml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'PySide')

diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 737db7894..21dc5d3cc 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -4531,8 +4531,30 @@
     </modify-function>
   </object-type>
   <object-type name="QToolBar">
-    <modify-function signature="addAction(QIcon,QString,const QObject*,const char*)" remove="all"/>
-    <modify-function signature="addAction(QString,const QObject*,const char*)" remove="all"/>
+    <modify-function signature="addAction(QIcon,QString,const QObject*,const char*)">
+      <modify-argument index="3">
+        <replace-type modified-type="PyObject" />
+      </modify-argument>
+      <modify-argument index="4">
+        <remove-argument />
+      </modify-argument>
+      <inject-code>
+        %PYARG_0 = %CONVERTTOPYTHON[QAction*](%CPPSELF.addAction(%1, %2));
+        Shiboken::AutoDecRef result(PyObject_CallMethod(%PYARG_0, "connect", "OsO", %PYARG_0, SIGNAL(triggered()), %PYARG_3));
+      </inject-code>
+    </modify-function>
+    <modify-function signature="addAction(QString,const QObject*,const char*)">
+      <modify-argument index="2">
+        <replace-type modified-type="PyObject" />
+      </modify-argument>
+      <modify-argument index="3">
+        <remove-argument />
+      </modify-argument>
+      <inject-code>
+        %PYARG_0 = %CONVERTTOPYTHON[QAction*](%CPPSELF.addAction(%1));
+        Shiboken::AutoDecRef result(PyObject_CallMethod(%PYARG_0, "connect", "OsO", %PYARG_0, SIGNAL(triggered()), %PYARG_2));
+      </inject-code>
+    </modify-function>
     <modify-function signature="addAction(const QString &amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
-- 
cgit v1.2.3