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/QtWebKitWidgets/typesystem_webkitwidgets.xml | |
| 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/QtWebKitWidgets/typesystem_webkitwidgets.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml index fa54703c3..27a4835e2 100644 --- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml +++ b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml @@ -46,6 +46,7 @@ <load-typesystem name="QtWebKit/typesystem_webkit.xml" generate="no"/> <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <load-typesystem name="QtPrintSupport/typesystem_printsupport.xml" generate="no"/> + <load-typesystem name="templates/webkitwidgets_common.xml" generate="no"/> <value-type name="QWebDatabase"/> @@ -118,14 +119,7 @@ <modify-argument index="return"> <replace-type modified-type="PyObject"/> </modify-argument> - <inject-code position="end"> - <insert-template name="convertFromMultiMap"> - <replace from="%MAP_NAME" to="%0"/> - <replace from="%RETURN_NAME" to="%PYARG_0"/> - <replace from="%KEY_TYPE" to="QString"/> - <replace from="%VALUE_TYPE" to="QString"/> - </insert-template> - </inject-code> + <inject-code position="end" file="../glue/qtwebkitwidgets.cpp" snippet="qwebframe-metadata" /> </modify-function> </object-type> @@ -150,19 +144,6 @@ <value-type name="ViewportAttributes"/> <modify-function signature="extension(QWebPage::Extension,const QWebPage::ExtensionOption*,QWebPage::ExtensionReturn*)"> - <template name="qwebpage_extension_argument_conversion"> - PyObject* %out = 0; - // Cast the parameters according to the extension type - if (extension == QWebPage::ChooseMultipleFilesExtension) { - const ChooseMultipleFilesExtension$TYPE_SUFFIX* _in = reinterpret_cast<const ChooseMultipleFilesExtension$TYPE_SUFFIX*>(%in); - %out = %CONVERTTOPYTHON[const QWebPage::ChooseMultipleFilesExtension$TYPE_SUFFIX*](_in); - #if QT_VERSION >= 0x040600 - } else if (extension == QWebPage::ErrorPageExtension) { - const ErrorPageExtension$TYPE_SUFFIX* _in = reinterpret_cast<const ErrorPageExtension$TYPE_SUFFIX*>(%in); - %out = %CONVERTTOPYTHON[const QWebPage::ErrorPageExtension$TYPE_SUFFIX*](_in); - #endif - } - </template> <modify-argument index="2" invalidate-after-use="yes"> <conversion-rule class="target"> <insert-template name="qwebpage_extension_argument_conversion"> |