summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/node.h
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/tool/node.h
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/tool/node.h')
-rw-r--r--src/ui/tool/node.h46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 231f57b7c..6a766125a 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -79,15 +79,15 @@ struct NodeSharedData {
class Handle : public ControlPoint {
public:
- virtual ~Handle();
+ ~Handle() override;
inline Geom::Point relativePos() const;
inline double length() const;
bool isDegenerate() const { return _degenerate; } // True if the handle is retracted, i.e. has zero length.
- virtual void setVisible(bool);
- virtual void move(Geom::Point const &p);
+ void setVisible(bool) override;
+ void move(Geom::Point const &p) override;
- virtual void setPosition(Geom::Point const &p);
+ void setPosition(Geom::Point const &p) override;
inline void setRelativePos(Geom::Point const &p);
void setLength(double len);
void retract();
@@ -103,15 +103,15 @@ protected:
Handle(NodeSharedData const &data, Geom::Point const &initial_pos, Node *parent);
virtual void handle_2button_press();
- virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event);
- virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event);
- virtual bool grabbed(GdkEventMotion *event);
- virtual void ungrabbed(GdkEventButton *event);
- virtual bool clicked(GdkEventButton *event);
+ bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override;
+ void dragged(Geom::Point &new_pos, GdkEventMotion *event) override;
+ bool grabbed(GdkEventMotion *event) override;
+ void ungrabbed(GdkEventButton *event) override;
+ bool clicked(GdkEventButton *event) override;
- virtual Glib::ustring _getTip(unsigned state) const;
- virtual Glib::ustring _getDragTip(GdkEventMotion *event) const;
- virtual bool _hasDragTips() const { return true; }
+ Glib::ustring _getTip(unsigned state) const override;
+ Glib::ustring _getDragTip(GdkEventMotion *event) const override;
+ bool _hasDragTips() const override { return true; }
private:
@@ -146,9 +146,9 @@ public:
*/
Node(NodeSharedData const &data, Geom::Point const &pos);
- virtual void move(Geom::Point const &p);
- virtual void transform(Geom::Affine const &m);
- virtual Geom::Rect bounds() const;
+ void move(Geom::Point const &p) override;
+ void transform(Geom::Affine const &m) override;
+ Geom::Rect bounds() const override;
NodeType type() const { return _type; }
@@ -216,20 +216,20 @@ public:
// temporarily public
/** Customized event handler to catch scroll events needed for selection grow/shrink. */
- virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event);
+ bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override;
Inkscape::SnapCandidatePoint snapCandidatePoint();
protected:
- virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event);
- virtual bool grabbed(GdkEventMotion *event);
- virtual bool clicked(GdkEventButton *event);
+ void dragged(Geom::Point &new_pos, GdkEventMotion *event) override;
+ bool grabbed(GdkEventMotion *event) override;
+ bool clicked(GdkEventButton *event) override;
- virtual void _setState(State state);
- virtual Glib::ustring _getTip(unsigned state) const;
- virtual Glib::ustring _getDragTip(GdkEventMotion *event) const;
- virtual bool _hasDragTips() const { return true; }
+ void _setState(State state) override;
+ Glib::ustring _getTip(unsigned state) const override;
+ Glib::ustring _getDragTip(GdkEventMotion *event) const override;
+ bool _hasDragTips() const override { return true; }
private: