diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-09-04 16:55:29 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-09-20 18:24:49 +0000 |
| commit | 21cc71ced3565585f7a2f94875ed845355ab2064 (patch) | |
| tree | fc9c632572e6f69d3753bc4a2658cec3e5cc7bff /src/xmlpatterns/schema/qxsdschemachecker.cpp | |
| parent | b1b57225dbc8733935697e1895631969e9a95376 (diff) | |
| download | qtxmlpatterns-21cc71ced3565585f7a2f94875ed845355ab2064.tar.gz | |
Eradicate Java-style loops (I): QHashIterator -> STL-style
Java-style iterators are slower than STL-style ones, so
they should not be used in library code.
Replaced them with STL iterator loops.
In one case, a QMutableHashIterator actually needn't be
mutable, so ported to const_iterator, like all others.
Change-Id: Ib7fd1fa5fca2df2c288a61925ee68a5df11caf62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/xmlpatterns/schema/qxsdschemachecker.cpp')
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemachecker.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/xmlpatterns/schema/qxsdschemachecker.cpp b/src/xmlpatterns/schema/qxsdschemachecker.cpp index 0898848..5e4302d 100644 --- a/src/xmlpatterns/schema/qxsdschemachecker.cpp +++ b/src/xmlpatterns/schema/qxsdschemachecker.cpp @@ -436,11 +436,9 @@ void XsdSchemaChecker::checkSimpleTypeConstraints() // 2.2.1.2 const XsdFacet::Hash facets = simpleType->facets(); - XsdFacet::HashIterator it(facets); bool invalidFacetFound = false; - while (it.hasNext()) { - it.next(); + for (auto it = facets.cbegin(), end = facets.cend(); it != end; ++it) { if (it.key() != XsdFacet::WhiteSpace) { invalidFacetFound = true; break; @@ -476,12 +474,10 @@ void XsdSchemaChecker::checkSimpleTypeConstraints() // 2.2.2.4 const XsdFacet::Hash facets = simpleType->facets(); - XsdFacet::HashIterator it(facets); bool invalidFacetFound = false; XsdFacet::Type invalidFacetType = XsdFacet::None; - while (it.hasNext()) { - it.next(); + for (auto it = facets.cbegin(), end = facets.cend(); it != end; ++it) { const XsdFacet::Type facetType = it.key(); if (facetType != XsdFacet::Length && facetType != XsdFacet::MinimumLength && @@ -573,12 +569,10 @@ void XsdSchemaChecker::checkSimpleTypeConstraints() // 3.1.2.4 const XsdFacet::Hash facets = simpleType->facets(); - XsdFacet::HashIterator it(facets); bool invalidFacetFound = false; XsdFacet::Type invalidFacetType = XsdFacet::None; - while (it.hasNext()) { - it.next(); + for (auto it = facets.cbegin(), end = facets.cend(); it != end; ++it) { const XsdFacet::Type facetType = it.key(); if (facetType != XsdFacet::Pattern && facetType != XsdFacet::Enumeration) { @@ -1573,9 +1567,7 @@ void XsdSchemaChecker::checkConstrainingFacets(const XsdFacet::Hash &facets, con if (!baseType->isDefinedBySchema()) { const XsdSchemaSourceLocationReflection reflection(sourceLocation(simpleType)); - XsdFacet::HashIterator it(facets); - while (it.hasNext()) { - it.next(); + for (auto it = facets.cbegin(), end = facets.cend(); it != end; ++it) { const XsdFacet::Ptr facet = it.value(); if (facet->type() == XsdFacet::MaximumInclusive || facet->type() == XsdFacet::MaximumExclusive || |