Run clang-tidy’s modernize-use-override pass.

This adds the override specifier on all methods which override a virtual
method, whether they were already virtual or missing this specifier.

42 files changed, 184 insertions, 184 deletions

diff --git a/src/ui/widget/addtoicon.h b/src/ui/widget/addtoicon.h
index 93d66c8d5..f79d12cdf 100644
--- a/src/ui/widget/addtoicon.h
+++ b/src/ui/widget/addtoicon.h
@@ -24,33 +24,33 @@ namespace Widget {
 class AddToIcon : public Gtk::CellRendererPixbuf {
 public:
     AddToIcon();
-    virtual ~AddToIcon() {};
+    ~AddToIcon() override {};
 
     Glib::PropertyProxy<bool> property_active() { return _property_active.get_proxy(); }
     Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on();
     Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_off();
 
 protected:
-    virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
+    void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
                                Gtk::Widget& widget,
                                const Gdk::Rectangle& background_area,
                                const Gdk::Rectangle& cell_area,
-                               Gtk::CellRendererState flags );
+                               Gtk::CellRendererState flags ) override;
 
-    virtual void get_preferred_width_vfunc(Gtk::Widget& widget,
+    void get_preferred_width_vfunc(Gtk::Widget& widget,
                                            int& min_w,
-                                           int& nat_w) const;
+                                           int& nat_w) const override;
     
-    virtual void get_preferred_height_vfunc(Gtk::Widget& widget,
+    void get_preferred_height_vfunc(Gtk::Widget& widget,
                                             int& min_h,
-                                            int& nat_h) const;
+                                            int& nat_h) const override;
 
-    virtual bool activate_vfunc(GdkEvent *event,
+    bool activate_vfunc(GdkEvent *event,
                                 Gtk::Widget &widget,
                                 const Glib::ustring &path,
                                 const Gdk::Rectangle &background_area,
                                 const Gdk::Rectangle &cell_area,
-                                Gtk::CellRendererState flags);
+                                Gtk::CellRendererState flags) override;
 
 
 private:
diff --git a/src/ui/widget/alignment-selector.h b/src/ui/widget/alignment-selector.h
index 43cd100ef..c1208477b 100644
--- a/src/ui/widget/alignment-selector.h
+++ b/src/ui/widget/alignment-selector.h
@@ -35,7 +35,7 @@ public:
     sigc::signal<void, int> &on_alignmentClicked() { return _alignmentClicked; }
 
     AlignmentSelector();
-    virtual ~AlignmentSelector();
+    ~AlignmentSelector() override;
 };
 
 } // namespace Widget
diff --git a/src/ui/widget/anchor-selector.h b/src/ui/widget/anchor-selector.h
index e756e9aa0..ad3114c3f 100644
--- a/src/ui/widget/anchor-selector.h
+++ b/src/ui/widget/anchor-selector.h
@@ -44,7 +44,7 @@ public:
 	void setAlignment(int horizontal, int vertical);
 
 	AnchorSelector();
-	virtual ~AnchorSelector();
+	~AnchorSelector() override;
 };
 
 } // namespace Widget
diff --git a/src/ui/widget/clipmaskicon.h b/src/ui/widget/clipmaskicon.h
index deb4554df..d355a1caf 100644
--- a/src/ui/widget/clipmaskicon.h
+++ b/src/ui/widget/clipmaskicon.h
@@ -24,7 +24,7 @@ namespace Widget {
 class ClipMaskIcon : public Gtk::CellRendererPixbuf {
 public:
     ClipMaskIcon();
-    virtual ~ClipMaskIcon() {};
+    ~ClipMaskIcon() override {};
 
     Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); }
     Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on();
@@ -32,26 +32,26 @@ public:
 
 protected:
 
-    virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
+    void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
                                Gtk::Widget& widget,
                                const Gdk::Rectangle& background_area,
                                const Gdk::Rectangle& cell_area,
-                               Gtk::CellRendererState flags );
+                               Gtk::CellRendererState flags ) override;
 
-    virtual void get_preferred_width_vfunc(Gtk::Widget& widget,
+    void get_preferred_width_vfunc(Gtk::Widget& widget,
                                            int& min_w,
-                                           int& nat_w) const;
+                                           int& nat_w) const override;
     
-    virtual void get_preferred_height_vfunc(Gtk::Widget& widget,
+    void get_preferred_height_vfunc(Gtk::Widget& widget,
                                             int& min_h,
-                                            int& nat_h) const;
+                                            int& nat_h) const override;
 
-    virtual bool activate_vfunc(GdkEvent *event,
+    bool activate_vfunc(GdkEvent *event,
                                 Gtk::Widget &widget,
                                 const Glib::ustring &path,
                                 const Gdk::Rectangle &background_area,
                                 const Gdk::Rectangle &cell_area,
-                                Gtk::CellRendererState flags);
+                                Gtk::CellRendererState flags) override;
 
 
 private:
diff --git a/src/ui/widget/color-entry.h b/src/ui/widget/color-entry.h
index 08537f26d..7197321e2 100644
--- a/src/ui/widget/color-entry.h
+++ b/src/ui/widget/color-entry.h
@@ -22,10 +22,10 @@ class ColorEntry : public Gtk::Entry
 {
 public:
     ColorEntry(SelectedColor &color);
-    virtual ~ColorEntry();
+    ~ColorEntry() override;
 
 protected:
-    void on_changed();
+    void on_changed() override;
 
 private:
     void _onColorChanged();
diff --git a/src/ui/widget/color-icc-selector.h b/src/ui/widget/color-icc-selector.h
index aaa8372b8..43ef26858 100644
--- a/src/ui/widget/color-icc-selector.h
+++ b/src/ui/widget/color-icc-selector.h
@@ -26,12 +26,12 @@ class ColorICCSelector
     static const gchar *MODE_NAME;
 
     ColorICCSelector(SelectedColor &color);
-    virtual ~ColorICCSelector();
+    ~ColorICCSelector() override;
 
     virtual void init();
 
   protected:
-    void on_show();
+    void on_show() override;
 
     virtual void _colorChanged();
 
@@ -50,8 +50,8 @@ class ColorICCSelector
 
 class ColorICCSelectorFactory : public ColorSelectorFactory {
   public:
-    Gtk::Widget *createWidget(SelectedColor &color) const;
-    Glib::ustring modeName() const;
+    Gtk::Widget *createWidget(SelectedColor &color) const override;
+    Glib::ustring modeName() const override;
 };
 }
 }
diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h
index 7c43435d3..c34c4faf3 100644
--- a/src/ui/widget/color-notebook.h
+++ b/src/ui/widget/color-notebook.h
@@ -34,7 +34,7 @@ class ColorNotebook
 {
 public:
     ColorNotebook(SelectedColor &color);
-    virtual ~ColorNotebook();
+    ~ColorNotebook() override;
 
 protected:
     struct Page {
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index 7bb4947d5..c80571df0 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -41,7 +41,7 @@ public:
                  const guint32 rgba,
                  bool undo);
 
-    virtual ~ColorPicker();
+    ~ColorPicker() override;
 
     void setRgba32 (guint32 rgba);
 
@@ -53,7 +53,7 @@ public:
 protected:
 
     void _onSelectedColorChanged();
-    virtual void on_clicked();
+    void on_clicked() override;
     virtual void on_changed (guint32);
 
     ColorPreview        _preview;
@@ -82,7 +82,7 @@ public:
                          const guint32 rgba,
                          bool undo) : Labelled(label, tip, new ColorPicker(title, tip, rgba, undo)) {}
 
-    ~LabelledColorPicker()
+    ~LabelledColorPicker() override
         { static_cast<ColorPicker*>(_widget)->~ColorPicker(); }
 
     void setRgba32 (guint32 rgba)
diff --git a/src/ui/widget/color-preview.h b/src/ui/widget/color-preview.h
index 1276cf42b..520b6fe24 100644
--- a/src/ui/widget/color-preview.h
+++ b/src/ui/widget/color-preview.h
@@ -31,13 +31,13 @@ public:
     GdkPixbuf* toPixbuf (int width, int height);
 
 protected:
-    virtual void on_size_allocate (Gtk::Allocation &all);
+    void on_size_allocate (Gtk::Allocation &all) override;
 
-    virtual void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const;
-    virtual void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) const;
-    virtual void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const;
-    virtual void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) const;
-    virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+    void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const override;
+    void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) const override;
+    void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const override;
+    void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) const override;
+    bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
     guint32 _rgba;
 };
diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h
index 5d681cdfb..40e2fdad0 100644
--- a/src/ui/widget/color-scales.h
+++ b/src/ui/widget/color-scales.h
@@ -33,7 +33,7 @@ public:
     static void setScaled(GtkAdjustment *a, gfloat v, bool constrained = false);
 
     ColorScales(SelectedColor &color, SPColorScalesMode mode);
-    virtual ~ColorScales();
+    ~ColorScales() override;
 
     virtual void _initUI(SPColorScalesMode mode);
 
@@ -42,7 +42,7 @@ public:
 
 protected:
     void _onColorChanged();
-    void on_show();
+    void on_show() override;
 
     static void _adjustmentAnyChanged(GtkAdjustment *adjustment, ColorScales *cs);
     void _sliderAnyGrabbed();
@@ -79,10 +79,10 @@ class ColorScalesFactory : public Inkscape::UI::ColorSelectorFactory
 {
 public:
     ColorScalesFactory(SPColorScalesMode submode);
-    ~ColorScalesFactory();
+    ~ColorScalesFactory() override;
 
-    Gtk::Widget *createWidget(Inkscape::UI::SelectedColor &color) const;
-    Glib::ustring modeName() const;
+    Gtk::Widget *createWidget(Inkscape::UI::SelectedColor &color) const override;
+    Glib::ustring modeName() const override;
 
 private:
     SPColorScalesMode _submode;
diff --git a/src/ui/widget/color-slider.h b/src/ui/widget/color-slider.h
index 9be6c356a..956615880 100644
--- a/src/ui/widget/color-slider.h
+++ b/src/ui/widget/color-slider.h
@@ -25,7 +25,7 @@ namespace Widget {
 class ColorSlider : public Gtk::Widget {
 public:
     ColorSlider(Glib::RefPtr<Gtk::Adjustment> adjustment);
-    ~ColorSlider();
+    ~ColorSlider() override;
 
     void setAdjustment(Glib::RefPtr<Gtk::Adjustment> adjustment);
 
@@ -41,17 +41,17 @@ public:
     sigc::signal<void> signal_value_changed;
 
 protected:
-    void on_size_allocate(Gtk::Allocation &allocation);
-    void on_realize();
-    void on_unrealize();
-    bool on_button_press_event(GdkEventButton *event);
-    bool on_button_release_event(GdkEventButton *event);
-    bool on_motion_notify_event(GdkEventMotion *event);
-    bool on_draw(const Cairo::RefPtr<Cairo::Context> &cr);
-    void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const;
-    void get_preferred_width_for_height_vfunc(int height, int &minimum_width, int &natural_width) const;
-    void get_preferred_height_vfunc(int &minimum_height, int &natural_height) const;
-    void get_preferred_height_for_width_vfunc(int width, int &minimum_height, int &natural_height) const;
+    void on_size_allocate(Gtk::Allocation &allocation) override;
+    void on_realize() override;
+    void on_unrealize() override;
+    bool on_button_press_event(GdkEventButton *event) override;
+    bool on_button_release_event(GdkEventButton *event) override;
+    bool on_motion_notify_event(GdkEventMotion *event) override;
+    bool on_draw(const Cairo::RefPtr<Cairo::Context> &cr) override;
+    void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const override;
+    void get_preferred_width_for_height_vfunc(int height, int &minimum_width, int &natural_width) const override;
+    void get_preferred_height_vfunc(int &minimum_height, int &natural_height) const override;
+    void get_preferred_height_for_width_vfunc(int width, int &minimum_height, int &natural_height) const override;
 
 private:
     void _onAdjustmentChanged();
diff --git a/src/ui/widget/color-wheel-selector.h b/src/ui/widget/color-wheel-selector.h
index db9f7746b..67669fa2d 100644
--- a/src/ui/widget/color-wheel-selector.h
+++ b/src/ui/widget/color-wheel-selector.h
@@ -35,12 +35,12 @@ public:
     static const gchar *MODE_NAME;
 
     ColorWheelSelector(SelectedColor &color);
-    virtual ~ColorWheelSelector();
+    ~ColorWheelSelector() override;
 
 protected:
     void _initUI();
 
-    void on_show();
+    void on_show() override;
 
     void _colorChanged();
     void _adjustmentChanged();
@@ -68,8 +68,8 @@ private:
 
 class ColorWheelSelectorFactory : public ColorSelectorFactory {
 public:
-    Gtk::Widget *createWidget(SelectedColor &color) const;
-    Glib::ustring modeName() const;
+    Gtk::Widget *createWidget(SelectedColor &color) const override;
+    Glib::ustring modeName() const override;
 };
 }
 }
diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h
index e7524ac71..6b69533d2 100644
--- a/src/ui/widget/combo-enums.h
+++ b/src/ui/widget/combo-enums.h
@@ -94,12 +94,12 @@ public:
         }
     }
 
-    virtual Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         return get_active_data()->key;
     }
 
-    virtual void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         setProgrammatically = true;
         const gchar* val = attribute_value(o);
diff --git a/src/ui/widget/entity-entry.h b/src/ui/widget/entity-entry.h
index 35f6ecfb4..19eea0fc8 100644
--- a/src/ui/widget/entity-entry.h
+++ b/src/ui/widget/entity-entry.h
@@ -46,23 +46,23 @@ protected:
 class EntityLineEntry : public EntityEntry {
 public:
     EntityLineEntry (rdf_work_entity_t* ent, Registry& wr);
-    ~EntityLineEntry();
-    void update (SPDocument *doc);
-    void load_from_preferences();
+    ~EntityLineEntry() override;
+    void update (SPDocument *doc) override;
+    void load_from_preferences() override;
 
 protected:
-    virtual void on_changed();
+    void on_changed() override;
 };
 
 class EntityMultiLineEntry : public EntityEntry {
 public:
     EntityMultiLineEntry (rdf_work_entity_t* ent, Registry& wr);
-    ~EntityMultiLineEntry();
-    void update (SPDocument *doc);
-    void load_from_preferences();
+    ~EntityMultiLineEntry() override;
+    void update (SPDocument *doc) override;
+    void load_from_preferences() override;
 
 protected: 
-    virtual void on_changed();
+    void on_changed() override;
     Gtk::TextView _v;
 };
 
diff --git a/src/ui/widget/font-selector-toolbar.h b/src/ui/widget/font-selector-toolbar.h
index df6fa5fd5..1bddfac55 100644
--- a/src/ui/widget/font-selector-toolbar.h
+++ b/src/ui/widget/font-selector-toolbar.h
@@ -78,7 +78,7 @@ private:
     void on_style_changed();
     void on_icon_pressed (Gtk::EntryIconPosition icon_position, const GdkEventButton* event);
     // bool on_match_selected (const Gtk::TreeModel::iterator& iter);
-    bool on_key_press_event (GdkEventKey* key_event);
+    bool on_key_press_event (GdkEventKey* key_event) override;
 
     // Signals
     sigc::signal<void> changed_signal;
diff --git a/src/ui/widget/frame.h b/src/ui/widget/frame.h
index 24dd716e6..3145eddfe 100644
--- a/src/ui/widget/frame.h
+++ b/src/ui/widget/frame.h
@@ -40,7 +40,7 @@ public:
     /**
      * Add a widget to this frame
      */
-    virtual void add(Widget& widget);
+    void add(Widget& widget) override;
 
     /**
      * Set the frame label text and if bold or not
diff --git a/src/ui/widget/highlight-picker.h b/src/ui/widget/highlight-picker.h
index c459b0dcd..6cfdf162c 100644
--- a/src/ui/widget/highlight-picker.h
+++ b/src/ui/widget/highlight-picker.h
@@ -24,31 +24,31 @@ namespace Widget {
 class HighlightPicker : public Gtk::CellRendererPixbuf {
 public:
     HighlightPicker();
-    virtual ~HighlightPicker();
+    ~HighlightPicker() override;
 
     Glib::PropertyProxy<guint32> property_active() { return _property_active.get_proxy(); }
 
 protected:
-    virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
+    void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
                                Gtk::Widget& widget,
                                const Gdk::Rectangle& background_area,
                                const Gdk::Rectangle& cell_area,
-                               Gtk::CellRendererState flags );
+                               Gtk::CellRendererState flags ) override;
 
-    virtual void get_preferred_width_vfunc(Gtk::Widget& widget,
+    void get_preferred_width_vfunc(Gtk::Widget& widget,
                                            int& min_w,
-                                           int& nat_w) const;
+                                           int& nat_w) const override;
     
-    virtual void get_preferred_height_vfunc(Gtk::Widget& widget,
+    void get_preferred_height_vfunc(Gtk::Widget& widget,
                                             int& min_h,
-                                            int& nat_h) const;
+                                            int& nat_h) const override;
 
-    virtual bool activate_vfunc(GdkEvent *event,
+    bool activate_vfunc(GdkEvent *event,
                                 Gtk::Widget &widget,
                                 const Glib::ustring &path,
                                 const Gdk::Rectangle &background_area,
                                 const Gdk::Rectangle &cell_area,
-                                Gtk::CellRendererState flags);
+                                Gtk::CellRendererState flags) override;
 
 private:
     
diff --git a/src/ui/widget/imageicon.h b/src/ui/widget/imageicon.h
index 2ea8b8533..8b95e4d77 100644
--- a/src/ui/widget/imageicon.h
+++ b/src/ui/widget/imageicon.h
@@ -56,7 +56,7 @@ public:
     /**
      * Destructor
      */
-    ~ImageIcon();
+    ~ImageIcon() override;
 
     /**
      *
diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h
index d4f27cf11..f537cc74c 100644
--- a/src/ui/widget/imagetoggler.h
+++ b/src/ui/widget/imagetoggler.h
@@ -25,7 +25,7 @@ namespace Widget {
 class ImageToggler : public Gtk::CellRendererPixbuf {
 public:
     ImageToggler( char const *on, char const *off);
-    virtual ~ImageToggler() {};
+    ~ImageToggler() override {};
 
     sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;}
     sigc::signal<void, GdkEvent const *> signal_pre_toggle()  { return _signal_pre_toggle; }
@@ -36,26 +36,26 @@ public:
     Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_off();
 
 protected:
-    virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
+    void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
                                Gtk::Widget& widget,
                                const Gdk::Rectangle& background_area,
                                const Gdk::Rectangle& cell_area,
-                               Gtk::CellRendererState flags );
+                               Gtk::CellRendererState flags ) override;
 
-    virtual void get_preferred_width_vfunc(Gtk::Widget& widget,
+    void get_preferred_width_vfunc(Gtk::Widget& widget,
                                            int& min_w,
-                                           int& nat_w) const;
+                                           int& nat_w) const override;
     
-    virtual void get_preferred_height_vfunc(Gtk::Widget& widget,
+    void get_preferred_height_vfunc(Gtk::Widget& widget,
                                             int& min_h,
-                                            int& nat_h) const;
+                                            int& nat_h) const override;
 
-    virtual bool activate_vfunc(GdkEvent *event,
+    bool activate_vfunc(GdkEvent *event,
                                 Gtk::Widget &widget,
                                 const Glib::ustring &path,
                                 const Gdk::Rectangle &background_area,
                                 const Gdk::Rectangle &cell_area,
-                                Gtk::CellRendererState flags);
+                                Gtk::CellRendererState flags) override;
 
 
 private:
diff --git a/src/ui/widget/ink-select-one-action.h b/src/ui/widget/ink-select-one-action.h
index 5cf7c934a..34495d346 100644
--- a/src/ui/widget/ink-select-one-action.h
+++ b/src/ui/widget/ink-select-one-action.h
@@ -80,8 +80,8 @@ public:
 
 protected:
 
-    virtual Gtk::Widget* create_menu_item_vfunc();
-    virtual Gtk::Widget* create_tool_item_vfunc();
+    Gtk::Widget* create_menu_item_vfunc() override;
+    Gtk::Widget* create_tool_item_vfunc() override;
 
     /* Signals */
     sigc::signal<void, int> _changed;
diff --git a/src/ui/widget/ink-spinscale.h b/src/ui/widget/ink-spinscale.h
index 9eb297b1f..7cb82c92a 100644
--- a/src/ui/widget/ink-spinscale.h
+++ b/src/ui/widget/ink-spinscale.h
@@ -31,7 +31,7 @@ class InkScale : public Gtk::Scale
 {
  public:
   InkScale(Glib::RefPtr<Gtk::Adjustment>, Gtk::SpinButton* spinbutton);
-  ~InkScale() {};
+  ~InkScale() override {};
 
   void set_label(Glib::ustring label);
 
@@ -71,7 +71,7 @@ class InkSpinScale : public Gtk::Box
   // Create an InkSpinScale with a preexisting adjustment.
   InkSpinScale(Glib::RefPtr<Gtk::Adjustment>);
 
-  virtual ~InkSpinScale() {};
+  ~InkSpinScale() override {};
 
   void set_label(Glib::ustring label);
   void set_digits(int digits);
diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h
index 43188fa5b..5c4c19603 100644
--- a/src/ui/widget/insertordericon.h
+++ b/src/ui/widget/insertordericon.h
@@ -25,7 +25,7 @@ namespace Widget {
 class InsertOrderIcon : public Gtk::CellRendererPixbuf {
 public:
     InsertOrderIcon();
-    virtual ~InsertOrderIcon() {};
+    ~InsertOrderIcon() override {};
 
     Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); }
     Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on();
@@ -33,26 +33,26 @@ public:
 
 protected:
 
-    virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
+    void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
                                Gtk::Widget& widget,
                                const Gdk::Rectangle& background_area,
                                const Gdk::Rectangle& cell_area,
-                               Gtk::CellRendererState flags );
+                               Gtk::CellRendererState flags ) override;
 
-    virtual void get_preferred_width_vfunc(Gtk::Widget& widget,
+    void get_preferred_width_vfunc(Gtk::Widget& widget,
                                            int& min_w,
-                                           int& nat_w) const;
+                                           int& nat_w) const override;
     
-    virtual void get_preferred_height_vfunc(Gtk::Widget& widget,
+    void get_preferred_height_vfunc(Gtk::Widget& widget,
                                             int& min_h,
-                                            int& nat_h) const;
+                                            int& nat_h) const override;
 
-    virtual bool activate_vfunc(GdkEvent *event,
+    bool activate_vfunc(GdkEvent *event,
                                 Gtk::Widget &widget,
                                 const Glib::ustring &path,
                                 const Gdk::Rectangle &background_area,
                                 const Gdk::Rectangle &cell_area,
-                                Gtk::CellRendererState flags);
+                                Gtk::CellRendererState flags) override;
 
 
 private:
diff --git a/src/ui/widget/labelled.h b/src/ui/widget/labelled.h
index 824abf305..79dd271a0 100644
--- a/src/ui/widget/labelled.h
+++ b/src/ui/widget/labelled.h
@@ -58,7 +58,7 @@ public:
     void setTooltipText(const Glib::ustring &tooltip);
 
 private:
-    virtual bool on_mnemonic_activate( bool group_cycling );
+    bool on_mnemonic_activate( bool group_cycling ) override;
 
 protected:
 
diff --git a/src/ui/widget/layer-selector.h b/src/ui/widget/layer-selector.h
index ff9e4ddfc..0b531231a 100644
--- a/src/ui/widget/layer-selector.h
+++ b/src/ui/widget/layer-selector.h
@@ -39,7 +39,7 @@ class DocumentTreeModel;
 class LayerSelector : public Gtk::HBox {
 public:
     LayerSelector(SPDesktop *desktop = NULL);
-    ~LayerSelector();
+    ~LayerSelector() override;
 
     SPDesktop *desktop() { return _desktop; }
     void setDesktop(SPDesktop *desktop);
diff --git a/src/ui/widget/layertypeicon.h b/src/ui/widget/layertypeicon.h
index f12029c12..5f7e79c29 100644
--- a/src/ui/widget/layertypeicon.h
+++ b/src/ui/widget/layertypeicon.h
@@ -24,7 +24,7 @@ namespace Widget {
 class LayerTypeIcon : public Gtk::CellRendererPixbuf {
 public:
     LayerTypeIcon();
-    virtual ~LayerTypeIcon() {};
+    ~LayerTypeIcon() override {};
 
     sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;}
     sigc::signal<void, GdkEvent const *> signal_pre_toggle()  { return _signal_pre_toggle; }
@@ -35,26 +35,26 @@ public:
     Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_off();
 
 protected:
-    virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
+    void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
                                Gtk::Widget& widget,
                                const Gdk::Rectangle& background_area,
                                const Gdk::Rectangle& cell_area,
-                               Gtk::CellRendererState flags );
+                               Gtk::CellRendererState flags ) override;
 
-    virtual void get_preferred_width_vfunc(Gtk::Widget& widget,
+    void get_preferred_width_vfunc(Gtk::Widget& widget,
                                            int& min_w,
-                                           int& nat_w) const;
+                                           int& nat_w) const override;
     
-    virtual void get_preferred_height_vfunc(Gtk::Widget& widget,
+    void get_preferred_height_vfunc(Gtk::Widget& widget,
                                             int& min_h,
-                                            int& nat_h) const;
+                                            int& nat_h) const override;
 
-    virtual bool activate_vfunc(GdkEvent *event,
+    bool activate_vfunc(GdkEvent *event,
                                 Gtk::Widget &widget,
                                 const Glib::ustring &path,
                                 const Gdk::Rectangle &background_area,
                                 const Gdk::Rectangle &cell_area,
-                                Gtk::CellRendererState flags);
+                                Gtk::CellRendererState flags) override;
 
 
 private:
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 1e9ee361d..c9d46bc66 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -46,7 +46,7 @@ class LicenseItem : public Gtk::RadioButton {
 public:
     LicenseItem (struct rdf_license_t const* license, EntityEntry* entity, Registry &wr, Gtk::RadioButtonGroup *group);
 protected:
-    void on_toggled();
+    void on_toggled() override;
     struct rdf_license_t const *_lic;
     EntityEntry                *_eep;
     Registry                   &_wr;
diff --git a/src/ui/widget/licensor.h b/src/ui/widget/licensor.h
index b96162589..798d20d4e 100644
--- a/src/ui/widget/licensor.h
+++ b/src/ui/widget/licensor.h
@@ -29,7 +29,7 @@ class Registry;
 class Licensor : public Gtk::VBox {
 public:
     Licensor();
-    virtual ~Licensor();
+    ~Licensor() override;
     void init (Registry&);
     void update (SPDocument *doc);
 
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index 9e810bc00..d71050ab3 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -35,7 +35,7 @@ class StyleSubject;
 class ObjectCompositeSettings : public Gtk::VBox {
 public:
     ObjectCompositeSettings(unsigned int verb_code, char const *history_prefix, int flags);
-    ~ObjectCompositeSettings();
+    ~ObjectCompositeSettings() override;
 
     void setSubject(StyleSubject *subject);
 
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 29cd204b9..001c6a65d 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -143,7 +143,7 @@ public:
     /**
      * Destructor
      */
-    virtual ~PageSizer();
+    ~PageSizer() override;
 
     /**
      * Set up or reset this widget
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index 1461bdf2a..aed90f99c 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -60,7 +60,7 @@ public:
      * @param verb_num the dialog verb.
      */
     Panel(gchar const *prefs_path = 0, int verb_num = 0);
-    virtual ~Panel();
+    ~Panel() override;
 
     gchar const *getPrefsPath() const;
     
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 2578be533..2b10d1a81 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -55,7 +55,7 @@ public:
     sigc::signal<void, bool> changed_signal;
 protected:
     Glib::ustring _prefs_path;
-    void on_toggled();
+    void on_toggled() override;
 };
 
 class PrefRadioButton : public Gtk::RadioButton
@@ -76,7 +76,7 @@ protected:
         VAL_STRING
     };
     int _int_value;
-    void on_toggled();
+    void on_toggled() override;
 };
 
 class PrefSpinButton : public SpinButton
@@ -89,7 +89,7 @@ protected:
     Glib::ustring _prefs_path;
     bool _is_int;
     bool _is_percent;
-    void on_value_changed();
+    void on_value_changed() override;
 };
 
 class PrefSpinUnit : public ScalarUnit
@@ -119,7 +119,7 @@ public:
     static const double textpadding;
 
 private:
-    bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+    bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
     void draw_marks(Cairo::RefPtr<Cairo::Context> cr, double dist, int major_interval);
 
@@ -140,7 +140,7 @@ private:
     void on_slider_value_changed();
     void on_spinbutton_value_changed();
     void on_unit_changed();
-    virtual bool on_mnemonic_activate( bool group_cycling );
+    bool on_mnemonic_activate( bool group_cycling ) override;
 
     Inkscape::UI::Widget::SpinButton _sb;
     UnitMenu        _unit;
@@ -158,7 +158,7 @@ public:
 private:
     void on_slider_value_changed();
     void on_spinbutton_value_changed();
-    virtual bool on_mnemonic_activate( bool group_cycling );
+    bool on_mnemonic_activate( bool group_cycling ) override;
 
     Glib::ustring _prefs_path;
     Inkscape::UI::Widget::SpinButton _sb;
@@ -185,7 +185,7 @@ protected:
     Glib::ustring _prefs_path;
     std::vector<int> _values;
     std::vector<Glib::ustring> _ustr_values;    ///< string key values used optionally instead of numeric _values
-    void on_changed();
+    void on_changed() override;
 };
 
 class PrefEntry : public Gtk::Entry
@@ -194,7 +194,7 @@ public:
     void init(Glib::ustring const &prefs_path, bool mask);
 protected:
     Glib::ustring _prefs_path;
-    void on_changed();
+    void on_changed() override;
 };
 
 class PrefMultiEntry : public Gtk::ScrolledWindow
@@ -220,7 +220,7 @@ protected:
     Gtk::Entry *relatedEntry;
     void onRelatedEntryChangedCallback();
     void onRelatedButtonClickedCallback();
-    virtual bool on_mnemonic_activate( bool group_cycling );
+    bool on_mnemonic_activate( bool group_cycling ) override;
 };
 
 class PrefEntryFileButtonHBox : public Gtk::HBox
@@ -234,7 +234,7 @@ protected:
     Gtk::Entry *relatedEntry;
     void onRelatedEntryChangedCallback();
     void onRelatedButtonClickedCallback();
-    virtual bool on_mnemonic_activate( bool group_cycling );
+    bool on_mnemonic_activate( bool group_cycling ) override;
 };
 
 class PrefFileButton : public Gtk::FileChooserButton
@@ -251,14 +251,14 @@ class PrefColorPicker : public ColorPicker
 {
 public:
     PrefColorPicker() : ColorPicker("", "", 0, false) {};
-    virtual ~PrefColorPicker() {};
+    ~PrefColorPicker() override {};
 
     void init(Glib::ustring const &abel, Glib::ustring const &prefs_path,
               guint32 default_rgba);
 
 protected:
     Glib::ustring _prefs_path;
-    virtual void on_changed (guint32 rgba);
+    void on_changed (guint32 rgba) override;
 };
 
 class PrefUnit : public UnitMenu
@@ -267,7 +267,7 @@ public:
     void init(Glib::ustring const &prefs_path);
 protected:
     Glib::ustring _prefs_path;
-    void on_changed();
+    void on_changed() override;
 };
 
 class DialogPage : public Gtk::Grid
diff --git a/src/ui/widget/registered-enums.h b/src/ui/widget/registered-enums.h
index 1d5074836..04ed521cd 100644
--- a/src/ui/widget/registered-enums.h
+++ b/src/ui/widget/registered-enums.h
@@ -23,7 +23,7 @@ namespace Widget {
 template<typename E> class RegisteredEnum : public RegisteredWidget< LabelledComboBoxEnum<E> >
 {
 public:
-    virtual ~RegisteredEnum() {
+    ~RegisteredEnum() override {
         _changed_connection.disconnect();
     }
 
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 02c1810cf..ca55e5397 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -83,7 +83,7 @@ protected:
     template< typename A, typename B, typename C, typename D, typename E , typename F, typename G>
     RegisteredWidget( A& a, B& b, C& c, D& d, E& e, F f, G& g): W( a, b, c, d, e, f, g) { construct(); }
 
-    virtual ~RegisteredWidget() {};
+    ~RegisteredWidget() override {};
 
     void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
     {
@@ -147,7 +147,7 @@ private:
 
 class RegisteredCheckButton : public RegisteredWidget<Gtk::CheckButton> {
 public:
-    virtual ~RegisteredCheckButton();
+    ~RegisteredCheckButton() override;
     RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *active_str = "true", char const *inactive_str = "false");
 
     void setActive (bool);
@@ -167,12 +167,12 @@ public:
 protected:
     char const *_active_str, *_inactive_str;
     sigc::connection  _toggled_connection;
-    void on_toggled();
+    void on_toggled() override;
 };
 
 class RegisteredToggleButton : public RegisteredWidget<Gtk::ToggleButton> {
 public:
-    virtual ~RegisteredToggleButton();
+    ~RegisteredToggleButton() override;
     RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *icon_active = "true", char const *icon_inactive = "false");
 
     void setActive (bool);
@@ -191,12 +191,12 @@ public:
 
 protected:
     sigc::connection  _toggled_connection;
-    void on_toggled();
+    void on_toggled() override;
 };
 
 class RegisteredUnitMenu : public RegisteredWidget<Labelled> {
 public:
-    ~RegisteredUnitMenu();
+    ~RegisteredUnitMenu() override;
     RegisteredUnitMenu ( const Glib::ustring& label,
                          const Glib::ustring& key,
                          Registry& wr,
@@ -222,7 +222,7 @@ enum RSU_UserUnits {
 
 class RegisteredScalarUnit : public RegisteredWidget<ScalarUnit> {
 public:
-    ~RegisteredScalarUnit();
+    ~RegisteredScalarUnit() override;
     RegisteredScalarUnit ( const Glib::ustring& label,
                            const Glib::ustring& tip,
                            const Glib::ustring& key,
@@ -241,7 +241,7 @@ protected:
 
 class RegisteredScalar : public RegisteredWidget<Scalar> {
 public:
-    virtual ~RegisteredScalar();
+    ~RegisteredScalar() override;
     RegisteredScalar (const Glib::ustring& label,
             const Glib::ustring& tip,
             const Glib::ustring& key,
@@ -255,7 +255,7 @@ protected:
 
 class RegisteredText : public RegisteredWidget<Text> {
 public:
-    virtual ~RegisteredText();
+    ~RegisteredText() override;
     RegisteredText (const Glib::ustring& label,
             const Glib::ustring& tip,
             const Glib::ustring& key,
@@ -270,7 +270,7 @@ protected:
 
 class RegisteredColorPicker : public RegisteredWidget<LabelledColorPicker> {
 public:
-    virtual ~RegisteredColorPicker();
+    ~RegisteredColorPicker() override;
 
     RegisteredColorPicker (const Glib::ustring& label,
                            const Glib::ustring& title,
@@ -292,7 +292,7 @@ protected:
 
 class RegisteredSuffixedInteger : public RegisteredWidget<Scalar> {
 public:
-    virtual ~RegisteredSuffixedInteger();
+    ~RegisteredSuffixedInteger() override;
     RegisteredSuffixedInteger ( const Glib::ustring& label,
                                 const Glib::ustring& tip, 
                                 const Glib::ustring& suffix,
@@ -311,7 +311,7 @@ protected:
 
 class RegisteredRadioButtonPair : public RegisteredWidget<Gtk::HBox> {
 public:
-    virtual ~RegisteredRadioButtonPair();
+    ~RegisteredRadioButtonPair() override;
     RegisteredRadioButtonPair ( const Glib::ustring& label,
                                 const Glib::ustring& label1,
                                 const Glib::ustring& label2,
@@ -334,7 +334,7 @@ protected:
 
 class RegisteredPoint : public RegisteredWidget<Point> {
 public:
-    virtual ~RegisteredPoint();
+    ~RegisteredPoint() override;
     RegisteredPoint ( const Glib::ustring& label,
                       const Glib::ustring& tip,
                       const Glib::ustring& key,
@@ -351,7 +351,7 @@ protected:
 
 class RegisteredTransformedPoint : public RegisteredWidget<Point> {
 public:
-    virtual ~RegisteredTransformedPoint();
+    ~RegisteredTransformedPoint() override;
     RegisteredTransformedPoint (  const Glib::ustring& label,
                                   const Glib::ustring& tip,
                                   const Glib::ustring& key,
@@ -375,7 +375,7 @@ protected:
 
 class RegisteredVector : public RegisteredWidget<Point> {
 public:
-    virtual ~RegisteredVector();
+    ~RegisteredVector() override;
     RegisteredVector (const Glib::ustring& label,
                       const Glib::ustring& tip,
                       const Glib::ustring& key,
@@ -406,7 +406,7 @@ protected:
 
 class RegisteredRandom : public RegisteredWidget<Random> {
 public:
-    virtual ~RegisteredRandom();
+    ~RegisteredRandom() override;
     RegisteredRandom ( const Glib::ustring& label,
                        const Glib::ustring& tip,
                        const Glib::ustring& key,
@@ -424,7 +424,7 @@ protected:
 
 class RegisteredFontButton : public RegisteredWidget<FontButton> {
 public:
-    virtual ~RegisteredFontButton();
+    ~RegisteredFontButton() override;
     RegisteredFontButton ( const Glib::ustring& label,
                              const Glib::ustring& tip,
                              const Glib::ustring& key,
diff --git a/src/ui/widget/rotateable.h b/src/ui/widget/rotateable.h
index 6404c3550..5ed3c62c9 100644
--- a/src/ui/widget/rotateable.h
+++ b/src/ui/widget/rotateable.h
@@ -26,7 +26,7 @@ class Rotateable: public Gtk::EventBox
 public:
     Rotateable();
 
-    ~Rotateable();
+    ~Rotateable() override;
 
     bool on_click(GdkEventButton *event);
     bool on_motion(GdkEventMotion *event);
diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h
index b7f3d5dda..6f1841928 100644
--- a/src/ui/widget/selected-style.h
+++ b/src/ui/widget/selected-style.h
@@ -69,13 +69,13 @@ class RotateableSwatch: public Rotateable
 {
 public:
     RotateableSwatch(SelectedStyle *parent, guint mode);
-    ~RotateableSwatch();
+    ~RotateableSwatch() override;
 
     double color_adjust (float *hsl, double by, guint32 cc, guint state);
 
-    virtual void do_motion (double by, guint state);
-    virtual void do_release (double by, guint state);
-    virtual void do_scroll (double by, guint state);
+    void do_motion (double by, guint state) override;
+    void do_release (double by, guint state) override;
+    void do_scroll (double by, guint state) override;
 
 private:
     guint fillstroke;
@@ -95,12 +95,12 @@ class RotateableStrokeWidth: public Rotateable
 {
 public:
     RotateableStrokeWidth(SelectedStyle *parent);
-    ~RotateableStrokeWidth();
+    ~RotateableStrokeWidth() override;
 
     double value_adjust(double current, double by, guint modifier, bool final);
-    virtual void do_motion (double by, guint state);
-    virtual void do_release (double by, guint state);
-    virtual void do_scroll (double by, guint state);
+    void do_motion (double by, guint state) override;
+    void do_release (double by, guint state) override;
+    void do_scroll (double by, guint state) override;
 
 private:
     SelectedStyle *parent;
@@ -119,7 +119,7 @@ class SelectedStyle : public Gtk::HBox
 public:
     SelectedStyle(bool layout = true);
 
-    ~SelectedStyle();
+    ~SelectedStyle() override;
 
     void setDesktop(SPDesktop *desktop);
     SPDesktop *getDesktop() {return _desktop;}
diff --git a/src/ui/widget/spin-scale.h b/src/ui/widget/spin-scale.h
index 123f527bb..316ac5a87 100644
--- a/src/ui/widget/spin-scale.h
+++ b/src/ui/widget/spin-scale.h
@@ -42,8 +42,8 @@ public:
               Glib::RefPtr<Gtk::Adjustment> adjustment, int digits,
               const SPAttributeEnum a = SP_ATTR_INVALID, const Glib::ustring tip_text = "");
 
-    virtual Glib::ustring get_as_attribute() const;
-    virtual void set_from_attribute(SPObject*);
+    Glib::ustring get_as_attribute() const override;
+    void set_from_attribute(SPObject*) override;
 
     // Shortcuts to _adjustment
     Glib::SignalProxy0<void> signal_value_changed();
@@ -75,8 +75,8 @@ public:
                   const SPAttributeEnum a,
                   const Glib::ustring tip_text1, const Glib::ustring tip_text2);
 
-    virtual Glib::ustring get_as_attribute() const;
-    virtual void set_from_attribute(SPObject*);
+    Glib::ustring get_as_attribute() const override;
+    void set_from_attribute(SPObject*) override;
 
     sigc::signal<void>& signal_value_changed();
 
diff --git a/src/ui/widget/spin-slider.h b/src/ui/widget/spin-slider.h
index 5a29c1b67..cd2d2a427 100644
--- a/src/ui/widget/spin-slider.h
+++ b/src/ui/widget/spin-slider.h
@@ -34,8 +34,8 @@ public:
     SpinSlider(double value, double lower, double upper, double step_inc,
 	       double climb_rate, int digits, const SPAttributeEnum a = SP_ATTR_INVALID, const char* tip_text = NULL);
 
-    virtual Glib::ustring get_as_attribute() const;
-    virtual void set_from_attribute(SPObject*);
+    Glib::ustring get_as_attribute() const override;
+    void set_from_attribute(SPObject*) override;
 
     // Shortcuts to _adjustment
     Glib::SignalProxy0<void> signal_value_changed();
@@ -71,8 +71,8 @@ public:
     DualSpinSlider(double value, double lower, double upper, double step_inc,
                    double climb_rate, int digits, const SPAttributeEnum, char* tip_text1, char* tip_text2);
 
-    virtual Glib::ustring get_as_attribute() const;
-    virtual void set_from_attribute(SPObject*);
+    Glib::ustring get_as_attribute() const override;
+    void set_from_attribute(SPObject*) override;
 
     sigc::signal<void>& signal_value_changed();
 
diff --git a/src/ui/widget/spinbutton.h b/src/ui/widget/spinbutton.h
index 9c015a3b2..a252743be 100644
--- a/src/ui/widget/spinbutton.h
+++ b/src/ui/widget/spinbutton.h
@@ -45,7 +45,7 @@ public:
       connect_signals();
   };
 
-  virtual ~SpinButton() {};
+  ~SpinButton() override {};
 
   void setUnitMenu(UnitMenu* unit_menu) { _unit_menu = unit_menu; };
   
@@ -65,7 +65,7 @@ protected:
      * @retval false No conversion done, continue with default handler.
      * @retval true  Conversion successful, don't call default handler. 
      */
-    int on_input(double* newvalue);
+    int on_input(double* newvalue) override;
 
     /**
      * When focus is obtained, save the value to enable undo later.
diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h
index b75b3ffa7..398aab065 100644
--- a/src/ui/widget/style-subject.h
+++ b/src/ui/widget/style-subject.h
@@ -66,15 +66,15 @@ private:
 class StyleSubject::Selection : public StyleSubject {
 public:
     Selection();
-    ~Selection();
+    ~Selection() override;
 
-    virtual Geom::OptRect getBounds(SPItem::BBoxType type);
-    virtual int queryStyle(SPStyle *query, int property);
-    virtual void setCSS(SPCSSAttr *css);
-    virtual std::vector<SPObject*> list();
+    Geom::OptRect getBounds(SPItem::BBoxType type) override;
+    int queryStyle(SPStyle *query, int property) override;
+    void setCSS(SPCSSAttr *css) override;
+    std::vector<SPObject*> list() override;
 
 protected:
-    virtual void _afterDesktopSwitch(SPDesktop *desktop);
+    void _afterDesktopSwitch(SPDesktop *desktop) override;
 
 private:
     Inkscape::Selection *_getSelection() const;
@@ -87,15 +87,15 @@ private:
 class StyleSubject::CurrentLayer : public StyleSubject {
 public:
     CurrentLayer();
-    ~CurrentLayer();
+    ~CurrentLayer() override;
 
-    virtual Geom::OptRect getBounds(SPItem::BBoxType type);
-    virtual int queryStyle(SPStyle *query, int property);
-    virtual void setCSS(SPCSSAttr *css);
-    virtual std::vector<SPObject*> list();
+    Geom::OptRect getBounds(SPItem::BBoxType type) override;
+    int queryStyle(SPStyle *query, int property) override;
+    void setCSS(SPCSSAttr *css) override;
+    std::vector<SPObject*> list() override;
 
 protected:
-    virtual void _afterDesktopSwitch(SPDesktop *desktop);
+    void _afterDesktopSwitch(SPDesktop *desktop) override;
 
 private:
     SPObject *_getLayer() const;
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 14a6c4502..15928e300 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -52,7 +52,7 @@ public:
         Observer(path),
         _style_swatch(ss)
     {}
-    virtual void notify(Inkscape::Preferences::Entry const &val);
+    void notify(Inkscape::Preferences::Entry const &val) override;
 private:
     StyleSwatch &_style_swatch;
 };
@@ -69,7 +69,7 @@ public:
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         this->notify(prefs->getEntry(path));
     }
-    virtual void notify(Inkscape::Preferences::Entry const &val) {
+    void notify(Inkscape::Preferences::Entry const &val) override {
         SPCSSAttr *css = val.getInheritedStyle();
         _style_swatch.setStyle(css);
         sp_repr_css_attr_unref(css);
diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h
index 81a907d16..bda5ce315 100644
--- a/src/ui/widget/style-swatch.h
+++ b/src/ui/widget/style-swatch.h
@@ -46,7 +46,7 @@ class StyleSwatch : public Gtk::HBox
 public:
     StyleSwatch (SPCSSAttr *attr, gchar const *main_tip);
 
-    ~StyleSwatch();
+    ~StyleSwatch() override;
 
     void setStyle(SPStyle *style);
     void setStyle(SPCSSAttr *attr);
diff --git a/src/ui/widget/unit-menu.h b/src/ui/widget/unit-menu.h
index f414660f7..a076c5168 100644
--- a/src/ui/widget/unit-menu.h
+++ b/src/ui/widget/unit-menu.h
@@ -31,7 +31,7 @@ public:
      */
     UnitMenu();
 
-    virtual ~UnitMenu();
+    ~UnitMenu() override;
 
     /**
      * Adds the unit type to the widget.  This extracts the corresponding