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.

65 files changed, 248 insertions, 248 deletions

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