diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-05 16:30:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-05 16:30:28 (GMT) |
| commit | 9e95890804d8b5114f8090496b82327178055348 (patch) | |
| tree | dbc17e0bceadcbd771e45a29cb1addcdd7fa18c2 /src/xmlpatterns/schema/qxsdelement.cpp | |
| parent | 671fff6071d1064094bf41364b11df3b55e7a65c (diff) | |
| parent | d1ac6af4f30e822e161fd8772104aa2e30e55a2f (diff) | |
| download | Qt-9e95890804d8b5114f8090496b82327178055348.zip Qt-9e95890804d8b5114f8090496b82327178055348.tar.gz Qt-9e95890804d8b5114f8090496b82327178055348.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/xmlpatterns/schema/qxsdelement.cpp')
| -rw-r--r-- | src/xmlpatterns/schema/qxsdelement.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xmlpatterns/schema/qxsdelement.cpp b/src/xmlpatterns/schema/qxsdelement.cpp index 1ebec06..b0c5661 100644 --- a/src/xmlpatterns/schema/qxsdelement.cpp +++ b/src/xmlpatterns/schema/qxsdelement.cpp @@ -57,12 +57,12 @@ XsdElement::Scope::Variety XsdElement::Scope::variety() const void XsdElement::Scope::setParent(const NamedSchemaComponent::Ptr &parent) { - m_parent = parent; + m_parent = parent.data(); } NamedSchemaComponent::Ptr XsdElement::Scope::parent() const { - return m_parent; + return NamedSchemaComponent::Ptr(m_parent); } void XsdElement::ValueConstraint::setVariety(Variety variety) @@ -233,10 +233,10 @@ XsdElement::List XsdElement::substitutionGroupAffiliations() const void XsdElement::addSubstitutionGroup(const XsdElement::Ptr &element) { - m_substitutionGroups.insert(element); + m_substitutionGroups.insert(element.data()); } -XsdElement::List XsdElement::substitutionGroups() const +XsdElement::WeakList XsdElement::substitutionGroups() const { return m_substitutionGroups.toList(); } |