diff options
author | Luciano Wolf <luciano.wolf@openbossa.org> | 2010-02-08 15:49:31 -0300 |
---|---|---|
committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-08 16:20:09 -0200 |
commit | 7fdbf2e9f2aa0202b6acdee4dcf6f7f24be6314c (patch) | |
tree | 090e55b56f268e129ec588fcc2b4f348bf57197b /PySide | |
parent | dff79b35f2724c3cda16b0a6500508a8a8a34316 (diff) |
Fix TODO's for QFontDialog.getFont(...) methods.
Reviewed by Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 36 | ||||
-rw-r--r-- | PySide/typesystem_templates.xml | 10 |
2 files changed, 37 insertions, 9 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index a7cb1fb8b..aac41ab23 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -1426,15 +1426,33 @@ </object-type> <object-type name="QFontComboBox"/> <object-type name="QFontDialog"> - <!-- TODO Replace inject code! --> - <modify-function signature="getFont(bool*,QWidget*)" allow-thread="yes" remove="all" /> - - <!-- TODO Replace inject code! --> - <modify-function signature="getFont(bool*,QFont,QWidget*)" allow-thread="yes" remove="all" /> - - <!-- TODO Replace inject code! --> - <modify-function signature="getFont(bool*,QFont,QWidget*,QString)" allow-thread="yes" remove="all" /> - + <modify-function signature="getFont(bool*,QWidget*)" allow-thread="yes"> + <modify-argument index="1" action="remove"/> + <modify-argument index="return"> + <replace-type modified-type="PyTuple" /> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_bool*,arg"/> + </inject-code> + </modify-function> + <modify-function signature="getFont(bool*,QFont,QWidget*)" allow-thread="yes"> + <modify-argument index="1" action="remove"/> + <modify-argument index="return"> + <replace-type modified-type="PyTuple" /> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_bool*,arg,arg"/> + </inject-code> + </modify-function> + <modify-function signature="getFont(bool*,QFont,QWidget*,QString)" allow-thread="yes"> + <modify-argument index="1" action="remove"/> + <modify-argument index="return"> + <replace-type modified-type="PyTuple" /> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_bool*,arg,arg,arg"/> + </inject-code> + </modify-function> </object-type> <object-type name="QGraphicsEllipseItem"> </object-type> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 03a220326..0460d340b 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -21,6 +21,16 @@ %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&ok_, %2); %PYARG_0 = Shiboken::makeTuple(retval_, ok_); </template> + <template name="fix_bool*,arg,arg"> + bool ok_; + %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&ok_, %2, %3); + %PYARG_0 = Shiboken::makeTuple(retval_, ok_); + </template> + <template name="fix_bool*,arg,arg,arg"> + bool ok_; + %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&ok_, %2, %3, %4); + %PYARG_0 = Shiboken::makeTuple(retval_, ok_); + </template> <template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"> bool ok_; %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, &ok_, %9); |