summaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtXml/typesystem_xml.xml
diff options
context:
space:
mode:
authorCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2018-10-11 17:45:43 +0200
committerCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2018-11-22 17:00:11 +0000
commita57a202a70801f766094c3ed11664b03c9a6a3e4 (patch)
tree73c2c1f4fc902ccbc10b73811bbf299a2c555728 /sources/pyside2/PySide2/QtXml/typesystem_xml.xml
parentf93a7369657814206bfbce49817c8fbd9a1bfcba (diff)
Move inject-code snippets to separate files
When code must be modified or added to certain functions, we currently have two options: * Write a template and include it into the typesystem, * inject code directly at a certain place of the function entry. The problem with injecting raw code is that since it is an XML file, one need to escape protected symbols, like "<" and "&". Thanks to a couple of complementary commits, now we can place this code snippets on a separate file without triggering a whole module compiling process, since the typesystem itself will not be alterered. All the injected code from the typesystem was removed and placed into a single file per module inside a top-level directory called glue. Some small fixes were included mainly regarding styling of the code. Task-number: PYSIDE-834 Change-Id: I823e92d241a528d75d5940090008db9bf297f49e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtXml/typesystem_xml.xml')
-rw-r--r--sources/pyside2/PySide2/QtXml/typesystem_xml.xml74
1 files changed, 29 insertions, 45 deletions
diff --git a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml
index 3bfd7c66..4f7839cc 100644
--- a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml
+++ b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml
@@ -40,18 +40,18 @@
****************************************************************************/
-->
<typesystem package="PySide2.QtXml">
- <load-typesystem name="typesystem_templates.xml" generate="no" />
- <load-typesystem name="QtCore/typesystem_core.xml" generate="no" />
+ <load-typesystem name="typesystem_templates.xml" generate="no"/>
+ <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
<rejection class="QXmlAttributes::Attribute"/>
<rejection class="QDomNode" field-name="impl"/>
<rejection class="QXmlInputSource" field-name="EndOfData"/>
<rejection class="QXmlInputSource" field-name="EndOfDocument"/>
- <value-type name="QDomAttr" />
- <value-type name="QDomCDATASection" />
- <value-type name="QDomCharacterData" />
- <value-type name="QDomComment" />
+ <value-type name="QDomAttr"/>
+ <value-type name="QDomCDATASection"/>
+ <value-type name="QDomCharacterData"/>
+ <value-type name="QDomComment"/>
<template name="qdomdocument_setcontent">
QString _errorMsg_;
@@ -86,7 +86,7 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
<modify-function signature="setContent(const QString&amp;,bool,QString*,int*,int*)">
@@ -106,7 +106,7 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
<modify-function signature="setContent(QIODevice*,bool,QString*,int*,int*)">
@@ -126,7 +126,7 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
<modify-function signature="setContent(const QByteArray&amp;,QString*,int*,int*)">
@@ -146,7 +146,7 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
<modify-function signature="setContent(QIODevice*,QString*,int*,int*)">
@@ -166,7 +166,7 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
<modify-function signature="setContent(QXmlInputSource*,bool,QString*,int*,int*)">
@@ -186,7 +186,7 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
<modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)">
@@ -206,7 +206,7 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
<modify-function signature="setContent(const QString&amp;,QString*,int*,int*)">
@@ -226,20 +226,20 @@
<replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
</modify-argument>
<inject-code class="target" position="beginning">
- <insert-template name="qdomdocument_setcontent" />
+ <insert-template name="qdomdocument_setcontent"/>
</inject-code>
</modify-function>
</value-type>
- <value-type name="QDomDocumentFragment" />
- <value-type name="QDomDocumentType" />
- <value-type name="QDomEntity" />
- <value-type name="QDomEntityReference" />
+ <value-type name="QDomDocumentFragment"/>
+ <value-type name="QDomDocumentType"/>
+ <value-type name="QDomEntity"/>
+ <value-type name="QDomEntityReference"/>
<value-type name="QDomImplementation">
<enum-type name="InvalidDataPolicy"/>
</value-type>
- <value-type name="QDomNamedNodeMap" />
+ <value-type name="QDomNamedNodeMap"/>
<value-type name="QDomNode">
<enum-type name="EncodingPolicy"/>
@@ -247,11 +247,11 @@
<modify-function signature="save(QTextStream&amp;,int,QDomNode::EncodingPolicy)const" allow-thread="yes"/>
</value-type>
- <value-type name="QDomNodeList" />
- <value-type name="QDomNotation" />
- <value-type name="QDomProcessingInstruction" />
+ <value-type name="QDomNodeList"/>
+ <value-type name="QDomNotation"/>
+ <value-type name="QDomProcessingInstruction"/>
- <value-type name="QDomText" />
+ <value-type name="QDomText"/>
<object-type name="QXmlParseException"/>
@@ -291,15 +291,7 @@
<insert-template name="QXmlEntityResolver_resolveEntity_return_conversion_native"/>
</conversion-rule>
</modify-argument>
- <inject-code class="target" position="end">
- QXmlInputSource* _qxmlinputsource_arg_ = 0;
- %BEGIN_ALLOW_THREADS
- %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
- %END_ALLOW_THREADS
- %PYARG_0 = PyTuple_New(2);
- PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
- PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
- </inject-code>
+ <inject-code class="target" position="end" file="../glue/qtxml.cpp" snippet="qxmlentityresolver-resolveentity"/>
</modify-function>
</object-type>
<object-type name="QXmlDefaultHandler">
@@ -318,15 +310,7 @@
<insert-template name="QXmlEntityResolver_resolveEntity_return_conversion_native"/>
</conversion-rule>
</modify-argument>
- <inject-code class="target" position="end">
- QXmlInputSource* _qxmlinputsource_arg_ = 0;
- %BEGIN_ALLOW_THREADS
- %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
- %END_ALLOW_THREADS
- %PYARG_0 = PyTuple_New(2);
- PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
- PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
- </inject-code>
+ <inject-code class="target" position="end" file="../glue/qtxml.cpp" snippet="qxmlentityresolver-resolveentity"/>
</modify-function>
</object-type>
<object-type name="QXmlInputSource"/>
@@ -342,7 +326,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="PySequence" />
+ <replace-type modified-type="PySequence"/>
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>
@@ -357,7 +341,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="PySequence" />
+ <replace-type modified-type="PySequence"/>
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>
@@ -409,7 +393,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="PySequence" />
+ <replace-type modified-type="PySequence"/>
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>
@@ -424,7 +408,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="PySequence" />
+ <replace-type modified-type="PySequence"/>
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>