summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-05-06 01:05:09 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-05-07 00:50:46 +0200
commit24385511522f9e595142ed491fe2e0c3061017b9 (patch)
treeb202c5a34690931d52ca0608096dddad70edc689
parentba741fd310214cd2524d939f647c429604bae79b (diff)
QXmlStreamWriter: replace indexed with ranged for loops
Simpler, and fixes the int/qsizetype mismatches. Pick-to: 6.3 6.2 Task-number: QTBUG-102465 Change-Id: I8ac139a14c4c790348acd76b95d1bee83bb2797d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/serialization/qxmlstream.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index 4f9affb2d4..21ca09057b 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -2939,8 +2939,7 @@ void QXmlStreamWriterPrivate::writeEscaped(const QString &s, bool escapeWhitespa
{
QString escaped;
escaped.reserve(s.size());
- for ( int i = 0; i < s.size(); ++i ) {
- QChar c = s.at(i);
+ for (QChar c : s) {
switch (c.unicode()) {
case '<':
escaped.append("&lt;"_L1);
@@ -3718,9 +3717,8 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader)
break;
case QXmlStreamReader::StartElement: {
writeStartElement(reader.namespaceUri().toString(), reader.name().toString());
- QXmlStreamNamespaceDeclarations namespaceDeclarations = reader.namespaceDeclarations();
- for (int i = 0; i < namespaceDeclarations.size(); ++i) {
- const QXmlStreamNamespaceDeclaration &namespaceDeclaration = namespaceDeclarations.at(i);
+ const QXmlStreamNamespaceDeclarations decls = reader.namespaceDeclarations();
+ for (const auto &namespaceDeclaration : decls) {
writeNamespace(namespaceDeclaration.namespaceUri().toString(),
namespaceDeclaration.prefix().toString());
}