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

QDomDocument: use .value() instead of dereferencing an iterator

Browse Source 
Do not assume that, given an iterator into an associative container,
you can write `*it`. Use `it.value()` instead. This is done
in preparation for the next commit.

Also, drop the const-prefix from functions (find, begin) where they
operate on a const container already.

Change-Id: I2cafc884666d98c240c2fdc661c9068c4c7319e1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2022-11-03 20:37:38 +01:00 committed by Marc Mutz
parent a5de12f0d7
commit 82eff42b7b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xml/dom/qdom.cpp
View File

@ -2523,7 +2523,7 @@ QDomNamedNodeMapPrivate* QDomNamedNodeMapPrivate::clone(QDomNodePrivate* p)
auto it = map.constBegin(); auto it = map.constBegin();
for (; it != map.constEnd(); ++it) { for (; it != map.constEnd(); ++it) {
QDomNodePrivate *new_node = (*it)->cloneNode(); QDomNodePrivate *new_node = it.value()->cloneNode();
new_node->setParent(p); new_node->setParent(p);
m->setNamedItem(new_node); m->setNamedItem(new_node);
} }
@ -2539,16 +2539,16 @@ void QDomNamedNodeMapPrivate::clearMap()
if (!appendToParent) { if (!appendToParent) {
auto it = map.constBegin(); auto it = map.constBegin();
for (; it != map.constEnd(); ++it) for (; it != map.constEnd(); ++it)
if (!(*it)->ref.deref()) if (!it.value()->ref.deref())
delete *it; delete it.value();
} }
map.clear(); map.clear();
} }
QDomNodePrivate* QDomNamedNodeMapPrivate::namedItem(const QString& name) const QDomNodePrivate* QDomNamedNodeMapPrivate::namedItem(const QString& name) const
{ {
auto it = map.constFind(name); auto it = map.find(name);
return it == map.cend() ? nullptr : *it; return it == map.end() ? nullptr : it.value();
} }
QDomNodePrivate* QDomNamedNodeMapPrivate::namedItemNS(const QString& nsURI, const QString& localName) const QDomNodePrivate* QDomNamedNodeMapPrivate::namedItemNS(const QString& nsURI, const QString& localName) const
@ -2556,7 +2556,7 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::namedItemNS(const QString& nsURI, cons
auto it = map.constBegin(); auto it = map.constBegin();
QDomNodePrivate *n; QDomNodePrivate *n;
for (; it != map.constEnd(); ++it) { for (; it != map.constEnd(); ++it) {
n = *it; n = it.value();
if (!n->prefix.isNull()) { if (!n->prefix.isNull()) {
// node has a namespace // node has a namespace
if (n->namespaceURI == nsURI && n->name == localName) if (n->namespaceURI == nsURI && n->name == localName)
@ -2623,7 +2623,7 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::item(int index) const
{ {
if (index >= length() || index < 0) if (index >= length() || index < 0)
return nullptr; return nullptr;
return *std::next(map.cbegin(), index); return std::next(map.begin(), index).value();
} }
int QDomNamedNodeMapPrivate::length() const int QDomNamedNodeMapPrivate::length() const
@ -3069,11 +3069,11 @@ void QDomDocumentTypePrivate::save(QTextStream& s, int, int indent) const
auto it2 = notations->map.constBegin(); auto it2 = notations->map.constBegin();
for (; it2 != notations->map.constEnd(); ++it2) for (; it2 != notations->map.constEnd(); ++it2)
(*it2)->save(s, 0, indent); it2.value()->save(s, 0, indent);
auto it = entities->map.constBegin(); auto it = entities->map.constBegin();
for (; it != entities->map.constEnd(); ++it) for (; it != entities->map.constEnd(); ++it)
(*it)->save(s, 0, indent); it.value()->save(s, 0, indent);
s << ']'; s << ']';
} }