From 6245d7dd3b669dd4032c487de6522e7e51d0f39e Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 6 May 2022 09:21:41 +0200 Subject: [PATCH] QXmlStreamReader: port another indexed to ranged for loop ... fixing yet another int/qsizetype mismatch. This is clearly safe, as the loop body trivially doesn't modifiy the container we're iterating over. Pick-to: 6.3 6.2 Task-number: QTBUG-102465 Change-Id: I7db65455019cf75663432078d39805be5816cf24 Reviewed-by: Lars Knoll --- src/corelib/serialization/qxmlstream.g | 3 +-- src/corelib/serialization/qxmlstreamparser_p.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g index 4d08f9aec3..713c5a17e0 100644 --- a/src/corelib/serialization/qxmlstream.g +++ b/src/corelib/serialization/qxmlstream.g @@ -1205,8 +1205,7 @@ attribute ::= qname space_opt EQ space_opt attribute_value; XmlStringRef attributeQualifiedName = symName(1); bool normalize = false; - for (int a = 0; a < dtdAttributes.size(); ++a) { - DtdAttribute &dtdAttribute = dtdAttributes[a]; + for (const DtdAttribute &dtdAttribute : std::as_const(dtdAttributes)) { if (!dtdAttribute.isCDATA && dtdAttribute.tagName == qualifiedName && dtdAttribute.attributeQualifiedName == attributeQualifiedName diff --git a/src/corelib/serialization/qxmlstreamparser_p.h b/src/corelib/serialization/qxmlstreamparser_p.h index e73a0f4a50..0a3e60e233 100644 --- a/src/corelib/serialization/qxmlstreamparser_p.h +++ b/src/corelib/serialization/qxmlstreamparser_p.h @@ -768,8 +768,7 @@ bool QXmlStreamReaderPrivate::parse() XmlStringRef attributeQualifiedName = symName(1); bool normalize = false; - for (int a = 0; a < dtdAttributes.size(); ++a) { - DtdAttribute &dtdAttribute = dtdAttributes[a]; + for (const DtdAttribute &dtdAttribute : std::as_const(dtdAttributes)) { if (!dtdAttribute.isCDATA && dtdAttribute.tagName == qualifiedName && dtdAttribute.attributeQualifiedName == attributeQualifiedName