From b5d66b52df068705a30f32b8e34c0a9b9b724d56 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Tue, 11 Jul 2023 13:56:51 +0200 Subject: [PATCH] QXmlStreamReader: Fix variable naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace variable names referring to XML "location" with names referring to XML context. Task-number: QTBUG-92113 Task-number: QTBUG-95188 Change-Id: If00e92dce237d95fa1850f0b45192995724ba99f Reviewed-by: Jan Arve Sæther (cherry picked from commit f67a497dbe70dd3258997010c286654aaf963d1c) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/serialization/qxmlstream.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 95cd8638f4b..07211fe2ea2 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -806,7 +806,7 @@ QString QXmlStreamReader::tokenString() const /*! \internal - \return \param loc (Prolog/Body) as a string. + \return \param ctxt (Prolog/Body) as a string. */ static constexpr QLatin1StringView contextString(QXmlStreamReaderPrivate::XmlContext ctxt) { @@ -3853,19 +3853,19 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader) } static constexpr bool isTokenAllowedInContext(QXmlStreamReader::TokenType type, - QXmlStreamReaderPrivate::XmlContext loc) + QXmlStreamReaderPrivate::XmlContext ctxt) { switch (type) { case QXmlStreamReader::StartDocument: case QXmlStreamReader::DTD: - return loc == QXmlStreamReaderPrivate::XmlContext::Prolog; + return ctxt == QXmlStreamReaderPrivate::XmlContext::Prolog; case QXmlStreamReader::StartElement: case QXmlStreamReader::EndElement: case QXmlStreamReader::Characters: case QXmlStreamReader::EntityReference: case QXmlStreamReader::EndDocument: - return loc == QXmlStreamReaderPrivate::XmlContext::Body; + return ctxt == QXmlStreamReaderPrivate::XmlContext::Body; case QXmlStreamReader::Comment: case QXmlStreamReader::ProcessingInstruction: