summaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.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/QtXmlPatterns/typesystem_xmlpatterns.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/QtXmlPatterns/typesystem_xmlpatterns.xml')
-rw-r--r--sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml91
1 files changed, 44 insertions, 47 deletions
diff --git a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
index 2ac15080..f3f689cf 100644
--- a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
+++ b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
@@ -42,83 +42,80 @@
<typesystem package="PySide2.QtXmlPatterns">
<load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
- <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type -->
+ <object-type name="QXmlSchema" since="4.6"/> <!-- Qt scoped pointer does not allow declare this as value type -->
<object-type name="QXmlSchemaValidator" since="4.6">
<modify-function signature="schema()const">
<modify-argument index="return">
<replace-type modified-type="QXmlSchema*"/>
<define-ownership owner="target"/>
</modify-argument>
- <inject-code>
- QXmlSchema* %0 = new QXmlSchema(%CPPSELF.schema());
- %PYARG_0 = %CONVERTTOPYTHON[QXmlSchema*](%0);
- </inject-code>
+ <inject-code file="../glue/qtxmlpatterns.cpp" snippet="qxmlschemavalidator-schema"/>
</modify-function>
</object-type>
- <object-type name="QAbstractMessageHandler" />
- <object-type name="QAbstractUriResolver" />
+ <object-type name="QAbstractMessageHandler"/>
+ <object-type name="QAbstractUriResolver"/>
<object-type name="QAbstractXmlNodeModel">
- <enum-type name="NodeCopySetting" />
- <enum-type name="SimpleAxis" />
+ <enum-type name="NodeCopySetting"/>
+ <enum-type name="SimpleAxis"/>
</object-type>
- <object-type name="QAbstractXmlReceiver" />
- <value-type name="QSourceLocation" />
- <object-type name="QXmlFormatter" />
- <value-type name="QXmlItem" />
+ <object-type name="QAbstractXmlReceiver"/>
+ <value-type name="QSourceLocation"/>
+ <object-type name="QXmlFormatter"/>
+ <value-type name="QXmlItem"/>
<value-type name="QXmlName">
<primitive-type name="NamespaceCode"/>
<primitive-type name="PrefixCode"/>
<primitive-type name="LocalNameCode"/>
<!-- ### These methods aren't part of Qt public API -->
<modify-function signature="QXmlName(QXmlName::NamespaceCode,QXmlName::LocalNameCode,QXmlName::PrefixCode)" remove="all"/>
- <modify-function signature="setNamespaceURI(QXmlName::NamespaceCode)" remove="all" />
- <modify-function signature="localName()const" remove="all" />
- <modify-function signature="prefix()const" remove="all" />
- <modify-function signature="hasPrefix()const" remove="all" />
- <modify-function signature="hasNamespace()const" remove="all" />
- <modify-function signature="namespaceURI()const" remove="all" />
- <modify-function signature="isLexicallyEqual(const QXmlName&amp;)const" remove="all" />
- <modify-function signature="setPrefix(QXmlName::PrefixCode)" remove="all" />
- <modify-function signature="setLocalName(QXmlName::LocalNameCode)" remove="all" />
- <modify-function signature="code()const" remove="all" />
+ <modify-function signature="setNamespaceURI(QXmlName::NamespaceCode)" remove="all"/>
+ <modify-function signature="localName()const" remove="all"/>
+ <modify-function signature="prefix()const" remove="all"/>
+ <modify-function signature="hasPrefix()const" remove="all"/>
+ <modify-function signature="hasNamespace()const" remove="all"/>
+ <modify-function signature="namespaceURI()const" remove="all"/>
+ <modify-function signature="isLexicallyEqual(const QXmlName&amp;)const" remove="all"/>
+ <modify-function signature="setPrefix(QXmlName::PrefixCode)" remove="all"/>
+ <modify-function signature="setLocalName(QXmlName::LocalNameCode)" remove="all"/>
+ <modify-function signature="code()const" remove="all"/>
<!-- ### -->
</value-type>
- <value-type name="QXmlNamePool" />
+ <value-type name="QXmlNamePool"/>
- <rejection class="QXmlNodeModelIndex" function-name="type" />
- <rejection class="QXmlNodeModelIndex" function-name="sequencedTypedValue" />
- <rejection class="QXmlNodeModelIndex" function-name="iterate" />
+ <rejection class="QXmlNodeModelIndex" function-name="type"/>
+ <rejection class="QXmlNodeModelIndex" function-name="sequencedTypedValue"/>
+ <rejection class="QXmlNodeModelIndex" function-name="iterate"/>
<!-- ### This enum isn't part of Qt public API -->
<suppress-warning text="enum 'QXmlNodeModelIndex::Axis' does not have a type entry or is not an enum"/>
<value-type name="QXmlNodeModelIndex">
- <enum-type name="DocumentOrder" />
- <enum-type name="NodeKind" />
+ <enum-type name="DocumentOrder"/>
+ <enum-type name="NodeKind"/>
<!-- ### Qt internal methods -->
- <modify-function signature="name()const" remove="all" />
- <modify-function signature="root()const" remove="all" />
- <modify-function signature="documentUri()const" remove="all" />
- <modify-function signature="baseUri()const" remove="all" />
- <modify-function signature="kind()const" remove="all" />
- <modify-function signature="isDeepEqual(const QXmlNodeModelIndex&amp;)const" remove="all" />
- <modify-function signature="compareOrder(const QXmlNodeModelIndex &amp;)const" remove="all" />
- <modify-function signature="sendNamespaces(QAbstractXmlReceiver*const)const" remove="all" />
- <modify-function signature="namespaceBindings()const" remove="all" />
- <modify-function signature="namespaceForPrefix(QXmlName::PrefixCode)const" remove="all" />
- <modify-function signature="stringValue()const" remove="all" />
- <modify-function signature="is(const QXmlNodeModelIndex &amp;)const" remove="all" />
- <modify-function signature="reset()" remove="all" />
+ <modify-function signature="name()const" remove="all"/>
+ <modify-function signature="root()const" remove="all"/>
+ <modify-function signature="documentUri()const" remove="all"/>
+ <modify-function signature="baseUri()const" remove="all"/>
+ <modify-function signature="kind()const" remove="all"/>
+ <modify-function signature="isDeepEqual(const QXmlNodeModelIndex&amp;)const" remove="all"/>
+ <modify-function signature="compareOrder(const QXmlNodeModelIndex &amp;)const" remove="all"/>
+ <modify-function signature="sendNamespaces(QAbstractXmlReceiver*const)const" remove="all"/>
+ <modify-function signature="namespaceBindings()const" remove="all"/>
+ <modify-function signature="namespaceForPrefix(QXmlName::PrefixCode)const" remove="all"/>
+ <modify-function signature="stringValue()const" remove="all"/>
+ <modify-function signature="is(const QXmlNodeModelIndex &amp;)const" remove="all"/>
+ <modify-function signature="reset()" remove="all"/>
<!-- ### -->
</value-type>
<value-type name="QXmlQuery">
<!-- ### TODO: must evaluate if anything other than removal is needed. -->
- <enum-type name="QueryLanguage" />
- <modify-function signature="evaluateTo(QStringList*)const" remove="all" />
- <modify-function signature="evaluateTo(QString*)const" remove="all" />
+ <enum-type name="QueryLanguage"/>
+ <modify-function signature="evaluateTo(QStringList*)const" remove="all"/>
+ <modify-function signature="evaluateTo(QString*)const" remove="all"/>
<!-- ### -->
</value-type>
- <object-type name="QXmlResultItems" />
- <object-type name="QXmlSerializer" />
+ <object-type name="QXmlResultItems"/>
+ <object-type name="QXmlSerializer"/>
<suppress-warning text="class 'QAbstractXmlNodeModel' inherits from unknown base class 'QSharedData'"/>
<suppress-warning text="class not found for setup inheritance 'QSharedData'"/>