diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-01-24 09:09:01 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-02-03 17:43:30 +0100 |
commit | c6e1b54f94e84950ee12c3bb2be0641f5742056b (patch) | |
tree | 60e47d56af4bafacfe8557619ddc08a8c528e874 /src/xml | |
parent | 7f67e91e55a40897923e38e37060e268f0a5ade4 (diff) |
Cleanup code where we mixed QHash and QMultiHash iterator code
Change-Id: Ib229cad13ca21d6288e009c6ee1c39fa974f80b8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/dom/qdom.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 647e22bf26..1ac13b380a 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -2550,7 +2550,7 @@ QDomNamedNodeMapPrivate* QDomNamedNodeMapPrivate::clone(QDomNodePrivate* p) m->readonly = readonly; m->appendToParent = appendToParent; - QHash<QString, QDomNodePrivate*>::const_iterator it = map.constBegin(); + auto it = map.constBegin(); for (; it != map.constEnd(); ++it) { QDomNodePrivate *new_node = (*it)->cloneNode(); new_node->setParent(p); @@ -2566,7 +2566,7 @@ void QDomNamedNodeMapPrivate::clearMap() { // Dereference all of our children if we took references if (!appendToParent) { - QHash<QString, QDomNodePrivate *>::const_iterator it = map.constBegin(); + auto it = map.constBegin(); for (; it != map.constEnd(); ++it) if (!(*it)->ref.deref()) delete *it; @@ -2582,7 +2582,7 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::namedItem(const QString& name) const QDomNodePrivate* QDomNamedNodeMapPrivate::namedItemNS(const QString& nsURI, const QString& localName) const { - QHash<QString, QDomNodePrivate *>::const_iterator it = map.constBegin(); + auto it = map.constBegin(); QDomNodePrivate *n; for (; it != map.constEnd(); ++it) { n = *it; @@ -3098,11 +3098,11 @@ void QDomDocumentTypePrivate::save(QTextStream& s, int, int indent) const if (entities->length()>0 || notations->length()>0) { s << " [" << Qt::endl; - QHash<QString, QDomNodePrivate *>::const_iterator it2 = notations->map.constBegin(); + auto it2 = notations->map.constBegin(); for (; it2 != notations->map.constEnd(); ++it2) (*it2)->save(s, 0, indent); - QHash<QString, QDomNodePrivate *>::const_iterator it = entities->map.constBegin(); + auto it = entities->map.constBegin(); for (; it != entities->map.constEnd(); ++it) (*it)->save(s, 0, indent); @@ -4088,7 +4088,7 @@ void QDomElementPrivate::save(QTextStream& s, int depth, int indent) const /* Write out attributes. */ if (!m_attr->map.isEmpty()) { QDuplicateTracker<QString> outputtedPrefixes; - QHash<QString, QDomNodePrivate *>::const_iterator it = m_attr->map.constBegin(); + auto it = m_attr->map.constBegin(); for (; it != m_attr->map.constEnd(); ++it) { s << ' '; if (it.value()->namespaceURI.isNull()) { |