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.

152 files changed, 740 insertions, 740 deletions

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 4f6adec4f..e719b2607 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -98,20 +98,20 @@ namespace UI {
  */
 class ClipboardManagerImpl : public ClipboardManager {
 public:
-    virtual void copy(ObjectSet *set);
-    virtual void copyPathParameter(Inkscape::LivePathEffect::PathParam *);
-    virtual void copySymbol(Inkscape::XML::Node* symbol, gchar const* style, bool user_symbol);
-    virtual bool paste(SPDesktop *desktop, bool in_place);
-    virtual bool pasteStyle(ObjectSet *set);
-    virtual bool pasteSize(ObjectSet *set, bool separately, bool apply_x, bool apply_y);
-    virtual bool pastePathEffect(ObjectSet *set);
-    virtual Glib::ustring getPathParameter(SPDesktop* desktop);
-    virtual Glib::ustring getShapeOrTextObjectId(SPDesktop *desktop);
-    virtual std::vector<Glib::ustring> getElementsOfType(SPDesktop *desktop, gchar const* type = "*", gint maxdepth = -1);
-    virtual const gchar *getFirstObjectID();
+    void copy(ObjectSet *set) override;
+    void copyPathParameter(Inkscape::LivePathEffect::PathParam *) override;
+    void copySymbol(Inkscape::XML::Node* symbol, gchar const* style, bool user_symbol) override;
+    bool paste(SPDesktop *desktop, bool in_place) override;
+    bool pasteStyle(ObjectSet *set) override;
+    bool pasteSize(ObjectSet *set, bool separately, bool apply_x, bool apply_y) override;
+    bool pastePathEffect(ObjectSet *set) override;
+    Glib::ustring getPathParameter(SPDesktop* desktop) override;
+    Glib::ustring getShapeOrTextObjectId(SPDesktop *desktop) override;
+    std::vector<Glib::ustring> getElementsOfType(SPDesktop *desktop, gchar const* type = "*", gint maxdepth = -1) override;
+    const gchar *getFirstObjectID() override;
 
     ClipboardManagerImpl();
-    ~ClipboardManagerImpl();
+    ~ClipboardManagerImpl() override;
 
 private:
     void _copySelection(ObjectSet *);
diff --git a/src/ui/contextmenu.h b/src/ui/contextmenu.h
index 465767604..29a090530 100644
--- a/src/ui/contextmenu.h
+++ b/src/ui/contextmenu.h
@@ -53,7 +53,7 @@ class ContextMenu : public Gtk::Menu
          * @param item SPItem pointer to the object selected at the time the ContextMenu is created.
          */
         ContextMenu(SPDesktop *desktop, SPItem *item);
-        ~ContextMenu(void);
+        ~ContextMenu(void) override;
         
     private:
         SPItem *_item; // pointer to the object selected at the time the ContextMenu is created
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index d0106bfcd..866f2eda7 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -92,9 +92,9 @@ private:
     {
     public:
         PrefListener(ControlManagerImpl &manager) : Inkscape::Preferences::Observer("/options/grabsize/value"), _mgr(manager) {}
-        virtual ~PrefListener() {}
+        ~PrefListener() override {}
 
-        virtual void notify(Inkscape::Preferences::Entry const &val) {
+        void notify(Inkscape::Preferences::Entry const &val) override {
             int size = val.getIntLimited(3, 1, 7);
             _mgr.setControlSize(size);
         }
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 75c217af9..1dc79474e 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -286,7 +286,7 @@ public :
     {}
 
 private :
-    virtual void on_button_click() {
+    void on_button_click() override {
         //Retrieve selected objects
         SPDesktop *desktop = _dialog.getDesktop();
         if (!desktop) return;
@@ -411,7 +411,7 @@ private :
     Geom::Dim2 _orientation;
     bool _distribute;
 
-    virtual void on_button_click() {
+    void on_button_click() override {
         if (!_dialog.getDesktop()) {
         	return;
         }
@@ -477,7 +477,7 @@ public:
     }
 
 private :
-    virtual void on_button_click()
+    void on_button_click() override
     {
         if (!_dialog.getDesktop()) return;
 
@@ -513,7 +513,7 @@ public:
     {}
 
 private :
-    virtual void on_button_click()
+    void on_button_click() override
     {
         if (!_dialog.getDesktop()) return;
 
@@ -575,7 +575,7 @@ private :
         return sp_item_repr_compare_position(a,b)<0;
     }
 
-    virtual void on_button_click()
+    void on_button_click() override
     {
         SPDesktop *desktop = _dialog.getDesktop();
         if (!desktop) return;
@@ -641,7 +641,7 @@ public :
     {}
 
 private :
-    virtual void on_button_click()
+    void on_button_click() override
     {
         if (!_dialog.getDesktop()) return;
 
@@ -673,7 +673,7 @@ public :
     {}
 
 private :
-    virtual void on_button_click()
+    void on_button_click() override
     {
         SPDesktop *desktop = _dialog.getDesktop();
         if (!desktop) return;
@@ -767,7 +767,7 @@ public :
 private :
     Geom::Dim2 _orientation;
     bool _distribute;
-    virtual void on_button_click()
+    void on_button_click() override
     {
         SPDesktop *desktop = _dialog.getDesktop();
         if (!desktop) return;
diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index 34d0230bf..d34bb8cc8 100644
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -43,7 +43,7 @@ class Action;
 class AlignAndDistribute : public Widget::Panel {
 public:
     AlignAndDistribute();
-    virtual ~AlignAndDistribute();
+    ~AlignAndDistribute() override;
 
     static AlignAndDistribute &getInstance() { return *new AlignAndDistribute(); }
 
@@ -184,7 +184,7 @@ public :
 private :
 
 
-    virtual void on_button_click() {
+    void on_button_click() override {
         //Retrieve selected objects
         SPDesktop *desktop = _dialog.getDesktop();
         if (!desktop) return;
diff --git a/src/ui/dialog/arrange-tab.h b/src/ui/dialog/arrange-tab.h
index 3ffe1ef4c..55baf775f 100644
--- a/src/ui/dialog/arrange-tab.h
+++ b/src/ui/dialog/arrange-tab.h
@@ -26,7 +26,7 @@ class ArrangeTab : public Gtk::VBox
 {
 public:
 	ArrangeTab() {};
-	virtual ~ArrangeTab() {};
+	~ArrangeTab() override {};
 
 	/**
 	 * Do the actual work! This method is invoked to actually arrange the
diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h
index c70e8ae98..6d8fa5c64 100644
--- a/src/ui/dialog/calligraphic-profile-rename.h
+++ b/src/ui/dialog/calligraphic-profile-rename.h
@@ -32,7 +32,7 @@ namespace Dialog {
 class CalligraphicProfileRename : public Gtk::Dialog {  
 public:
     CalligraphicProfileRename();
-    virtual ~CalligraphicProfileRename() {}
+    ~CalligraphicProfileRename() override {}
     Glib::ustring getName() const {
         return "CalligraphicProfileRename";
     }
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index 4fd8f95cf..c2f6fd337 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -41,7 +41,7 @@ namespace Dialog {
 class CloneTiler : public Widget::Panel {
 public:
     CloneTiler();
-    virtual ~CloneTiler();
+    ~CloneTiler() override;
 
     static CloneTiler &getInstance() { return *new CloneTiler(); }
     void show_page_trace();
@@ -169,7 +169,7 @@ private:
     /**
      * Can be invoked for setting the desktop. Currently not used.
      */
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
     /**
      * Is invoked by the desktop tracker when the desktop changes.
diff --git a/src/ui/dialog/color-item.h b/src/ui/dialog/color-item.h
index 3a0b33193..fea108cb7 100644
--- a/src/ui/dialog/color-item.h
+++ b/src/ui/dialog/color-item.h
@@ -47,14 +47,14 @@ public:
     ColorItem( ege::PaintDef::ColorType type );
     ColorItem( unsigned int r, unsigned int g, unsigned int b,
                Glib::ustring& name );
-    virtual ~ColorItem();
+    ~ColorItem() override;
     ColorItem(ColorItem const &other);
     virtual ColorItem &operator=(ColorItem const &other);
-    virtual Gtk::Widget* getPreview(PreviewStyle style,
+    Gtk::Widget* getPreview(PreviewStyle style,
                                     ViewType view,
                                     ::PreviewSize size,
                                     guint ratio,
-                                    guint border);
+                                    guint border) override;
     void buttonClicked(bool secondary = false);
 
     void setGradient(SPGradient *grad);
diff --git a/src/ui/dialog/cssdialog.h b/src/ui/dialog/cssdialog.h
index 31eb67e3f..76c98ee8d 100644
--- a/src/ui/dialog/cssdialog.h
+++ b/src/ui/dialog/cssdialog.h
@@ -37,7 +37,7 @@ class CssDialog : public UI::Widget::Panel
 {
 public:
     CssDialog();
-    ~CssDialog();
+    ~CssDialog() override;
 
     static CssDialog &getInstance() { return *new CssDialog(); }
 
@@ -78,7 +78,7 @@ public:
     SPDesktop* _desktop;
 
     // Helper functions
-    void setDesktop(SPDesktop* desktop);
+    void setDesktop(SPDesktop* desktop) override;
     void _styleButton(Gtk::Button& btn, char const* iconName, char const* tooltip);
 
     // Signal handlers
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index d062bf863..8771f935a 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -33,14 +33,14 @@ class DebugDialogImpl : public DebugDialog, public Gtk::Dialog
 {
 public:
     DebugDialogImpl();
-    ~DebugDialogImpl();
-
-    void show();
-    void hide();
-    void clear();
-    void message(char const *msg);
-    void captureLogMessages();
-    void releaseLogMessages();
+    ~DebugDialogImpl() override;
+
+    void show() override;
+    void hide() override;
+    void clear() override;
+    void message(char const *msg) override;
+    void captureLogMessages() override;
+    void releaseLogMessages() override;
 
 private:
     Gtk::MenuBar menuBar;
diff --git a/src/ui/dialog/dock-behavior.h b/src/ui/dialog/dock-behavior.h
index 15429f1c9..e64297955 100644
--- a/src/ui/dialog/dock-behavior.h
+++ b/src/ui/dialog/dock-behavior.h
@@ -30,38 +30,38 @@ class DockBehavior : public Behavior {
 public:
     static Behavior *create(Dialog& dialog);
 
-    ~DockBehavior();
+    ~DockBehavior() override;
 
     /** Gtk::Dialog methods */
-    operator Gtk::Widget&();
-    GtkWidget *gobj();
-    void present();
-    Gtk::VBox *get_vbox();
-    void show();
-    void hide();
-    void show_all_children();
-    void resize(int width, int height);
-    void move(int x, int y);
-    void set_position(Gtk::WindowPosition);
-    void set_size_request(int width, int height);
-    void size_request(Gtk::Requisition& requisition);
-    void get_position(int& x, int& y);
-    void get_size(int& width, int& height);
-    void set_title(Glib::ustring title);
-    void set_sensitive(bool sensitive);
+    operator Gtk::Widget&() override;
+    GtkWidget *gobj() override;
+    void present() override;
+    Gtk::VBox *get_vbox() override;
+    void show() override;
+    void hide() override;
+    void show_all_children() override;
+    void resize(int width, int height) override;
+    void move(int x, int y) override;
+    void set_position(Gtk::WindowPosition) override;
+    void set_size_request(int width, int height) override;
+    void size_request(Gtk::Requisition& requisition) override;
+    void get_position(int& x, int& y) override;
+    void get_size(int& width, int& height) override;
+    void set_title(Glib::ustring title) override;
+    void set_sensitive(bool sensitive) override;
 
     /** Gtk::Dialog signal proxies */
-    Glib::SignalProxy0<void> signal_show();
-    Glib::SignalProxy0<void> signal_hide();
-    Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event();
+    Glib::SignalProxy0<void> signal_show() override;
+    Glib::SignalProxy0<void> signal_hide() override;
+    Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event() override;
     Glib::SignalProxy0<void> signal_drag_begin();
     Glib::SignalProxy1<void, bool> signal_drag_end();
 
     /** Custom signal handlers */
-    void onHideF12();
-    void onShowF12();
-    void onDesktopActivated(SPDesktop *desktop);
-    void onShutdown();
+    void onHideF12() override;
+    void onShowF12() override;
+    void onDesktopActivated(SPDesktop *desktop) override;
+    void onShutdown() override;
 
 private:
     Widget::DockItem _dock_item;
diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index 2c56e9317..fd4f76c88 100644
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -67,7 +67,7 @@ protected:
     UI::Widget::Registry _wr;
 
 private:
-    virtual ~DocumentMetadata();
+    ~DocumentMetadata() override;
     DocumentMetadata();
 };
 
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index e59a375d5..89c87f5de 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -229,7 +229,7 @@ protected:
 
 private:
     DocumentProperties();
-    virtual ~DocumentProperties();
+    ~DocumentProperties() override;
 
     // callback methods for buttons on grids page.
     void onNewGrid();
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index 1f8e87dbc..281131cca 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -48,7 +48,7 @@ enum selection_type {
 class Export : public Widget::Panel {
 public:
     Export ();
-    ~Export ();
+    ~Export () override;
 
     static Export &getInstance() {
         return *new Export();
@@ -206,7 +206,7 @@ private:
     /**
      * Can be invoked for setting the desktop. Currently not used.
      */
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
     /**
      * Is invoked by the desktop tracker when the desktop changes.
diff --git a/src/ui/dialog/extension-editor.h b/src/ui/dialog/extension-editor.h
index 1fc9b5730..f4e1bfb56 100644
--- a/src/ui/dialog/extension-editor.h
+++ b/src/ui/dialog/extension-editor.h
@@ -28,7 +28,7 @@ namespace Dialog {
 class ExtensionEditor : public UI::Widget::Panel {
 public:
     ExtensionEditor();
-    virtual ~ExtensionEditor();
+    ~ExtensionEditor() override;
 
     static ExtensionEditor &getInstance() { return *new ExtensionEditor(); }
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 6b1f92d15..d09b371d3 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -85,7 +85,7 @@ public:
 
     SVGPreview();
 
-    ~SVGPreview();
+    ~SVGPreview() override;
 
     bool setDocument(SPDocument *doc);
 
@@ -169,7 +169,7 @@ public:
     /**
      *
      */
-    virtual ~FileDialogBaseGtk()
+    ~FileDialogBaseGtk() override
         {}
 
 protected:
@@ -224,23 +224,23 @@ public:
                        FileDialogType fileTypes,
                        const Glib::ustring &title);
 
-    virtual ~FileOpenDialogImplGtk();
+    ~FileOpenDialogImplGtk() override;
 
-    bool show();
+    bool show() override;
 
-    Inkscape::Extension::Extension *getSelectionType();
+    Inkscape::Extension::Extension *getSelectionType() override;
 
     Glib::ustring getFilename();
 
-    std::vector<Glib::ustring> getFilenames();
+    std::vector<Glib::ustring> getFilenames() override;
 
-	Glib::ustring getCurrentDirectory();
+	Glib::ustring getCurrentDirectory() override;
 
     /// Add a custom file filter menu item
     /// @param name - Name of the filter (such as "Javscript")
     /// @param pattern - File filtering patter (such as "*.js")
     /// Use the FileDialogType::CUSTOM_TYPE in constructor to not include other file types
-    void addFilterMenu(Glib::ustring name, Glib::ustring pattern);
+    void addFilterMenu(Glib::ustring name, Glib::ustring pattern) override;
 
 private:
 
@@ -283,15 +283,15 @@ public:
                           const gchar* docTitle,
                           const Inkscape::Extension::FileSaveMethod save_method);
 
-    virtual ~FileSaveDialogImplGtk();
+    ~FileSaveDialogImplGtk() override;
 
-    bool show();
+    bool show() override;
 
-    Inkscape::Extension::Extension *getSelectionType();
-    virtual void setSelectionType( Inkscape::Extension::Extension * key );
+    Inkscape::Extension::Extension *getSelectionType() override;
+    void setSelectionType( Inkscape::Extension::Extension * key ) override;
 
-	Glib::ustring getCurrentDirectory();
-	void addFileType(Glib::ustring name, Glib::ustring pattern);
+	Glib::ustring getCurrentDirectory() override;
+	void addFileType(Glib::ustring name, Glib::ustring pattern) override;
 
 private:
     //void change_title(const Glib::ustring& title);
diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h
index ad59443ad..76bec9083 100644
--- a/src/ui/dialog/fill-and-stroke.h
+++ b/src/ui/dialog/fill-and-stroke.h
@@ -34,12 +34,12 @@ namespace Dialog {
 class FillAndStroke : public UI::Widget::Panel {
 public:
     FillAndStroke();
-    virtual ~FillAndStroke();
+    ~FillAndStroke() override;
 
     static FillAndStroke &getInstance() { return *new FillAndStroke(); }
 
 
-    virtual void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
     //void selectionChanged(Inkscape::Selection *selection);
 
diff --git a/src/ui/dialog/filter-editor.h b/src/ui/dialog/filter-editor.h
index 5bf16dc10..8f18a0d45 100644
--- a/src/ui/dialog/filter-editor.h
+++ b/src/ui/dialog/filter-editor.h
@@ -35,7 +35,7 @@ class FilterEditorDialog : public UI::Widget::Panel {
 public:
 
     FilterEditorDialog();
-    ~FilterEditorDialog();
+    ~FilterEditorDialog() override;
 
     static FilterEditorDialog &getInstance()
     { return *new FilterEditorDialog(); }
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 4ad42bf1e..acf73554d 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -112,12 +112,12 @@ public:
         }
     }
 
-    Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         return get_active() ? _true_val : _false_val;
     }
 
-    void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         const gchar* val = attribute_value(o);
         if(val) {
@@ -150,7 +150,7 @@ public:
         signal_value_changed().connect(signal_attr_changed().make_slot());
     }
 
-    Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         const double val = get_value();
 
@@ -160,7 +160,7 @@ public:
             return Glib::Ascii::dtostr(val);
     }
 
-    void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         const gchar* val = attribute_value(o);
         if(val){
@@ -184,7 +184,7 @@ public:
         show_all();
     }
 
-    ~ComboWithTooltip()
+    ~ComboWithTooltip() override
     {
         delete combo;
     }
@@ -212,7 +212,7 @@ public:
         }
     }
 
-    ~MultiSpinButton()
+    ~MultiSpinButton() override
     {
         for(unsigned i = 0; i < _spins.size(); ++i)
             delete _spins[i];
@@ -263,7 +263,7 @@ public:
         return _s2;
     }
 
-    virtual Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         double v1 = _s1.get_value();
         double v2 = _s2.get_value();
@@ -276,7 +276,7 @@ public:
         return Glib::Ascii::dtostr(v1) + " " + Glib::Ascii::dtostr(v2);
     }
 
-    virtual void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         const gchar* val = attribute_value(o);
         NumberOptNumber n;
@@ -310,7 +310,7 @@ public:
     }
 
     // Returns the color in 'rgb(r,g,b)' form.
-    Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         // no doubles here, so we can use the standard string stream.
         std::ostringstream os;
@@ -322,7 +322,7 @@ public:
     }
 
 
-    void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         const gchar* val = attribute_value(o);
         guint32 i = 0;
@@ -353,12 +353,12 @@ public:
     }
 
     // No validity checking is done
-    Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         return get_text();
     }
 
-    void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         const gchar* val = attribute_value(o);
         if(val) {
@@ -412,7 +412,7 @@ public:
         }
     }
 
-    Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         // use SVGOStringStream to output SVG-compatible doubles
         Inkscape::SVGOStringStream os;
@@ -427,7 +427,7 @@ public:
         return os.str();
     }
 
-    void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         if(o) {
             if(SP_IS_FECONVOLVEMATRIX(o)) {
@@ -534,7 +534,7 @@ public:
         set_shadow_type(Gtk::SHADOW_NONE);
     }
 
-    virtual void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         if(SP_IS_FECOLORMATRIX(o)) {
             SPFeColorMatrix* col = SP_FECOLORMATRIX(o);
@@ -570,7 +570,7 @@ public:
         }
     }
 
-    virtual Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         const Widget* w = get_child();
         if(w == &_label)
@@ -635,13 +635,13 @@ public:
     }
 
     // Returns the element in xlink:href form.
-    Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         return _entry.get_text();
     }
 
 
-    void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         const gchar* val = attribute_value(o);
         if(val) {
@@ -1065,7 +1065,7 @@ public:
     }
 
     // Set new type and update widget visibility
-    virtual void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         // See componenttransfer.cpp
         if(SP_IS_FECOMPONENTTRANSFER(o)) {
@@ -1138,7 +1138,7 @@ private:
     }
 
 public:
-    virtual Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         return "";
     }
@@ -1200,11 +1200,11 @@ public:
         return _box;
     }
 protected:
-    Glib::ustring get_as_attribute() const
+    Glib::ustring get_as_attribute() const override
     {
         return "";
     }
-    void set_from_attribute(SPObject* o)
+    void set_from_attribute(SPObject* o) override
     {
         if(_locked)
             return;
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index d7bfff7d2..bae224964 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -45,21 +45,21 @@ class FilterEffectsDialog : public UI::Widget::Panel {
 public:
 
     FilterEffectsDialog();
-    ~FilterEffectsDialog();
+    ~FilterEffectsDialog() override;
 
     static FilterEffectsDialog &getInstance()
     { return *new FilterEffectsDialog(); }
 
     void set_attrs_locked(const bool);
 protected:
-    virtual void show_all_vfunc();
+    void show_all_vfunc() override;
 private:
 
     class FilterModifier : public Gtk::VBox
     {
     public:
         FilterModifier(FilterEffectsDialog&);
-        ~FilterModifier();
+        ~FilterModifier() override;
 
         SPFilter* get_selected_filter();
         void select_filter(const SPFilter*);
@@ -163,23 +163,23 @@ private:
         static const int size = 24;
         
     protected:
-        virtual void get_preferred_width_vfunc(Gtk::Widget& widget,
+        void get_preferred_width_vfunc(Gtk::Widget& widget,
                                                int& minimum_width,
-                                               int& natural_width) const;
+                                               int& natural_width) const override;
         
-        virtual void get_preferred_width_for_height_vfunc(Gtk::Widget& widget,
+        void get_preferred_width_for_height_vfunc(Gtk::Widget& widget,
                                                           int height,
                                                           int& minimum_width,
-                                                          int& natural_width) const;
+                                                          int& natural_width) const override;
 
-        virtual void get_preferred_height_vfunc(Gtk::Widget& widget,
+        void get_preferred_height_vfunc(Gtk::Widget& widget,
                                                 int& minimum_height,
-                                                int& natural_height) const;
+                                                int& natural_height) const override;
         
-        virtual void get_preferred_height_for_width_vfunc(Gtk::Widget& widget,
+        void get_preferred_height_for_width_vfunc(Gtk::Widget& widget,
                                                           int width,
                                                           int& minimum_height,
-                                                          int& natural_height) const;
+                                                          int& natural_height) const override;
     private:
         // void* should be SPFilterPrimitive*, some weirdness with properties prevents this
         Glib::Property<void*> _primitive;
@@ -209,10 +209,10 @@ private:
         bool on_draw_signal(const Cairo::RefPtr<Cairo::Context> &cr);
 
 
-        bool on_button_press_event(GdkEventButton*);
-        bool on_motion_notify_event(GdkEventMotion*);
-        bool on_button_release_event(GdkEventButton*);
-        void on_drag_end(const Glib::RefPtr<Gdk::DragContext>&);
+        bool on_button_press_event(GdkEventButton*) override;
+        bool on_motion_notify_event(GdkEventMotion*) override;
+        bool on_button_release_event(GdkEventButton*) override;
+        void on_drag_end(const Glib::RefPtr<Gdk::DragContext>&) override;
     private:
         void init_text();
 
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 2b4869def..c695bd9ac 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -50,7 +50,7 @@ namespace Dialog {
 class Find : public UI::Widget::Panel {
 public:
     Find();
-    virtual ~Find();
+    ~Find() override;
 
     /**
      * Helper function which returns a new instance of the dialog.
@@ -187,7 +187,7 @@ protected:
     /**
      * Can be invoked for setting the desktop. Currently not used.
      */
-    void        setDesktop(SPDesktop *desktop);
+    void        setDesktop(SPDesktop *desktop) override;
     /**
      * Is invoked by the desktop tracker when the desktop changes.
      */
diff --git a/src/ui/dialog/floating-behavior.h b/src/ui/dialog/floating-behavior.h
index 56ed76b41..4c998940a 100644
--- a/src/ui/dialog/floating-behavior.h
+++ b/src/ui/dialog/floating-behavior.h
@@ -30,36 +30,36 @@ class FloatingBehavior : public Behavior {
 public:
     static Behavior *create(Dialog &dialog);
 
-    ~FloatingBehavior();
+    ~FloatingBehavior() override;
 
     /** Gtk::Dialog methods */
-    operator Gtk::Widget &();
-    GtkWidget *gobj();
-    void present();
-    Gtk::Box *get_vbox();
-    void show();
-    void hide();
-    void show_all_children();
-    void resize(int width, int height);
-    void move(int x, int y);
-    void set_position(Gtk::WindowPosition);
-    void set_size_request(int width, int height);
-    void size_request(Gtk::Requisition &requisition);
-    void get_position(int &x, int &y);
-    void get_size(int& width, int &height);
-    void set_title(Glib::ustring title);
-    void set_sensitive(bool sensitive);
+    operator Gtk::Widget &() override;
+    GtkWidget *gobj() override;
+    void present() override;
+    Gtk::Box *get_vbox() override;
+    void show() override;
+    void hide() override;
+    void show_all_children() override;
+    void resize(int width, int height) override;
+    void move(int x, int y) override;
+    void set_position(Gtk::WindowPosition) override;
+    void set_size_request(int width, int height) override;
+    void size_request(Gtk::Requisition &requisition) override;
+    void get_position(int &x, int &y) override;
+    void get_size(int& width, int &height) override;
+    void set_title(Glib::ustring title) override;
+    void set_sensitive(bool sensitive) override;
 
     /** Gtk::Dialog signal proxies */
-    Glib::SignalProxy0<void> signal_show();
-    Glib::SignalProxy0<void> signal_hide();
-    Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event();
+    Glib::SignalProxy0<void> signal_show() override;
+    Glib::SignalProxy0<void> signal_hide() override;
+    Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event() override;
 
     /** Custom signal handlers */
-    void onHideF12();
-    void onShowF12();
-    void onDesktopActivated(SPDesktop *desktop);
-    void onShutdown();
+    void onHideF12() override;
+    void onShowF12() override;
+    void onDesktopActivated(SPDesktop *desktop) override;
+    void onShutdown() override;
 
 private:
     FloatingBehavior(Dialog& dialog);
diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h
index d9eb30c7c..76d26eac8 100644
--- a/src/ui/dialog/glyphs.h
+++ b/src/ui/dialog/glyphs.h
@@ -38,11 +38,11 @@ class GlyphsPanel : public Inkscape::UI::Widget::Panel
 {
 public:
     GlyphsPanel();
-    virtual ~GlyphsPanel();
+    ~GlyphsPanel() override;
 
     static GlyphsPanel& getInstance();
 
-    virtual void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
 protected:
 
diff --git a/src/ui/dialog/grid-arrange-tab.h b/src/ui/dialog/grid-arrange-tab.h
index cba2af1b4..5dff1bcf6 100644
--- a/src/ui/dialog/grid-arrange-tab.h
+++ b/src/ui/dialog/grid-arrange-tab.h
@@ -39,12 +39,12 @@ class ArrangeDialog;
 class GridArrangeTab : public ArrangeTab {
 public:
     GridArrangeTab(ArrangeDialog *parent);
-    virtual ~GridArrangeTab() {};
+    ~GridArrangeTab() override {};
 
     /**
      * Do the actual work
      */
-    virtual void arrange();
+    void arrange() override;
 
     /**
      * Respond to selection change
diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h
index fd3fbd74f..aacbbce22 100644
--- a/src/ui/dialog/guides.h
+++ b/src/ui/dialog/guides.h
@@ -44,7 +44,7 @@ namespace Dialogs {
 class GuidelinePropertiesDialog : public Gtk::Dialog {
 public:
     GuidelinePropertiesDialog(SPGuide *guide, SPDesktop *desktop);
-    virtual ~GuidelinePropertiesDialog();
+    ~GuidelinePropertiesDialog() override;
 
     Glib::ustring     getName() const { return "GuidelinePropertiesDialog"; }
 
diff --git a/src/ui/dialog/icon-preview.h b/src/ui/dialog/icon-preview.h
index 2ad7e68b4..ac8b47d34 100644
--- a/src/ui/dialog/icon-preview.h
+++ b/src/ui/dialog/icon-preview.h
@@ -44,11 +44,11 @@ class IconPreviewPanel : public UI::Widget::Panel
 public:
     IconPreviewPanel();
     //IconPreviewPanel(Glib::ustring const &label);
-    ~IconPreviewPanel();
+    ~IconPreviewPanel() override;
 
     static IconPreviewPanel& getInstance();
 
-    void setDesktop( SPDesktop* desktop );
+    void setDesktop( SPDesktop* desktop ) override;
     void refreshPreview();
     void modeToggled();
 
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 828859bb8..1cc55d88e 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -106,7 +106,7 @@ namespace Dialog {
 
 class InkscapePreferences : public UI::Widget::Panel {
 public:
-    virtual ~InkscapePreferences();
+    ~InkscapePreferences() override;
 
     static InkscapePreferences &getInstance() { return *new InkscapePreferences(); }
 
@@ -468,7 +468,7 @@ protected:
             add(shortcutid);
             add(user_set);
         }
-        virtual ~ModelColumns() {
+        ~ModelColumns() override {
         }
 
         Gtk::TreeModelColumn<Glib::ustring> name;
@@ -491,19 +491,19 @@ protected:
     int _natural_width;
     int _natural_height;
     bool GetSizeRequest(const Gtk::TreeModel::iterator& iter);
-    void get_preferred_width_vfunc (int& minimum_width, int& natural_width) const {
+    void get_preferred_width_vfunc (int& minimum_width, int& natural_width) const override {
         minimum_width = _minimum_width;
         natural_width = _natural_width;
     }
-    void get_preferred_width_for_height_vfunc (int height, int& minimum_width, int& natural_width) const {
+    void get_preferred_width_for_height_vfunc (int height, int& minimum_width, int& natural_width) const override {
         minimum_width = _minimum_width;
         natural_width = _natural_width;
     }
-    void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const {
+    void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override {
         minimum_height = _minimum_height;
         natural_height = _natural_height;
     }
-    void get_preferred_height_for_width_vfunc (int width, int& minimum_height, int& natural_height) const {
+    void get_preferred_height_for_width_vfunc (int width, int& minimum_height, int& natural_height) const override {
         minimum_height = _minimum_height;
         natural_height = _natural_height;
     }
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 3fdd2a6cf..b6f9b8f01 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -377,21 +377,21 @@ static std::map<Glib::ustring, Gdk::InputMode> &getStringToMode()
 class InputDialogImpl : public InputDialog {
 public:
     InputDialogImpl();
-    virtual ~InputDialogImpl() {}
+    ~InputDialogImpl() override {}
 
 private:
     class ConfPanel : public Gtk::VBox
     {
     public:
         ConfPanel();
-        ~ConfPanel();
+        ~ConfPanel() override;
 
         class Blink : public Preferences::Observer
         {
         public:
             Blink(ConfPanel &parent);
-            virtual ~Blink();
-            virtual void notify(Preferences::Entry const &new_val);
+            ~Blink() override;
+            void notify(Preferences::Entry const &new_val) override;
 
             ConfPanel &parent;
         };
@@ -436,7 +436,7 @@ private:
                 add(name);
                 add(value);
             }
-            virtual ~KeysColumns() {}
+            ~KeysColumns() override {}
 
             Gtk::TreeModelColumn<Glib::ustring> name;
             Gtk::TreeModelColumn<Glib::ustring> value;
diff --git a/src/ui/dialog/input.h b/src/ui/dialog/input.h
index f61b6972f..e79e32854 100644
--- a/src/ui/dialog/input.h
+++ b/src/ui/dialog/input.h
@@ -26,7 +26,7 @@ public:
     static InputDialog &getInstance();
 
     InputDialog() : UI::Widget::Panel("/dialogs/inputdevices", SP_VERB_DIALOG_INPUT) {}
-    virtual ~InputDialog() {}
+    ~InputDialog() override {}
 };
 
 } // namespace Dialog
diff --git a/src/ui/dialog/knot-properties.h b/src/ui/dialog/knot-properties.h
index 1297eae1f..4cf94a79a 100644
--- a/src/ui/dialog/knot-properties.h
+++ b/src/ui/dialog/knot-properties.h
@@ -30,7 +30,7 @@ namespace Dialogs {
 class KnotPropertiesDialog : public Gtk::Dialog {
  public:
 	KnotPropertiesDialog();
-    virtual ~KnotPropertiesDialog();
+    ~KnotPropertiesDialog() override;
 
     Glib::ustring     getName() const { return "LayerPropertiesDialog"; }
 
diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h
index 756f7a509..0e7f8b10d 100644
--- a/src/ui/dialog/layer-properties.h
+++ b/src/ui/dialog/layer-properties.h
@@ -39,7 +39,7 @@ namespace Dialogs {
 class LayerPropertiesDialog : public Gtk::Dialog {
  public:
     LayerPropertiesDialog();
-    virtual ~LayerPropertiesDialog();
+    ~LayerPropertiesDialog() override;
 
     Glib::ustring     getName() const { return "LayerPropertiesDialog"; }
 
@@ -61,18 +61,18 @@ protected:
     };
     struct Rename : public Strategy {
         static Rename &instance() { static Rename instance; return instance; }
-        void setup(LayerPropertiesDialog &dialog);
-        void perform(LayerPropertiesDialog &dialog);
+        void setup(LayerPropertiesDialog &dialog) override;
+        void perform(LayerPropertiesDialog &dialog) override;
     };
     struct Create : public Strategy {
         static Create &instance() { static Create instance; return instance; }
-        void setup(LayerPropertiesDialog &dialog);
-        void perform(LayerPropertiesDialog &dialog);
+        void setup(LayerPropertiesDialog &dialog) override;
+        void perform(LayerPropertiesDialog &dialog) override;
     };
     struct Move : public Strategy {
         static Move &instance() { static Move instance; return instance; }
-        void setup(LayerPropertiesDialog &dialog);
-        void perform(LayerPropertiesDialog &dialog);
+        void setup(LayerPropertiesDialog &dialog) override;
+        void perform(LayerPropertiesDialog &dialog) override;
     };
 
     friend struct Rename;
@@ -112,7 +112,7 @@ protected:
             add(_colLocked);
             add(_colLabel);
         }
-        virtual ~ModelColumns() {}
+        ~ModelColumns() override {}
 
         Gtk::TreeModelColumn<SPObject*> _colObject;
         Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 6f609736a..6fa96e539 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -312,7 +312,7 @@ public:
         add(_colLocked);
         add(_colLabel);
     }
-    virtual ~ModelColumns() {}
+    ~ModelColumns() override {}
 
     Gtk::TreeModelColumn<SPObject*> _colObject;
     Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index c2058ad48..89864664d 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -43,11 +43,11 @@ class LayersPanel : public UI::Widget::Panel
 {
 public:
     LayersPanel();
-    virtual ~LayersPanel();
+    ~LayersPanel() override;
 
     static LayersPanel& getInstance();
 
-    void setDesktop( SPDesktop* desktop );
+    void setDesktop( SPDesktop* desktop ) override;
 
 private:
     class ModelColumns;
diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h
index 90457c917..790feae29 100644
--- a/src/ui/dialog/livepatheffect-add.h
+++ b/src/ui/dialog/livepatheffect-add.h
@@ -30,7 +30,7 @@ namespace Dialog {
 class LivePathEffectAdd : public Gtk::Dialog {
 public:
     LivePathEffectAdd();
-    virtual ~LivePathEffectAdd() {}
+    ~LivePathEffectAdd() override {}
 
     /**
      * Show the dialog
@@ -86,7 +86,7 @@ private:
             //add(desc);
             add(data);
         }
-        virtual ~ModelColumns() {}
+        ~ModelColumns() override {}
 
         Gtk::TreeModelColumn<Glib::ustring> name;
         /**
diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h
index 7f6f56fd2..e355bba6e 100644
--- a/src/ui/dialog/livepatheffect-editor.h
+++ b/src/ui/dialog/livepatheffect-editor.h
@@ -41,14 +41,14 @@ namespace Dialog {
 class LivePathEffectEditor : public UI::Widget::Panel {
 public:
     LivePathEffectEditor();
-    virtual ~LivePathEffectEditor();
+    ~LivePathEffectEditor() override;
 
     static LivePathEffectEditor &getInstance() { return *new LivePathEffectEditor(); }
 
     void onSelectionChanged(Inkscape::Selection *sel);
     void onSelectionModified(Inkscape::Selection *sel);
     virtual void on_effect_selection_changed();
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
 private:
 
@@ -88,7 +88,7 @@ private:
             add(lperef);
             add(col_visible);
         }
-        virtual ~ModelColumns() {}
+        ~ModelColumns() override {}
 
         Gtk::TreeModelColumn<Glib::ustring> col_name;
         Gtk::TreeModelColumn<LivePathEffect::LPEObjectReference *> lperef;
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h
index 4021d6152..542a22bf6 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.h
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h
@@ -21,7 +21,7 @@ namespace Dialogs {
 class FilletChamferPropertiesDialog : public Gtk::Dialog {
 public:
     FilletChamferPropertiesDialog();
-    virtual ~FilletChamferPropertiesDialog();
+    ~FilletChamferPropertiesDialog() override;
 
     Glib::ustring getName() const
     {
diff --git a/src/ui/dialog/lpe-powerstroke-properties.h b/src/ui/dialog/lpe-powerstroke-properties.h
index 56b6e499d..c7e70b298 100644
--- a/src/ui/dialog/lpe-powerstroke-properties.h
+++ b/src/ui/dialog/lpe-powerstroke-properties.h
@@ -25,7 +25,7 @@ namespace Dialogs {
 class PowerstrokePropertiesDialog : public Gtk::Dialog {
  public:
 	PowerstrokePropertiesDialog();
-    virtual ~PowerstrokePropertiesDialog();
+    ~PowerstrokePropertiesDialog() override;
 
     Glib::ustring     getName() const { return "LayerPropertiesDialog"; }
 
diff --git a/src/ui/dialog/memory.h b/src/ui/dialog/memory.h
index 5ba93977d..3353dc440 100644
--- a/src/ui/dialog/memory.h
+++ b/src/ui/dialog/memory.h
@@ -20,12 +20,12 @@ namespace Dialog {
 class Memory : public UI::Widget::Panel {
 public:
     Memory();
-    ~Memory();
+    ~Memory() override;
 
     static Memory &getInstance() { return *new Memory(); }
 
 protected:
-    void _apply();
+    void _apply() override;
 
 private:
     Memory(Memory const &d) = delete; // no copy
diff --git a/src/ui/dialog/messages.h b/src/ui/dialog/messages.h
index ca2d5dc4e..d105ab46b 100644
--- a/src/ui/dialog/messages.h
+++ b/src/ui/dialog/messages.h
@@ -35,7 +35,7 @@ namespace Dialog {
 class Messages : public UI::Widget::Panel {
 public:
     Messages();
-    virtual ~Messages();
+    ~Messages() override;
 
     static Messages &getInstance() { return *new Messages(); }
 
diff --git a/src/ui/dialog/new-from-template.h b/src/ui/dialog/new-from-template.h
index c0b65affb..35c0b5aba 100644
--- a/src/ui/dialog/new-from-template.h
+++ b/src/ui/dialog/new-from-template.h
@@ -28,7 +28,7 @@ friend class TemplateLoadTab;
 public:
     static void load_new_from_template();
     void setCreateButtonSensitive(bool value);
-    virtual ~NewFromTemplate();
+    ~NewFromTemplate() override;
 
 private:
     NewFromTemplate();
diff --git a/src/ui/dialog/object-attributes.h b/src/ui/dialog/object-attributes.h
index 956091989..f10667093 100644
--- a/src/ui/dialog/object-attributes.h
+++ b/src/ui/dialog/object-attributes.h
@@ -38,7 +38,7 @@ namespace Dialog {
 class ObjectAttributes : public Widget::Panel {
 public:
     ObjectAttributes ();
-    ~ObjectAttributes ();
+    ~ObjectAttributes () override;
     
     /**
      * Returns a new instance of the object attributes dialog.
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index 8551d5fca..4ce72ae1a 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -66,7 +66,7 @@ namespace Dialog {
 class ObjectProperties : public Widget::Panel {
 public:
     ObjectProperties();
-    ~ObjectProperties();
+    ~ObjectProperties() override;
     
     static ObjectProperties &getInstance() { return *new ObjectProperties(); }
     
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index c2ee66cd7..9b2c12d40 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -137,26 +137,26 @@ public:
         _maskAttr(g_quark_from_string("mask"))
     {}
 
-    virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ )
+    void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override
     {
         if ( _pnl && _obj ) {
             _pnl->_objectsChanged( _obj );
         }
     }
-    virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ )
+    void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override
     {
         if ( _pnl && _obj ) {
             _pnl->_objectsChanged( _obj );
         }
     }
-    virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ )
+    void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) override
     {
         if ( _pnl && _obj ) {
             _pnl->_objectsChanged( _obj );
         }
     }
-    virtual void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) {}
-    virtual void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) {
+    void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) override {}
+    void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) override {
         if ( _pnl && _obj ) {
             if ( name == _lockedAttr || name == _labelAttr || name == _highlightAttr || name == _groupAttr || name == _styleAttr || name == _clipAttr || name == _maskAttr ) {
                 _pnl->_updateObject(_obj, name == _highlightAttr);
@@ -213,7 +213,7 @@ public:
         add(_colClipMask);
         //add(_colInsertOrder);
     }
-    virtual ~ModelColumns() {}
+    ~ModelColumns() override {}
 
     Gtk::TreeModelColumn<SPItem*> _colObject;
     Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h
index 439e3af2a..13b632f61 100644
--- a/src/ui/dialog/objects.h
+++ b/src/ui/dialog/objects.h
@@ -51,11 +51,11 @@ class ObjectsPanel : public UI::Widget::Panel
 {
 public:
     ObjectsPanel();
-    virtual ~ObjectsPanel();
+    ~ObjectsPanel() override;
 
     static ObjectsPanel& getInstance();
 
-    void setDesktop( SPDesktop* desktop );
+    void setDesktop( SPDesktop* desktop ) override;
     void setDocument( SPDesktop* desktop, SPDocument* document);
 
 private:
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index db3c60786..49befd411 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -84,7 +84,7 @@ public:
     /*
      * Destructor
      */
-    virtual ~FileDialogBase()
+    ~FileDialogBase() override
     {}
 
 protected:
@@ -403,7 +403,7 @@ public:
      * Destructor.
      * Perform any necessary cleanups.
      */
-    ~ImportDialog();
+    ~ImportDialog() override;
 
     /**
      * Show an OpenFile file selector.
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 97bb25154..47bb8db4f 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -77,12 +77,12 @@ public:
      */
     PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num);
 
-    virtual ~PanelDialog() {}
+    ~PanelDialog() override {}
 
     template <typename T>
     static PanelDialog<Behavior> *create();
 
-    inline virtual void present();
+    inline void present() override;
 
 private:
     inline void _presentDialog();
@@ -100,12 +100,12 @@ class PanelDialog<Behavior::FloatingBehavior> :
 public:
     inline PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num);
 
-    virtual ~PanelDialog() {}
+    ~PanelDialog() override {}
 
     template <typename T>
     static PanelDialog<Behavior::FloatingBehavior> *create();
 
-    inline virtual void present();
+    inline void present() override;
 
 private:
     PanelDialog() = delete;
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 5b96febb7..0762450f8 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -67,7 +67,7 @@ class PixelArtDialogImpl : public PixelArtDialog
 public:
     PixelArtDialogImpl();
 
-    ~PixelArtDialogImpl();
+    ~PixelArtDialogImpl() override;
 
 private:
     struct Input
@@ -87,7 +87,7 @@ private:
         SVGLength y;
     };
 
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
     void setTargetDesktop(SPDesktop *desktop);
 
     //############ Events
diff --git a/src/ui/dialog/pixelartdialog.h b/src/ui/dialog/pixelartdialog.h
index b928b4396..d0eac9296 100644
--- a/src/ui/dialog/pixelartdialog.h
+++ b/src/ui/dialog/pixelartdialog.h
@@ -36,7 +36,7 @@ public:
 
     static PixelArtDialog &getInstance();
 
-    virtual ~PixelArtDialog() {};
+    ~PixelArtDialog() override {};
 };
 
 
diff --git a/src/ui/dialog/polar-arrange-tab.h b/src/ui/dialog/polar-arrange-tab.h
index 6381f42bc..aeb8613ee 100644
--- a/src/ui/dialog/polar-arrange-tab.h
+++ b/src/ui/dialog/polar-arrange-tab.h
@@ -35,12 +35,12 @@ class ArrangeDialog;
 class PolarArrangeTab : public ArrangeTab {
 public:
 	PolarArrangeTab(ArrangeDialog *parent_);
-    virtual ~PolarArrangeTab() {};
+    ~PolarArrangeTab() override {};
 
     /**
      * Do the actual arrangement
      */
-    virtual void arrange();
+    void arrange() override;
 
     /**
      * Respond to selection change
diff --git a/src/ui/dialog/prototype.h b/src/ui/dialog/prototype.h
index 3494d8594..ee955d59b 100644
--- a/src/ui/dialog/prototype.h
+++ b/src/ui/dialog/prototype.h
@@ -33,11 +33,11 @@ namespace Dialog {
 class Prototype : public UI::Widget::Panel
 {
 public:
-    virtual ~Prototype();
+    ~Prototype() override;
 
     static Prototype& getInstance() { return *new Prototype(); };
 
-    virtual void present();
+    void present() override;
 
 private:
 
diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h
index aa89a7bdd..5156d0e00 100644
--- a/src/ui/dialog/spellcheck.h
+++ b/src/ui/dialog/spellcheck.h
@@ -56,7 +56,7 @@ namespace Dialog {
 class SpellCheck : public Widget::Panel {
 public:
     SpellCheck ();
-    ~SpellCheck ();
+    ~SpellCheck () override;
 
     static SpellCheck &getInstance() { return *new SpellCheck(); }
 
@@ -154,7 +154,7 @@ private:
     /**
      * Can be invoked for setting the desktop. Currently not used.
      */
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
     /**
      * Is invoked by the desktop tracker when the desktop changes.
@@ -262,7 +262,7 @@ private:
         {
             add(suggestions);
         }
-        virtual ~TreeColumns() {}
+        ~TreeColumns() override {}
         Gtk::TreeModelColumn<Glib::ustring> suggestions;
     };
     TreeColumns tree_columns;
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 17850712f..fd7e9bad8 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -57,9 +57,9 @@ public:
 #endif
     };
 
-    virtual void notifyContentChanged(Inkscape::XML::Node &node,
+    void notifyContentChanged(Inkscape::XML::Node &node,
                                       Inkscape::Util::ptr_shared old_content,
-                                      Inkscape::Util::ptr_shared new_content);
+                                      Inkscape::Util::ptr_shared new_content) override;
 
     StyleDialog * _styleDialog;
 };
@@ -93,28 +93,28 @@ public:
 #endif
     };
 
-    virtual void notifyChildAdded( Inkscape::XML::Node &/*node*/,
+    void notifyChildAdded( Inkscape::XML::Node &/*node*/,
                                    Inkscape::XML::Node &child,
-                                   Inkscape::XML::Node */*prev*/ )
+                                   Inkscape::XML::Node */*prev*/ ) override
     {
         if ( _styleDialog && _repr ) {
             _styleDialog->_nodeAdded( child );
         }
     }
 
-    virtual void notifyChildRemoved( Inkscape::XML::Node &/*node*/,
+    void notifyChildRemoved( Inkscape::XML::Node &/*node*/,
                                      Inkscape::XML::Node &child,
-                                     Inkscape::XML::Node */*prev*/ )
+                                     Inkscape::XML::Node */*prev*/ ) override
     {
         if ( _styleDialog && _repr ) {
             _styleDialog->_nodeRemoved( child );
         }
     }
 
-    virtual void notifyAttributeChanged( Inkscape::XML::Node &node,
+    void notifyAttributeChanged( Inkscape::XML::Node &node,
                                          GQuark qname,
                                          Util::ptr_shared /*old_value*/,
-                                         Util::ptr_shared /*new_value*/ ) {
+                                         Util::ptr_shared /*new_value*/ ) override {
         if ( _styleDialog && _repr ) {
 
             // For the moment only care about attributes that are directly used in selectors.
diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h
index 39e3edfd7..d3e49ea17 100644
--- a/src/ui/dialog/styledialog.h
+++ b/src/ui/dialog/styledialog.h
@@ -45,7 +45,7 @@ namespace Dialog {
 class StyleDialog : public Widget::Panel {
 
 public:
-    ~StyleDialog();
+    ~StyleDialog() override;
 
     static StyleDialog &getInstance() { return *new StyleDialog(); }
 
diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index 06586a34c..579948534 100644
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -63,7 +63,7 @@ public:
 class SvgFontsDialog : public UI::Widget::Panel {
 public:
     SvgFontsDialog();
-    ~SvgFontsDialog();
+    ~SvgFontsDialog() override;
 
     static SvgFontsDialog &getInstance() { return *new SvgFontsDialog(); }
 
diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index b3b694a6a..b742896bf 100644
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -41,11 +41,11 @@ class SwatchesPanel : public Inkscape::UI::Widget::Panel
 {
 public:
     SwatchesPanel(gchar const* prefsPath = "/dialogs/swatches");
-    virtual ~SwatchesPanel();
+    ~SwatchesPanel() override;
 
     static SwatchesPanel& getInstance();
 
-    virtual void setDesktop( SPDesktop* desktop );
+    void setDesktop( SPDesktop* desktop ) override;
     virtual SPDesktop* getDesktop() {return _currentDesktop;}
 
     virtual int getSelectedIndex() {return _currentIndex;} // temporary
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 0ef631a3a..dc65f299f 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -697,7 +697,7 @@ class REVENGE_API RVNGSVGDrawingGenerator_WithTitle : public RVNGSVGDrawingGener
       , _titles(titles)
     {}
 
-    void startPage(const RVNGPropertyList &propList)
+    void startPage(const RVNGPropertyList &propList) override
     {
       RVNGSVGDrawingGenerator::startPage(propList);
       if (propList["draw:name"]) {
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index a9be79a0c..b42309ef6 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -56,7 +56,7 @@ class SymbolsDialog : public UI::Widget::Panel {
 
 public:
     SymbolsDialog( gchar const* prefsPath = "/dialogs/symbols" );
-    virtual ~SymbolsDialog();
+    ~SymbolsDialog() override;
 
     static SymbolsDialog& getInstance();
 
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 24f167500..71a7e2ccf 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -84,26 +84,26 @@ public:
         _labelAttr(g_quark_from_string("inkscape:label"))
     {}
         
-    virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ )
+    void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override
     {
         if ( _pnl && _obj ) {
             _pnl->_objectsChanged( _obj );
         }
     }
-    virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ )
+    void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override
     {
         if ( _pnl && _obj ) {
             _pnl->_objectsChanged( _obj );
         }
     }
-    virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ )
+    void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) override
     {
         if ( _pnl && _obj ) {
             _pnl->_objectsChanged( _obj );
         }
     }
-    virtual void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) {}
-    virtual void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) {
+    void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) override {}
+    void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) override {
         if ( _pnl && _obj ) {
             if ( name == _labelAttr ) {
                 _pnl->_updateObject( _obj);
@@ -279,7 +279,7 @@ public:
         add(_colAddRemove);
         add(_colAllowAddRemove);
     }
-    virtual ~ModelColumns() {}
+    ~ModelColumns() override {}
 
     Gtk::TreeModelColumn<SPObject*> _colParentObject;
     Gtk::TreeModelColumn<SPObject*> _colObject;
diff --git a/src/ui/dialog/tags.h b/src/ui/dialog/tags.h
index 5f72f6f2f..68a041b32 100644
--- a/src/ui/dialog/tags.h
+++ b/src/ui/dialog/tags.h
@@ -41,11 +41,11 @@ class TagsPanel : public UI::Widget::Panel
 {
 public:
     TagsPanel();
-    virtual ~TagsPanel();
+    ~TagsPanel() override;
 
     static TagsPanel& getInstance();
 
-    void setDesktop( SPDesktop* desktop );
+    void setDesktop( SPDesktop* desktop ) override;
     void setDocument( SPDesktop* desktop, SPDocument* document);
 
 protected:
diff --git a/src/ui/dialog/template-load-tab.h b/src/ui/dialog/template-load-tab.h
index 0a5521d93..dd5d7e22e 100644
--- a/src/ui/dialog/template-load-tab.h
+++ b/src/ui/dialog/template-load-tab.h
@@ -50,7 +50,7 @@ public:
     };
     
     TemplateLoadTab(NewFromTemplate* parent);
-    virtual ~TemplateLoadTab();
+    ~TemplateLoadTab() override;
     virtual void createTemplate();
 
 protected:    
diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h
index 8b2f39672..bcf14d63f 100644
--- a/src/ui/dialog/text-edit.h
+++ b/src/ui/dialog/text-edit.h
@@ -54,7 +54,7 @@ namespace Dialog {
 class TextEdit : public UI::Widget::Panel {
 public:
     TextEdit();
-    virtual ~TextEdit();
+    ~TextEdit() override;
 
     /**
      * Helper function which returns a new instance of the dialog.
@@ -134,7 +134,7 @@ protected:
     /**
      * Can be invoked for setting the desktop. Currently not used.
      */
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
     /**
      * Is invoked by the desktop tracker when the desktop changes.
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index 2c29f85b8..a368c7072 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -52,14 +52,14 @@ private:
 
 public:
 	ArrangeDialog();
-	virtual ~ArrangeDialog() {};
+	~ArrangeDialog() override {};
 
     /**
      * Callback from Apply
      */
-    virtual void _apply();
+    void _apply() override;
 
-    virtual void on_show();
+    void on_show() override;
 
 	static ArrangeDialog& getInstance() { return *new ArrangeDialog(); }
 };
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index a1d4d88b8..72dfe60ec 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -58,7 +58,7 @@ class TraceDialogImpl : public TraceDialog
     /**
      * Destructor
      */
-    ~TraceDialogImpl();
+    ~TraceDialogImpl() override;
 
     /**
      * Callback from OK or Cancel
@@ -89,7 +89,7 @@ class TraceDialogImpl : public TraceDialog
     void onSelectionModified( guint flags );
     void onSetDefaults();
 
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
     void setTargetDesktop(SPDesktop *desktop);
 
     //############ General items
diff --git a/src/ui/dialog/tracedialog.h b/src/ui/dialog/tracedialog.h
index e6eb4fbde..2a6b7a1a0 100644
--- a/src/ui/dialog/tracedialog.h
+++ b/src/ui/dialog/tracedialog.h
@@ -44,7 +44,7 @@ public:
     /**
      * Destructor
      */
-    virtual ~TraceDialog() {};
+    ~TraceDialog() override {};
 
 
 };
diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h
index 357f4f8f8..953c6d27a 100644
--- a/src/ui/dialog/transformation.h
+++ b/src/ui/dialog/transformation.h
@@ -64,7 +64,7 @@ public:
     /**
      * Cleanup
      */
-    virtual ~Transformation();
+    ~Transformation() override;
 
     /**
      * Factory method.  Create an instance of this class/interface
@@ -166,7 +166,7 @@ protected:
     void layoutPageSkew();
     void layoutPageTransform();
 
-    virtual void _apply();
+    void _apply() override;
     void presentPage(PageType page);
 
     void onSwitchPage(Gtk::Widget *page, guint pagenum);
diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h
index 019cff354..f582161d9 100644
--- a/src/ui/dialog/undo-history.h
+++ b/src/ui/dialog/undo-history.h
@@ -49,11 +49,11 @@ public:
     property_event_type() { return _property_event_type.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;
 private:
 
     Glib::Property<Glib::RefPtr<Gdk::Pixbuf> > _property_icon;
@@ -85,18 +85,18 @@ public:
     static const Filter& no_filter;
 
 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;
 
 private:
 
     Glib::Property<int> _property_number;
     const Filter& _filter;
 
-    struct NoFilter : Filter { bool operator() (const int& /*x*/) const { return true; } };
+    struct NoFilter : Filter { bool operator() (const int& /*x*/) const override { return true; } };
 };
 
 /**
@@ -107,10 +107,10 @@ private:
  */
 class UndoHistory : public Widget::Panel {
 public:
-    virtual ~UndoHistory();
+    ~UndoHistory() override;
 
     static UndoHistory &getInstance();
-    void setDesktop(SPDesktop* desktop);
+    void setDesktop(SPDesktop* desktop) override;
 
     sigc::connection _document_replaced_connection;
 
@@ -153,7 +153,7 @@ private:
 
     struct GreaterThan : CellRendererInt::Filter {
         GreaterThan(int _i) : i (_i) {}
-        bool operator() (const int& x) const { return x > i; }
+        bool operator() (const int& x) const override { return x > i; }
         int i;
     };
 
diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h
index 7a4709dd4..72622a070 100644
--- a/src/ui/dialog/xml-tree.h
+++ b/src/ui/dialog/xml-tree.h
@@ -54,7 +54,7 @@ namespace Dialog {
 class XmlTree : public Widget::Panel {
 public:
     XmlTree ();
-    ~XmlTree ();
+    ~XmlTree () override;
 
     static XmlTree &getInstance() { return *new XmlTree(); }
 
@@ -170,7 +170,7 @@ private:
 
     void cmd_delete_attr();
     void cmd_set_attr();
-    virtual void present();
+    void present() override;
 
     bool sp_xml_tree_key_press(GdkEventKey *event);
 
@@ -179,7 +179,7 @@ private:
     /**
      * Can be invoked for setting the desktop. Currently not used.
      */
-    void setDesktop(SPDesktop *desktop);
+    void setDesktop(SPDesktop *desktop) override;
 
     /**
      * Flag to ensure only one operation is performed at once
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 4ae0f4a6d..19dddf2c3 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -770,7 +770,7 @@ public:
         Observer("/options/maxrecentdocuments/value"),
         _rm(recent_menu)
     {}
-    virtual void notify(Inkscape::Preferences::Entry const &e) {
+    void notify(Inkscape::Preferences::Entry const &e) override {
         gtk_recent_chooser_set_limit(GTK_RECENT_CHOOSER(_rm), e.getInt());
         // hack: the recent menu doesn't repopulate after changing the limit, so we force it
         g_signal_emit_by_name((gpointer) gtk_recent_manager_get_default(), "changed");
diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h
index b12bd466e..cccc0ea9e 100644
--- a/src/ui/previewholder.h
+++ b/src/ui/previewholder.h
@@ -36,7 +36,7 @@ class PreviewHolder : public Gtk::Bin
 {
 public:
     PreviewHolder();
-    virtual ~PreviewHolder();
+    ~PreviewHolder() override;
 
     virtual void clear();
     virtual void addPreview( Previewable* preview );
@@ -54,7 +54,7 @@ public:
     virtual bool getWrap() const { return _wrap; }
 
 protected:
-    virtual bool on_scroll_event(GdkEventScroll*);
+    bool on_scroll_event(GdkEventScroll*) override;
 
 private:
     void rebuildUI();
diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp
index 1027dea7f..53829be0b 100644
--- a/src/ui/shape-editor-knotholders.cpp
+++ b/src/ui/shape-editor-knotholders.cpp
@@ -41,49 +41,49 @@
 class RectKnotHolder : public KnotHolder {
 public:
     RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~RectKnotHolder() {};
+    ~RectKnotHolder() override {};
 };
 
 class Box3DKnotHolder : public KnotHolder {
 public:
     Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~Box3DKnotHolder() {};
+    ~Box3DKnotHolder() override {};
 };
 
 class ArcKnotHolder : public KnotHolder {
 public:
     ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~ArcKnotHolder() {};
+    ~ArcKnotHolder() override {};
 };
 
 class StarKnotHolder : public KnotHolder {
 public:
     StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~StarKnotHolder() {};
+    ~StarKnotHolder() override {};
 };
 
 class SpiralKnotHolder : public KnotHolder {
 public:
     SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~SpiralKnotHolder() {};
+    ~SpiralKnotHolder() override {};
 };
 
 class OffsetKnotHolder : public KnotHolder {
 public:
     OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~OffsetKnotHolder() {};
+    ~OffsetKnotHolder() override {};
 };
 
 class FlowtextKnotHolder : public KnotHolder {
 public:
     FlowtextKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~FlowtextKnotHolder() {};
+    ~FlowtextKnotHolder() override {};
 };
 
 class MiscKnotHolder : public KnotHolder {
 public:
     MiscKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
-    virtual ~MiscKnotHolder() {};
+    ~MiscKnotHolder() override {};
 };
 
 namespace {
@@ -157,24 +157,24 @@ KnotHolder *createLPEKnotHolder(SPItem *item, SPDesktop *desktop)
 /* handle for horizontal rounding radius */
 class RectKnotHolderEntityRX : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 /* handle for vertical rounding radius */
 class RectKnotHolderEntityRY : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 /* handle for width/height adjustment */
 class RectKnotHolderEntityWH : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 
 protected:
     void set_internal(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
@@ -183,15 +183,15 @@ protected:
 /* handle for x/y adjustment */
 class RectKnotHolderEntityXY : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 /* handle for position */
 class RectKnotHolderEntityCenter : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 Geom::Point
@@ -572,8 +572,8 @@ RectKnotHolder::RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel
 
 class Box3DKnotHolderEntity : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const = 0;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) = 0;
+    Geom::Point knot_get() const override = 0;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override = 0;
 
     Geom::Point knot_get_generic(SPItem *item, unsigned int knot_id) const;
     void knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &p, unsigned int state);
@@ -614,56 +614,56 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, Geom
 
 class Box3DKnotHolderEntity0 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntity1 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntity2 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntity3 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntity4 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntity5 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntity6 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntity7 : public Box3DKnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class Box3DKnotHolderEntityCenter : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 Geom::Point
@@ -855,36 +855,36 @@ Box3DKnotHolder::Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderR
 
 class ArcKnotHolderEntityStart : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 class ArcKnotHolderEntityEnd : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 class ArcKnotHolderEntityRX : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 class ArcKnotHolderEntityRY : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 class ArcKnotHolderEntityCenter : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 /*
@@ -1158,22 +1158,22 @@ ArcKnotHolder::ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRelea
 
 class StarKnotHolderEntity1 : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 class StarKnotHolderEntity2 : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 class StarKnotHolderEntityCenter : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 void
@@ -1342,21 +1342,21 @@ StarKnotHolder::StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel
 
 class SpiralKnotHolderEntityInner : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
-    virtual void knot_click(unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
+    void knot_click(unsigned int state) override;
 };
 
 class SpiralKnotHolderEntityOuter : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 class SpiralKnotHolderEntityCenter : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 
@@ -1589,8 +1589,8 @@ SpiralKnotHolder::SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde
 
 class OffsetKnotHolderEntity : public KnotHolderEntity {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 void
@@ -1636,8 +1636,8 @@ OffsetKnotHolder::OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde
 // sense logically.
 class FlowtextKnotHolderEntity : public RectKnotHolderEntityWH {
 public:
-    virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override;
 };
 
 Geom::Point
diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h
index d0cfce8d2..ca00800c0 100644
--- a/src/ui/tool/control-point-selection.h
+++ b/src/ui/tool/control-point-selection.h
@@ -41,7 +41,7 @@ namespace UI {
 class ControlPointSelection : public Manipulator, public sigc::trackable {
 public:
     ControlPointSelection(SPDesktop *d, SPCanvasGroup *th_group);
-    ~ControlPointSelection();
+    ~ControlPointSelection() override;
     typedef INK_UNORDERED_SET<SelectableControlPoint *> set_type;
     typedef set_type Set; // convenience alias
 
@@ -91,7 +91,7 @@ public:
     void invertSelection();
     void spatialGrow(SelectableControlPoint *origin, int dir);
 
-    virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *);
+    bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override;
 
     void transform(Geom::Affine const &m);
     void align(Geom::Dim2 d);
diff --git a/src/ui/tool/curve-drag-point.h b/src/ui/tool/curve-drag-point.h
index c1d40575f..925d8d05d 100644
--- a/src/ui/tool/curve-drag-point.h
+++ b/src/ui/tool/curve-drag-point.h
@@ -37,16 +37,16 @@ public:
     double getTimeValue() { return _t; }
     void setIterator(NodeList::iterator i) { first = i; }
     NodeList::iterator getIterator() { return first; }
-    virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event);
+    bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override;
 
 protected:
 
-    virtual Glib::ustring _getTip(unsigned state) const;
-    virtual void dragged(Geom::Point &, GdkEventMotion *);
-    virtual bool grabbed(GdkEventMotion *);
-    virtual void ungrabbed(GdkEventButton *);
-    virtual bool clicked(GdkEventButton *);
-    virtual bool doubleclicked(GdkEventButton *);
+    Glib::ustring _getTip(unsigned state) const override;
+    void dragged(Geom::Point &, GdkEventMotion *) override;
+    bool grabbed(GdkEventMotion *) override;
+    void ungrabbed(GdkEventButton *) override;
+    bool clicked(GdkEventButton *) override;
+    bool doubleclicked(GdkEventButton *) override;
 
 private:
     double _t;
diff --git a/src/ui/tool/manipulator.h b/src/ui/tool/manipulator.h
index 66b47ce98..96861e660 100644
--- a/src/ui/tool/manipulator.h
+++ b/src/ui/tool/manipulator.h
@@ -145,7 +145,7 @@ public:
         }
     }
     
-    virtual bool event(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) {
+    bool event(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override {
         for (typename MapType::iterator i = _mmap.begin(); i != _mmap.end(); ++i) {
             if ((*i).second->event(event_context, event)) return true;
         }
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index 742c6d421..46f0d17ba 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -35,8 +35,8 @@ struct PathSharedData;
 class MultiPathManipulator : public PointManipulator {
 public:
     MultiPathManipulator(PathSharedData &data, sigc::connection &chg);
-    virtual ~MultiPathManipulator();
-    virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *event);
+    ~MultiPathManipulator() override;
+    bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *event) override;
 
     bool empty() { return _mmap.empty(); }
     unsigned size() { return _mmap.size(); }
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 231f57b7c..6a766125a 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -79,15 +79,15 @@ struct NodeSharedData {
 class Handle : public ControlPoint {
 public:
 
-    virtual ~Handle();
+    ~Handle() override;
     inline Geom::Point relativePos() const;
     inline double length() const;
     bool isDegenerate() const { return _degenerate; } // True if the handle is retracted, i.e. has zero length.
 
-    virtual void setVisible(bool);
-    virtual void move(Geom::Point const &p);
+    void setVisible(bool) override;
+    void move(Geom::Point const &p) override;
 
-    virtual void setPosition(Geom::Point const &p);
+    void setPosition(Geom::Point const &p) override;
     inline void setRelativePos(Geom::Point const &p);
     void setLength(double len);
     void retract();
@@ -103,15 +103,15 @@ protected:
 
     Handle(NodeSharedData const &data, Geom::Point const &initial_pos, Node *parent);
     virtual void handle_2button_press();
-    virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event);
-    virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event);
-    virtual bool grabbed(GdkEventMotion *event);
-    virtual void ungrabbed(GdkEventButton *event);
-    virtual bool clicked(GdkEventButton *event);
+    bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override;
+    void dragged(Geom::Point &new_pos, GdkEventMotion *event) override;
+    bool grabbed(GdkEventMotion *event) override;
+    void ungrabbed(GdkEventButton *event) override;
+    bool clicked(GdkEventButton *event) override;
 
-    virtual Glib::ustring _getTip(unsigned state) const;
-    virtual Glib::ustring _getDragTip(GdkEventMotion *event) const;
-    virtual bool _hasDragTips() const { return true; }
+    Glib::ustring _getTip(unsigned state) const override;
+    Glib::ustring _getDragTip(GdkEventMotion *event) const override;
+    bool _hasDragTips() const override { return true; }
 
 private:
 
@@ -146,9 +146,9 @@ public:
      */
     Node(NodeSharedData const &data, Geom::Point const &pos);
 
-    virtual void move(Geom::Point const &p);
-    virtual void transform(Geom::Affine const &m);
-    virtual Geom::Rect bounds() const;
+    void move(Geom::Point const &p) override;
+    void transform(Geom::Affine const &m) override;
+    Geom::Rect bounds() const override;
 
     NodeType type() const { return _type; }
 
@@ -216,20 +216,20 @@ public:
 
     // temporarily public
     /** Customized event handler to catch scroll events needed for selection grow/shrink. */
-    virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event);
+    bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override;
 
     Inkscape::SnapCandidatePoint snapCandidatePoint();
 
 protected:
 
-    virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event);
-    virtual bool grabbed(GdkEventMotion *event);
-    virtual bool clicked(GdkEventButton *event);
+    void dragged(Geom::Point &new_pos, GdkEventMotion *event) override;
+    bool grabbed(GdkEventMotion *event) override;
+    bool clicked(GdkEventButton *event) override;
 
-    virtual void _setState(State state);
-    virtual Glib::ustring _getTip(unsigned state) const;
-    virtual Glib::ustring _getDragTip(GdkEventMotion *event) const;
-    virtual bool _hasDragTips() const { return true; }
+    void _setState(State state) override;
+    Glib::ustring _getTip(unsigned state) const override;
+    Glib::ustring _getDragTip(GdkEventMotion *event) const override;
+    bool _hasDragTips() const override { return true; }
 
 private:
 
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 192a02fe2..6582501cb 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -68,13 +68,13 @@ public:
         _node->addObserver(*this);
     }
 
-    ~PathManipulatorObserver() {
+    ~PathManipulatorObserver() override {
         _node->removeObserver(*this);
         Inkscape::GC::release(_node);
     }
 
-    virtual void notifyAttributeChanged(Inkscape::XML::Node &/*node*/, GQuark attr,
-        Util::ptr_shared, Util::ptr_shared)
+    void notifyAttributeChanged(Inkscape::XML::Node &/*node*/, GQuark attr,
+        Util::ptr_shared, Util::ptr_shared) override
     {
         // do nothing if blocked
         if (_blocked) return;
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 5fa24c23b..cf5142600 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -54,8 +54,8 @@ public:
 
     PathManipulator(MultiPathManipulator &mpm, SPPath *path, Geom::Affine const &edit_trans,
         guint32 outline_color, Glib::ustring lpe_key);
-    ~PathManipulator();
-    virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *);
+    ~PathManipulator() override;
+    bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override;
 
     bool empty();
     void writeXML();
diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h
index c16f639b1..b3020b47f 100644
--- a/src/ui/tool/selectable-control-point.h
+++ b/src/ui/tool/selectable-control-point.h
@@ -22,7 +22,7 @@ class ControlPointSelection;
 class SelectableControlPoint : public ControlPoint {
 public:
 
-    ~SelectableControlPoint();
+    ~SelectableControlPoint() override;
     bool selected() const;
     void updateState() { _setState(_state); }
     virtual Geom::Rect bounds() const {
@@ -44,12 +44,12 @@ protected:
                            ControlPointSelection &sel,
                            ColorSet const &cset = _default_scp_color_set, SPCanvasGroup *group = 0);
 
-    virtual void _setState(State state);
+    void _setState(State state) override;
 
-    virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event);
-    virtual bool grabbed(GdkEventMotion *event);
-    virtual void ungrabbed(GdkEventButton *event);
-    virtual bool clicked(GdkEventButton *event);
+    void dragged(Geom::Point &new_pos, GdkEventMotion *event) override;
+    bool grabbed(GdkEventMotion *event) override;
+    void ungrabbed(GdkEventButton *event) override;
+    bool clicked(GdkEventButton *event) override;
 
     ControlPointSelection &_selection;
 
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 84e96173d..3444de809 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -42,7 +42,7 @@ public:
         sp_canvas_item_hide(_rubber);
     }
 
-    ~SelectorPoint() {
+    ~SelectorPoint() override {
         sp_canvas_item_destroy(_rubber);
     }
 
@@ -53,7 +53,7 @@ public:
     }
 
 protected:
-    virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) {
+    bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override {
         if (event->type == GDK_KEY_PRESS && shortcut_key(event->key) == GDK_KEY_Escape &&
             sp_canvas_item_is_visible(_rubber))
         {
@@ -65,27 +65,27 @@ protected:
     }
 
 private:
-    virtual bool grabbed(GdkEventMotion *) {
+    bool grabbed(GdkEventMotion *) override {
         _cancel = false;
         _start = position();
         sp_canvas_item_show(_rubber);
         return false;
     }
 
-    virtual void dragged(Geom::Point &new_pos, GdkEventMotion *) {
+    void dragged(Geom::Point &new_pos, GdkEventMotion *) override {
         if (_cancel) return;
         Geom::Rect sel(_start, new_pos);
         _rubber->setRectangle(sel);
     }
 
-    virtual void ungrabbed(GdkEventButton *event) {
+    void ungrabbed(GdkEventButton *event) override {
         if (_cancel) return;
         sp_canvas_item_hide(_rubber);
         Geom::Rect sel(_start, position());
         _selector->signal_area.emit(sel, event);
     }
 
-    virtual bool clicked(GdkEventButton *event) {
+    bool clicked(GdkEventButton *event) override {
         if (event->button != 1) return false;
         _selector->signal_point.emit(position(), event);
         return true;
diff --git a/src/ui/tool/selector.h b/src/ui/tool/selector.h
index bd8d3e1aa..450e318f6 100644
--- a/src/ui/tool/selector.h
+++ b/src/ui/tool/selector.h
@@ -27,8 +27,8 @@ class SelectorPoint;
 class Selector : public Manipulator {
 public:
     Selector(SPDesktop *d);
-    virtual ~Selector();
-    virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *);
+    ~Selector() override;
+    bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override;
     virtual bool doubleClicked();
     
     sigc::signal<void, Geom::Rect const &, GdkEventButton*> signal_area;
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index 23cd6b79d..bb2e6c861 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -204,7 +204,7 @@ public:
         : TransformHandle(th, anchor, pb)
     {}
 protected:
-    virtual Glib::ustring _getTip(unsigned state) const {
+    Glib::ustring _getTip(unsigned state) const override {
         if (state_held_control(state)) {
             if (state_held_shift(state)) {
                 return C_("Transform handle tip",
@@ -225,12 +225,12 @@ protected:
         return C_("Transform handle tip", "<b>Scale handle</b>: drag to scale the selection");
     }
 
-    virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) const {
+    Glib::ustring _getDragTip(GdkEventMotion */*event*/) const override {
         return format_tip(C_("Transform handle tip",
             "Scale by %.2f%% x %.2f%%"), _last_scale_x * 100, _last_scale_y * 100);
     }
 
-    virtual bool _hasDragTips() const { return true; }
+    bool _hasDragTips() const override { return true; }
 
     static double _last_scale_x, _last_scale_y;
 };
@@ -249,13 +249,13 @@ public:
     {}
 
 protected:
-    virtual void startTransform() {
+    void startTransform() override {
         _sc_center = _th.rotationCenter();
         _sc_opposite = _th.bounds().corner(_corner + 2);
         _last_scale_x = _last_scale_y = 1.0;
     }
 
-    virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) {
+    Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override {
         Geom::Point scc = held_shift(*event) ? _sc_center : _sc_opposite;
         Geom::Point vold = _origin - scc, vnew = new_pos - scc;
         // avoid exploding the selection
@@ -300,7 +300,7 @@ protected:
         return t;
     }
 
-    virtual CommitEvent getCommitEvent() {
+    CommitEvent getCommitEvent() override {
         return _last_transform.isUniformScale()
             ? COMMIT_MOUSE_SCALE_UNIFORM
             : COMMIT_MOUSE_SCALE;
@@ -335,13 +335,13 @@ public:
         , _side(side)
     {}
 protected:
-    virtual void startTransform() {
+    void startTransform() override {
         _sc_center = _th.rotationCenter();
         Geom::Rect b = _th.bounds();
         _sc_opposite = Geom::middle_point(b.corner(_side + 2), b.corner(_side + 3));
         _last_scale_x = _last_scale_y = 1.0;
     }
-    virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) {
+    Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override {
         Geom::Point scc = held_shift(*event) ? _sc_center : _sc_opposite;
         Geom::Point vs;
         Geom::Dim2 d1 = static_cast<Geom::Dim2>((_side + 1) % 2);
@@ -386,7 +386,7 @@ protected:
             * Geom::Translate(scc);
         return t;
     }
-    virtual CommitEvent getCommitEvent() {
+    CommitEvent getCommitEvent() override {
         return _last_transform.isUniformScale()
             ? COMMIT_MOUSE_SCALE_UNIFORM
             : COMMIT_MOUSE_SCALE;
@@ -415,13 +415,13 @@ public:
     {}
 protected:
 
-    virtual void startTransform() {
+    void startTransform() override {
         _rot_center = _th.rotationCenter();
         _rot_opposite = _th.bounds().corner(_corner + 2);
         _last_angle = 0;
     }
 
-    virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event)
+    Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override
     {
         Geom::Point rotc = held_shift(*event) ? _rot_opposite : _rot_center;
         double angle = Geom::angle_between(_origin - rotc, new_pos - rotc);
@@ -446,9 +446,9 @@ protected:
         return t;
     }
 
-    virtual CommitEvent getCommitEvent() { return COMMIT_MOUSE_ROTATE; }
+    CommitEvent getCommitEvent() override { return COMMIT_MOUSE_ROTATE; }
 
-    virtual Glib::ustring _getTip(unsigned state) const {
+    Glib::ustring _getTip(unsigned state) const override {
         if (state_held_shift(state)) {
             if (state_held_control(state)) {
                 return format_tip(C_("Transform handle tip",
@@ -465,12 +465,12 @@ protected:
             "the selection around the rotation center");
     }
 
-    virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) const {
+    Glib::ustring _getDragTip(GdkEventMotion */*event*/) const override {
         return format_tip(C_("Transform handle tip", "Rotate by %.2f°"),
             _last_angle * 180.0 / M_PI);
     }
 
-    virtual bool _hasDragTips() const { return true; }
+    bool _hasDragTips() const override { return true; }
 
 private:
     static Glib::RefPtr<Gdk::Pixbuf> _corner_to_pixbuf(unsigned c) {
@@ -498,7 +498,7 @@ public:
 
 protected:
 
-    virtual void startTransform() {
+    void startTransform() override {
         _skew_center = _th.rotationCenter();
         Geom::Rect b = _th.bounds();
         _skew_opposite = Geom::middle_point(b.corner(_side + 2), b.corner(_side + 3));
@@ -506,7 +506,7 @@ protected:
         _last_horizontal = _side % 2;
     }
 
-    virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event)
+    Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override
     {
         Geom::Point scc = held_shift(*event) ? _skew_center : _skew_opposite;
         Geom::Dim2 d1 = static_cast<Geom::Dim2>((_side + 1) % 2);
@@ -581,13 +581,13 @@ protected:
         return t;
     }
 
-    virtual CommitEvent getCommitEvent() {
+    CommitEvent getCommitEvent() override {
         return (_side % 2)
             ? COMMIT_MOUSE_SKEW_Y
             : COMMIT_MOUSE_SKEW_X;
     }
 
-    virtual Glib::ustring _getTip(unsigned state) const {
+    Glib::ustring _getTip(unsigned state) const override {
         if (state_held_shift(state)) {
             if (state_held_control(state)) {
                 return format_tip(C_("Transform handle tip",
@@ -605,7 +605,7 @@ protected:
             "the opposite handle");
     }
 
-    virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) const {
+    Glib::ustring _getDragTip(GdkEventMotion */*event*/) const override {
         if (_last_horizontal) {
             return format_tip(C_("Transform handle tip", "Skew horizontally by %.2f°"),
                 _last_angle * 360.0);
@@ -615,7 +615,7 @@ protected:
         }
     }
 
-    virtual bool _hasDragTips() const { return true; }
+    bool _hasDragTips() const override { return true; }
 
 private:
 
@@ -650,7 +650,7 @@ public:
     }
 
 protected:
-    virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event) {
+    void dragged(Geom::Point &new_pos, GdkEventMotion *event) override {
         SnapManager &sm = _th._desktop->namedview->snap_manager;
         sm.setup(_th._desktop);
         bool snap = !held_shift(*event) && sm.someSnapperMightSnap();
@@ -667,7 +667,7 @@ protected:
         }
         sm.unSetup();
     }
-    virtual Glib::ustring _getTip(unsigned /*state*/) const {
+    Glib::ustring _getTip(unsigned /*state*/) const override {
         return C_("Transform handle tip",
             "<b>Rotation center</b>: drag to change the origin of transforms");
     }
diff --git a/src/ui/tool/transform-handle-set.h b/src/ui/tool/transform-handle-set.h
index 54f81adf5..023e4f855 100644
--- a/src/ui/tool/transform-handle-set.h
+++ b/src/ui/tool/transform-handle-set.h
@@ -39,8 +39,8 @@ public:
     };
 
     TransformHandleSet(SPDesktop *d, SPCanvasGroup *th_group);
-    virtual ~TransformHandleSet();
-    virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *);
+    ~TransformHandleSet() override;
+    bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override;
 
     bool visible() const { return _visible; }
     Mode mode() const { return _mode; }
@@ -117,9 +117,9 @@ protected:
     std::vector<Inkscape::SnapCandidatePoint>::iterator _all_snap_sources_iter;
 
 private:
-    virtual bool grabbed(GdkEventMotion *);
-    virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event);
-    virtual void ungrabbed(GdkEventButton *);
+    bool grabbed(GdkEventMotion *) override;
+    void dragged(Geom::Point &new_pos, GdkEventMotion *event) override;
+    void ungrabbed(GdkEventButton *) override;
 
     static ColorSet thandle_cset;
 };
diff --git a/src/ui/tools/arc-tool.h b/src/ui/tools/arc-tool.h
index 55cbaf78c..7232f07af 100644
--- a/src/ui/tools/arc-tool.h
+++ b/src/ui/tools/arc-tool.h
@@ -39,16 +39,16 @@ namespace Tools {
 class ArcTool : public ToolBase {
 public:
 	ArcTool();
-	virtual ~ArcTool();
+	~ArcTool() override;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void finish();
-	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	bool root_handler(GdkEvent* event) override;
+	bool item_handler(SPItem* item, GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	SPGenericEllipse *arc;
diff --git a/src/ui/tools/box3d-tool.h b/src/ui/tools/box3d-tool.h
index 33ae6d8e7..cbd7dbe08 100644
--- a/src/ui/tools/box3d-tool.h
+++ b/src/ui/tools/box3d-tool.h
@@ -46,18 +46,18 @@ namespace Tools {
 class Box3dTool : public ToolBase {
 public:
 	Box3dTool();
-	virtual ~Box3dTool();
+	~Box3dTool() override;
 
 	Box3D::VPDrag * _vpdrag;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void finish();
-	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	bool root_handler(GdkEvent* event) override;
+	bool item_handler(SPItem* item, GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
     SPBox3D* box3d;
diff --git a/src/ui/tools/calligraphic-tool.h b/src/ui/tools/calligraphic-tool.h
index 83b4d73ff..ac8a7436b 100644
--- a/src/ui/tools/calligraphic-tool.h
+++ b/src/ui/tools/calligraphic-tool.h
@@ -44,15 +44,15 @@ namespace Tools {
 class CalligraphicTool : public DynamicBase {
 public:
 	CalligraphicTool();
-	virtual ~CalligraphicTool();
+	~CalligraphicTool() override;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void set(const Inkscape::Preferences::Entry& val);
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	void set(const Inkscape::Preferences::Entry& val) override;
+	bool root_handler(GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
     /** newly created object remain selected */
diff --git a/src/ui/tools/connector-tool.h b/src/ui/tools/connector-tool.h
index 8aef637e8..241a59dca 100644
--- a/src/ui/tools/connector-tool.h
+++ b/src/ui/tools/connector-tool.h
@@ -58,7 +58,7 @@ namespace Tools {
 class ConnectorTool : public ToolBase {
 public:
     ConnectorTool();
-    virtual ~ConnectorTool();
+    ~ConnectorTool() override;
 
     Inkscape::Selection *selection;
     Geom::Point p[5];
@@ -109,13 +109,13 @@ public:
 
     static std::string const prefsPath;
 
-    virtual void setup();
-    virtual void finish();
-    virtual void set(const Inkscape::Preferences::Entry& val);
-    virtual bool root_handler(GdkEvent* event);
-    virtual bool item_handler(SPItem* item, GdkEvent* event);
+    void setup() override;
+    void finish() override;
+    void set(const Inkscape::Preferences::Entry& val) override;
+    bool root_handler(GdkEvent* event) override;
+    bool item_handler(SPItem* item, GdkEvent* event) override;
 
-    virtual std::string const& getPrefsPath();
+    std::string const& getPrefsPath() override;
 
     void cc_clear_active_shape();
     void cc_set_active_conn(SPItem *item);
diff --git a/src/ui/tools/dropper-tool.h b/src/ui/tools/dropper-tool.h
index 813f68296..049244b66 100644
--- a/src/ui/tools/dropper-tool.h
+++ b/src/ui/tools/dropper-tool.h
@@ -38,18 +38,18 @@ namespace Tools {
 class DropperTool : public ToolBase {
 public:
 	DropperTool();
-	virtual ~DropperTool();
+	~DropperTool() override;
 
 	static const std::string prefsPath;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 	guint32 get_color(bool invert=false);
 
 protected:
-	virtual void setup();
-	virtual void finish();
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	bool root_handler(GdkEvent* event) override;
 
 private:
     double        R;
diff --git a/src/ui/tools/dynamic-base.h b/src/ui/tools/dynamic-base.h
index b9ffd71ce..4b78ee416 100644
--- a/src/ui/tools/dynamic-base.h
+++ b/src/ui/tools/dynamic-base.h
@@ -40,9 +40,9 @@ namespace Tools {
 class DynamicBase : public ToolBase {
 public:
 	DynamicBase(gchar const *const *cursor_shape);
-	virtual ~DynamicBase();
+	~DynamicBase() override;
 
-	virtual void set(const Inkscape::Preferences::Entry& val);
+	void set(const Inkscape::Preferences::Entry& val) override;
 
 protected:
     /** accumulated shape which ultimately goes in svg:path */
diff --git a/src/ui/tools/eraser-tool.h b/src/ui/tools/eraser-tool.h
index bd0e98057..8a196d360 100644
--- a/src/ui/tools/eraser-tool.h
+++ b/src/ui/tools/eraser-tool.h
@@ -42,14 +42,14 @@ namespace Tools {
 class EraserTool : public DynamicBase {
 public:
 	EraserTool();
-	virtual ~EraserTool();
+	~EraserTool() override;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	bool root_handler(GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	void reset(Geom::Point p);
diff --git a/src/ui/tools/flood-tool.h b/src/ui/tools/flood-tool.h
index 7eadeea34..f6f49b9c4 100644
--- a/src/ui/tools/flood-tool.h
+++ b/src/ui/tools/flood-tool.h
@@ -30,7 +30,7 @@ namespace Tools {
 class FloodTool : public ToolBase {
 public:
 	FloodTool();
-	virtual ~FloodTool();
+	~FloodTool() override;
 
 	SPItem *item;
 
@@ -38,11 +38,11 @@ public:
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
+	void setup() override;
+	bool root_handler(GdkEvent* event) override;
+	bool item_handler(SPItem* item, GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 	static void set_channels(gint channels);
 	static const std::vector<Glib::ustring> channel_list;
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index 38b3851ff..ffc4b738f 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -45,7 +45,7 @@ namespace Tools {
 class FreehandBase : public ToolBase {
 public:
     FreehandBase(gchar const *const *cursor_shape);
-    virtual ~FreehandBase();
+    ~FreehandBase() override;
 
     Inkscape::Selection *selection;
     SPCanvasItem *grab;
@@ -101,13 +101,13 @@ public:
     bool is_tablet;
 
     gdouble pressure;
-    virtual void set(const Inkscape::Preferences::Entry& val);
+    void set(const Inkscape::Preferences::Entry& val) override;
 
 protected:
 
-    virtual void setup();
-    virtual void finish();
-    virtual bool root_handler(GdkEvent* event);
+    void setup() override;
+    void finish() override;
+    bool root_handler(GdkEvent* event) override;
 };
 
 /**
diff --git a/src/ui/tools/gradient-tool.h b/src/ui/tools/gradient-tool.h
index 6fe3bca9f..3b7a646e7 100644
--- a/src/ui/tools/gradient-tool.h
+++ b/src/ui/tools/gradient-tool.h
@@ -29,7 +29,7 @@ namespace Tools {
 class GradientTool : public ToolBase {
 public:
 	GradientTool();
-	virtual ~GradientTool();
+	~GradientTool() override;
 
     Geom::Point origin;
 
@@ -44,10 +44,10 @@ public:
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	bool root_handler(GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	void selection_changed(Inkscape::Selection*);
diff --git a/src/ui/tools/lpe-tool.h b/src/ui/tools/lpe-tool.h
index df78c205c..d3a5a056e 100644
--- a/src/ui/tools/lpe-tool.h
+++ b/src/ui/tools/lpe-tool.h
@@ -48,7 +48,7 @@ namespace Tools {
 class LpeTool : public PenTool {
 public:
 	LpeTool();
-	virtual ~LpeTool();
+	~LpeTool() override;
 
     ShapeEditor* shape_editor;
     SPCanvasItem *canvas_bbox;
@@ -61,13 +61,13 @@ public:
 
 	static const std::string prefsPath;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 protected:
-	virtual void setup();
-	virtual void set(const Inkscape::Preferences::Entry& val);
-	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
+	void setup() override;
+	void set(const Inkscape::Preferences::Entry& val) override;
+	bool root_handler(GdkEvent* event) override;
+	bool item_handler(SPItem* item, GdkEvent* event) override;
 };
 
 int lpetool_mode_to_index(Inkscape::LivePathEffect::EffectType const type);
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 42122dca1..519e849c3 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -37,12 +37,12 @@ namespace Tools {
 class MeasureTool : public ToolBase {
 public:
     MeasureTool();
-    virtual ~MeasureTool();
+    ~MeasureTool() override;
 
     static const std::string prefsPath;
 
-    virtual void finish();
-    virtual bool root_handler(GdkEvent* event);
+    void finish() override;
+    bool root_handler(GdkEvent* event) override;
     virtual void showCanvasItems(bool to_guides = false, bool to_item = false, bool to_phantom = false, Inkscape::XML::Node *measure_repr = NULL);
     virtual void reverseKnots();
     virtual void toGuides();
@@ -52,7 +52,7 @@ public:
     virtual void reset();
     virtual void setMarkers();
     virtual void setMarker(bool isStart);
-    virtual const std::string& getPrefsPath();
+    const std::string& getPrefsPath() override;
     Geom::Point readMeasurePoint(bool is_start);
     void showInfoBox(Geom::Point cursor, bool into_groups);
     void showItemInfoText(Geom::Point pos, gchar *measure_str, double fontsize);
diff --git a/src/ui/tools/mesh-tool.h b/src/ui/tools/mesh-tool.h
index 9c13ec30e..59c60dad4 100644
--- a/src/ui/tools/mesh-tool.h
+++ b/src/ui/tools/mesh-tool.h
@@ -33,7 +33,7 @@ namespace Tools {
 class MeshTool : public ToolBase {
 public:
     MeshTool();
-    virtual ~MeshTool();
+    ~MeshTool() override;
 
     Geom::Point origin;
 
@@ -44,11 +44,11 @@ public:
 
     static const std::string prefsPath;
 
-    virtual void setup();
-    virtual void set(const Inkscape::Preferences::Entry& val);
-    virtual bool root_handler(GdkEvent* event);
+    void setup() override;
+    void set(const Inkscape::Preferences::Entry& val) override;
+    bool root_handler(GdkEvent* event) override;
 
-    virtual const std::string& getPrefsPath();
+    const std::string& getPrefsPath() override;
 
 private:
     void selection_changed(Inkscape::Selection* sel);
diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h
index dded2d9bd..a05eb5850 100644
--- a/src/ui/tools/node-tool.h
+++ b/src/ui/tools/node-tool.h
@@ -45,7 +45,7 @@ namespace Tools {
 class NodeTool : public ToolBase {
 public:
     NodeTool();
-    virtual ~NodeTool();
+    ~NodeTool() override;
 
     Inkscape::UI::ControlPointSelection* _selected_nodes;
     Inkscape::UI::MultiPathManipulator* _multipath;
@@ -56,11 +56,11 @@ public:
 
     static const std::string prefsPath;
 
-    virtual void setup();
-    virtual void set(const Inkscape::Preferences::Entry& val);
-    virtual bool root_handler(GdkEvent* event);
+    void setup() override;
+    void set(const Inkscape::Preferences::Entry& val) override;
+    bool root_handler(GdkEvent* event) override;
 
-    virtual const std::string& getPrefsPath();
+    const std::string& getPrefsPath() override;
     boost::ptr_map<SPItem*, ShapeEditor> _shape_editors;
 
 private:
diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h
index fe1947f81..7d442bfca 100644
--- a/src/ui/tools/pen-tool.h
+++ b/src/ui/tools/pen-tool.h
@@ -24,7 +24,7 @@ class PenTool : public FreehandBase {
 public:
     PenTool();
     PenTool(gchar const *const *cursor_shape);
-    virtual ~PenTool();
+    ~PenTool() override;
 
     enum Mode {
         MODE_CLICK,
@@ -68,7 +68,7 @@ public:
 
     static const std::string prefsPath;
 
-    virtual const std::string& getPrefsPath();
+    const std::string& getPrefsPath() override;
 
     int nextParaxialDirection(Geom::Point const &pt, Geom::Point const &origin, guint state) const;
     void setPolylineMode();
@@ -76,11 +76,11 @@ public:
     void waitForLPEMouseClicks(Inkscape::LivePathEffect::EffectType effect_type, unsigned int num_clicks, bool use_polylines = true);
 
 protected:
-    virtual void setup();
-    virtual void finish();
-    virtual void set(const Inkscape::Preferences::Entry& val);
-    virtual bool root_handler(GdkEvent* event);
-    virtual bool item_handler(SPItem* item, GdkEvent* event);
+    void setup() override;
+    void finish() override;
+    void set(const Inkscape::Preferences::Entry& val) override;
+    bool root_handler(GdkEvent* event) override;
+    bool item_handler(SPItem* item, GdkEvent* event) override;
 
 private:
     bool _handleButtonPress(GdkEventButton const &bevent);
diff --git a/src/ui/tools/pencil-tool.h b/src/ui/tools/pencil-tool.h
index 24f2c8bfc..58b449c98 100644
--- a/src/ui/tools/pencil-tool.h
+++ b/src/ui/tools/pencil-tool.h
@@ -37,7 +37,7 @@ enum PencilState {
 class PencilTool : public FreehandBase {
 public:
     PencilTool();
-    virtual ~PencilTool();
+    ~PencilTool() override;
     Geom::Point p[16];
     std::vector<Geom::Point> ps;
     std::vector<Geom::Point> points;
@@ -47,12 +47,12 @@ public:
     Geom::Piecewise<Geom::D2<Geom::SBasis> > sketch_interpolation; // the current proposal from the sketched paths
     unsigned sketch_n; // number of sketches done
     static const std::string prefsPath;
-    virtual const std::string& getPrefsPath();
+    const std::string& getPrefsPath() override;
 
 protected:
 
-    virtual void setup();
-    virtual bool root_handler(GdkEvent* event);
+    void setup() override;
+    bool root_handler(GdkEvent* event) override;
 
 private:
     bool _handleButtonPress(GdkEventButton const &bevent);
diff --git a/src/ui/tools/rect-tool.h b/src/ui/tools/rect-tool.h
index ac056668f..4036bf35b 100644
--- a/src/ui/tools/rect-tool.h
+++ b/src/ui/tools/rect-tool.h
@@ -29,17 +29,17 @@ namespace Tools {
 class RectTool : public ToolBase {
 public:
 	RectTool();
-	virtual ~RectTool();
+	~RectTool() override;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void finish();
-	virtual void set(const Inkscape::Preferences::Entry& val);
-	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	void set(const Inkscape::Preferences::Entry& val) override;
+	bool root_handler(GdkEvent* event) override;
+	bool item_handler(SPItem* item, GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	SPRect *rect;
diff --git a/src/ui/tools/select-tool.h b/src/ui/tools/select-tool.h
index 420374661..f198686f2 100644
--- a/src/ui/tools/select-tool.h
+++ b/src/ui/tools/select-tool.h
@@ -32,7 +32,7 @@ namespace Tools {
 class SelectTool : public ToolBase {
 public:
 	SelectTool();
-	virtual ~SelectTool();
+	~SelectTool() override;
 
 	bool dragging;
 	bool moved;
@@ -52,12 +52,12 @@ public:
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void set(const Inkscape::Preferences::Entry& val);
-	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
+	void setup() override;
+	void set(const Inkscape::Preferences::Entry& val) override;
+	bool root_handler(GdkEvent* event) override;
+	bool item_handler(SPItem* item, GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	bool sp_select_context_abort();
diff --git a/src/ui/tools/spiral-tool.h b/src/ui/tools/spiral-tool.h
index add92342d..ca5acccd2 100644
--- a/src/ui/tools/spiral-tool.h
+++ b/src/ui/tools/spiral-tool.h
@@ -31,16 +31,16 @@ namespace Tools {
 class SpiralTool : public ToolBase {
 public:
 	SpiralTool();
-	virtual ~SpiralTool();
+	~SpiralTool() override;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void finish();
-	virtual void set(const Inkscape::Preferences::Entry& val);
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	void set(const Inkscape::Preferences::Entry& val) override;
+	bool root_handler(GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	SPSpiral * spiral;
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index d5504d565..06fba80a9 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -56,7 +56,7 @@ enum {
 class SprayTool : public ToolBase {
 public:
     SprayTool();
-    virtual ~SprayTool();
+    ~SprayTool() override;
 
     //ToolBase event_context;
     //Inkscape::UI::Dialog::Dialog *dialog_option;//Attribut de type SprayOptionClass, localisé dans scr/ui/dialog    
@@ -114,12 +114,12 @@ public:
 
     static const std::string prefsPath;
 
-    virtual void setup();
-    virtual void set(const Inkscape::Preferences::Entry& val);
+    void setup() override;
+    void set(const Inkscape::Preferences::Entry& val) override;
     virtual void setCloneTilerPrefs();
-    virtual bool root_handler(GdkEvent* event);
+    bool root_handler(GdkEvent* event) override;
 
-    virtual const std::string& getPrefsPath();
+    const std::string& getPrefsPath() override;
 
     void update_cursor(bool /*with_shift*/);
 
diff --git a/src/ui/tools/star-tool.h b/src/ui/tools/star-tool.h
index a697582d3..2e973fad5 100644
--- a/src/ui/tools/star-tool.h
+++ b/src/ui/tools/star-tool.h
@@ -28,16 +28,16 @@ namespace Tools {
 class StarTool : public ToolBase {
 public:
 	StarTool();
-	virtual ~StarTool();
+	~StarTool() override;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void finish();
-	virtual void set(const Inkscape::Preferences::Entry& val);
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	void set(const Inkscape::Preferences::Entry& val) override;
+	bool root_handler(GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	SPStar* star;
diff --git a/src/ui/tools/text-tool.h b/src/ui/tools/text-tool.h
index f2e6fea1a..d8968544b 100644
--- a/src/ui/tools/text-tool.h
+++ b/src/ui/tools/text-tool.h
@@ -34,7 +34,7 @@ namespace Tools {
 class TextTool : public ToolBase {
 public:
 	TextTool();
-	virtual ~TextTool();
+	~TextTool() override;
 
     sigc::connection sel_changed_connection;
     sigc::connection sel_modified_connection;
@@ -77,12 +77,12 @@ public:
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void finish();
-	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	bool root_handler(GdkEvent* event) override;
+	bool item_handler(SPItem* item, GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
     void _selectionChanged(Inkscape::Selection *selection);
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index 945e41a77..cb08e67b4 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -205,7 +205,7 @@ public:
 	    {
 	    }
 
-	    virtual void notify(Inkscape::Preferences::Entry const &val) {
+	    void notify(Inkscape::Preferences::Entry const &val) override {
 	    	ec->set(val);
 	    }
 
diff --git a/src/ui/tools/tweak-tool.h b/src/ui/tools/tweak-tool.h
index 7fe4b1856..51f32daa9 100644
--- a/src/ui/tools/tweak-tool.h
+++ b/src/ui/tools/tweak-tool.h
@@ -44,7 +44,7 @@ enum {
 class TweakTool : public ToolBase {
 public:
 	TweakTool();
-	virtual ~TweakTool();
+	~TweakTool() override;
 
     /* extended input data */
     gdouble pressure;
@@ -76,11 +76,11 @@ public:
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void set(const Inkscape::Preferences::Entry& val);
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	void set(const Inkscape::Preferences::Entry& val) override;
+	bool root_handler(GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 	void update_cursor(bool with_shift);
 
diff --git a/src/ui/tools/zoom-tool.h b/src/ui/tools/zoom-tool.h
index 6e5cca7aa..6a656eec4 100644
--- a/src/ui/tools/zoom-tool.h
+++ b/src/ui/tools/zoom-tool.h
@@ -25,15 +25,15 @@ namespace Tools {
 class ZoomTool : public ToolBase {
 public:
 	ZoomTool();
-	virtual ~ZoomTool();
+	~ZoomTool() override;
 
 	static const std::string prefsPath;
 
-	virtual void setup();
-	virtual void finish();
-	virtual bool root_handler(GdkEvent* event);
+	void setup() override;
+	void finish() override;
+	bool root_handler(GdkEvent* event) override;
 
-	virtual const std::string& getPrefsPath();
+	const std::string& getPrefsPath() override;
 
 private:
 	SPCanvasItem *grabbed;
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 3ec38edf9..5412d1fef 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -80,17 +80,17 @@ class UXManagerImpl : public UXManager
 {
 public:
     UXManagerImpl();
-    virtual ~UXManagerImpl();
+    ~UXManagerImpl() override;
 
-    virtual void addTrack( SPDesktopWidget* dtw );
-    virtual void delTrack( SPDesktopWidget* dtw );
+    void addTrack( SPDesktopWidget* dtw ) override;
+    void delTrack( SPDesktopWidget* dtw ) override;
 
-    virtual void connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop );
+    void connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop ) override;
 
-    virtual gint getDefaultTask( SPDesktop *desktop );
-    virtual void setTask(SPDesktop* dt, gint val);
+    gint getDefaultTask( SPDesktop *desktop ) override;
+    void setTask(SPDesktop* dt, gint val) override;
 
-    virtual bool isWidescreen() const;
+    bool isWidescreen() const override;
 
 private:
     bool _widescreen;
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 21a5d0dfc..200b52e7a 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -76,7 +76,7 @@ public:
     /**
      * Deletes and nulls all View message stacks and disconnects it from signals.
      */
-    virtual ~View();
+    ~View() override;
 
     void close() { _close(); }
 
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