3 files changed, 22 insertions, 27 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();
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index c0ebfa12c..f6552a5f9 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -78,9 +78,9 @@ public:
           instr(nullptr),
           gzin(nullptr)
     {
-        for (int k=0;k<4;k++)
+        for (unsigned char & k : firstFew)
         {
-            firstFew[k]=0;
+            k=0;
         }
     }
     virtual ~XmlSource()
@@ -877,10 +877,10 @@ static void sp_repr_write_stream_root_element(Node *repr, Writer &out,
     }
 
     List<AttributeRecord const> attributes=repr->attributeList();
-    for ( NSMap::iterator iter=ns_map.begin() ; iter != ns_map.end() ; ++iter ) 
+    for (auto & iter : ns_map) 
     {
-        Glib::QueryQuark prefix=(*iter).first;
-        ptr_shared ns_uri=(*iter).second;
+        Glib::QueryQuark prefix=iter.first;
+        ptr_shared ns_uri=iter.second;
 
         if (prefix.id()) {
             if ( prefix != xml_prefix ) {
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 721924a7a..db25824dc 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -675,8 +675,8 @@ void SimpleNode::cleanOriginal(Node *src, gchar const *key){
             to_delete.push_back(child);
         }
     }
-    for ( std::vector<Node *>::iterator i = to_delete.begin(); i != to_delete.end(); ++i) {
-        removeChild(*i);
+    for (auto & i : to_delete) {
+        removeChild(i);
     }
 }