summaryrefslogtreecommitdiffstats
path: root/src/ui/tools
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/ui/tools
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/ui/tools')
-rw-r--r--src/ui/tools/arc-tool.h12
-rw-r--r--src/ui/tools/box3d-tool.h12
-rw-r--r--src/ui/tools/calligraphic-tool.h10
-rw-r--r--src/ui/tools/connector-tool.h14
-rw-r--r--src/ui/tools/dropper-tool.h10
-rw-r--r--src/ui/tools/dynamic-base.h4
-rw-r--r--src/ui/tools/eraser-tool.h8
-rw-r--r--src/ui/tools/flood-tool.h10
-rw-r--r--src/ui/tools/freehand-base.h10
-rw-r--r--src/ui/tools/gradient-tool.h8
-rw-r--r--src/ui/tools/lpe-tool.h12
-rw-r--r--src/ui/tools/measure-tool.h8
-rw-r--r--src/ui/tools/mesh-tool.h10
-rw-r--r--src/ui/tools/node-tool.h10
-rw-r--r--src/ui/tools/pen-tool.h14
-rw-r--r--src/ui/tools/pencil-tool.h8
-rw-r--r--src/ui/tools/rect-tool.h14
-rw-r--r--src/ui/tools/select-tool.h12
-rw-r--r--src/ui/tools/spiral-tool.h12
-rw-r--r--src/ui/tools/spray-tool.h10
-rw-r--r--src/ui/tools/star-tool.h12
-rw-r--r--src/ui/tools/text-tool.h12
-rw-r--r--src/ui/tools/tool-base.h2
-rw-r--r--src/ui/tools/tweak-tool.h10
-rw-r--r--src/ui/tools/zoom-tool.h10
25 files changed, 127 insertions, 127 deletions
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;