diff options
author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-08-31 14:27:02 +0200 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-28 16:11:36 +0000 |
commit | 0363a0986e19bfb97ed1b899fc1431a0e1b14dcb (patch) | |
tree | 9c5b67a91e61033b415f8d6b8d62c6ec86fd5dac /sources/pyside2/PySide2/QtWidgets | |
parent | addfdfb1ff195e36d412dc7aa3dde2f2d474c0ed (diff) |
Place templates per module
There is a main template file that hosts most of the
code-templates we use in the typesystems, but there
were still several templates written in each module-typesystem
file.
The templates that are used on different typesystem
are now placed in:
sources/pyside2/PySide2/templates/core_common.xml
Additionally, the templates used only by a certain module,
are placed next to it, e.g.:
sources/pyside2/PySide2/templates/widgets_common.xml
Some simple templates were moved to the snippets files too.
Task-number: PYSIDE-799
Change-Id: I4f355cf2ae983aba9e85414e910550189cd18dcb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'sources/pyside2/PySide2/QtWidgets')
-rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 53 |
1 files changed, 12 insertions, 41 deletions
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index c7fae8d7f..d22d694cc 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -40,7 +40,8 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtWidgets"> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="templates/core_common.xml" generate="no"/> + <load-typesystem name="templates/widgets_common.xml" generate="no"/> @@ -2297,9 +2298,7 @@ <modify-argument index="return"> <replace-type modified-type="QString"/> </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_QString"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="qstring-return"/> </modify-function> <modify-function signature="validate(QString &,int &)const"> <modify-argument index="return"> @@ -2436,9 +2435,7 @@ <replace-type modified-type="QString"/> <replace-default-expression with="QString()"/> </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_for_QFileDialog"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qfiledialog-return" /> </modify-function> <modify-function signature="getOpenFileNames(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> <modify-argument index="return"> @@ -2448,9 +2445,7 @@ <replace-type modified-type="QString"/> <replace-default-expression with="QString()"/> </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_for_QFileDialog"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qfiledialog-return" /> </modify-function> <modify-function signature="getOpenFileUrl(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> @@ -2461,9 +2456,7 @@ <replace-type modified-type="QString"/> <replace-default-expression with="QString()"/> </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_for_QFileDialog"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qfiledialog-return" /> </modify-function> <modify-function signature="getOpenFileUrls(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> @@ -2474,9 +2467,7 @@ <replace-type modified-type="QString"/> <replace-default-expression with="QString()"/> </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_for_QFileDialog"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qfiledialog-return" /> </modify-function> <modify-function signature="getSaveFileName(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> @@ -2487,9 +2478,7 @@ <replace-type modified-type="QString"/> <replace-default-expression with="QString()"/> </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_for_QFileDialog"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qfiledialog-return" /> </modify-function> <modify-function signature="getSaveFileUrl(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> @@ -2500,9 +2489,7 @@ <replace-type modified-type="QString"/> <replace-default-expression with="QString()"/> </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_for_QFileDialog"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qfiledialog-return" /> </modify-function> </object-type> @@ -2979,16 +2966,6 @@ <enum-type name="ItemRole"/> <enum-type name="RowWrapPolicy"/> - <template name="fix_args,int*,ItemRole*"> - int _row; - QFormLayout::ItemRole _role; - %BEGIN_ALLOW_THREADS - %CPPSELF->%FUNCTION_NAME(%ARGUMENT_NAMES, &_row, &_role); - %END_ALLOW_THREADS - %PYARG_0 = PyTuple_New(2); - PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](_row)); - PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QFormLayout::ItemRole](_role)); - </template> <modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const"> <modify-argument index="0"> @@ -3000,9 +2977,7 @@ <modify-argument index="3"> <remove-argument/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_args,int*,ItemRole*"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qformlayout-fix-args" /> </modify-function> <modify-function signature="getWidgetPosition(QWidget*,int*,QFormLayout::ItemRole*)const"> <modify-argument index="0"> @@ -3014,9 +2989,7 @@ <modify-argument index="3"> <remove-argument/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_args,int*,ItemRole*"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qformlayout-fix-args" /> </modify-function> <modify-function signature="getItemPosition(int,int*,QFormLayout::ItemRole*)const"> <modify-argument index="0"> @@ -3028,9 +3001,7 @@ <modify-argument index="3"> <remove-argument/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_args,int*,ItemRole*"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qformlayout-fix-args" /> </modify-function> <modify-function signature="addRow(QWidget*,QWidget*)"> |