run clang tidy modernize pass

83 files changed, 129 insertions, 125 deletions

diff --git a/src/extension/internal/bitmap/adaptiveThreshold.cpp b/src/extension/internal/bitmap/adaptiveThreshold.cpp
index a632ba226..473bada4e 100644
--- a/src/extension/internal/bitmap/adaptiveThreshold.cpp
+++ b/src/extension/internal/bitmap/adaptiveThreshold.cpp
@@ -33,7 +33,7 @@ AdaptiveThreshold::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-AdaptiveThreshold::init(void)
+AdaptiveThreshold::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/adaptiveThreshold.h b/src/extension/internal/bitmap/adaptiveThreshold.h
index 33ad87618..066f13ba0 100644
--- a/src/extension/internal/bitmap/adaptiveThreshold.h
+++ b/src/extension/internal/bitmap/adaptiveThreshold.h
@@ -23,7 +23,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/addNoise.cpp b/src/extension/internal/bitmap/addNoise.cpp
index 606099638..5981eed24 100644
--- a/src/extension/internal/bitmap/addNoise.cpp
+++ b/src/extension/internal/bitmap/addNoise.cpp
@@ -39,7 +39,7 @@ AddNoise::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-AddNoise::init(void)
+AddNoise::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/addNoise.h b/src/extension/internal/bitmap/addNoise.h
index 16ab6ed4c..06ce8c397 100644
--- a/src/extension/internal/bitmap/addNoise.h
+++ b/src/extension/internal/bitmap/addNoise.h
@@ -21,7 +21,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/blur.cpp b/src/extension/internal/bitmap/blur.cpp
index 712d135a0..57c3342a8 100644
--- a/src/extension/internal/bitmap/blur.cpp
+++ b/src/extension/internal/bitmap/blur.cpp
@@ -32,7 +32,7 @@ Blur::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-Blur::init(void)
+Blur::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/blur.h b/src/extension/internal/bitmap/blur.h
index d4315e96a..da93a42fd 100644
--- a/src/extension/internal/bitmap/blur.h
+++ b/src/extension/internal/bitmap/blur.h
@@ -22,7 +22,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init(void);
+    static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/channel.cpp b/src/extension/internal/bitmap/channel.cpp
index 4ca666814..fb0dad635 100644
--- a/src/extension/internal/bitmap/channel.cpp
+++ b/src/extension/internal/bitmap/channel.cpp
@@ -42,7 +42,7 @@ Channel::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-Channel::init(void)
+Channel::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/channel.h b/src/extension/internal/bitmap/channel.h
index 477d6f341..e215344f7 100644
--- a/src/extension/internal/bitmap/channel.h
+++ b/src/extension/internal/bitmap/channel.h
@@ -23,7 +23,7 @@ public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
 
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/charcoal.cpp b/src/extension/internal/bitmap/charcoal.cpp
index 69b76614b..2c4894732 100644
--- a/src/extension/internal/bitmap/charcoal.cpp
+++ b/src/extension/internal/bitmap/charcoal.cpp
@@ -32,7 +32,7 @@ Charcoal::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Charcoal::init(void)
+Charcoal::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/charcoal.h b/src/extension/internal/bitmap/charcoal.h
index bd6021cda..c22574689 100644
--- a/src/extension/internal/bitmap/charcoal.h
+++ b/src/extension/internal/bitmap/charcoal.h
@@ -22,7 +22,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init(void);
+    static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/colorize.cpp b/src/extension/internal/bitmap/colorize.cpp
index b7ce01a2a..01dfd1d7e 100644
--- a/src/extension/internal/bitmap/colorize.cpp
+++ b/src/extension/internal/bitmap/colorize.cpp
@@ -44,7 +44,7 @@ Colorize::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-Colorize::init(void)
+Colorize::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/colorize.h b/src/extension/internal/bitmap/colorize.h
index c854b78e9..7c16ef5b6 100644
--- a/src/extension/internal/bitmap/colorize.h
+++ b/src/extension/internal/bitmap/colorize.h
@@ -25,7 +25,7 @@ public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
 
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/contrast.cpp b/src/extension/internal/bitmap/contrast.cpp
index 35d04f50d..bb01d8e85 100644
--- a/src/extension/internal/bitmap/contrast.cpp
+++ b/src/extension/internal/bitmap/contrast.cpp
@@ -34,7 +34,7 @@ Contrast::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-Contrast::init(void)
+Contrast::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/contrast.h b/src/extension/internal/bitmap/contrast.h
index d37736874..c0e95e4a2 100644
--- a/src/extension/internal/bitmap/contrast.h
+++ b/src/extension/internal/bitmap/contrast.h
@@ -21,7 +21,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init(void);
+    static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp
index 7b36bd340..b83e7d882 100644
--- a/src/extension/internal/bitmap/crop.cpp
+++ b/src/extension/internal/bitmap/crop.cpp
@@ -61,7 +61,7 @@ Crop::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-Crop::init(void)
+Crop::init()
 {
     Inkscape::Extension::build_from_mem(
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/crop.h b/src/extension/internal/bitmap/crop.h
index 7cb9b0148..da538789c 100644
--- a/src/extension/internal/bitmap/crop.h
+++ b/src/extension/internal/bitmap/crop.h
@@ -26,7 +26,7 @@ public:
     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);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/cycleColormap.cpp b/src/extension/internal/bitmap/cycleColormap.cpp
index f7198eba5..d245294bc 100644
--- a/src/extension/internal/bitmap/cycleColormap.cpp
+++ b/src/extension/internal/bitmap/cycleColormap.cpp
@@ -31,7 +31,7 @@ CycleColormap::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-CycleColormap::init(void)
+CycleColormap::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/cycleColormap.h b/src/extension/internal/bitmap/cycleColormap.h
index 81ffd32e0..0d66b15a7 100644
--- a/src/extension/internal/bitmap/cycleColormap.h
+++ b/src/extension/internal/bitmap/cycleColormap.h
@@ -20,7 +20,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/despeckle.cpp b/src/extension/internal/bitmap/despeckle.cpp
index e0b2ed7e6..7a3069d7b 100644
--- a/src/extension/internal/bitmap/despeckle.cpp
+++ b/src/extension/internal/bitmap/despeckle.cpp
@@ -30,7 +30,7 @@ Despeckle::refreshParameters(Inkscape::Extension::Effect */*module*/) {
 #include "../clear-n_.h"
 
 void
-Despeckle::init(void)
+Despeckle::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/despeckle.h b/src/extension/internal/bitmap/despeckle.h
index d38d83921..0c731ee43 100644
--- a/src/extension/internal/bitmap/despeckle.h
+++ b/src/extension/internal/bitmap/despeckle.h
@@ -18,7 +18,7 @@ class Despeckle : public ImageMagick {
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/edge.cpp b/src/extension/internal/bitmap/edge.cpp
index 4212dee0d..d147001d6 100644
--- a/src/extension/internal/bitmap/edge.cpp
+++ b/src/extension/internal/bitmap/edge.cpp
@@ -31,7 +31,7 @@ Edge::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-Edge::init(void)
+Edge::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/edge.h b/src/extension/internal/bitmap/edge.h
index 3091e2d75..2c5fe1427 100644
--- a/src/extension/internal/bitmap/edge.h
+++ b/src/extension/internal/bitmap/edge.h
@@ -20,7 +20,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/emboss.cpp b/src/extension/internal/bitmap/emboss.cpp
index 44f65b049..8cb363ebd 100644
--- a/src/extension/internal/bitmap/emboss.cpp
+++ b/src/extension/internal/bitmap/emboss.cpp
@@ -32,7 +32,7 @@ Emboss::refreshParameters(Inkscape::Extension::Effect *module) {
 #include "../clear-n_.h"
 
 void
-Emboss::init(void)
+Emboss::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/emboss.h b/src/extension/internal/bitmap/emboss.h
index 86fa38c18..18b91bb1a 100644
--- a/src/extension/internal/bitmap/emboss.h
+++ b/src/extension/internal/bitmap/emboss.h
@@ -22,7 +22,7 @@ private:
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/enhance.cpp b/src/extension/internal/bitmap/enhance.cpp
index 8c7dc52fd..aff9fafa9 100644
--- a/src/extension/internal/bitmap/enhance.cpp
+++ b/src/extension/internal/bitmap/enhance.cpp
@@ -29,7 +29,7 @@ Enhance::refreshParameters(Inkscape::Extension::Effect */*module*/) { }
 #include "../clear-n_.h"
 
 void
-Enhance::init(void)
+Enhance::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/enhance.h b/src/extension/internal/bitmap/enhance.h
index 040d673e2..dd3d9ff6a 100644
--- a/src/extension/internal/bitmap/enhance.h
+++ b/src/extension/internal/bitmap/enhance.h
@@ -19,7 +19,7 @@ class Enhance : public ImageMagick
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/equalize.cpp b/src/extension/internal/bitmap/equalize.cpp
index 25d5e3c45..423b88b34 100644
--- a/src/extension/internal/bitmap/equalize.cpp
+++ b/src/extension/internal/bitmap/equalize.cpp
@@ -29,7 +29,7 @@ Equalize::refreshParameters(Inkscape::Extension::Effect */*module*/) { }
 #include "../clear-n_.h"
 
 void
-Equalize::init(void)
+Equalize::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/equalize.h b/src/extension/internal/bitmap/equalize.h
index d66a0f873..8259ffb78 100644
--- a/src/extension/internal/bitmap/equalize.h
+++ b/src/extension/internal/bitmap/equalize.h
@@ -19,7 +19,7 @@ class Equalize : public ImageMagick
 public:
     void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-    static void init (void);
+    static void init ();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/gaussianBlur.cpp b/src/extension/internal/bitmap/gaussianBlur.cpp
index 944d84838..78b77e23c 100644
--- a/src/extension/internal/bitmap/gaussianBlur.cpp
+++ b/src/extension/internal/bitmap/gaussianBlur.cpp
@@ -32,7 +32,7 @@ GaussianBlur::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-GaussianBlur::init(void)
+GaussianBlur::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/gaussianBlur.h b/src/extension/internal/bitmap/gaussianBlur.h
index e2afb41f8..3cd3fb871 100644
--- a/src/extension/internal/bitmap/gaussianBlur.h
+++ b/src/extension/internal/bitmap/gaussianBlur.h
@@ -22,7 +22,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/implode.cpp b/src/extension/internal/bitmap/implode.cpp
index b48fb47cc..7bad3489f 100644
--- a/src/extension/internal/bitmap/implode.cpp
+++ b/src/extension/internal/bitmap/implode.cpp
@@ -31,7 +31,7 @@ Implode::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Implode::init(void)
+Implode::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/implode.h b/src/extension/internal/bitmap/implode.h
index e6649ced2..d9c5adb15 100644
--- a/src/extension/internal/bitmap/implode.h
+++ b/src/extension/internal/bitmap/implode.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/level.cpp b/src/extension/internal/bitmap/level.cpp
index cc4ade583..0b58ec8b9 100644
--- a/src/extension/internal/bitmap/level.cpp
+++ b/src/extension/internal/bitmap/level.cpp
@@ -35,7 +35,7 @@ Level::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Level::init(void)
+Level::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/level.h b/src/extension/internal/bitmap/level.h
index fc4159b7c..d37274539 100644
--- a/src/extension/internal/bitmap/level.h
+++ b/src/extension/internal/bitmap/level.h
@@ -23,7 +23,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/levelChannel.cpp b/src/extension/internal/bitmap/levelChannel.cpp
index ddaf2e958..714293d28 100644
--- a/src/extension/internal/bitmap/levelChannel.cpp
+++ b/src/extension/internal/bitmap/levelChannel.cpp
@@ -46,7 +46,7 @@ LevelChannel::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-LevelChannel::init(void)
+LevelChannel::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/levelChannel.h b/src/extension/internal/bitmap/levelChannel.h
index 42b8917cd..a619939f9 100644
--- a/src/extension/internal/bitmap/levelChannel.h
+++ b/src/extension/internal/bitmap/levelChannel.h
@@ -24,7 +24,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/medianFilter.cpp b/src/extension/internal/bitmap/medianFilter.cpp
index eb7c374a9..5a5e0311b 100644
--- a/src/extension/internal/bitmap/medianFilter.cpp
+++ b/src/extension/internal/bitmap/medianFilter.cpp
@@ -31,7 +31,7 @@ MedianFilter::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-MedianFilter::init(void)
+MedianFilter::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/medianFilter.h b/src/extension/internal/bitmap/medianFilter.h
index 69ea58a85..60ac31ae1 100644
--- a/src/extension/internal/bitmap/medianFilter.h
+++ b/src/extension/internal/bitmap/medianFilter.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/modulate.cpp b/src/extension/internal/bitmap/modulate.cpp
index 086b0aafa..1a82707f2 100644
--- a/src/extension/internal/bitmap/modulate.cpp
+++ b/src/extension/internal/bitmap/modulate.cpp
@@ -34,7 +34,7 @@ Modulate::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Modulate::init(void)
+Modulate::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/modulate.h b/src/extension/internal/bitmap/modulate.h
index 911df8154..f0aaf1b78 100644
--- a/src/extension/internal/bitmap/modulate.h
+++ b/src/extension/internal/bitmap/modulate.h
@@ -23,7 +23,7 @@ private:
 public:
   void applyEffect(Magick::Image *image) override;
   void refreshParameters(Inkscape::Extension::Effect *module) override;
-  static void init(void);
+  static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/negate.cpp b/src/extension/internal/bitmap/negate.cpp
index 0465c7f2c..fcec5c070 100644
--- a/src/extension/internal/bitmap/negate.cpp
+++ b/src/extension/internal/bitmap/negate.cpp
@@ -30,7 +30,7 @@ Negate::refreshParameters(Inkscape::Extension::Effect* /*module*/) {
 #include "../clear-n_.h"
 
 void
-Negate::init(void)
+Negate::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/negate.h b/src/extension/internal/bitmap/negate.h
index 81423ac1e..4cde402bc 100644
--- a/src/extension/internal/bitmap/negate.h
+++ b/src/extension/internal/bitmap/negate.h
@@ -19,7 +19,7 @@ class Negate : public ImageMagick
 public:
   void applyEffect(Magick::Image *image) override;
   void refreshParameters(Inkscape::Extension::Effect *module) override;
-  static void init(void);
+  static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/normalize.cpp b/src/extension/internal/bitmap/normalize.cpp
index 91029aa2c..f6cf053f7 100644
--- a/src/extension/internal/bitmap/normalize.cpp
+++ b/src/extension/internal/bitmap/normalize.cpp
@@ -30,7 +30,7 @@ Normalize::refreshParameters(Inkscape::Extension::Effect* /*module*/) {
 #include "../clear-n_.h"
 
 void
-Normalize::init(void)
+Normalize::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/normalize.h b/src/extension/internal/bitmap/normalize.h
index 64e8c3e4b..2d4a9c2f5 100644
--- a/src/extension/internal/bitmap/normalize.h
+++ b/src/extension/internal/bitmap/normalize.h
@@ -19,7 +19,7 @@ class Normalize : public ImageMagick
 public:
   void applyEffect(Magick::Image *image) override;
   void refreshParameters(Inkscape::Extension::Effect *module) override;
-  static void init(void);
+  static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/oilPaint.cpp b/src/extension/internal/bitmap/oilPaint.cpp
index 66c8941c9..a2ffce712 100644
--- a/src/extension/internal/bitmap/oilPaint.cpp
+++ b/src/extension/internal/bitmap/oilPaint.cpp
@@ -31,7 +31,7 @@ OilPaint::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-OilPaint::init(void)
+OilPaint::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/oilPaint.h b/src/extension/internal/bitmap/oilPaint.h
index a45f91666..d3957bd6f 100644
--- a/src/extension/internal/bitmap/oilPaint.h
+++ b/src/extension/internal/bitmap/oilPaint.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/opacity.cpp b/src/extension/internal/bitmap/opacity.cpp
index bcffbc497..3206d246d 100644
--- a/src/extension/internal/bitmap/opacity.cpp
+++ b/src/extension/internal/bitmap/opacity.cpp
@@ -32,7 +32,7 @@ Opacity::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Opacity::init(void)
+Opacity::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/opacity.h b/src/extension/internal/bitmap/opacity.h
index f389bc650..df6e6acde 100644
--- a/src/extension/internal/bitmap/opacity.h
+++ b/src/extension/internal/bitmap/opacity.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/raise.cpp b/src/extension/internal/bitmap/raise.cpp
index 55d2d6e7d..b97455d4e 100644
--- a/src/extension/internal/bitmap/raise.cpp
+++ b/src/extension/internal/bitmap/raise.cpp
@@ -34,7 +34,7 @@ Raise::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Raise::init(void)
+Raise::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/raise.h b/src/extension/internal/bitmap/raise.h
index bc402828e..90023fb80 100644
--- a/src/extension/internal/bitmap/raise.h
+++ b/src/extension/internal/bitmap/raise.h
@@ -23,7 +23,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/reduceNoise.cpp b/src/extension/internal/bitmap/reduceNoise.cpp
index 43846b816..1a4e124ac 100644
--- a/src/extension/internal/bitmap/reduceNoise.cpp
+++ b/src/extension/internal/bitmap/reduceNoise.cpp
@@ -34,7 +34,7 @@ ReduceNoise::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-ReduceNoise::init(void)
+ReduceNoise::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/reduceNoise.h b/src/extension/internal/bitmap/reduceNoise.h
index 9a41d8463..3c9d2d6c2 100644
--- a/src/extension/internal/bitmap/reduceNoise.h
+++ b/src/extension/internal/bitmap/reduceNoise.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/sample.cpp b/src/extension/internal/bitmap/sample.cpp
index f75dd966f..e8bf32500 100644
--- a/src/extension/internal/bitmap/sample.cpp
+++ b/src/extension/internal/bitmap/sample.cpp
@@ -33,7 +33,7 @@ Sample::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Sample::init(void)
+Sample::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/sample.h b/src/extension/internal/bitmap/sample.h
index 48908326d..c93ab0ac5 100644
--- a/src/extension/internal/bitmap/sample.h
+++ b/src/extension/internal/bitmap/sample.h
@@ -22,7 +22,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/shade.cpp b/src/extension/internal/bitmap/shade.cpp
index 1db1ce90f..5896072c4 100644
--- a/src/extension/internal/bitmap/shade.cpp
+++ b/src/extension/internal/bitmap/shade.cpp
@@ -34,7 +34,7 @@ Shade::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Shade::init(void)
+Shade::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/shade.h b/src/extension/internal/bitmap/shade.h
index f94cb62e1..71ed3db1e 100644
--- a/src/extension/internal/bitmap/shade.h
+++ b/src/extension/internal/bitmap/shade.h
@@ -23,7 +23,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/sharpen.cpp b/src/extension/internal/bitmap/sharpen.cpp
index 4c9c38d9b..6ee05a900 100644
--- a/src/extension/internal/bitmap/sharpen.cpp
+++ b/src/extension/internal/bitmap/sharpen.cpp
@@ -32,7 +32,7 @@ Sharpen::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Sharpen::init(void)
+Sharpen::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/sharpen.h b/src/extension/internal/bitmap/sharpen.h
index 6fac5681e..35067ed5e 100644
--- a/src/extension/internal/bitmap/sharpen.h
+++ b/src/extension/internal/bitmap/sharpen.h
@@ -22,7 +22,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/solarize.cpp b/src/extension/internal/bitmap/solarize.cpp
index 994f4b48b..489141d39 100644
--- a/src/extension/internal/bitmap/solarize.cpp
+++ b/src/extension/internal/bitmap/solarize.cpp
@@ -33,7 +33,7 @@ Solarize::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Solarize::init(void)
+Solarize::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/solarize.h b/src/extension/internal/bitmap/solarize.h
index 45515f3fc..2e4a51b28 100644
--- a/src/extension/internal/bitmap/solarize.h
+++ b/src/extension/internal/bitmap/solarize.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/spread.cpp b/src/extension/internal/bitmap/spread.cpp
index 87ce35796..e6f426591 100644
--- a/src/extension/internal/bitmap/spread.cpp
+++ b/src/extension/internal/bitmap/spread.cpp
@@ -31,7 +31,7 @@ Spread::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Spread::init(void)
+Spread::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/spread.h b/src/extension/internal/bitmap/spread.h
index f7ec0cb3f..ad775440b 100644
--- a/src/extension/internal/bitmap/spread.h
+++ b/src/extension/internal/bitmap/spread.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/swirl.cpp b/src/extension/internal/bitmap/swirl.cpp
index 199359f9e..21df59502 100644
--- a/src/extension/internal/bitmap/swirl.cpp
+++ b/src/extension/internal/bitmap/swirl.cpp
@@ -31,7 +31,7 @@ Swirl::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Swirl::init(void)
+Swirl::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/swirl.h b/src/extension/internal/bitmap/swirl.h
index 64dcafe7e..b9ca3484e 100644
--- a/src/extension/internal/bitmap/swirl.h
+++ b/src/extension/internal/bitmap/swirl.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/threshold.cpp b/src/extension/internal/bitmap/threshold.cpp
index 0f06c7c79..ddcc7ab1b 100644
--- a/src/extension/internal/bitmap/threshold.cpp
+++ b/src/extension/internal/bitmap/threshold.cpp
@@ -31,7 +31,7 @@ Threshold::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Threshold::init(void)
+Threshold::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/threshold.h b/src/extension/internal/bitmap/threshold.h
index 94ef145dd..93e15bcb6 100644
--- a/src/extension/internal/bitmap/threshold.h
+++ b/src/extension/internal/bitmap/threshold.h
@@ -21,7 +21,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/unsharpmask.cpp b/src/extension/internal/bitmap/unsharpmask.cpp
index c54008342..2e807a39a 100644
--- a/src/extension/internal/bitmap/unsharpmask.cpp
+++ b/src/extension/internal/bitmap/unsharpmask.cpp
@@ -35,7 +35,7 @@ Unsharpmask::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Unsharpmask::init(void)
+Unsharpmask::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/unsharpmask.h b/src/extension/internal/bitmap/unsharpmask.h
index 442f19cf8..34fbfebc6 100644
--- a/src/extension/internal/bitmap/unsharpmask.h
+++ b/src/extension/internal/bitmap/unsharpmask.h
@@ -24,7 +24,7 @@ private:
 public:
   void applyEffect(Magick::Image *image) override;
   void refreshParameters(Inkscape::Extension::Effect *module) override;
-  static void init(void);
+  static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/bitmap/wave.cpp b/src/extension/internal/bitmap/wave.cpp
index c3a81a4e0..6a86ca3f7 100644
--- a/src/extension/internal/bitmap/wave.cpp
+++ b/src/extension/internal/bitmap/wave.cpp
@@ -32,7 +32,7 @@ Wave::refreshParameters(Inkscape::Extension::Effect* module) {
 #include "../clear-n_.h"
 
 void
-Wave::init(void)
+Wave::init()
 {
 	Inkscape::Extension::build_from_mem(
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
diff --git a/src/extension/internal/bitmap/wave.h b/src/extension/internal/bitmap/wave.h
index 49131e558..f524c175f 100644
--- a/src/extension/internal/bitmap/wave.h
+++ b/src/extension/internal/bitmap/wave.h
@@ -22,7 +22,7 @@ private:
 public:
 	void applyEffect(Magick::Image *image) override;
 	void refreshParameters(Inkscape::Extension::Effect *module) override;
-	static void init(void);
+	static void init();
 };
 
 }; /* namespace Bitmap */
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 0f96b4583..d1b9d47ac 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -1187,7 +1187,7 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index)
                     d->dc[d->level].style.stroke_dasharray.values.clear();
                 for (unsigned int i=0; i<pEmr->elp.elpNumEntries; i++) {
                     double dash_length = pix_to_abs_size( d, pEmr->elp.elpStyleEntry[i] );
-                    d->dc[d->level].style.stroke_dasharray.values.push_back(SPILength("temp", dash_length));
+                    d->dc[d->level].style.stroke_dasharray.values.emplace_back("temp", dash_length);
                 }
                 d->dc[d->level].style.stroke_dasharray.set = 1;
             } else {
diff --git a/src/io/file-export-cmd.cpp b/src/io/file-export-cmd.cpp
index e969e1087..d9527f89a 100644
--- a/src/io/file-export-cmd.cpp
+++ b/src/io/file-export-cmd.cpp
@@ -239,7 +239,7 @@ InkFileExportCmd::do_export_svg(SPDocument* doc, std::string filename_in)
     // Export each object in list (or root if empty).  Use ';' so in future it could be possible to selected multiple objects to export together.
     std::vector<Glib::ustring> objects = Glib::Regex::split_simple("\\s*;\\s*", export_id);
     if (objects.empty()) {
-        objects.push_back(Glib::ustring()); // So we do loop at least once for root.
+        objects.emplace_back(); // So we do loop at least once for root.
     }
 
     for (auto object : objects) {
@@ -337,7 +337,7 @@ InkFileExportCmd::do_export_png(SPDocument *doc, std::string filename_in)
     // Export each object in list (or root if empty).  Use ';' so in future it could be possible to selected multiple objects to export together.
     std::vector<Glib::ustring> objects = Glib::Regex::split_simple("\\s*;\\s*", export_id);
     if (objects.empty()) {
-        objects.push_back(Glib::ustring()); // So we do loop at least once for root.
+        objects.emplace_back(); // So we do loop at least once for root.
     }
 
     for (auto object_id : objects) {
@@ -644,7 +644,7 @@ InkFileExportCmd::do_export_ps_pdf(SPDocument* doc, std::string filename_in, std
     // Export each object in list (or root if empty).  Use ';' so in future it could be possible to selected multiple objects to export together.
     std::vector<Glib::ustring> objects = Glib::Regex::split_simple("\\s*;\\s*", export_id);
     if (objects.empty()) {
-        objects.push_back(Glib::ustring()); // So we do loop at least once for root.
+        objects.emplace_back(); // So we do loop at least once for root.
     }
 
     for (auto object : objects) {
diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index f00e17817..413c7b131 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -8,6 +8,8 @@
 #include <glibmm/i18n.h>
 #include <gtkmm.h>
 
+#include <utility>
+
 #include "include/gtkmm_version.h"
 #include "live_effects/parameter/message.h"
 #include "live_effects/effect.h"
@@ -18,12 +20,12 @@ namespace LivePathEffect {
 
 MessageParam::MessageParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, const gchar * default_message, const Glib::ustring& legend, 
+                      Effect* effect, const gchar * default_message, Glib::ustring  legend, 
                       Gtk::Align halign, Gtk::Align valign, double marginstart, double marginend)
     : Parameter(label, tip, key, wr, effect),
       message(default_message),
       defmessage(default_message),
-      _legend(legend),
+      _legend(std::move(legend)),
       _halign(halign),
       _valign(valign),
       _marginstart(marginstart),
diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h
index 439cce8f2..c0a54aa23 100644
--- a/src/live_effects/parameter/message.h
+++ b/src/live_effects/parameter/message.h
@@ -23,7 +23,7 @@ public:
                Inkscape::UI::Widget::Registry* wr,
                Effect* effect,
                const gchar * default_message = "Default message",
-               const Glib::ustring& legend = "Use Label",
+               Glib::ustring  legend = "Use Label",
                Gtk::Align halign = Gtk::ALIGN_START,
                Gtk::Align valign = Gtk::ALIGN_CENTER,
                double marginstart = 6,
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index e2be3d431..429fab403 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -875,8 +875,8 @@ void InkscapePreferences::initPageUI()
         std::vector<Glib::ustring> values;
         for (l = list; l; l = l->next) {
             theme = (gchar *)l->data;
-            labels.push_back(Glib::ustring(theme));
-            values.push_back(Glib::ustring(theme));
+            labels.emplace_back(theme);
+            values.emplace_back(theme);
         }
 
         g_list_free(list);
@@ -913,7 +913,7 @@ void InkscapePreferences::initPageUI()
         std::sort(values.begin(), values.end());
         labels.erase(unique(labels.begin(), labels.end()), labels.end());
         values.erase(unique(values.begin(), values.end()), values.end());
-        labels.push_back(_("Use system icons"));
+        labels.emplace_back(_("Use system icons"));
         values.push_back(prefs->getString("/theme/defaultIconTheme"));
         _icon_theme.init("/theme/iconTheme", labels, values, "hicolor");
         _page_theme.add_line(false, _("Change icon theme:"), _icon_theme, "", "", false);
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index e040d3be9..a0d5c9495 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -429,13 +429,13 @@ void PixelArtDialogImpl::processLibdepixelize(const Input &input)
     }
 
     if ( voronoiRadioButton.get_active() ) {
-        output.push_back(Output(Tracer::Kopf2011::to_voronoi(input.pixbuf,
+        output.emplace_back(Tracer::Kopf2011::to_voronoi(input.pixbuf,
                                                              lastOptions),
-                                input.x, input.y));
+                                input.x, input.y);
     } else {
-        output.push_back(Output(Tracer::Kopf2011::to_splines(input.pixbuf,
+        output.emplace_back(Tracer::Kopf2011::to_splines(input.pixbuf,
                                                              lastOptions),
-                                input.x, input.y));
+                                input.x, input.y);
     }
 }
 
diff --git a/src/ui/toolbar/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp
index 9a1261aba..77308c9ec 100644
--- a/src/ui/toolbar/connector-toolbar.cpp
+++ b/src/ui/toolbar/connector-toolbar.cpp
@@ -61,13 +61,13 @@ using Inkscape::UI::PrefPusher;
 //##      Connector      ##
 //#########################
 
-static void sp_connector_path_set_avoid(void)
+static void sp_connector_path_set_avoid()
 {
     Inkscape::UI::Tools::cc_selection_set_avoid(true);
 }
 
 
-static void sp_connector_path_set_ignore(void)
+static void sp_connector_path_set_ignore()
 {
     Inkscape::UI::Tools::cc_selection_set_avoid(false);
 }
@@ -215,7 +215,7 @@ static void connector_spacing_changed(GtkAdjustment *adj, GObject* tbl)
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );
 }
 
-static void sp_connector_graph_layout(void)
+static void sp_connector_graph_layout()
 {
     if (!SP_ACTIVE_DESKTOP) {
         return;
diff --git a/src/ui/toolbar/measure-toolbar.cpp b/src/ui/toolbar/measure-toolbar.cpp
index eca4cf911..fa0d8827e 100644
--- a/src/ui/toolbar/measure-toolbar.cpp
+++ b/src/ui/toolbar/measure-toolbar.cpp
@@ -236,7 +236,7 @@ sp_toggle_show_in_between( GtkToggleAction* act, gpointer data )
     }
 }
 static void 
-sp_reverse_knots(void){
+sp_reverse_knots(){
     MeasureTool *mt = get_measure_tool();
     if (mt) {
         mt->reverseKnots();
@@ -244,7 +244,7 @@ sp_reverse_knots(void){
 }
 
 static void 
-sp_to_mark_dimension(void){
+sp_to_mark_dimension(){
     MeasureTool *mt = get_measure_tool();
     if (mt) {
         mt->toMarkDimension();
@@ -252,7 +252,7 @@ sp_to_mark_dimension(void){
 }
 
 static void 
-sp_to_guides(void){
+sp_to_guides(){
     MeasureTool *mt = get_measure_tool();
     if (mt) {
         mt->toGuides();
@@ -260,7 +260,7 @@ sp_to_guides(void){
 }
 
 static void 
-sp_to_phantom(void){
+sp_to_phantom(){
     MeasureTool *mt = get_measure_tool();
     if (mt) {
         mt->toPhantom();
@@ -268,7 +268,7 @@ sp_to_phantom(void){
 }
 
 static void 
-sp_to_item(void){
+sp_to_item(){
     MeasureTool *mt = get_measure_tool();
     if (mt) {
         mt->toItem();
diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp
index 6dad5a189..b3f37f3e5 100644
--- a/src/ui/toolbar/mesh-toolbar.cpp
+++ b/src/ui/toolbar/mesh-toolbar.cpp
@@ -285,7 +285,7 @@ static MeshTool *get_mesh_tool()
     return tool;
 }
 
-static void ms_toggle_sides(void)
+static void ms_toggle_sides()
 {
     MeshTool *mt = get_mesh_tool();
     if (mt) {
@@ -293,7 +293,7 @@ static void ms_toggle_sides(void)
     }
 }
 
-static void ms_make_elliptical(void)
+static void ms_make_elliptical()
 {
     MeshTool *mt = get_mesh_tool();
     if (mt) {
@@ -301,7 +301,7 @@ static void ms_make_elliptical(void)
     }
 }
 
-static void ms_pick_colors(void)
+static void ms_pick_colors()
 {
     MeshTool *mt = get_mesh_tool();
     if (mt) {
@@ -309,7 +309,7 @@ static void ms_pick_colors(void)
     }
 }
 
-static void ms_fit_mesh(void)
+static void ms_fit_mesh()
 {
     MeshTool *mt = get_mesh_tool();
     if (mt) {
@@ -317,7 +317,7 @@ static void ms_fit_mesh(void)
     }
 }
 
-static void ms_toggle_handles(void)
+static void ms_toggle_handles()
 {
     MeshTool *mt = get_mesh_tool();
     if (mt) {
@@ -338,7 +338,7 @@ static void ms_toggle_fill_stroke(InkToggleAction * /*act*/, gpointer data)
     }
 }
 
-static void ms_warning_popup(void)
+static void ms_warning_popup()
 {
     char *msg = _("Mesh gradients are part of SVG 2:\n"
                   "* Syntax may change.\n"
diff --git a/src/ui/toolbar/node-toolbar.cpp b/src/ui/toolbar/node-toolbar.cpp
index 1026aff59..86d2f4d52 100644
--- a/src/ui/toolbar/node-toolbar.cpp
+++ b/src/ui/toolbar/node-toolbar.cpp
@@ -77,7 +77,7 @@ static NodeTool *get_node_tool()
     return tool;
 }
 
-static void sp_node_path_edit_add(void)
+static void sp_node_path_edit_add()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -85,28 +85,28 @@ static void sp_node_path_edit_add(void)
     }
 }
 
-static void sp_node_path_edit_add_min_x(void)
+static void sp_node_path_edit_add_min_x()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
         nt->_multipath->insertNodesAtExtrema(Inkscape::UI::PointManipulator::EXTR_MIN_X);
     }
 }
-static void sp_node_path_edit_add_max_x(void)
+static void sp_node_path_edit_add_max_x()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
         nt->_multipath->insertNodesAtExtrema(Inkscape::UI::PointManipulator::EXTR_MAX_X);
     }
 }
-static void sp_node_path_edit_add_min_y(void)
+static void sp_node_path_edit_add_min_y()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
         nt->_multipath->insertNodesAtExtrema(Inkscape::UI::PointManipulator::EXTR_MIN_Y);
     }
 }
-static void sp_node_path_edit_add_max_y(void)
+static void sp_node_path_edit_add_max_y()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -114,7 +114,7 @@ static void sp_node_path_edit_add_max_y(void)
     }
 }
 
-static void sp_node_path_edit_delete(void)
+static void sp_node_path_edit_delete()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -123,7 +123,7 @@ static void sp_node_path_edit_delete(void)
     }
 }
 
-static void sp_node_path_edit_delete_segment(void)
+static void sp_node_path_edit_delete_segment()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -131,7 +131,7 @@ static void sp_node_path_edit_delete_segment(void)
     }
 }
 
-static void sp_node_path_edit_break(void)
+static void sp_node_path_edit_break()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -139,7 +139,7 @@ static void sp_node_path_edit_break(void)
     }
 }
 
-static void sp_node_path_edit_join(void)
+static void sp_node_path_edit_join()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -147,7 +147,7 @@ static void sp_node_path_edit_join(void)
     }
 }
 
-static void sp_node_path_edit_join_segment(void)
+static void sp_node_path_edit_join_segment()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -155,7 +155,7 @@ static void sp_node_path_edit_join_segment(void)
     }
 }
 
-static void sp_node_path_edit_toline(void)
+static void sp_node_path_edit_toline()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -163,7 +163,7 @@ static void sp_node_path_edit_toline(void)
     }
 }
 
-static void sp_node_path_edit_tocurve(void)
+static void sp_node_path_edit_tocurve()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -171,7 +171,7 @@ static void sp_node_path_edit_tocurve(void)
     }
 }
 
-static void sp_node_path_edit_cusp(void)
+static void sp_node_path_edit_cusp()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -179,7 +179,7 @@ static void sp_node_path_edit_cusp(void)
     }
 }
 
-static void sp_node_path_edit_smooth(void)
+static void sp_node_path_edit_smooth()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -187,7 +187,7 @@ static void sp_node_path_edit_smooth(void)
     }
 }
 
-static void sp_node_path_edit_symmetrical(void)
+static void sp_node_path_edit_symmetrical()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
@@ -195,7 +195,7 @@ static void sp_node_path_edit_symmetrical(void)
     }
 }
 
-static void sp_node_path_edit_auto(void)
+static void sp_node_path_edit_auto()
 {
     NodeTool *nt = get_node_tool();
     if (nt) {
diff --git a/src/ui/widget/ink-flow-box.cpp b/src/ui/widget/ink-flow-box.cpp
index 127da3107..215e9d954 100644
--- a/src/ui/widget/ink-flow-box.cpp
+++ b/src/ui/widget/ink-flow-box.cpp
@@ -47,7 +47,7 @@ InkFlowBox::InkFlowBox(const gchar *name)
     sensitive = true;
 }
 
-InkFlowBox::~InkFlowBox() {}
+InkFlowBox::~InkFlowBox() = default;
 
 Glib::ustring InkFlowBox::getPrefsPath(gint pos)
 {
diff --git a/testfiles/src/attributes-test.cpp b/testfiles/src/attributes-test.cpp
index ae933611d..ce397b9bb 100644
--- a/testfiles/src/attributes-test.cpp
+++ b/testfiles/src/attributes-test.cpp
@@ -12,6 +12,7 @@
  */
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "gtest/gtest.h"
@@ -25,8 +26,8 @@ static const unsigned int FIRST_VALID_ID = 1;
 class AttributeInfo
 {
 public:
-    AttributeInfo(std::string const &attr, bool supported) :
-        attr(attr),
+    AttributeInfo(std::string attr, bool supported) :
+        attr(std::move(attr)),
         supported(supported)
     {
     }
diff --git a/testfiles/src/style-test.cpp b/testfiles/src/style-test.cpp
index 1d34e7bef..15195d853 100644
--- a/testfiles/src/style-test.cpp
+++ b/testfiles/src/style-test.cpp
@@ -12,6 +12,7 @@
  */
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "gtest/gtest.h"
@@ -23,13 +24,13 @@ namespace {
 class StyleRead {
 
 public:
-  StyleRead(std::string const &src, std::string const &dst, std::string const &uri) :
-    src(src), dst(dst), uri(uri)
+  StyleRead(std::string src, std::string dst, std::string uri) :
+    src(std::move(src)), dst(std::move(dst)), uri(std::move(uri))
   {
   }
 
-  StyleRead(std::string const &src, std::string const &dst) :
-    src(src), dst(dst), uri("")
+  StyleRead(std::string src, std::string dst) :
+    src(std::move(src)), dst(std::move(dst)), uri("")
   {
   }
 
@@ -275,8 +276,8 @@ TEST(StyleTest, Read) {
 class StyleMatch {
 
 public:
-  StyleMatch(std::string const &src, std::string const &dst, bool const &match) :
-    src(src), dst(dst), match(match)
+  StyleMatch(std::string src, std::string dst, bool const &match) :
+    src(std::move(src)), dst(std::move(dst)), match(match)
   {
   }
 
@@ -426,8 +427,8 @@ TEST(StyleTest, Match) {
 class StyleCascade {
 
 public:
-  StyleCascade(std::string const &parent, std::string const &child, std::string const &result) :
-    parent(parent), child(child), result(result)
+  StyleCascade(std::string parent, std::string child, std::string result) :
+    parent(std::move(parent)), child(std::move(child)), result(std::move(result))
   {
   }