diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 14 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemahelper.cpp | 19 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemaresolver.cpp | 2 |
4 files changed, 10 insertions, 27 deletions
diff --git a/.qmake.conf b/.qmake.conf index 58db72c..fc13c75 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.5.1 +MODULE_VERSION = 5.6.0 diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 1a24dcc..f419eb5 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -441,9 +441,6 @@ namespace QPatternist class MergeIterator { public: - inline MergeIterator() - { - } inline QXmlNodeModelIndexIteratorPointer @@ -452,12 +449,9 @@ namespace QPatternist { return it; } - - private: - Q_DISABLE_COPY(MergeIterator) }; - static const MergeIterator mergeIterator; + static const MergeIterator mergeIterator = {}; /** * One might wonder, why not use makeVectorIterator() directly on a QVector @@ -483,8 +477,9 @@ namespace QPatternist virtual QAbstractXmlForwardIterator<QXmlNodeModelIndexIteratorPointer>::Ptr copy() const { ItVector result; - - for(int i = 0; i < m_list.count(); ++i) + const int count = m_list.count(); + result.reserve(count); + for (int i = 0; i < count; ++i) result.append(m_list.at(i)->copy()); return Ptr(new IteratorVector(result)); @@ -501,6 +496,7 @@ static inline QXmlNodeModelIndexIteratorPointer mergeIterators(const QXmlNodeMod const QXmlNodeModelIndexIteratorPointer &it2) { QVector<QXmlNodeModelIndexIteratorPointer> iterators; + iterators.reserve(2); iterators.append(makeSingletonIterator(node)); iterators.append(it2); diff --git a/src/xmlpatterns/schema/qxsdschemahelper.cpp b/src/xmlpatterns/schema/qxsdschemahelper.cpp index b0fbf31..8a8314d 100644 --- a/src/xmlpatterns/schema/qxsdschemahelper.cpp +++ b/src/xmlpatterns/schema/qxsdschemahelper.cpp @@ -150,19 +150,6 @@ bool XsdSchemaHelper::wildcardAllowsExpandedName(const QXmlName &name, const Xsd return true; } -// small helper function that should be available in Qt 4.6 -template<class T> -static inline bool containsSet(const QSet<T> &super, const QSet<T> &sub) -{ - QSetIterator<T> it(sub); - while (it.hasNext()) { - if (!super.contains(it.next())) - return false; - } - - return true; -} - bool XsdSchemaHelper::isWildcardSubset(const XsdWildcard::Ptr &wildcard, const XsdWildcard::Ptr &otherWildcard) { // @see http://www.w3.org/TR/xmlschema11-1/#cos-ns-subset @@ -178,19 +165,19 @@ bool XsdSchemaHelper::isWildcardSubset(const XsdWildcard::Ptr &wildcard, const X // 2 if ((constraint->variety() == XsdWildcard::NamespaceConstraint::Enumeration) && (otherConstraint->variety() == XsdWildcard::NamespaceConstraint::Enumeration)) { - if (containsSet<QString>(otherConstraint->namespaces(), constraint->namespaces())) + if (otherConstraint->namespaces().contains(constraint->namespaces())) return true; } // 3 if ((constraint->variety() == XsdWildcard::NamespaceConstraint::Enumeration) && (otherConstraint->variety() == XsdWildcard::NamespaceConstraint::Not)) { - if (constraint->namespaces().intersect(otherConstraint->namespaces()).isEmpty()) + if (!constraint->namespaces().intersects(otherConstraint->namespaces())) return true; } // 4 if ((constraint->variety() == XsdWildcard::NamespaceConstraint::Not) && (otherConstraint->variety() == XsdWildcard::NamespaceConstraint::Not)) { - if (containsSet<QString>(constraint->namespaces(), otherConstraint->namespaces())) + if (constraint->namespaces().contains(otherConstraint->namespaces())) return true; } diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp index 469a239..14109d6 100644 --- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp +++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp @@ -1413,7 +1413,7 @@ bool isValidWildcardRestriction(const XsdWildcard::Ptr &wildcard, const XsdWildc } if (baseWildcard->namespaceConstraint()->variety() == XsdWildcard::NamespaceConstraint::Not && wildcard->namespaceConstraint()->variety() == XsdWildcard::NamespaceConstraint::Enumeration) { - if (!baseWildcard->namespaceConstraint()->namespaces().intersect(wildcard->namespaceConstraint()->namespaces()).isEmpty()) + if (baseWildcard->namespaceConstraint()->namespaces().intersects(wildcard->namespaceConstraint()->namespaces())) return false; } if (baseWildcard->namespaceConstraint()->variety() == XsdWildcard::NamespaceConstraint::Enumeration && |