AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QXmlStream: use more ranged for loops

Browse Source 
More compact and isolates against decltype(size()) issues.

Had to make QXmlStreamSimpleStack iterable.

Change-Id: Icfa7b2ab09995c7a442fd8a5b2f5d6ce90120822
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2020-05-09 23:57:24 +02:00
parent f490ac6712
commit 0beaed7384
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1586,8 +1586,7 @@ void QXmlStreamReaderPrivate::resolveTag()
int n = attributeStack.size();
if (namespaceProcessing) {
for (int a = 0; a < dtdAttributes.size(); ++a) {
DtdAttribute &dtdAttribute = dtdAttributes[a];
for (DtdAttribute &dtdAttribute : dtdAttributes) {
if (!dtdAttribute.isNamespaceAttribute
|| dtdAttribute.defaultValue.isNull()
|| dtdAttribute.tagName != qualifiedName
@ -1657,8 +1656,7 @@ void QXmlStreamReaderPrivate::resolveTag()
}
}
for (int a = 0; a < dtdAttributes.size(); ++a) {
DtdAttribute &dtdAttribute = dtdAttributes[a];
for (DtdAttribute &dtdAttribute : dtdAttributes) {
if (dtdAttribute.isNamespaceAttribute
|| dtdAttribute.defaultValue.isNull()
|| dtdAttribute.tagName != qualifiedName
@ -2120,8 +2118,8 @@ void QXmlStreamReader::addExtraNamespaceDeclaration(const QXmlStreamNamespaceDec
*/
void QXmlStreamReader::addExtraNamespaceDeclarations(const QXmlStreamNamespaceDeclarations &extraNamespaceDeclarations)
{
for (int i = 0; i < extraNamespaceDeclarations.size(); ++i)
addExtraNamespaceDeclaration(extraNamespaceDeclarations.at(i));
for (const auto &extraNamespaceDeclaration : extraNamespaceDeclarations)
addExtraNamespaceDeclaration(extraNamespaceDeclaration);
}
@ -2730,8 +2728,7 @@ Returns the entity's value.
*/
QStringRef QXmlStreamAttributes::value(const QString &namespaceUri, const QString &name) const
{
for (int i = 0; i < size(); ++i) {
const QXmlStreamAttribute &attribute = at(i);
for (const QXmlStreamAttribute &attribute : *this) {
if (attribute.name() == name && attribute.namespaceUri() == namespaceUri)
return attribute.value();
}
@ -2745,8 +2742,7 @@ QStringRef QXmlStreamAttributes::value(const QString &namespaceUri, const QStrin
*/
QStringRef QXmlStreamAttributes::value(const QString &namespaceUri, QLatin1String name) const
{
for (int i = 0; i < size(); ++i) {
const QXmlStreamAttribute &attribute = at(i);
for (const QXmlStreamAttribute &attribute : *this) {
if (attribute.name() == name && attribute.namespaceUri() == namespaceUri)
return attribute.value();
}
@ -2760,8 +2756,7 @@ QStringRef QXmlStreamAttributes::value(const QString &namespaceUri, QLatin1Strin
*/
QStringRef QXmlStreamAttributes::value(QLatin1String namespaceUri, QLatin1String name) const
{
for (int i = 0; i < size(); ++i) {
const QXmlStreamAttribute &attribute = at(i);
for (const QXmlStreamAttribute &attribute : *this) {
if (attribute.name() == name && attribute.namespaceUri() == namespaceUri)
return attribute.value();
}
@ -2782,8 +2777,7 @@ QStringRef QXmlStreamAttributes::value(QLatin1String namespaceUri, QLatin1String
*/
QStringRef QXmlStreamAttributes::value(const QString &qualifiedName) const
{
for (int i = 0; i < size(); ++i) {
const QXmlStreamAttribute &attribute = at(i);
for (const QXmlStreamAttribute &attribute : *this) {
if (attribute.qualifiedName() == qualifiedName)
return attribute.value();
}
@ -2804,8 +2798,7 @@ QStringRef QXmlStreamAttributes::value(const QString &qualifiedName) const
*/
QStringRef QXmlStreamAttributes::value(QLatin1String qualifiedName) const
{
for (int i = 0; i < size(); ++i) {
const QXmlStreamAttribute &attribute = at(i);
for (const QXmlStreamAttribute &attribute : *this) {
if (attribute.qualifiedName() == qualifiedName)
return attribute.value();
}
@ -3595,8 +3588,8 @@ void QXmlStreamWriter::writeAttributes(const QXmlStreamAttributes& attributes)
Q_D(QXmlStreamWriter);
Q_ASSERT(d->inStartElement);
Q_UNUSED(d);
for (int i = 0; i < attributes.size(); ++i)
writeAttribute(attributes.at(i));
for (const auto &attr : attributes)
writeAttribute(attr);
}

9
src/corelib/serialization/qxmlstream.g
View File

@ -179,6 +179,15 @@ public:
inline void resize(int s) { tos = s - 1; }
inline bool isEmpty() const { return tos < 0; }
inline void clear() { tos = -1; }
using const_iterator = const T*;
using iterator = T*;
T *begin() { return data; }
const T *begin() const { return data; }
const T *cbegin() const { return begin(); }
T *end() { return data + size(); }
const T *end() const { return data + size(); }
const T *cend() const { return end(); }
};

9
src/corelib/serialization/qxmlstream_p.h
View File

@ -668,6 +668,15 @@ public:
inline void resize(int s) { tos = s - 1; }
inline bool isEmpty() const { return tos < 0; }
inline void clear() { tos = -1; }
using const_iterator = const T*;
using iterator = T*;
T *begin() { return data; }
const T *begin() const { return data; }
const T *cbegin() const { return begin(); }
T *end() { return data + size(); }
const T *end() const { return data + size(); }
const T *cend() const { return end(); }
};