diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-31 14:01:13 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-31 13:29:23 +0000 |
| commit | 2252017bd8ddc1c1fec9791c0a9dd7ab00a0a6d9 (patch) | |
| tree | e5f30ee985237980ce8506402568e04f97b8ee72 /sources | |
| parent | 3625e5a8caa66b702ab52659a47f882dcc69804f (diff) | |
PySide2/Widgets: Add overload of QInputDialog::getDouble()
Add modification and new variant of the fix_arg template, fixing warning:
There's no user provided way (conversion rule,
argument removal, custom code, etc) to handle the primitive type 'bool
*' of argument 8 in function 'QInputDialog::getDouble(QWidget *
parent, const QString & title, const QString & label, double value,
double minValue, double maxValue, int decimals, bool * ok,
QFlags<Qt::WindowType> flags, double step)'.
Change-Id: I02ee5c477d74698bd5dda23bbec01f39775d5c6d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 10 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/templates/core_common.xml | 8 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 456a411d3..c2c36d60f 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -1558,6 +1558,16 @@ <insert-template name="fix_arg,arg,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>,double)" 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,arg"/> + </inject-code> + </modify-function> </object-type> <object-type name="QGraphicsScene"> diff --git a/sources/pyside2/PySide2/templates/core_common.xml b/sources/pyside2/PySide2/templates/core_common.xml index 4984cb21a..96a9be620 100644 --- a/sources/pyside2/PySide2/templates/core_common.xml +++ b/sources/pyside2/PySide2/templates/core_common.xml @@ -134,6 +134,14 @@ <insert-template name="tuple_retval_ok"/> </template> + <template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg,arg"> + bool ok_; + %BEGIN_ALLOW_THREADS + %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, &ok_, %9, %10); + %END_ALLOW_THREADS + <insert-template name="tuple_retval_ok"/> + </template> + <template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg"> bool ok_; %BEGIN_ALLOW_THREADS |