summaryrefslogtreecommitdiffstats
path: root/src/xml/composite-node-observer.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
commit169dff19d4da8d76e69b8e896aa25b0013639c03 (patch)
treea0c070fa95188b5cde708ac285e6a2db9df4a83f /src/xml/composite-node-observer.cpp
parentAvoid creating a new document before opening an old document. (diff)
downloadinkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.tar.gz
inkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.zip
modernize loops
Diffstat (limited to 'src/xml/composite-node-observer.cpp')
-rw-r--r--src/xml/composite-node-observer.cpp35
1 files changed, 15 insertions, 20 deletions
diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index d8dce45b0..e3b40d43b 100644
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -37,11 +37,10 @@ namespace XML {
void CompositeNodeObserver::notifyChildAdded(Node &node, Node &child, Node *prev)
{
_startIteration();
- for ( ObserverRecordList::iterator iter=_active.begin() ;
- iter != _active.end() ; ++iter )
+ for (auto & iter : _active)
{
- if (!iter->marked) {
- iter->observer.notifyChildAdded(node, child, prev);
+ if (!iter.marked) {
+ iter.observer.notifyChildAdded(node, child, prev);
}
}
_finishIteration();
@@ -51,11 +50,10 @@ void CompositeNodeObserver::notifyChildRemoved(Node &node, Node &child,
Node *prev)
{
_startIteration();
- for ( ObserverRecordList::iterator iter=_active.begin() ;
- iter != _active.end() ; ++iter )
+ for (auto & iter : _active)
{
- if (!iter->marked) {
- iter->observer.notifyChildRemoved(node, child, prev);
+ if (!iter.marked) {
+ iter.observer.notifyChildRemoved(node, child, prev);
}
}
_finishIteration();
@@ -66,11 +64,10 @@ void CompositeNodeObserver::notifyChildOrderChanged(Node &node, Node &child,
Node *new_prev)
{
_startIteration();
- for ( ObserverRecordList::iterator iter=_active.begin() ;
- iter != _active.end() ; ++iter )
+ for (auto & iter : _active)
{
- if (!iter->marked) {
- iter->observer.notifyChildOrderChanged(node, child, old_prev, new_prev);
+ if (!iter.marked) {
+ iter.observer.notifyChildOrderChanged(node, child, old_prev, new_prev);
}
}
_finishIteration();
@@ -81,11 +78,10 @@ void CompositeNodeObserver::notifyContentChanged(
Util::ptr_shared old_content, Util::ptr_shared new_content
) {
_startIteration();
- for ( ObserverRecordList::iterator iter=_active.begin() ;
- iter != _active.end() ; ++iter )
+ for (auto & iter : _active)
{
- if (!iter->marked) {
- iter->observer.notifyContentChanged(node, old_content, new_content);
+ if (!iter.marked) {
+ iter.observer.notifyContentChanged(node, old_content, new_content);
}
}
_finishIteration();
@@ -96,11 +92,10 @@ void CompositeNodeObserver::notifyAttributeChanged(
Util::ptr_shared old_value, Util::ptr_shared new_value
) {
_startIteration();
- for ( ObserverRecordList::iterator iter=_active.begin() ;
- iter != _active.end() ; ++iter )
+ for (auto & iter : _active)
{
- if (!iter->marked) {
- iter->observer.notifyAttributeChanged(node, name, old_value, new_value);
+ if (!iter.marked) {
+ iter.observer.notifyAttributeChanged(node, name, old_value, new_value);
}
}
_finishIteration();