Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: Ie4eaf067382d8ca5e139a994e045e83f3f90760c

1 files changed, 1 insertions, 5 deletions

diff --git a/src/xmlpatterns/schema/qxsdtypechecker.cpp b/src/xmlpatterns/schema/qxsdtypechecker.cpp
index 7c554c5..2e4ce8e 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker.cpp
+++ b/src/xmlpatterns/schema/qxsdtypechecker.cpp
@@ -206,12 +206,8 @@ XsdFacet::Hash XsdTypeChecker::mergedFacetsForType(const SchemaType::Ptr &type,
     const XsdFacet::Hash facets = context->facetsForType(type);
 
     XsdFacet::Hash result = baseFacets;
-    XsdFacet::HashIterator it(facets);
-    while (it.hasNext()) {
-        it.next();
-
+    for (auto it = facets.cbegin(), end = facets.cend(); it != end; ++it)
         result.insert(it.key(), it.value());
-    }
 
     return result;
 }