summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-14 22:45:10 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:00 +0000
commit7654fc11a6442e6ee2a463d6dee6458c0f53768f (patch)
tree7eb16a57b879747842bb0401dfee7fb47cd16f95 /src/widgets
parentFix build issue caused by f09962028d017896279b717a6621a4de772d1b4f on GTK+ <3... (diff)
downloadinkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.tar.gz
inkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.zip
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.
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/dash-selector.h2
-rw-r--r--src/widgets/desktop-widget.cpp4
-rw-r--r--src/widgets/desktop-widget.h76
-rw-r--r--src/widgets/fill-style.cpp2
-rw-r--r--src/widgets/gradient-selector.h2
-rw-r--r--src/widgets/sp-attribute-widget.h2
-rw-r--r--src/widgets/stroke-marker-selector.h2
-rw-r--r--src/widgets/stroke-style.h2
-rw-r--r--src/widgets/swatch-selector.h2
-rw-r--r--src/widgets/toolbox.cpp12
-rw-r--r--src/widgets/toolbox.h4
11 files changed, 55 insertions, 55 deletions
diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h
index f176acf04..2e59c5948 100644
--- a/src/widgets/dash-selector.h
+++ b/src/widgets/dash-selector.h
@@ -27,7 +27,7 @@
class SPDashSelector : public Gtk::HBox {
public:
SPDashSelector();
- ~SPDashSelector();
+ ~SPDashSelector() override;
/**
* Get and set methods for dashes
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index bd972aef2..850253c00 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -152,7 +152,7 @@ private:
class DisplayProfileWatcher : public Inkscape::Preferences::Observer {
public:
DisplayProfileWatcher(CMSPrefWatcher &pw) : Observer("/options/displayprofile"), _pw(pw) {}
- virtual void notify(Inkscape::Preferences::Entry const &/*val*/) {
+ void notify(Inkscape::Preferences::Entry const &/*val*/) override {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
_pw._setCmsSensitive(!prefs->getString("/options/displayprofile/uri").empty());
_pw._refreshAll();
@@ -166,7 +166,7 @@ private:
class SoftProofWatcher : public Inkscape::Preferences::Observer {
public:
SoftProofWatcher(CMSPrefWatcher &pw) : Observer("/options/softproof"), _pw(pw) {}
- virtual void notify(Inkscape::Preferences::Entry const &) {
+ void notify(Inkscape::Preferences::Entry const &) override {
_pw._refreshAll();
}
private:
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index fe0d6597b..92d670019 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -127,93 +127,93 @@ struct SPDesktopWidget {
SPDesktopWidget *_dtw;
WidgetStub (SPDesktopWidget* dtw) : _dtw(dtw) {}
- virtual void setTitle (gchar const *uri)
+ void setTitle (gchar const *uri) override
{ _dtw->updateTitle (uri); }
- virtual Gtk::Window* getWindow()
+ Gtk::Window* getWindow() override
{ return _dtw->window; }
- virtual void layout() {
+ void layout() override {
_dtw->layoutWidgets();
}
- virtual void present()
+ void present() override
{ _dtw->presentWindow(); }
- virtual void getGeometry (gint &x, gint &y, gint &w, gint &h)
+ void getGeometry (gint &x, gint &y, gint &w, gint &h) override
{ _dtw->getWindowGeometry (x, y, w, h); }
- virtual void setSize (gint w, gint h)
+ void setSize (gint w, gint h) override
{ _dtw->setWindowSize (w, h); }
- virtual void setPosition (Geom::Point p)
+ void setPosition (Geom::Point p) override
{ _dtw->setWindowPosition (p); }
- virtual void setTransient (void* p, int transient_policy)
+ void setTransient (void* p, int transient_policy) override
{ _dtw->setWindowTransient (p, transient_policy); }
- virtual Geom::Point getPointer()
+ Geom::Point getPointer() override
{ return _dtw->window_get_pointer(); }
- virtual void setIconified()
+ void setIconified() override
{ sp_desktop_widget_iconify (_dtw); }
- virtual void setMaximized()
+ void setMaximized() override
{ sp_desktop_widget_maximize (_dtw); }
- virtual void setFullscreen()
+ void setFullscreen() override
{ sp_desktop_widget_fullscreen (_dtw); }
- virtual bool shutdown()
+ bool shutdown() override
{ return _dtw->shutdown(); }
- virtual void destroy()
+ void destroy() override
{
if(_dtw->window != NULL)
delete _dtw->window;
_dtw->window = NULL;
}
- virtual void requestCanvasUpdate()
+ void requestCanvasUpdate() override
{ _dtw->requestCanvasUpdate(); }
- virtual void requestCanvasUpdateAndWait()
+ void requestCanvasUpdateAndWait() override
{ _dtw->requestCanvasUpdateAndWait(); }
- virtual void enableInteraction()
+ void enableInteraction() override
{ _dtw->enableInteraction(); }
- virtual void disableInteraction()
+ void disableInteraction() override
{ _dtw->disableInteraction(); }
- virtual void activateDesktop()
+ void activateDesktop() override
{ sp_dtw_desktop_activate (_dtw); }
- virtual void deactivateDesktop()
+ void deactivateDesktop() override
{ sp_dtw_desktop_deactivate (_dtw); }
- virtual void updateRulers()
+ void updateRulers() override
{ sp_desktop_widget_update_rulers (_dtw); }
- virtual void updateScrollbars (double scale)
+ void updateScrollbars (double scale) override
{ sp_desktop_widget_update_scrollbars (_dtw, scale); }
- virtual void toggleRulers()
+ void toggleRulers() override
{ sp_desktop_widget_toggle_rulers (_dtw); }
- virtual void toggleScrollbars()
+ void toggleScrollbars() override
{ sp_desktop_widget_toggle_scrollbars (_dtw); }
- virtual void toggleColorProfAdjust()
+ void toggleColorProfAdjust() override
{ sp_desktop_widget_toggle_color_prof_adj(_dtw); }
- virtual bool colorProfAdjustEnabled()
+ bool colorProfAdjustEnabled() override
{ return sp_desktop_widget_color_prof_adj_enabled(_dtw); }
- virtual void updateZoom()
+ void updateZoom() override
{ sp_desktop_widget_update_zoom (_dtw); }
- virtual void letZoomGrabFocus()
+ void letZoomGrabFocus() override
{ _dtw->letZoomGrabFocus(); }
- virtual void updateRotation()
+ void updateRotation() override
{ sp_desktop_widget_update_rotation (_dtw); }
- virtual void setToolboxFocusTo (const gchar * id)
+ void setToolboxFocusTo (const gchar * id) override
{ _dtw->setToolboxFocusTo (id); }
- virtual void setToolboxAdjustmentValue (const gchar *id, double val)
+ void setToolboxAdjustmentValue (const gchar *id, double val) override
{ _dtw->setToolboxAdjustmentValue (id, val); }
- virtual void setToolboxSelectOneValue (gchar const *id, int val)
+ void setToolboxSelectOneValue (gchar const *id, int val) override
{ _dtw->setToolboxSelectOneValue (id, val); }
- virtual bool isToolboxButtonActive (gchar const* id)
+ bool isToolboxButtonActive (gchar const* id) override
{ return _dtw->isToolboxButtonActive (id); }
- virtual void setCoordinateStatus (Geom::Point p)
+ void setCoordinateStatus (Geom::Point p) override
{ _dtw->setCoordinateStatus (p); }
- virtual void setMessage (Inkscape::MessageType type, gchar const* msg)
+ void setMessage (Inkscape::MessageType type, gchar const* msg) override
{ _dtw->setMessage (type, msg); }
- virtual bool showInfoDialog( Glib::ustring const &message ) {
+ bool showInfoDialog( Glib::ustring const &message ) override {
return _dtw->showInfoDialog( message );
}
- virtual bool warnDialog (Glib::ustring const &text)
+ bool warnDialog (Glib::ustring const &text) override
{ return _dtw->warnDialog (text); }
- virtual Inkscape::UI::Widget::Dock* getDock ()
+ Inkscape::UI::Widget::Dock* getDock () override
{ return _dtw->getDock(); }
};
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 8b3a31516..e1c1ad6d0 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -68,7 +68,7 @@ class FillNStroke : public Gtk::VBox
{
public:
FillNStroke( FillOrStroke k );
- ~FillNStroke();
+ ~FillNStroke() override;
void setFillrule( SPPaintSelector::FillRule mode );
diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h
index 93ef5d8c1..6176ab880 100644
--- a/src/widgets/gradient-selector.h
+++ b/src/widgets/gradient-selector.h
@@ -82,7 +82,7 @@ struct SPGradientSelector {
add(data);
add(pixbuf);
}
- virtual ~ModelColumns() {}
+ ~ModelColumns() override {}
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<unsigned long> color;
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index 161bb706a..de1b95e9c 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -65,7 +65,7 @@ public:
*/
SPAttributeTable (SPObject *object, std::vector<Glib::ustring> &labels, std::vector<Glib::ustring> &attributes, GtkWidget* parent);
- ~SPAttributeTable ();
+ ~SPAttributeTable () override;
/**
* Sets class properties and creates child widgets
diff --git a/src/widgets/stroke-marker-selector.h b/src/widgets/stroke-marker-selector.h
index 78e5569af..96f203b8b 100644
--- a/src/widgets/stroke-marker-selector.h
+++ b/src/widgets/stroke-marker-selector.h
@@ -38,7 +38,7 @@ class Adjustment;
class MarkerComboBox : public Gtk::ComboBox {
public:
MarkerComboBox(gchar const *id, int loc);
- ~MarkerComboBox();
+ ~MarkerComboBox() override;
void setDesktop(SPDesktop *desktop);
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index 034d385e7..274cc2b47 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -111,7 +111,7 @@ class StrokeStyle : public Gtk::VBox
{
public:
StrokeStyle();
- ~StrokeStyle();
+ ~StrokeStyle() override;
void setDesktop(SPDesktop *desktop);
private:
diff --git a/src/widgets/swatch-selector.h b/src/widgets/swatch-selector.h
index 16a8cfac8..e0478f3ee 100644
--- a/src/widgets/swatch-selector.h
+++ b/src/widgets/swatch-selector.h
@@ -18,7 +18,7 @@ class SwatchSelector : public Gtk::VBox
{
public:
SwatchSelector();
- virtual ~SwatchSelector();
+ ~SwatchSelector() override;
void connectGrabbedHandler( GCallback handler, void *data );
void connectDraggedHandler( GCallback handler, void *data );
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 58ea6c116..c340e5291 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -258,17 +258,17 @@ class VerbAction : public Gtk::Action {
public:
static Glib::RefPtr<VerbAction> create(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view);
- virtual ~VerbAction();
+ ~VerbAction() override;
virtual void set_active(bool active = true);
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;
- virtual void connect_proxy_vfunc(Gtk::Widget* proxy);
- virtual void disconnect_proxy_vfunc(Gtk::Widget* proxy);
+ void connect_proxy_vfunc(Gtk::Widget* proxy) override;
+ void disconnect_proxy_vfunc(Gtk::Widget* proxy) override;
- virtual void on_activate();
+ void on_activate() override;
private:
Inkscape::Verb* verb;
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index a61130d33..a1dc0770b 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -87,12 +87,12 @@ public:
/**
* Destructor that unregisters the preference callback.
*/
- virtual ~PrefPusher();
+ ~PrefPusher() override;
/**
* Callback method invoked when the preference setting changes.
*/
- virtual void notify(Inkscape::Preferences::Entry const &new_val);
+ void notify(Inkscape::Preferences::Entry const &new_val) override;
private: