From 5eb09c649e399ee6f3d4101d4cfb4c802f9da5e3 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Mon, 25 May 2015 17:13:28 +0100 Subject: Replace containsSet() with QSet::contains() We have a QSet::contains() since 4.6. Change-Id: Idbafeec6e58aadff4a07e7ed50ac54dc8738623a Reviewed-by: Konstantin Ritt Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/xmlpatterns/schema/qxsdschemahelper.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/xmlpatterns/schema/qxsdschemahelper.cpp b/src/xmlpatterns/schema/qxsdschemahelper.cpp index b0fbf31..f6e9b98 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 -static inline bool containsSet(const QSet &super, const QSet &sub) -{ - QSetIterator 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,7 +165,7 @@ bool XsdSchemaHelper::isWildcardSubset(const XsdWildcard::Ptr &wildcard, const X // 2 if ((constraint->variety() == XsdWildcard::NamespaceConstraint::Enumeration) && (otherConstraint->variety() == XsdWildcard::NamespaceConstraint::Enumeration)) { - if (containsSet(otherConstraint->namespaces(), constraint->namespaces())) + if (otherConstraint->namespaces().contains(constraint->namespaces())) return true; } @@ -190,7 +177,7 @@ bool XsdSchemaHelper::isWildcardSubset(const XsdWildcard::Ptr &wildcard, const X // 4 if ((constraint->variety() == XsdWildcard::NamespaceConstraint::Not) && (otherConstraint->variety() == XsdWildcard::NamespaceConstraint::Not)) { - if (containsSet(constraint->namespaces(), otherConstraint->namespaces())) + if (constraint->namespaces().contains(otherConstraint->namespaces())) return true; } -- cgit v1.2.1