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/QtXml | |
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/QtXml')
-rw-r--r-- | sources/pyside2/PySide2/QtXml/typesystem_xml.xml | 56 |
1 files changed, 11 insertions, 45 deletions
diff --git a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml index 4f7839ccf..59343543a 100644 --- a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml +++ b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml @@ -40,8 +40,9 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtXml"> - <load-typesystem name="typesystem_templates.xml" generate="no"/> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> + <load-typesystem name="templates/core_common.xml" generate="no" /> + <load-typesystem name="templates/xml_common.xml" generate="no" /> <rejection class="QXmlAttributes::Attribute"/> <rejection class="QDomNode" field-name="impl"/> @@ -53,19 +54,6 @@ <value-type name="QDomCharacterData"/> <value-type name="QDomComment"/> - <template name="qdomdocument_setcontent"> - QString _errorMsg_; - int _errorLine_ = 0; - int _errorColumn_ = 0; - %BEGIN_ALLOW_THREADS - bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &_errorMsg_, &_errorLine_, &_errorColumn_); - %END_ALLOW_THREADS - %PYARG_0 = PyTuple_New(4); - PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](_ret_)); - PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](_errorMsg_)); - PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](_errorLine_)); - PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](_errorColumn_)); - </template> <value-type name="QDomDocument"> <!-- will be replaced in inject code --> @@ -85,9 +73,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> <modify-function signature="setContent(const QString&,bool,QString*,int*,int*)"> <modify-argument index="3"> @@ -105,9 +91,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> <modify-function signature="setContent(QIODevice*,bool,QString*,int*,int*)"> <modify-argument index="3"> @@ -125,9 +109,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> <modify-function signature="setContent(const QByteArray&,QString*,int*,int*)"> <modify-argument index="2"> @@ -145,9 +127,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> <modify-function signature="setContent(QIODevice*,QString*,int*,int*)"> <modify-argument index="2"> @@ -165,9 +145,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> <modify-function signature="setContent(QXmlInputSource*,bool,QString*,int*,int*)"> <modify-argument index="3"> @@ -185,9 +163,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)"> <modify-argument index="3"> @@ -205,9 +181,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> <modify-function signature="setContent(const QString&,QString*,int*,int*)"> <modify-argument index="2"> @@ -225,9 +199,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="qdomdocument_setcontent"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtxml.cpp" snippet="qdomdocument-setcontent" /> </modify-function> </value-type> @@ -273,12 +245,6 @@ <object-type name="QXmlErrorHandler"/> <object-type name="QXmlLexicalHandler"/> - <template name="QXmlEntityResolver_resolveEntity_return_conversion_native"> - Shiboken::AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 0)); - Shiboken::AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 1)); - %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ok_); - %3 = %CONVERTTOCPP[QXmlInputSource*](_py_ret_); - </template> <object-type name="QXmlEntityResolver"> <modify-function signature="resolveEntity(const QString&,const QString&,QXmlInputSource*&)"> |