4 files changed, 12 insertions, 12 deletions

diff --git a/src/ui/tool/manipulator.h b/src/ui/tool/manipulator.h
index 161d36bc1..164dddf63 100644
--- a/src/ui/tool/manipulator.h
+++ b/src/ui/tool/manipulator.h
@@ -112,8 +112,8 @@ public:
             }
         }
         typedef typename std::set<void*>::iterator RmIter;
-        for (RmIter ri = to_remove.begin(); ri != to_remove.end(); ++ri) {
-            removeItem(*ri);
+        for (auto ri : to_remove) {
+            removeItem(ri);
         }
     }
 
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index 102f85dff..6eaa5520e 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -100,20 +100,20 @@ private:
     }
     template <typename R, typename A>
     void invokeForAll(R (PathManipulator::*method)(A), A a) {
-        for (MapType::iterator i = _mmap.begin(); i != _mmap.end(); ++i) {
-            ((i->second.get())->*method)(a);
+        for (auto & i : _mmap) {
+            ((i.second.get())->*method)(a);
         }
     }
     template <typename R, typename A>
     void invokeForAll(R (PathManipulator::*method)(A const &), A const &a) {
-        for (MapType::iterator i = _mmap.begin(); i != _mmap.end(); ++i) {
-            ((i->second.get())->*method)(a);
+        for (auto & i : _mmap) {
+            ((i.second.get())->*method)(a);
         }
     }
     template <typename R, typename A, typename B>
     void invokeForAll(R (PathManipulator::*method)(A,B), A a, B b) {
-        for (MapType::iterator i = _mmap.begin(); i != _mmap.end(); ++i) {
-            ((i->second.get())->*method)(a, b);
+        for (auto & i : _mmap) {
+            ((i.second.get())->*method)(a, b);
         }
     }
 
diff --git a/src/ui/view/svg-view-widget.h b/src/ui/view/svg-view-widget.h
index 6d1fe9f1a..644c879b3 100644
--- a/src/ui/view/svg-view-widget.h
+++ b/src/ui/view/svg-view-widget.h
@@ -35,7 +35,7 @@ class SVGViewWidget : public Gtk::ScrolledWindow {
 
 public:
     SVGViewWidget(SPDocument* document);
-    ~SVGViewWidget();
+    ~SVGViewWidget() override;
     void setDocument(  SPDocument* document);
     void setResize( int width, int height);
 
diff --git a/src/ui/widget/button.h b/src/ui/widget/button.h
index ab559e4e6..0b1bfc200 100644
--- a/src/ui/widget/button.h
+++ b/src/ui/widget/button.h
@@ -51,8 +51,8 @@ private:
     sigc::connection _on_clicked;
 
 protected:
-    virtual void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const override;
-    virtual void get_preferred_height_vfunc(int &minimum_height, int &natural_height) const override;
+    void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const override;
+    void get_preferred_height_vfunc(int &minimum_height, int &natural_height) const override;
     void on_clicked() override;
 
 public:
@@ -67,7 +67,7 @@ public:
            const gchar              *name,
            const gchar              *tip);
 
-    ~Button();
+    ~Button() override;
 
     void toggle_set_down(bool down);
 };