diff options
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 55 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 15 |
2 files changed, 60 insertions, 10 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 9e41faf2e..c16a6f5f4 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -2267,16 +2267,51 @@ <modify-function signature="drawItems(QPainter*, int, QGraphicsItem**, const QStyleOptionGraphicsItem*)" remove="all" /> </object-type> <object-type name="QInputDialog"> - <!-- TODO Replace inject code! --> - <modify-function signature="getInteger(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)" allow-thread="yes" remove="all" /> - <!-- TODO Replace inject code! --> - <modify-function signature="getInt(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)" allow-thread="yes" remove="all" /> - <!-- TODO Replace inject code! --> - <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList &, int, bool, bool *, QFlags<Qt::WindowType>)" allow-thread="yes" remove="all" /> - <!-- TODO Replace inject code! --> - <modify-function signature="getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, QFlags<Qt::WindowType>)" allow-thread="yes" remove="all" /> - <!-- TODO Replace inject code! --> - <modify-function signature="getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)" allow-thread="yes" remove="all" /> + <modify-function signature="getInteger(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)" allow-thread="yes"> + <modify-argument index="8"> + <remove-default-expression/> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"/> + </inject-code> + </modify-function> + <modify-function signature="getInt(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)" allow-thread="yes"> + <modify-argument index="8"> + <remove-default-expression/> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"/> + </inject-code> + </modify-function> + <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList &, int, bool, bool *, QFlags<Qt::WindowType>)" allow-thread="yes"> + <modify-argument index="7"> + <remove-default-expression/> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg"/> + </inject-code> + </modify-function> + <modify-function signature="getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, QFlags<Qt::WindowType>)" allow-thread="yes"> + <modify-argument index="6"> + <remove-default-expression/> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_arg,arg,arg,arg,arg,bool*,arg"/> + </inject-code> + </modify-function> + <modify-function signature="getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)" allow-thread="yes"> + <modify-argument index="8"> + <remove-default-expression/> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"/> + </inject-code> + </modify-function> </object-type> <object-type name="QGraphicsScene"> <extra-includes> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index f28d26142..f0c28c158 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -21,6 +21,21 @@ %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&ok_, %2); %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); + %PYARG_0 = Shiboken::makeTuple(retval_, ok_); + </template> + <template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg"> + bool ok_; + %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, &ok_, %8); + %PYARG_0 = Shiboken::makeTuple(retval_, ok_); + </template> + <template name="fix_arg,arg,arg,arg,arg,bool*,arg"> + bool ok_; + %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &ok_, %7); + %PYARG_0 = Shiboken::makeTuple(retval_, ok_); + </template> <template name="get_slice"> %TYPE* sequence; Py_ssize_t start, end; |