diff options
| author | renatofilho <renato.filho@openbossa.org> | 2010-10-27 17:24:27 -0300 |
|---|---|---|
| committer | renatofilho <renato.filho@openbossa.org> | 2010-10-28 13:51:55 -0300 |
| commit | 631f296b188737477aba4c4dd7af57c356db16c4 (patch) | |
| tree | 669a66e9957bf88359d6d83a54b234ff8e59a742 | |
| parent | 7c6595c9264e6d21e715f0697a3b9a402828a5fb (diff) | |
Updated QtXml and QtXmlPatterns typesystem.
Move some value-types to object-type because these classes use QScopedPointer without assigner operator.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
| -rw-r--r-- | PySide/QtXml/typesystem_xml.xml | 2 | ||||
| -rw-r--r-- | PySide/QtXmlPatterns/typesystem_xmlpatterns.xml | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml index f5d6f2c08..1dd8dd3f8 100644 --- a/PySide/QtXml/typesystem_xml.xml +++ b/PySide/QtXml/typesystem_xml.xml @@ -260,7 +260,7 @@ <modify-function signature="nodeType()const" remove="all"/> </value-type> - <value-type name="QXmlParseException"/> + <object-type name="QXmlParseException"/> <!-- These are defined in QtCore <value-type name="QXmlStreamAttribute"/> diff --git a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml index cfa6f86d9..322e2f0b7 100644 --- a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml +++ b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml @@ -21,8 +21,18 @@ <typesystem package="PySide.QtXmlPatterns"> <load-typesystem name="typesystem_core.xml" generate="no"/> - <value-type name="QXmlSchema"/> - <object-type name="QXmlSchemaValidator"/> + <object-type name="QXmlSchema"/> <!-- Qt scoped pointer does not allow declare this as value type --> + <object-type name="QXmlSchemaValidator"> + <modify-function signature="schema() const"> + <modify-argument index="return"> + <replace-type modified-type="QXmlSchema*"/> + <define-ownership owner="target"/> + </modify-argument> + <inject-code> + %PYARG_0 = %CONVERTTOPYTHON[QXmlSchema*](new QXmlSchema(%CPPSELF.schema())); + </inject-code> + </modify-function> + </object-type> <object-type name="QAbstractMessageHandler" /> <object-type name="QAbstractUriResolver" /> <object-type name="QAbstractXmlNodeModel"> |