1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QXmlStreamReader: Fix variable naming

Browse Source 
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 <jan-arve.saether@qt.io>
(cherry picked from commit f67a497dbe70dd3258997010c286654aaf963d1c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2023-07-11 13:56:51 +02:00 committed by Qt Cherry-pick Bot
parent acc2cdb6c8
commit b5d66b52df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/serialization/qxmlstream.cpp
View File

@ -806,7 +806,7 @@ QString QXmlStreamReader::tokenString() const
/*! /*!
\internal \internal
\return \param loc (Prolog/Body) as a string. \return \param ctxt (Prolog/Body) as a string.
*/ */
static constexpr QLatin1StringView contextString(QXmlStreamReaderPrivate::XmlContext ctxt) static constexpr QLatin1StringView contextString(QXmlStreamReaderPrivate::XmlContext ctxt)
{ {
@ -3853,19 +3853,19 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader)
} }
static constexpr bool isTokenAllowedInContext(QXmlStreamReader::TokenType type, static constexpr bool isTokenAllowedInContext(QXmlStreamReader::TokenType type,
QXmlStreamReaderPrivate::XmlContext loc) QXmlStreamReaderPrivate::XmlContext ctxt)
{ {
switch (type) { switch (type) {
case QXmlStreamReader::StartDocument: case QXmlStreamReader::StartDocument:
case QXmlStreamReader::DTD: case QXmlStreamReader::DTD:
return loc == QXmlStreamReaderPrivate::XmlContext::Prolog; return ctxt == QXmlStreamReaderPrivate::XmlContext::Prolog;
case QXmlStreamReader::StartElement: case QXmlStreamReader::StartElement:
case QXmlStreamReader::EndElement: case QXmlStreamReader::EndElement:
case QXmlStreamReader::Characters: case QXmlStreamReader::Characters:
case QXmlStreamReader::EntityReference: case QXmlStreamReader::EntityReference:
case QXmlStreamReader::EndDocument: case QXmlStreamReader::EndDocument:
return loc == QXmlStreamReaderPrivate::XmlContext::Body; return ctxt == QXmlStreamReaderPrivate::XmlContext::Body;
case QXmlStreamReader::Comment: case QXmlStreamReader::Comment:
case QXmlStreamReader::ProcessingInstruction: case QXmlStreamReader::ProcessingInstruction: