diff options
| author | Renato Araujo Oliveira Filho <renato.filho@openbossa.org> | 2011-01-24 11:13:27 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:51:49 -0300 |
| commit | b66595efa544b2675fef7ec2c6832dba5d8c1177 (patch) | |
| tree | 79a04cbc39be99694d4022a82e4e10cbbf78ccb3 | |
| parent | f2cce0a1b594efc6edf901848a609f3f7209e870 (diff) | |
Fixed QLineEdit.getTextMargins return value.
Fixes bug #632
Reviewer: Hugo Parente Lima <hugo.pl@gmail.com>
Marcelo Lira <marcelo.lira@openbossa.org>
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 20 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 1 | ||||
| -rw-r--r-- | tests/QtGui/bug_632.py | 20 |
3 files changed, 41 insertions, 0 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 1f0078918..d606fdb2b 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -4333,6 +4333,26 @@ </modify-argument> </modify-function> <modify-function signature="del()" rename="del_" /> + <modify-function signature="getTextMargins(int *, int *, int *, int *) const"> + <modify-argument index="0"> + <replace-type modified-type="PyObject *" /> + </modify-argument> + <modify-argument index="1"> + <remove-argument/> + </modify-argument> + <modify-argument index="2"> + <remove-argument/> + </modify-argument> + <modify-argument index="3"> + <remove-argument/> + </modify-argument> + <modify-argument index="4"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_int*,int*,int*,int*"/> + </inject-code> + </modify-function> </object-type> <object-type name="QLCDNumber"> <enum-type name="Mode"/> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index dd07459ad..424c32345 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -123,6 +123,7 @@ %CPPSELF.%FUNCTION_NAME(&a, &b, &c, &d); %PYARG_0 = Shiboken::makeTuple(a, b, c, d); </template> + <template name="fix_qreal*,qreal*,qreal*,qreal*"> qreal a, b, c, d; %CPPSELF.%FUNCTION_NAME(&a, &b, &c, &d); diff --git a/tests/QtGui/bug_632.py b/tests/QtGui/bug_632.py new file mode 100644 index 000000000..e189393b2 --- /dev/null +++ b/tests/QtGui/bug_632.py @@ -0,0 +1,20 @@ +import sys +from PySide.QtGui import QLineEdit, QApplication +import unittest + + +class Bug589(unittest.TestCase): + def testWrongSignature(self): + text = QLineEdit("PySide bug 632") + a = b = c = d = 0 + self.assertRaises(TypeError, text.getTextMargins, (a, b, c, d)) + + def testTupleReturn(self): + text = QLineEdit("PySide bug 632") + text.setTextMargins(10, 20, 30, 40) + (a, b, c, d) = text.getTextMargins() + self.assert_((a, b, c, d), (10, 20, 30, 40)) + +if __name__ == "__main__": + app = QApplication(sys.argv) + unittest.main() |