modernize: add overrides

58 files changed, 115 insertions, 116 deletions

diff --git a/src/color-rgba.h b/src/color-rgba.h
index b893e701a..fb1aae06d 100644
--- a/src/color-rgba.h
+++ b/src/color-rgba.h
@@ -39,8 +39,8 @@ public:
      */
     ColorRGBA()
     {
-        for (int i = 0; i < 4; i++)
-            _c[i] = 0.0;
+        for (float & i : _c)
+            i = 0.0;
     }
 
     /**
diff --git a/src/desktop.h b/src/desktop.h
index cea9cd88d..d75c3cd25 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -581,11 +581,11 @@ private:
     sigc::connection _commit_connection;
     sigc::connection _modified_connection;
 
-    void onResized (double, double);
-    void onRedrawRequested();
-    void onStatusMessage (Inkscape::MessageType type, gchar const *message);
-    void onDocumentURISet (gchar const* uri);
-    void onDocumentResized (double, double);
+    void onResized (double, double) override;
+    void onRedrawRequested() override;
+    void onStatusMessage (Inkscape::MessageType type, gchar const *message) override;
+    void onDocumentURISet (gchar const* uri) override;
+    void onDocumentResized (double, double) override;
 
     static void _onActivate (SPDesktop* dt);
     static void _onDeactivate (SPDesktop* dt);
diff --git a/src/extension/internal/bitmap/adaptiveThreshold.h b/src/extension/internal/bitmap/adaptiveThreshold.h
index 631c8e2e0..33ad87618 100644
--- a/src/extension/internal/bitmap/adaptiveThreshold.h
+++ b/src/extension/internal/bitmap/adaptiveThreshold.h
@@ -21,8 +21,8 @@ private:
 	unsigned int _height;
 	unsigned _offset;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/addNoise.h b/src/extension/internal/bitmap/addNoise.h
index ab7936432..16ab6ed4c 100644
--- a/src/extension/internal/bitmap/addNoise.h
+++ b/src/extension/internal/bitmap/addNoise.h
@@ -19,8 +19,8 @@ class AddNoise : public ImageMagick
 private:
 	const gchar* _noiseTypeName;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/blur.h b/src/extension/internal/bitmap/blur.h
index 269d57567..d4315e96a 100644
--- a/src/extension/internal/bitmap/blur.h
+++ b/src/extension/internal/bitmap/blur.h
@@ -20,8 +20,8 @@ private:
 	float _radius;
 	float _sigma;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/channel.h b/src/extension/internal/bitmap/channel.h
index 067a5fd3b..477d6f341 100644
--- a/src/extension/internal/bitmap/channel.h
+++ b/src/extension/internal/bitmap/channel.h
@@ -20,8 +20,8 @@ private:
 	const gchar * _layerName;
 
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 
     static void init (void);
 };
diff --git a/src/extension/internal/bitmap/charcoal.h b/src/extension/internal/bitmap/charcoal.h
index 5c2a8d513..bd6021cda 100644
--- a/src/extension/internal/bitmap/charcoal.h
+++ b/src/extension/internal/bitmap/charcoal.h
@@ -20,8 +20,8 @@ private:
 	float _radius;
 	float _sigma;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/colorize.h b/src/extension/internal/bitmap/colorize.h
index 5faccf5a9..c854b78e9 100644
--- a/src/extension/internal/bitmap/colorize.h
+++ b/src/extension/internal/bitmap/colorize.h
@@ -22,8 +22,8 @@ private:
 	guint32 _color;	
 
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 
     static void init (void);
 };
diff --git a/src/extension/internal/bitmap/contrast.h b/src/extension/internal/bitmap/contrast.h
index c8099176f..d37736874 100644
--- a/src/extension/internal/bitmap/contrast.h
+++ b/src/extension/internal/bitmap/contrast.h
@@ -19,8 +19,8 @@ class Contrast : public ImageMagick
 private:
 	unsigned int _sharpen;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/crop.h b/src/extension/internal/bitmap/crop.h
index 168c093c5..7cb9b0148 100644
--- a/src/extension/internal/bitmap/crop.h
+++ b/src/extension/internal/bitmap/crop.h
@@ -23,9 +23,9 @@ private:
     int _left;
     int _right;
 public:
-    void applyEffect(Magick::Image *image);
-    void postEffect(Magick::Image *image, SPItem *item);
-    void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+    void postEffect(Magick::Image *image, SPItem *item) override;
+    void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/cycleColormap.h b/src/extension/internal/bitmap/cycleColormap.h
index eacbb8c85..81ffd32e0 100644
--- a/src/extension/internal/bitmap/cycleColormap.h
+++ b/src/extension/internal/bitmap/cycleColormap.h
@@ -18,8 +18,8 @@ class CycleColormap : public ImageMagick {
 private:
 	int _amount;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/despeckle.h b/src/extension/internal/bitmap/despeckle.h
index 0c846b651..d38d83921 100644
--- a/src/extension/internal/bitmap/despeckle.h
+++ b/src/extension/internal/bitmap/despeckle.h
@@ -16,8 +16,8 @@ namespace Bitmap {
 
 class Despeckle : public ImageMagick {
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/edge.h b/src/extension/internal/bitmap/edge.h
index 8c7b8f9d1..3091e2d75 100644
--- a/src/extension/internal/bitmap/edge.h
+++ b/src/extension/internal/bitmap/edge.h
@@ -18,8 +18,8 @@ class Edge : public ImageMagick {
 private:
 	unsigned int _radius;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/emboss.h b/src/extension/internal/bitmap/emboss.h
index ff897089b..86fa38c18 100644
--- a/src/extension/internal/bitmap/emboss.h
+++ b/src/extension/internal/bitmap/emboss.h
@@ -20,8 +20,8 @@ private:
 	float _radius;
 	float _sigma;
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/enhance.h b/src/extension/internal/bitmap/enhance.h
index 574781fbe..040d673e2 100644
--- a/src/extension/internal/bitmap/enhance.h
+++ b/src/extension/internal/bitmap/enhance.h
@@ -17,8 +17,8 @@ namespace Bitmap {
 class Enhance : public ImageMagick
 {
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/equalize.h b/src/extension/internal/bitmap/equalize.h
index ea897dafb..d66a0f873 100644
--- a/src/extension/internal/bitmap/equalize.h
+++ b/src/extension/internal/bitmap/equalize.h
@@ -17,8 +17,8 @@ namespace Bitmap {
 class Equalize : public ImageMagick
 {
 public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+    void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
     static void init (void);
 };
 
diff --git a/src/extension/internal/bitmap/gaussianBlur.h b/src/extension/internal/bitmap/gaussianBlur.h
index 2227fde5b..e2afb41f8 100644
--- a/src/extension/internal/bitmap/gaussianBlur.h
+++ b/src/extension/internal/bitmap/gaussianBlur.h
@@ -20,8 +20,8 @@ private:
 	float _width;
 	float _sigma;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index e476a7370..61503ca95 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -47,7 +47,7 @@ protected:
     SPItem** _imageItems;
 public:
     ImageMagickDocCache(Inkscape::UI::View::View * view);
-    ~ImageMagickDocCache ( );
+    ~ImageMagickDocCache ( ) override;
 };
 
 ImageMagickDocCache::ImageMagickDocCache(Inkscape::UI::View::View * view) :
diff --git a/src/extension/internal/bitmap/imagemagick.h b/src/extension/internal/bitmap/imagemagick.h
index 2793e457e..754e1959e 100644
--- a/src/extension/internal/bitmap/imagemagick.h
+++ b/src/extension/internal/bitmap/imagemagick.h
@@ -35,10 +35,10 @@ public:
     virtual void postEffect(Magick::Image */*image*/, SPItem */*item*/) { };
 
     /* Functions implemented from ::Implementation */
-    bool load(Inkscape::Extension::Extension *module);
-    Inkscape::Extension::Implementation::ImplementationDocumentCache * newDocCache (Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * doc);
-    void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache);
-    Gtk::Widget* prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache);
+    bool load(Inkscape::Extension::Extension *module) override;
+    Inkscape::Extension::Implementation::ImplementationDocumentCache * newDocCache (Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * doc) override;
+    void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override;
+    Gtk::Widget* prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override;
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/implode.h b/src/extension/internal/bitmap/implode.h
index 24218dc9f..e6649ced2 100644
--- a/src/extension/internal/bitmap/implode.h
+++ b/src/extension/internal/bitmap/implode.h
@@ -19,8 +19,8 @@ class Implode : public ImageMagick
 private:
 	float _factor;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/level.h b/src/extension/internal/bitmap/level.h
index 600a82a79..fc4159b7c 100644
--- a/src/extension/internal/bitmap/level.h
+++ b/src/extension/internal/bitmap/level.h
@@ -21,8 +21,8 @@ private:
 	float _white_point;
 	float _mid_point;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/levelChannel.h b/src/extension/internal/bitmap/levelChannel.h
index 5e2b20ca7..42b8917cd 100644
--- a/src/extension/internal/bitmap/levelChannel.h
+++ b/src/extension/internal/bitmap/levelChannel.h
@@ -22,8 +22,8 @@ private:
 	float _mid_point;
 	const gchar * _channelName;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/medianFilter.h b/src/extension/internal/bitmap/medianFilter.h
index 343a11d3c..69ea58a85 100644
--- a/src/extension/internal/bitmap/medianFilter.h
+++ b/src/extension/internal/bitmap/medianFilter.h
@@ -19,8 +19,8 @@ class MedianFilter : public ImageMagick
 private:
 	float _radius;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/modulate.h b/src/extension/internal/bitmap/modulate.h
index 1eb69cbdb..911df8154 100644
--- a/src/extension/internal/bitmap/modulate.h
+++ b/src/extension/internal/bitmap/modulate.h
@@ -21,8 +21,8 @@ private:
 	float _saturation;
 	float _hue;
 public:
-  void applyEffect(Magick::Image *image);
-  void refreshParameters(Inkscape::Extension::Effect *module);
+  void applyEffect(Magick::Image *image) override;
+  void refreshParameters(Inkscape::Extension::Effect *module) override;
   static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/negate.h b/src/extension/internal/bitmap/negate.h
index c8464664a..81423ac1e 100644
--- a/src/extension/internal/bitmap/negate.h
+++ b/src/extension/internal/bitmap/negate.h
@@ -17,8 +17,8 @@ namespace Bitmap {
 class Negate : public ImageMagick
 {
 public:
-  void applyEffect(Magick::Image *image);
-  void refreshParameters(Inkscape::Extension::Effect *module);
+  void applyEffect(Magick::Image *image) override;
+  void refreshParameters(Inkscape::Extension::Effect *module) override;
   static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/normalize.h b/src/extension/internal/bitmap/normalize.h
index 5da81ed38..64e8c3e4b 100644
--- a/src/extension/internal/bitmap/normalize.h
+++ b/src/extension/internal/bitmap/normalize.h
@@ -17,8 +17,8 @@ namespace Bitmap {
 class Normalize : public ImageMagick
 {
 public:
-  void applyEffect(Magick::Image *image);
-  void refreshParameters(Inkscape::Extension::Effect *module);
+  void applyEffect(Magick::Image *image) override;
+  void refreshParameters(Inkscape::Extension::Effect *module) override;
   static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/oilPaint.h b/src/extension/internal/bitmap/oilPaint.h
index 77d4ad10e..a45f91666 100644
--- a/src/extension/internal/bitmap/oilPaint.h
+++ b/src/extension/internal/bitmap/oilPaint.h
@@ -19,8 +19,8 @@ class OilPaint : public ImageMagick
 private:
 	float _radius;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/opacity.h b/src/extension/internal/bitmap/opacity.h
index 287b10f8c..f389bc650 100644
--- a/src/extension/internal/bitmap/opacity.h
+++ b/src/extension/internal/bitmap/opacity.h
@@ -19,8 +19,8 @@ class Opacity : public ImageMagick
 private:
 	float _opacity;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/raise.h b/src/extension/internal/bitmap/raise.h
index fca23ccb1..bc402828e 100644
--- a/src/extension/internal/bitmap/raise.h
+++ b/src/extension/internal/bitmap/raise.h
@@ -21,8 +21,8 @@ private:
 	int _height;
 	bool _raisedFlag;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/reduceNoise.h b/src/extension/internal/bitmap/reduceNoise.h
index f7270db25..9a41d8463 100644
--- a/src/extension/internal/bitmap/reduceNoise.h
+++ b/src/extension/internal/bitmap/reduceNoise.h
@@ -19,8 +19,8 @@ class ReduceNoise : public ImageMagick
 private:
 	int _order;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/sample.h b/src/extension/internal/bitmap/sample.h
index a87929ea8..48908326d 100644
--- a/src/extension/internal/bitmap/sample.h
+++ b/src/extension/internal/bitmap/sample.h
@@ -20,8 +20,8 @@ private:
 	int _width;
 	int _height;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/shade.h b/src/extension/internal/bitmap/shade.h
index a7580a23c..f94cb62e1 100644
--- a/src/extension/internal/bitmap/shade.h
+++ b/src/extension/internal/bitmap/shade.h
@@ -21,8 +21,8 @@ private:
 	float _elevation;
 	bool _colorShading;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/sharpen.h b/src/extension/internal/bitmap/sharpen.h
index 56baff42b..6fac5681e 100644
--- a/src/extension/internal/bitmap/sharpen.h
+++ b/src/extension/internal/bitmap/sharpen.h
@@ -20,8 +20,8 @@ private:
 	float _radius;
 	float _sigma;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/solarize.h b/src/extension/internal/bitmap/solarize.h
index 8e161c532..45515f3fc 100644
--- a/src/extension/internal/bitmap/solarize.h
+++ b/src/extension/internal/bitmap/solarize.h
@@ -19,8 +19,8 @@ class Solarize : public ImageMagick
 private:
 	float _factor;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/spread.h b/src/extension/internal/bitmap/spread.h
index dd6591336..f7ec0cb3f 100644
--- a/src/extension/internal/bitmap/spread.h
+++ b/src/extension/internal/bitmap/spread.h
@@ -19,8 +19,8 @@ class Spread : public ImageMagick
 private:
 	int _amount;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/swirl.h b/src/extension/internal/bitmap/swirl.h
index 320c31214..64dcafe7e 100644
--- a/src/extension/internal/bitmap/swirl.h
+++ b/src/extension/internal/bitmap/swirl.h
@@ -19,8 +19,8 @@ class Swirl : public ImageMagick
 private:
 	float _degrees;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/threshold.h b/src/extension/internal/bitmap/threshold.h
index 13221ed33..94ef145dd 100644
--- a/src/extension/internal/bitmap/threshold.h
+++ b/src/extension/internal/bitmap/threshold.h
@@ -19,8 +19,8 @@ class Threshold : public ImageMagick
 private:
 	double _threshold;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/unsharpmask.h b/src/extension/internal/bitmap/unsharpmask.h
index 29c0c4253..442f19cf8 100644
--- a/src/extension/internal/bitmap/unsharpmask.h
+++ b/src/extension/internal/bitmap/unsharpmask.h
@@ -22,8 +22,8 @@ private:
 	float _amount;
 	float _threshold;
 public:
-  void applyEffect(Magick::Image *image);
-  void refreshParameters(Inkscape::Extension::Effect *module);
+  void applyEffect(Magick::Image *image) override;
+  void refreshParameters(Inkscape::Extension::Effect *module) override;
   static void init(void);
 };
 
diff --git a/src/extension/internal/bitmap/wave.h b/src/extension/internal/bitmap/wave.h
index d88ce68d6..49131e558 100644
--- a/src/extension/internal/bitmap/wave.h
+++ b/src/extension/internal/bitmap/wave.h
@@ -20,8 +20,8 @@ private:
 	float _amplitude;
 	float _wavelength;
 public:
-	void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
+	void applyEffect(Magick::Image *image) override;
+	void refreshParameters(Inkscape::Extension::Effect *module) override;
 	static void init(void);
 };
 
diff --git a/src/inkscape-application.h b/src/inkscape-application.h
index e8cf12ee9..22e5a430a 100644
--- a/src/inkscape-application.h
+++ b/src/inkscape-application.h
@@ -67,11 +67,11 @@ public:
     ConcreteInkscapeApplication();
 
 public:
-    InkFileExportCmd* file_export() { return &_file_export; }
+    InkFileExportCmd* file_export() override { return &_file_export; }
 
 protected:
     void on_startup()  override;
-    void on_startup2();
+    void on_startup2() override;
     void on_activate() override;
     void on_open(const Gio::Application::type_vec_files& files, const Glib::ustring& hint) override;
     SPDesktop* create_window(const Glib::RefPtr<Gio::File>& file = Glib::RefPtr<Gio::File>());
diff --git a/src/livarot/Shape.h b/src/livarot/Shape.h
index e2bc0b99e..2764b90ad 100644
--- a/src/livarot/Shape.h
+++ b/src/livarot/Shape.h
@@ -320,7 +320,7 @@ public:
     void QuickScan(float &pos, int &curP, float to, AlphaLigne* line, float step);
 
     void Transform(Geom::Affine const &tr)
-        {for(std::vector<dg_point>::iterator it=_pts.begin();it!=_pts.end();++it) it->x*=tr;}
+        {for(auto & _pt : _pts) _pt.x*=tr;}
 
     std::vector<back_data> ebData;
     std::vector<voronoi_point> vorpData;
diff --git a/src/live_effects/lpe-embrodery-stitch-ordering.h b/src/live_effects/lpe-embrodery-stitch-ordering.h
index af0f7adcc..9899f6678 100644
--- a/src/live_effects/lpe-embrodery-stitch-ordering.h
+++ b/src/live_effects/lpe-embrodery-stitch-ordering.h
@@ -227,8 +227,8 @@ struct OrderingGroup {
         revItems(false),
         index(indexIn)
     {
-        for (int i = 0; i < sizeof(endpoints) / sizeof(*endpoints); i++) {
-            endpoints[i] = nullptr;
+        for (auto & endpoint : endpoints) {
+            endpoint = nullptr;
         }
     }
 
diff --git a/src/live_effects/lpe-powerclip.h b/src/live_effects/lpe-powerclip.h
index ac196a399..d1b4098d8 100644
--- a/src/live_effects/lpe-powerclip.h
+++ b/src/live_effects/lpe-powerclip.h
@@ -19,7 +19,7 @@ class LPEPowerClip : public Effect {
 public:
     LPEPowerClip(LivePathEffectObject *lpeobject);
     ~LPEPowerClip() override;
-    void doOnApply (SPLPEItem const * lpeitem);
+    void doOnApply (SPLPEItem const * lpeitem) override;
     void doBeforeEffect (SPLPEItem const* lpeitem) override;
     Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override;
     void doOnRemove (SPLPEItem const* /*lpeitem*/) override;
diff --git a/src/live_effects/lpe-powermask.h b/src/live_effects/lpe-powermask.h
index 660e349af..3353adf28 100644
--- a/src/live_effects/lpe-powermask.h
+++ b/src/live_effects/lpe-powermask.h
@@ -20,7 +20,7 @@ class LPEPowerMask : public Effect {
 public:
     LPEPowerMask(LivePathEffectObject *lpeobject);
     ~LPEPowerMask() override;
-    void doOnApply (SPLPEItem const * lpeitem);
+    void doOnApply (SPLPEItem const * lpeitem) override;
     void doBeforeEffect (SPLPEItem const* lpeitem) override;
     void doEffect (SPCurve * curve) override;
     void doOnRemove (SPLPEItem const* /*lpeitem*/) override;
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 8849faa4f..5291be09e 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -1241,7 +1241,7 @@ sp_te_adjust_line_height (SPObject *object, double amount, double average, bool
     // Always set if top level true.
     // Also set if line_height is set to a non-zero value.
     if (top_level ||
-        (style->line_height.set && !style->line_height.inherit && (((!(((style->line_height.computed))) == 0))))){
+        (style->line_height.set && !style->line_height.inherit && style->line_height.computed != 0)){
 
         // Scale default values
         if (!style->line_height.set || style->line_height.inherit || style->line_height.normal) {
diff --git a/src/trace/pool.h b/src/trace/pool.h
index 1b7ad5821..a6fed5950 100644
--- a/src/trace/pool.h
+++ b/src/trace/pool.h
@@ -64,8 +64,8 @@ class pool {
       cblock = 0;
       size = sizeof(T) > sizeof(void *) ? sizeof(T) : sizeof(void *);
       next = nullptr;
-      for (int k = 0; k < 64; k++) {
-          block[k] = nullptr;
+      for (auto & k : block) {
+          k = nullptr;
       }
   }
 
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);
 };
diff --git a/src/util/ucompose.hpp b/src/util/ucompose.hpp
index f1e536c0c..e0d2fc273 100644
--- a/src/util/ucompose.hpp
+++ b/src/util/ucompose.hpp
@@ -248,9 +248,8 @@ namespace UStringPrivate
     // assemble string
     std::string str;
   
-    for (output_list::const_iterator i = output.begin(), end = output.end();
-	 i != end; ++i)
-      str += *i;
+    for (const auto & i : output)
+      str += i;
   
     return str;
   }
diff --git a/testfiles/src/color-profile-test.cpp b/testfiles/src/color-profile-test.cpp
index 4ed8b3655..48047632b 100644
--- a/testfiles/src/color-profile-test.cpp
+++ b/testfiles/src/color-profile-test.cpp
@@ -32,7 +32,7 @@ public:
     }
 
 protected:
-    virtual void SetUp()
+    void SetUp() override
     {
         DocPerCaseTest::SetUp();
         _prof = new Inkscape::ColorProfile();
@@ -40,7 +40,7 @@ protected:
         _prof->document = _doc;
     }
 
-    virtual void TearDown()
+    void TearDown() override
     {
         if (_prof) {
             delete _prof;
diff --git a/testfiles/src/object-set-test.cpp b/testfiles/src/object-set-test.cpp
index 91c1dc5f7..5df97386d 100644
--- a/testfiles/src/object-set-test.cpp
+++ b/testfiles/src/object-set-test.cpp
@@ -77,7 +77,7 @@ public:
         r3->set_shape();
 
     }
-    ~ObjectSetTest() {
+    ~ObjectSetTest() override {
         delete set;
         delete set2;
         delete X;
diff --git a/testfiles/src/object-style-test.cpp b/testfiles/src/object-style-test.cpp
index 9331eda65..25d9268fb 100644
--- a/testfiles/src/object-style-test.cpp
+++ b/testfiles/src/object-style-test.cpp
@@ -48,7 +48,7 @@ rect { fill: #808080; opacity:0.5; }\
         doc = SPDocument::createNewDocFromMem(docString, static_cast<int>(strlen(docString)), false);
     }
 
-    ~ObjectTest() {
+    ~ObjectTest() override {
         doc->doUnref();
     }
 
diff --git a/testfiles/src/object-test.cpp b/testfiles/src/object-test.cpp
index d4a14c170..3abc13dfa 100644
--- a/testfiles/src/object-test.cpp
+++ b/testfiles/src/object-test.cpp
@@ -73,7 +73,7 @@ public:
         doc = SPDocument::createNewDocFromMem(docString, static_cast<int>(strlen(docString)), false);
     }
 
-    ~ObjectTest() {
+    ~ObjectTest() override {
         doc->doUnref();
     }
 
diff --git a/testfiles/src/sp-gradient-test.cpp b/testfiles/src/sp-gradient-test.cpp
index b3347b576..d190f1cb1 100644
--- a/testfiles/src/sp-gradient-test.cpp
+++ b/testfiles/src/sp-gradient-test.cpp
@@ -29,7 +29,7 @@ public:
         gr = new SPGradient();
     }
 
-    ~SPGradientTest() {
+    ~SPGradientTest() override {
         delete gr;
         DocPerCaseTest::TearDownTestCase();
     }
diff --git a/testfiles/src/sp-object-test.cpp b/testfiles/src/sp-object-test.cpp
index a00cdaf24..713b4b0d2 100644
--- a/testfiles/src/sp-object-test.cpp
+++ b/testfiles/src/sp-object-test.cpp
@@ -40,7 +40,7 @@ public:
         b->invoke_build(_doc, bt, 0);
         a->invoke_build(_doc, at, 0);
     }
-    ~SPObjectTest() {
+    ~SPObjectTest() override {
         delete e;
         delete d;
         delete c;
diff --git a/testfiles/src/style-elem-test.cpp b/testfiles/src/style-elem-test.cpp
index 1d2ceed2a..c003e7b7c 100644
--- a/testfiles/src/style-elem-test.cpp
+++ b/testfiles/src/style-elem-test.cpp
@@ -40,7 +40,7 @@ rect { fill: green; opacity:1.0; }\
         doc = SPDocument::createNewDocFromMem(docString, static_cast<int>(strlen(docString)), false);
     }
 
-    ~ObjectTest() {
+    ~ObjectTest() override {
         doc->doUnref();
     }