diff options
Diffstat (limited to 'src')
504 files changed, 3093 insertions, 3093 deletions
diff --git a/src/bad-uri-exception.h b/src/bad-uri-exception.h index 322b9ae58..6ebb10d13 100644 --- a/src/bad-uri-exception.h +++ b/src/bad-uri-exception.h @@ -9,12 +9,12 @@ class BadURIException : public std::exception {}; class UnsupportedURIException : public BadURIException { public: - char const *what() const throw() { return "Unsupported URI"; } + char const *what() const throw() override { return "Unsupported URI"; } }; class MalformedURIException : public BadURIException { public: - char const *what() const throw() { return "Malformed URI"; } + char const *what() const throw() override { return "Malformed URI"; } }; } diff --git a/src/composite-undo-stack-observer.h b/src/composite-undo-stack-observer.h index 33afda48d..d4d2386a9 100644 --- a/src/composite-undo-stack-observer.h +++ b/src/composite-undo-stack-observer.h @@ -114,7 +114,7 @@ public: */ CompositeUndoStackObserver(); - virtual ~CompositeUndoStackObserver(); + ~CompositeUndoStackObserver() override; /** * Add an UndoStackObserver. @@ -135,24 +135,24 @@ public: * * \param log The event log generated by the undo event. */ - void notifyUndoEvent(Event* log); + void notifyUndoEvent(Event* log) override; /** * Notify all registered UndoStackObservers of a redo event. * * \param log The event log generated by the redo event. */ - void notifyRedoEvent(Event* log); + void notifyRedoEvent(Event* log) override; /** * Notify all registered UndoStackObservers of an event log being committed to the undo stack. * * \param log The event log being committed to the undo stack. */ - void notifyUndoCommitEvent(Event* log); + void notifyUndoCommitEvent(Event* log) override; - virtual void notifyClearUndoEvent(); - virtual void notifyClearRedoEvent(); + void notifyClearUndoEvent() override; + void notifyClearRedoEvent() override; private: // Remove an observer from a given list diff --git a/src/console-output-undo-observer.h b/src/console-output-undo-observer.h index f47a86534..09eab5868 100644 --- a/src/console-output-undo-observer.h +++ b/src/console-output-undo-observer.h @@ -23,13 +23,13 @@ namespace Inkscape { class ConsoleOutputUndoObserver : public UndoStackObserver { public: ConsoleOutputUndoObserver() : UndoStackObserver() { } - virtual ~ConsoleOutputUndoObserver() { } + ~ConsoleOutputUndoObserver() override { } - void notifyUndoEvent(Event* log); - void notifyRedoEvent(Event* log); - void notifyUndoCommitEvent(Event* log); - void notifyClearUndoEvent(); - void notifyClearRedoEvent(); + void notifyUndoEvent(Event* log) override; + void notifyRedoEvent(Event* log) override; + void notifyUndoCommitEvent(Event* log) override; + void notifyClearUndoEvent() override; + void notifyClearRedoEvent() override; }; } diff --git a/src/debug/gc-heap.h b/src/debug/gc-heap.h index 0daf39487..88de2b7e8 100644 --- a/src/debug/gc-heap.h +++ b/src/debug/gc-heap.h @@ -20,19 +20,19 @@ namespace Debug { class GCHeap : public Debug::Heap { public: - int features() const { + int features() const override { return SIZE_AVAILABLE | USED_AVAILABLE | GARBAGE_COLLECTED; } - Util::ptr_shared name() const { + Util::ptr_shared name() const override { return Util::share_static_string("libgc"); } - Heap::Stats stats() const { + Heap::Stats stats() const override { Stats stats; stats.size = GC::Core::get_heap_size(); stats.bytes_used = stats.size - GC::Core::get_free_bytes(); return stats; } - void force_collect() { GC::Core::gcollect(); } + void force_collect() override { GC::Core::gcollect(); } }; } diff --git a/src/debug/log-display-config.cpp b/src/debug/log-display-config.cpp index 1f436a708..a2e07e207 100644 --- a/src/debug/log-display-config.cpp +++ b/src/debug/log-display-config.cpp @@ -72,7 +72,7 @@ private: class Display : public ConfigurationEvent { public: Display() : ConfigurationEvent("display") {} - void generateChildEvents() const { + void generateChildEvents() const override { GdkDisplay *display=gdk_display_get_default(); #if GTK_CHECK_VERSION(3,22,0) diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h index 076b9b4b5..b22f1c2ee 100644 --- a/src/debug/simple-event.h +++ b/src/debug/simple-event.h @@ -34,13 +34,13 @@ public: static Category category() { return C; } - Util::ptr_shared name() const { return _name; } - unsigned propertyCount() const { return _properties.size(); } - PropertyPair property(unsigned property) const { + Util::ptr_shared name() const override { return _name; } + unsigned propertyCount() const override { return _properties.size(); } + PropertyPair property(unsigned property) const override { return _properties[property]; } - void generateChildEvents() const {} + void generateChildEvents() const override {} protected: void _addProperty(Util::ptr_shared name, diff --git a/src/debug/sysv-heap.h b/src/debug/sysv-heap.h index 4bde77cd8..baab0af5f 100644 --- a/src/debug/sysv-heap.h +++ b/src/debug/sysv-heap.h @@ -21,13 +21,13 @@ class SysVHeap : public Heap { public: SysVHeap() {} - int features() const; + int features() const override; - Util::ptr_shared name() const { + Util::ptr_shared name() const override { return Util::share_static_string("standard malloc()"); } - Stats stats() const; - void force_collect() {} + Stats stats() const override; + void force_collect() override {} }; } diff --git a/src/desktop.h b/src/desktop.h index 73463ffd5..aec4ee518 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -248,7 +248,7 @@ public: SPDesktop(); void init (SPNamedView* nv, SPCanvas* canvas, Inkscape::UI::View::EditWidgetInterface *widget); - virtual ~SPDesktop(); + ~SPDesktop() override; void destroy(); Inkscape::MessageContext *guidesMessageContext() const { @@ -425,10 +425,10 @@ public: Geom::Point doc2dt(Geom::Point const &p) const; Geom::Point dt2doc(Geom::Point const &p) const; - virtual void setDocument (SPDocument* doc); - virtual bool shutdown(); - virtual void mouseover() {} - virtual void mouseout() {} + void setDocument (SPDocument* doc) override; + bool shutdown() override; + void mouseover() override {} + void mouseout() override {} virtual bool onDeleteUI (GdkEventAny*); @@ -550,7 +550,7 @@ private: prefs->addObserver(*this); } private: - void notify(Inkscape::Preferences::Entry const &) { + void notify(Inkscape::Preferences::Entry const &) override { _desktop->redrawDesktop(); } SPDesktop *_desktop; @@ -577,11 +577,11 @@ private: sigc::connection _commit_connection; sigc::connection _modified_connection; - virtual void onResized (double, double); - virtual void onRedrawRequested(); - virtual void onStatusMessage (Inkscape::MessageType type, gchar const *message); - virtual void onDocumentURISet (gchar const* uri); - virtual void onDocumentResized (double, double); + void onResized (double, double) override; + void onRedrawRequested() override; + void onStatusMessage (Inkscape::MessageType type, gchar const *message) override; + void onDocumentURISet (gchar const* uri) override; + void onDocumentResized (double, double) override; static void _onActivate (SPDesktop* dt); static void _onDeactivate (SPDesktop* dt); diff --git a/src/device-manager.cpp b/src/device-manager.cpp index 185d417fb..df6567a30 100644 --- a/src/device-manager.cpp +++ b/src/device-manager.cpp @@ -168,20 +168,20 @@ InputDevice::~InputDevice() {} class InputDeviceImpl : public InputDevice { public: InputDeviceImpl(Glib::RefPtr<Gdk::Device> device, std::set<Glib::ustring> &knownIDs); - virtual ~InputDeviceImpl() {} - - virtual Glib::ustring getId() const {return id;} - virtual Glib::ustring getName() const {return name;} - virtual Gdk::InputSource getSource() const {return source;} - virtual Gdk::InputMode getMode() const {return (device->get_mode());} - virtual gint getNumAxes() const {return device->get_n_axes();} - virtual bool hasCursor() const {return device->get_has_cursor();} - virtual int getNumKeys() const {return device->get_n_keys();} - virtual Glib::ustring getLink() const {return link;} + ~InputDeviceImpl() override {} + + Glib::ustring getId() const override {return id;} + Glib::ustring getName() const override {return name;} + Gdk::InputSource getSource() const override {return source;} + Gdk::InputMode getMode() const override {return (device->get_mode());} + gint getNumAxes() const override {return device->get_n_axes();} + bool hasCursor() const override {return device->get_has_cursor();} + int getNumKeys() const override {return device->get_n_keys();} + Glib::ustring getLink() const override {return link;} virtual void setLink( Glib::ustring const& link ) {this->link = link;} - virtual gint getLiveAxes() const {return liveAxes;} + gint getLiveAxes() const override {return liveAxes;} virtual void setLiveAxes(gint axes) {liveAxes = axes;} - virtual gint getLiveButtons() const {return liveButtons;} + gint getLiveButtons() const override {return liveButtons;} virtual void setLiveButtons(gint buttons) {liveButtons = buttons;} // internal methods not on public superclass: @@ -287,23 +287,23 @@ class DeviceManagerImpl : public DeviceManager { public: DeviceManagerImpl(); - virtual void loadConfig(); - virtual void saveConfig(); + void loadConfig() override; + void saveConfig() override; - virtual std::list<Glib::RefPtr<InputDevice const> > getDevices(); + std::list<Glib::RefPtr<InputDevice const> > getDevices() override; - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalDeviceChanged(); - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalAxesChanged(); - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalButtonsChanged(); - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalLinkChanged(); + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalDeviceChanged() override; + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalAxesChanged() override; + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalButtonsChanged() override; + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalLinkChanged() override; - virtual void addAxis(Glib::ustring const & id, gint axis); - virtual void addButton(Glib::ustring const & id, gint button); - virtual void setLinkedTo(Glib::ustring const & id, Glib::ustring const& link); + void addAxis(Glib::ustring const & id, gint axis) override; + void addButton(Glib::ustring const & id, gint button) override; + void setLinkedTo(Glib::ustring const & id, Glib::ustring const& link) override; - virtual void setMode( Glib::ustring const & id, Gdk::InputMode mode ); - virtual void setAxisUse( Glib::ustring const & id, guint index, Gdk::AxisUse use ); - virtual void setKey( Glib::ustring const & id, guint index, guint keyval, Gdk::ModifierType mods ); + void setMode( Glib::ustring const & id, Gdk::InputMode mode ) override; + void setAxisUse( Glib::ustring const & id, guint index, Gdk::AxisUse use ) override; + void setKey( Glib::ustring const & id, guint index, guint keyval, Gdk::ModifierType mods ) override; protected: std::list<Glib::RefPtr<InputDeviceImpl> > devices; diff --git a/src/device-manager.h b/src/device-manager.h index 8583ae5d0..66e4264fa 100644 --- a/src/device-manager.h +++ b/src/device-manager.h @@ -31,7 +31,7 @@ public: protected: InputDevice(); - virtual ~InputDevice(); + ~InputDevice() override; private: InputDevice(InputDevice const &) = delete; // no copy @@ -62,7 +62,7 @@ public: protected: DeviceManager(); - virtual ~DeviceManager(); + ~DeviceManager() override; private: DeviceManager(DeviceManager const &) = delete; // no copy diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index 366b3c7d1..8271a6ad9 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -58,7 +58,7 @@ struct CachePrefObserver : public Inkscape::Preferences::Observer { } prefs->addObserver(*this); } - void notify(Preferences::Entry const &v) { + void notify(Preferences::Entry const &v) override { Glib::ustring name = v.getEntryName(); if (name == "size") { _arena->drawing.setCacheBudget((1 << 20) * v.getIntLimited(64, 0, 4096)); diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h index 4231520e7..a4598f087 100644 --- a/src/display/canvas-axonomgrid.h +++ b/src/display/canvas-axonomgrid.h @@ -23,13 +23,13 @@ namespace XML { class CanvasAxonomGrid : public CanvasGrid { public: CanvasAxonomGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc); - virtual ~CanvasAxonomGrid(); + ~CanvasAxonomGrid() override; - virtual void Update (Geom::Affine const &affine, unsigned int flags); - virtual void Render (SPCanvasBuf *buf); + void Update (Geom::Affine const &affine, unsigned int flags) override; + void Render (SPCanvasBuf *buf) override; - virtual void readRepr(); - virtual void onReprAttrChanged (Inkscape::XML::Node * repr, char const *key, char const *oldval, char const *newval, bool is_interactive); + void readRepr() override; + void onReprAttrChanged (Inkscape::XML::Node * repr, char const *key, char const *oldval, char const *newval, bool is_interactive) override; double lengthy; /**< The lengths of the primary y-axis */ double angle_deg[3]; /**< Angle of each axis (note that angle[2] == 0) */ @@ -49,7 +49,7 @@ protected: Geom::Point sw; /**< the scaling factors of the affine transform */ - virtual Gtk::Widget * newSpecificWidget(); + Gtk::Widget * newSpecificWidget() override; private: CanvasAxonomGrid(const CanvasAxonomGrid&) = delete; @@ -74,16 +74,16 @@ class CanvasAxonomGridSnapper : public LineSnapper { public: CanvasAxonomGridSnapper(CanvasAxonomGrid *grid, SnapManager *sm, Geom::Coord const d); - bool ThisSnapperMightSnap() const; + bool ThisSnapperMightSnap() const override; - Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) - bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance + Geom::Coord getSnapperTolerance() const override; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) + bool getSnapperAlwaysSnap() const override; //if true, then the snapper will always snap, regardless of its tolerance private: - LineList _getSnapLines(Geom::Point const &p) const; - void _addSnappedLine(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const &normal_to_line, const Geom::Point &point_on_line) const; - void _addSnappedPoint(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const; - void _addSnappedLinePerpendicularly(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const; + LineList _getSnapLines(Geom::Point const &p) const override; + void _addSnappedLine(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const &normal_to_line, const Geom::Point &point_on_line) const override; + void _addSnappedPoint(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const override; + void _addSnappedLinePerpendicularly(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const override; CanvasAxonomGrid *grid; }; diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h index a02b5d5fd..226acd5ef 100644 --- a/src/display/canvas-grid.h +++ b/src/display/canvas-grid.h @@ -143,14 +143,14 @@ private: class CanvasXYGrid : public CanvasGrid { public: CanvasXYGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc); - virtual ~CanvasXYGrid(); + ~CanvasXYGrid() override; virtual void Scale (Geom::Scale const &scale); - virtual void Update (Geom::Affine const &affine, unsigned int flags); - virtual void Render (SPCanvasBuf *buf); + void Update (Geom::Affine const &affine, unsigned int flags) override; + void Render (SPCanvasBuf *buf) override; - virtual void readRepr(); - virtual void onReprAttrChanged (Inkscape::XML::Node * repr, char const *key, char const *oldval, char const *newval, bool is_interactive); + void readRepr() override; + void onReprAttrChanged (Inkscape::XML::Node * repr, char const *key, char const *oldval, char const *newval, bool is_interactive) override; Geom::Point spacing; /**< Spacing between elements of the grid */ bool scaled[2]; /**< Whether the grid is in scaled mode, which can @@ -160,7 +160,7 @@ public: Geom::Point sw[2]; /**< Transformed spacing by the affine for the zoom */ protected: - virtual Gtk::Widget * newSpecificWidget(); + Gtk::Widget * newSpecificWidget() override; private: CanvasXYGrid(const CanvasXYGrid&) = delete; @@ -187,16 +187,16 @@ class CanvasXYGridSnapper : public LineSnapper { public: CanvasXYGridSnapper(CanvasXYGrid *grid, SnapManager *sm, Geom::Coord const d); - bool ThisSnapperMightSnap() const; + bool ThisSnapperMightSnap() const override; - Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) - bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance + Geom::Coord getSnapperTolerance() const override; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) + bool getSnapperAlwaysSnap() const override; //if true, then the snapper will always snap, regardless of its tolerance private: - LineList _getSnapLines(Geom::Point const &p) const; - void _addSnappedLine(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const &normal_to_line, const Geom::Point &point_on_line) const; - void _addSnappedPoint(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const; - void _addSnappedLinePerpendicularly(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const; + LineList _getSnapLines(Geom::Point const &p) const override; + void _addSnappedLine(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const &normal_to_line, const Geom::Point &point_on_line) const override; + void _addSnappedPoint(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const override; + void _addSnappedLinePerpendicularly(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const override; CanvasXYGrid *grid; }; diff --git a/src/display/drawing-group.h b/src/display/drawing-group.h index 0c985b43f..a66ea16a9 100644 --- a/src/display/drawing-group.h +++ b/src/display/drawing-group.h @@ -21,7 +21,7 @@ class DrawingGroup { public: DrawingGroup(Drawing &drawing); - ~DrawingGroup(); + ~DrawingGroup() override; bool pickChildren() { return _pick_children; } void setPickChildren(bool p); @@ -29,13 +29,13 @@ public: void setChildTransform(Geom::Affine const &new_trans); protected: - virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, - unsigned flags, unsigned reset); - virtual unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, - DrawingItem *stop_at); - virtual void _clipItem(DrawingContext &dc, Geom::IntRect const &area); - virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags); - virtual bool _canClip(); + unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, + unsigned flags, unsigned reset) override; + unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, + DrawingItem *stop_at) override; + void _clipItem(DrawingContext &dc, Geom::IntRect const &area) override; + DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags) override; + bool _canClip() override; Geom::Affine *_child_transform; }; diff --git a/src/display/drawing-image.h b/src/display/drawing-image.h index 7511768c9..966ff1145 100644 --- a/src/display/drawing-image.h +++ b/src/display/drawing-image.h @@ -26,7 +26,7 @@ class DrawingImage { public: DrawingImage(Drawing &drawing); - ~DrawingImage(); + ~DrawingImage() override; void setPixbuf(Inkscape::Pixbuf *pb); void setScale(double sx, double sy); @@ -35,11 +35,11 @@ public: Geom::Rect bounds() const; protected: - virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, - unsigned flags, unsigned reset); - virtual unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, - DrawingItem *stop_at); - virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags); + unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, + unsigned flags, unsigned reset) override; + unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, + DrawingItem *stop_at) override; + DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags) override; Inkscape::Pixbuf *_pixbuf; diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h index 21f6ffacc..43015c263 100644 --- a/src/display/drawing-item.h +++ b/src/display/drawing-item.h @@ -59,7 +59,7 @@ struct CacheRecord typedef std::list<CacheRecord> CacheList; class InvalidItemException : public std::exception { - virtual const char *what() const throw() { + const char *what() const throw() override { return "Invalid item in drawing"; } }; diff --git a/src/display/drawing-pattern.h b/src/display/drawing-pattern.h index 43e0e97e1..a5795eca6 100644 --- a/src/display/drawing-pattern.h +++ b/src/display/drawing-pattern.h @@ -31,7 +31,7 @@ class DrawingPattern { public: DrawingPattern(Drawing &drawing, bool debug = false); - ~DrawingPattern(); + ~DrawingPattern() override; /** * Set the transformation from pattern to user coordinate systems. @@ -56,8 +56,8 @@ public: */ cairo_pattern_t *renderPattern(float opacity); protected: - virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, - unsigned flags, unsigned reset); + unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, + unsigned flags, unsigned reset) override; Geom::Affine *_pattern_to_user; Geom::Affine _overflow_initial_transform; diff --git a/src/display/drawing-shape.h b/src/display/drawing-shape.h index 1cdbc636e..20da54239 100644 --- a/src/display/drawing-shape.h +++ b/src/display/drawing-shape.h @@ -25,20 +25,20 @@ class DrawingShape { public: DrawingShape(Drawing &drawing); - ~DrawingShape(); + ~DrawingShape() override; void setPath(SPCurve *curve); - virtual void setStyle(SPStyle *style, SPStyle *context_style = NULL); - virtual void setChildrenStyle(SPStyle *context_style); + void setStyle(SPStyle *style, SPStyle *context_style = NULL) override; + void setChildrenStyle(SPStyle *context_style) override; protected: - virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, - unsigned flags, unsigned reset); - virtual unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, - DrawingItem *stop_at); - virtual void _clipItem(DrawingContext &dc, Geom::IntRect const &area); - virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags); - virtual bool _canClip(); + unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, + unsigned flags, unsigned reset) override; + unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, + DrawingItem *stop_at) override; + void _clipItem(DrawingContext &dc, Geom::IntRect const &area) override; + DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags) override; + bool _canClip() override; void _renderFill(DrawingContext &dc); void _renderStroke(DrawingContext &dc); diff --git a/src/display/drawing-surface.h b/src/display/drawing-surface.h index 569964721..ae9a576e7 100644 --- a/src/display/drawing-surface.h +++ b/src/display/drawing-surface.h @@ -65,7 +65,7 @@ class DrawingCache { public: explicit DrawingCache(Geom::IntRect const &area, int device_scale = 1); - ~DrawingCache(); + ~DrawingCache() override; void markDirty(Geom::IntRect const &area = Geom::IntRect::infinite()); void markClean(Geom::IntRect const &area = Geom::IntRect::infinite()); diff --git a/src/display/drawing-text.h b/src/display/drawing-text.h index 3d248df9b..376182d4e 100644 --- a/src/display/drawing-text.h +++ b/src/display/drawing-text.h @@ -25,15 +25,15 @@ class DrawingGlyphs { public: DrawingGlyphs(Drawing &drawing); - ~DrawingGlyphs(); + ~DrawingGlyphs() override; void setGlyph(font_instance *font, int glyph, Geom::Affine const &trans); - virtual void setStyle(SPStyle *style, SPStyle *context_style = NULL); // Not to be used + void setStyle(SPStyle *style, SPStyle *context_style = NULL) override; // Not to be used protected: unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, - unsigned flags, unsigned reset); - virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags); + unsigned flags, unsigned reset) override; + DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags) override; font_instance *_font; int _glyph; @@ -52,22 +52,22 @@ class DrawingText { public: DrawingText(Drawing &drawing); - ~DrawingText(); + ~DrawingText() override; void clear(); bool addComponent(font_instance *font, int glyph, Geom::Affine const &trans, float width, float ascent, float descent, float phase_length); - virtual void setStyle(SPStyle *style, SPStyle *context_style = NULL); - virtual void setChildrenStyle(SPStyle *context_style); + void setStyle(SPStyle *style, SPStyle *context_style = NULL) override; + void setChildrenStyle(SPStyle *context_style) override; protected: - virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, - unsigned flags, unsigned reset); - virtual unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, - DrawingItem *stop_at); - virtual void _clipItem(DrawingContext &dc, Geom::IntRect const &area); - virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags); - virtual bool _canClip(); + unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, + unsigned flags, unsigned reset) override; + unsigned _renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, + DrawingItem *stop_at) override; + void _clipItem(DrawingContext &dc, Geom::IntRect const &area) override; + DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags) override; + bool _canClip() override; void decorateItem(DrawingContext &dc, double phase_length, bool under); void decorateStyle(DrawingContext &dc, double vextent, double xphase, Geom::Point const &p1, Geom::Point const &p2, double thickness); diff --git a/src/display/nr-filter-blend.h b/src/display/nr-filter-blend.h index cdabb469b..e6be8b67e 100644 --- a/src/display/nr-filter-blend.h +++ b/src/display/nr-filter-blend.h @@ -48,18 +48,18 @@ class FilterBlend : public FilterPrimitive { public: FilterBlend(); static FilterPrimitive *create(); - virtual ~FilterBlend(); + ~FilterBlend() override; - virtual void render_cairo(FilterSlot &slot); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); - virtual bool uses_background(); + void render_cairo(FilterSlot &slot) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; + bool uses_background() override; - virtual void set_input(int slot); - virtual void set_input(int input, int slot); + void set_input(int slot) override; + void set_input(int input, int slot) override; void set_mode(FilterBlendMode mode); - virtual Glib::ustring name() { return Glib::ustring("Blend"); } + Glib::ustring name() override { return Glib::ustring("Blend"); } private: static const std::set<FilterBlendMode> _valid_modes; diff --git a/src/display/nr-filter-colormatrix.h b/src/display/nr-filter-colormatrix.h index a6ba3693e..cb85c8b71 100644 --- a/src/display/nr-filter-colormatrix.h +++ b/src/display/nr-filter-colormatrix.h @@ -36,17 +36,17 @@ class FilterColorMatrix : public FilterPrimitive { public: FilterColorMatrix(); static FilterPrimitive *create(); - virtual ~FilterColorMatrix(); + ~FilterColorMatrix() override; - virtual void render_cairo(FilterSlot &slot); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; virtual void set_type(FilterColorMatrixType type); virtual void set_value(double value); virtual void set_values(std::vector<double> const &values); - virtual Glib::ustring name() { return Glib::ustring("Color Matrix"); } + Glib::ustring name() override { return Glib::ustring("Color Matrix"); } public: struct ColorMatrixMatrix { diff --git a/src/display/nr-filter-component-transfer.h b/src/display/nr-filter-component-transfer.h index dae230f24..bd7720563 100644 --- a/src/display/nr-filter-component-transfer.h +++ b/src/display/nr-filter-component-transfer.h @@ -33,11 +33,11 @@ class FilterComponentTransfer : public FilterPrimitive { public: FilterComponentTransfer(); static FilterPrimitive *create(); - virtual ~FilterComponentTransfer(); + ~FilterComponentTransfer() override; - virtual void render_cairo(FilterSlot &slot); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; FilterComponentTransferType type[4]; std::vector<double> tableValues[4]; @@ -47,7 +47,7 @@ public: double exponent[4]; double offset[4]; - virtual Glib::ustring name() { return Glib::ustring("Component Transfer"); } + Glib::ustring name() override { return Glib::ustring("Component Transfer"); } }; } /* namespace Filters */ diff --git a/src/display/nr-filter-composite.h b/src/display/nr-filter-composite.h index 820c64da0..8a08c3dd2 100644 --- a/src/display/nr-filter-composite.h +++ b/src/display/nr-filter-composite.h @@ -24,19 +24,19 @@ class FilterComposite : public FilterPrimitive { public: FilterComposite(); static FilterPrimitive *create(); - virtual ~FilterComposite(); + ~FilterComposite() override; - virtual void render_cairo(FilterSlot &); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; - virtual void set_input(int input); - virtual void set_input(int input, int slot); + void set_input(int input) override; + void set_input(int input, int slot) override; void set_operator(FeCompositeOperator op); void set_arithmetic(double k1, double k2, double k3, double k4); - virtual Glib::ustring name() { return Glib::ustring("Composite"); } + Glib::ustring name() override { return Glib::ustring("Composite"); } private: FeCompositeOperator op; diff --git a/src/display/nr-filter-convolve-matrix.h b/src/display/nr-filter-convolve-matrix.h index 3d86129ba..85a2b8c41 100644 --- a/src/display/nr-filter-convolve-matrix.h +++ b/src/display/nr-filter-convolve-matrix.h @@ -31,11 +31,11 @@ class FilterConvolveMatrix : public FilterPrimitive { public: FilterConvolveMatrix(); static FilterPrimitive *create(); - virtual ~FilterConvolveMatrix(); + ~FilterConvolveMatrix() override; - virtual void render_cairo(FilterSlot &slot); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) override; + double complexity(Geom::Affine const &ctm) override; void set_targetY(int coord); void set_targetX(int coord); @@ -47,7 +47,7 @@ public: void set_edgeMode(FilterConvolveMatrixEdgeMode mode); void set_preserveAlpha(bool pa); - virtual Glib::ustring name() { return Glib::ustring("Convolve Matrix"); } + Glib::ustring name() override { return Glib::ustring("Convolve Matrix"); } private: std::vector<double> kernelMatrix; diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h index ef7a3011b..095d9bccb 100644 --- a/src/display/nr-filter-diffuselighting.h +++ b/src/display/nr-filter-diffuselighting.h @@ -31,11 +31,11 @@ class FilterDiffuseLighting : public FilterPrimitive { public: FilterDiffuseLighting(); static FilterPrimitive *create(); - virtual ~FilterDiffuseLighting(); - virtual void render_cairo(FilterSlot &slot); + ~FilterDiffuseLighting() override; + void render_cairo(FilterSlot &slot) override; virtual void set_icc(SVGICCColor *icc_color); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans); - virtual double complexity(Geom::Affine const &ctm); + void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) override; + double complexity(Geom::Affine const &ctm) override; union { SPFeDistantLight *distant; @@ -47,7 +47,7 @@ public: double surfaceScale; guint32 lighting_color; - virtual Glib::ustring name() { return Glib::ustring("Diffuse Lighting"); } + Glib::ustring name() override { return Glib::ustring("Diffuse Lighting"); } private: SVGICCColor *icc; diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h index 00c8d8264..c825ea0f9 100644 --- a/src/display/nr-filter-displacement-map.h +++ b/src/display/nr-filter-displacement-map.h @@ -24,18 +24,18 @@ class FilterDisplacementMap : public FilterPrimitive { public: FilterDisplacementMap(); static FilterPrimitive *create(); - virtual ~FilterDisplacementMap(); + ~FilterDisplacementMap() override; - virtual void render_cairo(FilterSlot &slot); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) override; + double complexity(Geom::Affine const &ctm) override; - virtual void set_input(int slot); - virtual void set_input(int input, int slot); + void set_input(int slot) override; + void set_input(int input, int slot) override; virtual void set_scale(double s); virtual void set_channel_selector(int s, FilterDisplacementMapChannelSelector channel); - virtual Glib::ustring name() { return Glib::ustring("Displacement Map"); } + Glib::ustring name() override { return Glib::ustring("Displacement Map"); } private: double scale; diff --git a/src/display/nr-filter-flood.h b/src/display/nr-filter-flood.h index 1752a4ca4..87708b73f 100644 --- a/src/display/nr-filter-flood.h +++ b/src/display/nr-filter-flood.h @@ -24,18 +24,18 @@ class FilterFlood : public FilterPrimitive { public: FilterFlood(); static FilterPrimitive *create(); - virtual ~FilterFlood(); + ~FilterFlood() override; - virtual void render_cairo(FilterSlot &slot); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); - virtual bool uses_background() { return false; } + void render_cairo(FilterSlot &slot) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; + bool uses_background() override { return false; } virtual void set_opacity(double o); virtual void set_color(guint32 c); virtual void set_icc(SVGICCColor *icc_color); - virtual Glib::ustring name() { return Glib::ustring("Flood"); } + Glib::ustring name() override { return Glib::ustring("Flood"); } private: double opacity; diff --git a/src/display/nr-filter-gaussian.h b/src/display/nr-filter-gaussian.h index c8314b633..ee0ad4cdd 100644 --- a/src/display/nr-filter-gaussian.h +++ b/src/display/nr-filter-gaussian.h @@ -32,12 +32,12 @@ class FilterGaussian : public FilterPrimitive { public: FilterGaussian(); static FilterPrimitive *create(); - virtual ~FilterGaussian(); + ~FilterGaussian() override; - virtual void render_cairo(FilterSlot &slot); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &m); - virtual bool can_handle_affine(Geom::Affine const &m); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + void area_enlarge(Geom::IntRect &area, Geom::Affine const &m) override; + bool can_handle_affine(Geom::Affine const &m) override; + double complexity(Geom::Affine const &ctm) override; /** * Set the standard deviation value for gaussian blur. Deviation along @@ -56,7 +56,7 @@ public: */ void set_deviation(double x, double y); - virtual Glib::ustring name() { return Glib::ustring("Gaussian Blur"); } + Glib::ustring name() override { return Glib::ustring("Gaussian Blur"); } private: double _deviation_x; diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h index 0ae6ac6ce..23663c71c 100644 --- a/src/display/nr-filter-image.h +++ b/src/display/nr-filter-image.h @@ -27,11 +27,11 @@ class FilterImage : public FilterPrimitive { public: FilterImage(); static FilterPrimitive *create(); - virtual ~FilterImage(); + ~FilterImage() override; - virtual void render_cairo(FilterSlot &slot); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; void set_document( SPDocument *document ); void set_href(char const *href); @@ -40,7 +40,7 @@ public: bool from_element; SPItem* SVGElem; - virtual Glib::ustring name() { return Glib::ustring("Image"); } + Glib::ustring name() override { return Glib::ustring("Image"); } private: SPDocument *document; diff --git a/src/display/nr-filter-merge.h b/src/display/nr-filter-merge.h index 26ef42e4d..5bb397aec 100644 --- a/src/display/nr-filter-merge.h +++ b/src/display/nr-filter-merge.h @@ -22,17 +22,17 @@ class FilterMerge : public FilterPrimitive { public: FilterMerge(); static FilterPrimitive *create(); - virtual ~FilterMerge(); + ~FilterMerge() override; - virtual void render_cairo(FilterSlot &); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); - virtual bool uses_background(); + void render_cairo(FilterSlot &) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; + bool uses_background() override; - virtual void set_input(int input); - virtual void set_input(int input, int slot); + void set_input(int input) override; + void set_input(int input, int slot) override; - virtual Glib::ustring name() { return Glib::ustring("Merge"); } + Glib::ustring name() override { return Glib::ustring("Merge"); } private: std::vector<int> _input_image; diff --git a/src/display/nr-filter-morphology.h b/src/display/nr-filter-morphology.h index 97d91b1a6..a45fcfd96 100644 --- a/src/display/nr-filter-morphology.h +++ b/src/display/nr-filter-morphology.h @@ -29,17 +29,17 @@ class FilterMorphology : public FilterPrimitive { public: FilterMorphology(); static FilterPrimitive *create(); - virtual ~FilterMorphology(); + ~FilterMorphology() override; - virtual void render_cairo(FilterSlot &slot); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) override; + double complexity(Geom::Affine const &ctm) override; void set_operator(FilterMorphologyOperator &o); void set_xradius(double x); void set_yradius(double y); - virtual Glib::ustring name() { return Glib::ustring("Morphology"); } + Glib::ustring name() override { return Glib::ustring("Morphology"); } private: FilterMorphologyOperator Operator; diff --git a/src/display/nr-filter-offset.h b/src/display/nr-filter-offset.h index 6e02bc1d7..5c28691c1 100644 --- a/src/display/nr-filter-offset.h +++ b/src/display/nr-filter-offset.h @@ -23,17 +23,17 @@ class FilterOffset : public FilterPrimitive { public: FilterOffset(); static FilterPrimitive *create(); - virtual ~FilterOffset(); + ~FilterOffset() override; - virtual void render_cairo(FilterSlot &slot); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans); - virtual bool can_handle_affine(Geom::Affine const &); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) override; + bool can_handle_affine(Geom::Affine const &) override; + double complexity(Geom::Affine const &ctm) override; void set_dx(double amount); void set_dy(double amount); - virtual Glib::ustring name() { return Glib::ustring("Offset"); } + Glib::ustring name() override { return Glib::ustring("Offset"); } private: double dx, dy; diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h index 833b2ac3d..ed468110e 100644 --- a/src/display/nr-filter-specularlighting.h +++ b/src/display/nr-filter-specularlighting.h @@ -31,12 +31,12 @@ class FilterSpecularLighting : public FilterPrimitive { public: FilterSpecularLighting(); static FilterPrimitive *create(); - virtual ~FilterSpecularLighting(); + ~FilterSpecularLighting() override; - virtual void render_cairo(FilterSlot &slot); + void render_cairo(FilterSlot &slot) override; virtual void set_icc(SVGICCColor *icc_color); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans); - virtual double complexity(Geom::Affine const &ctm); + void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) override; + double complexity(Geom::Affine const &ctm) override; union { SPFeDistantLight *distant; @@ -49,7 +49,7 @@ public: double specularExponent; guint32 lighting_color; - virtual Glib::ustring name() { return Glib::ustring("Specular Lighting"); } + Glib::ustring name() override { return Glib::ustring("Specular Lighting"); } private: SVGICCColor *icc; diff --git a/src/display/nr-filter-tile.h b/src/display/nr-filter-tile.h index c76302033..fbc319cd0 100644 --- a/src/display/nr-filter-tile.h +++ b/src/display/nr-filter-tile.h @@ -23,13 +23,13 @@ class FilterTile : public FilterPrimitive { public: FilterTile(); static FilterPrimitive *create(); - virtual ~FilterTile(); + ~FilterTile() override; - virtual void render_cairo(FilterSlot &slot); - virtual void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans); - virtual double complexity(Geom::Affine const &ctm); + void render_cairo(FilterSlot &slot) override; + void area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) override; + double complexity(Geom::Affine const &ctm) override; - virtual Glib::ustring name() { return Glib::ustring("Tile"); } + Glib::ustring name() override { return Glib::ustring("Tile"); } }; } /* namespace Filters */ diff --git a/src/display/nr-filter-turbulence.h b/src/display/nr-filter-turbulence.h index 3960c2f8e..45b4d881d 100644 --- a/src/display/nr-filter-turbulence.h +++ b/src/display/nr-filter-turbulence.h @@ -42,11 +42,11 @@ class FilterTurbulence : public FilterPrimitive { public: FilterTurbulence(); static FilterPrimitive *create(); - virtual ~FilterTurbulence(); + ~FilterTurbulence() override; - virtual void render_cairo(FilterSlot &slot); - virtual double complexity(Geom::Affine const &ctm); - virtual bool uses_background() { return false; } + void render_cairo(FilterSlot &slot) override; + double complexity(Geom::Affine const &ctm) override; + bool uses_background() override { return false; } void set_baseFrequency(int axis, double freq); void set_numOctaves(int num); @@ -55,7 +55,7 @@ public: void set_type(FilterTurbulenceType t); void set_updated(bool u); - virtual Glib::ustring name() { return Glib::ustring("Turbulence"); } + Glib::ustring name() override { return Glib::ustring("Turbulence"); } private: diff --git a/src/document-subset.cpp b/src/document-subset.cpp index e0ec941f6..f5e60db31 100644 --- a/src/document-subset.cpp +++ b/src/document-subset.cpp @@ -128,7 +128,7 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>, Relations() { records[NULL]; } - ~Relations() { + ~Relations() override { for ( Map::iterator iter=records.begin() ; iter != records.end() ; ++iter ) { diff --git a/src/document.h b/src/document.h index 1f3de042b..f235353cc 100644 --- a/src/document.h +++ b/src/document.h @@ -102,7 +102,7 @@ public: typedef sigc::signal<void> CommitSignal; SPDocument(); - virtual ~SPDocument(); + ~SPDocument() override; sigc::connection connectDestroy(sigc::signal<void>::slot_type slot); diff --git a/src/event-log.h b/src/event-log.h index 3cbcb6d3a..8a4703554 100644 --- a/src/event-log.h +++ b/src/event-log.h @@ -45,7 +45,7 @@ public: typedef Gtk::TreeModel::const_iterator const_iterator; EventLog(SPDocument* document); - virtual ~EventLog(); + ~EventLog() override; /** * Event datatype @@ -68,11 +68,11 @@ public: /** * Modifies the log's entries and the view's selection when triggered. */ - void notifyUndoEvent(Event *log); - void notifyRedoEvent(Event *log); - void notifyUndoCommitEvent(Event *log); - void notifyClearUndoEvent(); - void notifyClearRedoEvent(); + void notifyUndoEvent(Event *log) override; + void notifyRedoEvent(Event *log) override; + void notifyUndoCommitEvent(Event *log) override; + void notifyClearUndoEvent() override; + void notifyClearRedoEvent() override; // Accessor functions diff --git a/src/extension/effect.h b/src/extension/effect.h index 0e28b06ea..a0f478978 100644 --- a/src/extension/effect.h +++ b/src/extension/effect.h @@ -58,7 +58,7 @@ class Effect : public Extension { /** \brief Name with elipses if that makes sense */ gchar * _elip_name; protected: - virtual SPAction * make_action (Inkscape::ActionContext const & context); + SPAction * make_action (Inkscape::ActionContext const & context) override; public: /** \brief Use the Verb initializer with the same parameters. */ EffectVerb(gchar const * id, @@ -80,7 +80,7 @@ class Effect : public Extension { } /** \brief Destructor */ - ~EffectVerb() { + ~EffectVerb() override { if (_elip_name != NULL) { g_free(_elip_name); } @@ -106,8 +106,8 @@ class Effect : public Extension { public: Effect (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp); - virtual ~Effect (void); - virtual bool check (void); + ~Effect (void) override; + bool check (void) override; bool prefs (Inkscape::UI::View::View * doc); void effect (Inkscape::UI::View::View * doc); /** \brief Accessor function for a pointer to the verb */ diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index d725ff8cc..6b629934f 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -400,7 +400,7 @@ protected: int _tempfd; public: ScriptDocCache (Inkscape::UI::View::View * view); - ~ScriptDocCache ( ); + ~ScriptDocCache ( ) override; }; ScriptDocCache::ScriptDocCache (Inkscape::UI::View::View * view) : diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h index c6ae117c7..22c15faa8 100644 --- a/src/extension/implementation/script.h +++ b/src/extension/implementation/script.h @@ -35,19 +35,19 @@ class Script : public Implementation { public: Script(void); - virtual ~Script(); - virtual bool load(Inkscape::Extension::Extension *module); - virtual void unload(Inkscape::Extension::Extension *module); - virtual bool check(Inkscape::Extension::Extension *module); - - ImplementationDocumentCache * newDocCache(Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * view); - - virtual Gtk::Widget *prefs_input(Inkscape::Extension::Input *module, gchar const *filename); - virtual SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename); - virtual Gtk::Widget *prefs_output(Inkscape::Extension::Output *module); - virtual void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename); - virtual void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc, ImplementationDocumentCache * docCache); - virtual bool cancelProcessing (void); + ~Script() override; + bool load(Inkscape::Extension::Extension *module) override; + void unload(Inkscape::Extension::Extension *module) override; + bool check(Inkscape::Extension::Extension *module) override; + + ImplementationDocumentCache * newDocCache(Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * view) override; + + Gtk::Widget *prefs_input(Inkscape::Extension::Input *module, gchar const *filename) override; + SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename) override; + Gtk::Widget *prefs_output(Inkscape::Extension::Output *module) override; + void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename) override; + void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc, ImplementationDocumentCache * docCache) override; + bool cancelProcessing (void) override; private: bool _canceled; diff --git a/src/extension/implementation/xslt.h b/src/extension/implementation/xslt.h index 45befb529..3e5e24a9b 100644 --- a/src/extension/implementation/xslt.h +++ b/src/extension/implementation/xslt.h @@ -39,14 +39,14 @@ private: public: XSLT (void); - bool load(Inkscape::Extension::Extension *module); - void unload(Inkscape::Extension::Extension *module); + bool load(Inkscape::Extension::Extension *module) override; + void unload(Inkscape::Extension::Extension *module) override; - bool check(Inkscape::Extension::Extension *module); + bool check(Inkscape::Extension::Extension *module) override; SPDocument *open(Inkscape::Extension::Input *module, - gchar const *filename); - void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename); + gchar const *filename) override; + void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename) override; }; } /* Inkscape */ diff --git a/src/extension/input.h b/src/extension/input.h index 2a0a177a0..de3d9c0f8 100644 --- a/src/extension/input.h +++ b/src/extension/input.h @@ -31,22 +31,22 @@ public: /* this is a hack for this release, this will be private shortly */ public: struct open_failed : public std::exception { - virtual ~open_failed() throw() {} - const char *what() const throw() { return "Open failed"; } + ~open_failed() throw() override {} + const char *what() const throw() override { return "Open failed"; } }; struct no_extension_found : public std::exception { - virtual ~no_extension_found() throw() {} - const char *what() const throw() { return "No suitable input extension found"; } + ~no_extension_found() throw() override {} + const char *what() const throw() override { return "No suitable input extension found"; } }; struct open_cancelled : public std::exception { - virtual ~open_cancelled() throw() {} - const char *what() const throw() { return "Open was cancelled"; } + ~open_cancelled() throw() override {} + const char *what() const throw() override { return "Open was cancelled"; } }; Input (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp); - virtual ~Input (void); - virtual bool check (void); + ~Input (void) override; + bool check (void) override; SPDocument * open (gchar const *uri); gchar * get_mimetype (void); gchar * get_extension (void); diff --git a/src/extension/internal/bluredge.h b/src/extension/internal/bluredge.h index d8fe056f7..c30372d99 100644 --- a/src/extension/internal/bluredge.h +++ b/src/extension/internal/bluredge.h @@ -23,9 +23,9 @@ namespace Internal { class BlurEdge : public Inkscape::Extension::Implementation::Implementation { public: - bool load(Inkscape::Extension::Extension *module); - void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); - Gtk::Widget * prefs_effect(Inkscape::Extension::Effect * module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); + bool load(Inkscape::Extension::Extension *module) override; + void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; + Gtk::Widget * prefs_effect(Inkscape::Extension::Effect * module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; static void init (void); }; diff --git a/src/extension/internal/cairo-png-out.h b/src/extension/internal/cairo-png-out.h index 93e3ab37f..6a66d7f3e 100644 --- a/src/extension/internal/cairo-png-out.h +++ b/src/extension/internal/cairo-png-out.h @@ -25,10 +25,10 @@ namespace Internal { class CairoRendererOutput : Inkscape::Extension::Implementation::Implementation { public: - bool check(Inkscape::Extension::Extension *module); + bool check(Inkscape::Extension::Extension *module) override; void save(Inkscape::Extension::Output *mod, SPDocument *doc, - gchar const *filename); + gchar const *filename) override; static void init(); }; diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h index 3c273f6d4..e15931de4 100644 --- a/src/extension/internal/cairo-ps-out.h +++ b/src/extension/internal/cairo-ps-out.h @@ -27,24 +27,24 @@ namespace Internal { class CairoPsOutput : Inkscape::Extension::Implementation::Implementation { public: - bool check(Inkscape::Extension::Extension *module); + bool check(Inkscape::Extension::Extension *module) override; void save(Inkscape::Extension::Output *mod, SPDocument *doc, - gchar const *filename); + gchar const *filename) override; static void init(); - bool textToPath(Inkscape::Extension::Print *ext); + bool textToPath(Inkscape::Extension::Print *ext) override; }; class CairoEpsOutput : Inkscape::Extension::Implementation::Implementation { public: - bool check(Inkscape::Extension::Extension *module); + bool check(Inkscape::Extension::Extension *module) override; void save(Inkscape::Extension::Output *mod, SPDocument *doc, - gchar const *uri); + gchar const *uri) override; static void init(); - bool textToPath(Inkscape::Extension::Print *ext); + bool textToPath(Inkscape::Extension::Print *ext) override; }; diff --git a/src/extension/internal/cairo-renderer-pdf-out.h b/src/extension/internal/cairo-renderer-pdf-out.h index 5cb61444b..7910266e7 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.h +++ b/src/extension/internal/cairo-renderer-pdf-out.h @@ -25,10 +25,10 @@ namespace Internal { class CairoRendererPdfOutput : Inkscape::Extension::Implementation::Implementation { public: - bool check(Inkscape::Extension::Extension *module); + bool check(Inkscape::Extension::Extension *module) override; void save(Inkscape::Extension::Output *mod, SPDocument *doc, - gchar const *filename); + gchar const *filename) override; static void init(); }; diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index bfba67282..e6e7d4ed4 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -67,7 +67,7 @@ namespace Internal { class CdrImportDialog : public Gtk::Dialog { public: CdrImportDialog(const std::vector<RVNGString> &vec); - virtual ~CdrImportDialog(); + ~CdrImportDialog() override; bool showDialog(); unsigned getSelectedPage(); diff --git a/src/extension/internal/cdr-input.h b/src/extension/internal/cdr-input.h index 10af41d5a..9b7ef75db 100644 --- a/src/extension/internal/cdr-input.h +++ b/src/extension/internal/cdr-input.h @@ -31,7 +31,7 @@ class CdrInput : public Inkscape::Extension::Implementation::Implementation { CdrInput () { }; public: SPDocument *open( Inkscape::Extension::Input *mod, - const gchar *uri ); + const gchar *uri ) override; static void init( void ); }; diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h index 6cc4ceffb..3c2a814aa 100644 --- a/src/extension/internal/emf-inout.h +++ b/src/extension/internal/emf-inout.h @@ -179,16 +179,16 @@ public: Emf(); // Empty constructor - virtual ~Emf();//Destructor + ~Emf() override;//Destructor - bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now) + bool check(Inkscape::Extension::Extension *module) override; //Can this module load (always yes for now) void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename SPDocument *doc, - gchar const *filename); + gchar const *filename) override; - virtual SPDocument *open( Inkscape::Extension::Input *mod, - const gchar *uri ); + SPDocument *open( Inkscape::Extension::Input *mod, + const gchar *uri ) override; static void init(void);//Initialize the class diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h index 5e9a67ca1..43267dd2d 100644 --- a/src/extension/internal/emf-print.h +++ b/src/extension/internal/emf-print.h @@ -37,32 +37,32 @@ public: PrintEmf(); /* Print functions */ - virtual unsigned int setup (Inkscape::Extension::Print * module); + unsigned int setup (Inkscape::Extension::Print * module) override; - virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc); - virtual unsigned int finish (Inkscape::Extension::Print * module); + unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc) override; + unsigned int finish (Inkscape::Extension::Print * module) override; /* Rendering methods */ - virtual unsigned int fill (Inkscape::Extension::Print *module, + unsigned int fill (Inkscape::Extension::Print *module, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, - Geom::OptRect const &bbox); - virtual unsigned int stroke (Inkscape::Extension::Print * module, + Geom::OptRect const &bbox) override; + unsigned int stroke (Inkscape::Extension::Print * module, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, - Geom::OptRect const &bbox); - virtual unsigned int image(Inkscape::Extension::Print *module, + Geom::OptRect const &bbox) override; + unsigned int image(Inkscape::Extension::Print *module, unsigned char *px, unsigned int w, unsigned int h, unsigned int rs, Geom::Affine const &transform, - SPStyle const *style); - virtual unsigned int comment(Inkscape::Extension::Print *module, const char * comment); - virtual unsigned int text(Inkscape::Extension::Print *module, char const *text, - Geom::Point const &p, SPStyle const *style); + SPStyle const *style) override; + unsigned int comment(Inkscape::Extension::Print *module, const char * comment) override; + unsigned int text(Inkscape::Extension::Print *module, char const *text, + Geom::Point const &p, SPStyle const *style) override; static void init (void); protected: @@ -77,10 +77,10 @@ protected: Geom::Point get_pathrect_corner(Geom::Path pathRect, double angle, int corner); U_TRIVERTEX make_trivertex(Geom::Point Pt, U_COLORREF uc); int vector_rect_alignment(double angle, Geom::Point vtest); - int create_brush(SPStyle const *style, PU_COLORREF fcolor); - void destroy_brush(); - int create_pen(SPStyle const *style, const Geom::Affine &transform); - void destroy_pen(); + int create_brush(SPStyle const *style, PU_COLORREF fcolor) override; + void destroy_brush() override; + int create_pen(SPStyle const *style, const Geom::Affine &transform) override; + void destroy_pen() override; }; } /* namespace Internal */ diff --git a/src/extension/internal/filter/bevels.h b/src/extension/internal/filter/bevels.h index 68e94ad3d..91fe2f8cf 100644 --- a/src/extension/internal/filter/bevels.h +++ b/src/extension/internal/filter/bevels.h @@ -41,11 +41,11 @@ namespace Filter { class DiffuseLight : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: DiffuseLight ( ) : Filter() { }; - virtual ~DiffuseLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~DiffuseLight ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -121,11 +121,11 @@ DiffuseLight::get_filter_text (Inkscape::Extension::Extension * ext) class MatteJelly : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: MatteJelly ( ) : Filter() { }; - virtual ~MatteJelly ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~MatteJelly ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -205,11 +205,11 @@ MatteJelly::get_filter_text (Inkscape::Extension::Extension * ext) class SpecularLight : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: SpecularLight ( ) : Filter() { }; - virtual ~SpecularLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~SpecularLight ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/blurs.h b/src/extension/internal/filter/blurs.h index 859fadb87..0956b23b6 100644 --- a/src/extension/internal/filter/blurs.h +++ b/src/extension/internal/filter/blurs.h @@ -42,11 +42,11 @@ namespace Filter { class Blur : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Blur ( ) : Filter() { }; - virtual ~Blur ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Blur ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -113,11 +113,11 @@ Blur::get_filter_text (Inkscape::Extension::Extension * ext) class CleanEdges : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: CleanEdges ( ) : Filter() { }; - virtual ~CleanEdges ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~CleanEdges ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -173,11 +173,11 @@ CleanEdges::get_filter_text (Inkscape::Extension::Extension * ext) class CrossBlur : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: CrossBlur ( ) : Filter() { }; - virtual ~CrossBlur ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~CrossBlur ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -248,11 +248,11 @@ CrossBlur::get_filter_text (Inkscape::Extension::Extension * ext) class Feather : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Feather ( ) : Filter() { }; - virtual ~Feather ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Feather ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -313,11 +313,11 @@ Feather::get_filter_text (Inkscape::Extension::Extension * ext) class ImageBlur : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ImageBlur ( ) : Filter() { }; - virtual ~ImageBlur ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ImageBlur ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h index cbda5ea35..95f6170f3 100644 --- a/src/extension/internal/filter/bumps.h +++ b/src/extension/internal/filter/bumps.h @@ -68,11 +68,11 @@ namespace Filter { class Bump : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Bump ( ) : Filter() { }; - virtual ~Bump ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Bump ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -297,11 +297,11 @@ Bump::get_filter_text (Inkscape::Extension::Extension * ext) class WaxBump : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: WaxBump ( ) : Filter() { }; - virtual ~WaxBump ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~WaxBump ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h index 921ff3171..063073267 100644 --- a/src/extension/internal/filter/color.h +++ b/src/extension/internal/filter/color.h @@ -62,11 +62,11 @@ namespace Filter { */ class Brilliance : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Brilliance ( ) : Filter() { }; - virtual ~Brilliance ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Brilliance ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -142,11 +142,11 @@ Brilliance::get_filter_text (Inkscape::Extension::Extension * ext) */ class ChannelPaint : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ChannelPaint ( ) : Filter() { }; - virtual ~ChannelPaint ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ChannelPaint ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -243,11 +243,11 @@ ChannelPaint::get_filter_text (Inkscape::Extension::Extension * ext) */ class ColorBlindness : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ColorBlindness ( ) : Filter() { }; - virtual ~ColorBlindness ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ColorBlindness ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -318,11 +318,11 @@ ColorBlindness::get_filter_text (Inkscape::Extension::Extension * ext) class ColorShift : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ColorShift ( ) : Filter() { }; - virtual ~ColorShift ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ColorShift ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -381,11 +381,11 @@ ColorShift::get_filter_text (Inkscape::Extension::Extension * ext) class Colorize : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Colorize ( ) : Filter() { }; - virtual ~Colorize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Colorize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -488,11 +488,11 @@ Colorize::get_filter_text (Inkscape::Extension::Extension * ext) */ class ComponentTransfer : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ComponentTransfer ( ) : Filter() { }; - virtual ~ComponentTransfer ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ComponentTransfer ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -573,11 +573,11 @@ ComponentTransfer::get_filter_text (Inkscape::Extension::Extension * ext) class Duochrome : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Duochrome ( ) : Filter() { }; - virtual ~Duochrome ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Duochrome ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -698,11 +698,11 @@ Duochrome::get_filter_text (Inkscape::Extension::Extension * ext) */ class ExtractChannel : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ExtractChannel ( ) : Filter() { }; - virtual ~ExtractChannel ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ExtractChannel ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -804,11 +804,11 @@ ExtractChannel::get_filter_text (Inkscape::Extension::Extension * ext) */ class FadeToBW : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: FadeToBW ( ) : Filter() { }; - virtual ~FadeToBW ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~FadeToBW ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -883,11 +883,11 @@ FadeToBW::get_filter_text (Inkscape::Extension::Extension * ext) */ class Greyscale : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Greyscale ( ) : Filter() { }; - virtual ~Greyscale ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Greyscale ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -969,11 +969,11 @@ Greyscale::get_filter_text (Inkscape::Extension::Extension * ext) class Invert : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Invert ( ) : Filter() { }; - virtual ~Invert ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Invert ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1104,11 +1104,11 @@ Invert::get_filter_text (Inkscape::Extension::Extension * ext) */ class Lighting : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Lighting ( ) : Filter() { }; - virtual ~Lighting ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Lighting ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1175,11 +1175,11 @@ Lighting::get_filter_text (Inkscape::Extension::Extension * ext) */ class LightnessContrast : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: LightnessContrast ( ) : Filter() { }; - virtual ~LightnessContrast ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~LightnessContrast ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1254,11 +1254,11 @@ LightnessContrast::get_filter_text (Inkscape::Extension::Extension * ext) */ class NudgeRGB : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: NudgeRGB ( ) : Filter() { }; - virtual ~NudgeRGB ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~NudgeRGB ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1366,11 +1366,11 @@ NudgeRGB::get_filter_text (Inkscape::Extension::Extension * ext) */ class NudgeCMY : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: NudgeCMY ( ) : Filter() { }; - virtual ~NudgeCMY ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~NudgeCMY ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1472,11 +1472,11 @@ NudgeCMY::get_filter_text (Inkscape::Extension::Extension * ext) class Quadritone : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Quadritone ( ) : Filter() { }; - virtual ~Quadritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Quadritone ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1555,11 +1555,11 @@ Quadritone::get_filter_text (Inkscape::Extension::Extension * ext) */ class SimpleBlend : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: SimpleBlend ( ) : Filter() { }; - virtual ~SimpleBlend ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~SimpleBlend ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1641,11 +1641,11 @@ SimpleBlend::get_filter_text (Inkscape::Extension::Extension * ext) class Solarize : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Solarize ( ) : Filter() { }; - virtual ~Solarize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Solarize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -1728,11 +1728,11 @@ Solarize::get_filter_text (Inkscape::Extension::Extension * ext) class Tritone : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Tritone ( ) : Filter() { }; - virtual ~Tritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Tritone ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/distort.h b/src/extension/internal/filter/distort.h index 56aab51f5..6d1fc0a75 100644 --- a/src/extension/internal/filter/distort.h +++ b/src/extension/internal/filter/distort.h @@ -55,11 +55,11 @@ namespace Filter { class FeltFeather : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: FeltFeather ( ) : Filter() { }; - virtual ~FeltFeather ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~FeltFeather ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -178,11 +178,11 @@ FeltFeather::get_filter_text (Inkscape::Extension::Extension * ext) class Roughen : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Roughen ( ) : Filter() { }; - virtual ~Roughen ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Roughen ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp index c18879430..07a7eb0af 100644 --- a/src/extension/internal/filter/filter-file.cpp +++ b/src/extension/internal/filter/filter-file.cpp @@ -78,9 +78,9 @@ void Filter::filters_all_files(void) class mywriter : public Inkscape::IO::BasicWriter { Glib::ustring _str; public: - void close(void); - void flush(void); - void put (gunichar ch); + void close(void) override; + void flush(void) override; + void put (gunichar ch) override; gchar const * c_str (void) { return _str.c_str(); } }; diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h index 8fa086b69..ea4ae2302 100644 --- a/src/extension/internal/filter/filter.h +++ b/src/extension/internal/filter/filter.h @@ -42,11 +42,11 @@ private: public: Filter(); Filter(gchar const * filter); - virtual ~Filter(); + ~Filter() override; - bool load(Inkscape::Extension::Extension *module); - Inkscape::Extension::Implementation::ImplementationDocumentCache * newDocCache (Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * doc); - void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); + bool load(Inkscape::Extension::Extension *module) override; + Inkscape::Extension::Implementation::ImplementationDocumentCache * newDocCache (Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * doc) override; + void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; static void filter_init(gchar const * id, gchar const * name, gchar const * submenu, gchar const * tip, gchar const * filter); static void filters_all(void); diff --git a/src/extension/internal/filter/image.h b/src/extension/internal/filter/image.h index 868588f80..9cbe05e2f 100644 --- a/src/extension/internal/filter/image.h +++ b/src/extension/internal/filter/image.h @@ -37,11 +37,11 @@ namespace Filter { */ class EdgeDetect : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: EdgeDetect ( ) : Filter() { }; - virtual ~EdgeDetect ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~EdgeDetect ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h index e1785f7d3..025cca8fe 100644 --- a/src/extension/internal/filter/morphology.h +++ b/src/extension/internal/filter/morphology.h @@ -46,11 +46,11 @@ namespace Filter { class Crosssmooth : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Crosssmooth ( ) : Filter() { }; - virtual ~Crosssmooth ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Crosssmooth ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -154,11 +154,11 @@ Crosssmooth::get_filter_text (Inkscape::Extension::Extension * ext) class Outline : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Outline ( ) : Filter() { }; - virtual ~Outline ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Outline ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/overlays.h b/src/extension/internal/filter/overlays.h index f6c0509c8..a0436e2ad 100644 --- a/src/extension/internal/filter/overlays.h +++ b/src/extension/internal/filter/overlays.h @@ -44,11 +44,11 @@ namespace Filter { class NoiseFill : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: NoiseFill ( ) : Filter() { }; - virtual ~NoiseFill ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~NoiseFill ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h index 43f4b6c90..653008fc6 100644 --- a/src/extension/internal/filter/paint.h +++ b/src/extension/internal/filter/paint.h @@ -59,11 +59,11 @@ namespace Filter { */ class Chromolitho : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Chromolitho ( ) : Filter() { }; - virtual ~Chromolitho ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Chromolitho ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -220,11 +220,11 @@ Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext) */ class CrossEngraving : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: CrossEngraving ( ) : Filter() { }; - virtual ~CrossEngraving ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~CrossEngraving ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -319,11 +319,11 @@ CrossEngraving::get_filter_text (Inkscape::Extension::Extension * ext) class Drawing : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Drawing ( ) : Filter() { }; - virtual ~Drawing ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Drawing ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -482,11 +482,11 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext) */ class Electrize : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Electrize ( ) : Filter() { }; - virtual ~Electrize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Electrize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -572,11 +572,11 @@ Electrize::get_filter_text (Inkscape::Extension::Extension * ext) */ class NeonDraw : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: NeonDraw ( ) : Filter() { }; - virtual ~NeonDraw ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~NeonDraw ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -675,11 +675,11 @@ NeonDraw::get_filter_text (Inkscape::Extension::Extension * ext) class PointEngraving : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: PointEngraving ( ) : Filter() { }; - virtual ~PointEngraving ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~PointEngraving ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -838,11 +838,11 @@ PointEngraving::get_filter_text (Inkscape::Extension::Extension * ext) */ class Posterize : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Posterize ( ) : Filter() { }; - virtual ~Posterize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Posterize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -961,11 +961,11 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext) */ class PosterizeBasic : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: PosterizeBasic ( ) : Filter() { }; - virtual ~PosterizeBasic ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~PosterizeBasic ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/protrusions.h b/src/extension/internal/filter/protrusions.h index d6fd315db..c4cd2a688 100644 --- a/src/extension/internal/filter/protrusions.h +++ b/src/extension/internal/filter/protrusions.h @@ -35,11 +35,11 @@ namespace Filter { */ class Snow : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Snow ( ) : Filter() { }; - virtual ~Snow ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Snow ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } public: static void init (void) { diff --git a/src/extension/internal/filter/shadows.h b/src/extension/internal/filter/shadows.h index e69e05669..cca34e2a2 100644 --- a/src/extension/internal/filter/shadows.h +++ b/src/extension/internal/filter/shadows.h @@ -45,11 +45,11 @@ namespace Filter { */ class ColorizableDropShadow : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ColorizableDropShadow ( ) : Filter() { }; - virtual ~ColorizableDropShadow ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ColorizableDropShadow ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/filter/textures.h b/src/extension/internal/filter/textures.h index a2584c627..39b1789b3 100644 --- a/src/extension/internal/filter/textures.h +++ b/src/extension/internal/filter/textures.h @@ -49,11 +49,11 @@ namespace Filter { */ class InkBlot : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: InkBlot ( ) : Filter() { }; - virtual ~InkBlot ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~InkBlot ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } public: static void init (void) { diff --git a/src/extension/internal/filter/transparency.h b/src/extension/internal/filter/transparency.h index da89498bb..b3498a638 100644 --- a/src/extension/internal/filter/transparency.h +++ b/src/extension/internal/filter/transparency.h @@ -41,11 +41,11 @@ namespace Filter { class Blend : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Blend ( ) : Filter() { }; - virtual ~Blend ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Blend ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -118,11 +118,11 @@ Blend::get_filter_text (Inkscape::Extension::Extension * ext) */ class ChannelTransparency : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: ChannelTransparency ( ) : Filter() { }; - virtual ~ChannelTransparency ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~ChannelTransparency ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -193,11 +193,11 @@ ChannelTransparency::get_filter_text (Inkscape::Extension::Extension * ext) */ class LightEraser : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: LightEraser ( ) : Filter() { }; - virtual ~LightEraser ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~LightEraser ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -267,11 +267,11 @@ LightEraser::get_filter_text (Inkscape::Extension::Extension * ext) */ class Opacity : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Opacity ( ) : Filter() { }; - virtual ~Opacity ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Opacity ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( @@ -329,11 +329,11 @@ Opacity::get_filter_text (Inkscape::Extension::Extension * ext) class Silhouette : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override; public: Silhouette ( ) : Filter() { }; - virtual ~Silhouette ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + ~Silhouette ( ) override { if (_filter != NULL) g_free((void *)_filter); return; } static void init (void) { Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/gdkpixbuf-input.h b/src/extension/internal/gdkpixbuf-input.h index 2e03a96db..347277e90 100644 --- a/src/extension/internal/gdkpixbuf-input.h +++ b/src/extension/internal/gdkpixbuf-input.h @@ -10,7 +10,7 @@ namespace Internal { class GdkpixbufInput : Inkscape::Extension::Implementation::Implementation { public: SPDocument *open(Inkscape::Extension::Input *mod, - char const *uri); + char const *uri) override; static void init(); }; diff --git a/src/extension/internal/gimpgrad.h b/src/extension/internal/gimpgrad.h index c34de840d..790c43b75 100644 --- a/src/extension/internal/gimpgrad.h +++ b/src/extension/internal/gimpgrad.h @@ -25,9 +25,9 @@ namespace Internal { class GimpGrad : public Inkscape::Extension::Implementation::Implementation { public: - bool load(Inkscape::Extension::Extension *module); - void unload(Inkscape::Extension::Extension *module); - SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename); + bool load(Inkscape::Extension::Extension *module) override; + void unload(Inkscape::Extension::Extension *module) override; + SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename) override; static void init(); }; diff --git a/src/extension/internal/grid.h b/src/extension/internal/grid.h index c54135d81..7d25c7b20 100644 --- a/src/extension/internal/grid.h +++ b/src/extension/internal/grid.h @@ -23,9 +23,9 @@ namespace Internal { class Grid : public Inkscape::Extension::Implementation::Implementation { public: - bool load(Inkscape::Extension::Extension *module); - void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); - Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); + bool load(Inkscape::Extension::Extension *module) override; + void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; + Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; static void init (void); }; diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h index ec1cde032..f9d209b86 100644 --- a/src/extension/internal/javafx-out.h +++ b/src/extension/internal/javafx-out.h @@ -51,13 +51,13 @@ public: /** * Check whether we can actually output using this module */ - virtual bool check (Inkscape::Extension::Extension * module); + bool check (Inkscape::Extension::Extension * module) override; /** * API call to perform the output to a file */ - virtual void save(Inkscape::Extension::Output *mod, - SPDocument *doc, gchar const *filename); + void save(Inkscape::Extension::Output *mod, + SPDocument *doc, gchar const *filename) override; /** * Inkscape runtime startup call. diff --git a/src/extension/internal/latex-pstricks-out.h b/src/extension/internal/latex-pstricks-out.h index a12cdc3c1..842a52655 100644 --- a/src/extension/internal/latex-pstricks-out.h +++ b/src/extension/internal/latex-pstricks-out.h @@ -22,13 +22,13 @@ class LatexOutput : Inkscape::Extension::Implementation::Implementation { //This public: LatexOutput(); // Empty constructor - virtual ~LatexOutput();//Destructor + ~LatexOutput() override;//Destructor - bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now) + bool check(Inkscape::Extension::Extension *module) override; //Can this module load (always yes for now) void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename SPDocument *doc, - gchar const *filename); + gchar const *filename) override; static void init(void);//Initialize the class }; diff --git a/src/extension/internal/latex-pstricks.h b/src/extension/internal/latex-pstricks.h index 5bc6eeb22..9b9519c55 100644 --- a/src/extension/internal/latex-pstricks.h +++ b/src/extension/internal/latex-pstricks.h @@ -38,28 +38,28 @@ class PrintLatex : public Inkscape::Extension::Implementation::Implementation { public: PrintLatex (void); - virtual ~PrintLatex (void); + ~PrintLatex (void) override; /* Print functions */ - virtual unsigned int setup (Inkscape::Extension::Print * module); + unsigned int setup (Inkscape::Extension::Print * module) override; - virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc); - virtual unsigned int finish (Inkscape::Extension::Print * module); + unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc) override; + unsigned int finish (Inkscape::Extension::Print * module) override; /* Rendering methods */ - virtual unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity); - virtual unsigned int release(Inkscape::Extension::Print *module); + unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity) override; + unsigned int release(Inkscape::Extension::Print *module) override; - virtual unsigned int fill (Inkscape::Extension::Print *module, Geom::PathVector const &pathv, + unsigned int fill (Inkscape::Extension::Print *module, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, - Geom::OptRect const &bbox); - virtual unsigned int stroke (Inkscape::Extension::Print *module, Geom::PathVector const &pathv, + Geom::OptRect const &bbox) override; + unsigned int stroke (Inkscape::Extension::Print *module, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, - Geom::OptRect const &bbox); - virtual unsigned int comment(Inkscape::Extension::Print *module, const char * comment); - bool textToPath (Inkscape::Extension::Print * ext); + Geom::OptRect const &bbox) override; + unsigned int comment(Inkscape::Extension::Print *module, const char * comment) override; + bool textToPath (Inkscape::Extension::Print * ext) override; static void init (void); }; diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h index fd6ef28a8..f8562839e 100644 --- a/src/extension/internal/metafile-inout.h +++ b/src/extension/internal/metafile-inout.h @@ -63,7 +63,7 @@ class Metafile { public: Metafile() {} - ~Metafile(); + ~Metafile() override; protected: static uint32_t sethexcolor(U_COLORREF color); diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h index eac93cbda..156610657 100644 --- a/src/extension/internal/metafile-print.h +++ b/src/extension/internal/metafile-print.h @@ -49,11 +49,11 @@ class PrintMetafile { public: PrintMetafile() {} - ~PrintMetafile(); + ~PrintMetafile() override; - bool textToPath (Inkscape::Extension::Print * ext); - unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity); - unsigned int release(Inkscape::Extension::Print *module); + bool textToPath (Inkscape::Extension::Print * ext) override; + unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity) override; + unsigned int release(Inkscape::Extension::Print *module) override; protected: struct GRADVALUES { diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 2e01d2e49..1c1d7c6f6 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -266,11 +266,11 @@ class OdfOutput : public Inkscape::Extension::Implementation::Implementation public: - bool check (Inkscape::Extension::Extension * module); + bool check (Inkscape::Extension::Extension * module) override; void save (Inkscape::Extension::Output *mod, SPDocument *doc, - gchar const *filename); + gchar const *filename) override; static void init (void); diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h index a70d40a23..ae820946d 100644 --- a/src/extension/internal/pdfinput/pdf-input.h +++ b/src/extension/internal/pdfinput/pdf-input.h @@ -63,7 +63,7 @@ class PdfImportDialog : public Gtk::Dialog { public: PdfImportDialog(PDFDoc *doc, const gchar *uri); - virtual ~PdfImportDialog(); + ~PdfImportDialog() override; bool showDialog(); int getSelectedPage(); @@ -135,9 +135,9 @@ class PdfInput: public Inkscape::Extension::Implementation::Implementation { PdfInput () { }; public: SPDocument *open( Inkscape::Extension::Input *mod, - const gchar *uri ); + const gchar *uri ) override; static void init( void ); - virtual bool wasCancelled(); + bool wasCancelled() override; private: bool _cancelled; }; diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h index 3f7aa7e90..75ae0460d 100644 --- a/src/extension/internal/pov-out.h +++ b/src/extension/internal/pov-out.h @@ -54,13 +54,13 @@ public: /** * Check whether we can actually output using this module */ - bool check (Inkscape::Extension::Extension * module); + bool check (Inkscape::Extension::Extension * module) override; /** * API call to perform the output to a file */ void save(Inkscape::Extension::Output *mod, - SPDocument *doc, gchar const *filename); + SPDocument *doc, gchar const *filename) override; /** * Inkscape runtime startup call. diff --git a/src/extension/internal/svg.h b/src/extension/internal/svg.h index b97735dd8..a7b593d54 100644 --- a/src/extension/internal/svg.h +++ b/src/extension/internal/svg.h @@ -24,11 +24,11 @@ namespace Internal { class Svg : public Inkscape::Extension::Implementation::Implementation { public: - virtual void save( Inkscape::Extension::Output *mod, + void save( Inkscape::Extension::Output *mod, SPDocument *doc, - gchar const *filename ); - virtual SPDocument *open( Inkscape::Extension::Input *mod, - const gchar *uri ); + gchar const *filename ) override; + SPDocument *open( Inkscape::Extension::Input *mod, + const gchar *uri ) override; static void init( void ); }; diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 7c92a895d..b650e2876 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -66,7 +66,7 @@ namespace Internal { class VsdImportDialog : public Gtk::Dialog { public: VsdImportDialog(const std::vector<RVNGString> &vec); - virtual ~VsdImportDialog(); + ~VsdImportDialog() override; bool showDialog(); unsigned getSelectedPage(); diff --git a/src/extension/internal/vsd-input.h b/src/extension/internal/vsd-input.h index acc52debf..2cc20747a 100644 --- a/src/extension/internal/vsd-input.h +++ b/src/extension/internal/vsd-input.h @@ -31,7 +31,7 @@ class VsdInput : public Inkscape::Extension::Implementation::Implementation { VsdInput () { }; public: SPDocument *open( Inkscape::Extension::Input *mod, - const gchar *uri ); + const gchar *uri ) override; static void init( void ); }; diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h index 19cf53956..02280f6d8 100644 --- a/src/extension/internal/wmf-inout.h +++ b/src/extension/internal/wmf-inout.h @@ -172,16 +172,16 @@ class Wmf : public Metafile public: Wmf(); // Empty constructor - virtual ~Wmf();//Destructor + ~Wmf() override;//Destructor - bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now) + bool check(Inkscape::Extension::Extension *module) override; //Can this module load (always yes for now) void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename SPDocument *doc, - gchar const *filename); + gchar const *filename) override; - virtual SPDocument *open( Inkscape::Extension::Input *mod, - const gchar *uri ); + SPDocument *open( Inkscape::Extension::Input *mod, + const gchar *uri ) override; static void init(void);//Initialize the class diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h index be35da717..c271e3cf7 100644 --- a/src/extension/internal/wmf-print.h +++ b/src/extension/internal/wmf-print.h @@ -37,41 +37,41 @@ public: PrintWmf(); /* Print functions */ - virtual unsigned int setup (Inkscape::Extension::Print * module); + unsigned int setup (Inkscape::Extension::Print * module) override; - virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc); - virtual unsigned int finish (Inkscape::Extension::Print * module); + unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc) override; + unsigned int finish (Inkscape::Extension::Print * module) override; /* Rendering methods */ - virtual unsigned int fill (Inkscape::Extension::Print *module, + unsigned int fill (Inkscape::Extension::Print *module, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, - Geom::OptRect const &bbox); - virtual unsigned int stroke (Inkscape::Extension::Print * module, + Geom::OptRect const &bbox) override; + unsigned int stroke (Inkscape::Extension::Print * module, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, - Geom::OptRect const &bbox); - virtual unsigned int image(Inkscape::Extension::Print *module, + Geom::OptRect const &bbox) override; + unsigned int image(Inkscape::Extension::Print *module, unsigned char *px, unsigned int w, unsigned int h, unsigned int rs, Geom::Affine const &transform, - SPStyle const *style); - virtual unsigned int comment(Inkscape::Extension::Print *module, const char * comment); - virtual unsigned int text(Inkscape::Extension::Print *module, char const *text, - Geom::Point const &p, SPStyle const *style); + SPStyle const *style) override; + unsigned int comment(Inkscape::Extension::Print *module, const char * comment) override; + unsigned int text(Inkscape::Extension::Print *module, char const *text, + Geom::Point const &p, SPStyle const *style) override; static void init (void); protected: static void smuggle_adxky_out(const char *string, int16_t **adx, double *ky, int *rtl, int *ndx, float scale); - int create_brush(SPStyle const *style, PU_COLORREF fcolor); - void destroy_brush(); - int create_pen(SPStyle const *style, const Geom::Affine &transform); - void destroy_pen(); + int create_brush(SPStyle const *style, PU_COLORREF fcolor) override; + void destroy_brush() override; + int create_pen(SPStyle const *style, const Geom::Affine &transform) override; + void destroy_pen() override; }; } /* namespace Internal */ diff --git a/src/extension/internal/wpg-input.h b/src/extension/internal/wpg-input.h index ca882039b..4ee041eb9 100644 --- a/src/extension/internal/wpg-input.h +++ b/src/extension/internal/wpg-input.h @@ -25,7 +25,7 @@ class WpgInput : public Inkscape::Extension::Implementation::Implementation { WpgInput () { }; public: SPDocument *open( Inkscape::Extension::Input *mod, - const gchar *uri ); + const gchar *uri ) override; static void init( void ); }; diff --git a/src/extension/output.h b/src/extension/output.h index 420eb9245..c28706cf4 100644 --- a/src/extension/output.h +++ b/src/extension/output.h @@ -39,8 +39,8 @@ public: Output (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp); - virtual ~Output (void); - virtual bool check (void); + ~Output (void) override; + bool check (void) override; void save (SPDocument *doc, gchar const *uri); bool prefs (void); diff --git a/src/extension/param/bool.h b/src/extension/param/bool.h index 826a98927..f987621d5 100644 --- a/src/extension/param/bool.h +++ b/src/extension/param/bool.h @@ -61,16 +61,16 @@ public: * Creates a bool check button for a bool parameter. * Builds a hbox with a label and a check button in it. */ - Gtk::Widget *get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget *get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::list <std::string> &list) const { return Parameter::string(list); } + void string(std::list <std::string> &list) const override { return Parameter::string(list); } /** * Appends 'true' or 'false'. * @todo investigate. Returning a value that can then be appended would probably work better/safer. */ - virtual void string(std::string &string) const; + void string(std::string &string) const override; private: /** Internal value. */ diff --git a/src/extension/param/color.h b/src/extension/param/color.h index 890f5ba5f..ed272ea2a 100644 --- a/src/extension/param/color.h +++ b/src/extension/param/color.h @@ -38,19 +38,19 @@ public: int indent, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml); - virtual ~ParamColor(void); + ~ParamColor(void) override; /** Returns \c _value, with a \i const to protect it. */ guint32 get( SPDocument const * /*doc*/, Inkscape::XML::Node const * /*node*/ ) const { return _color.value(); } guint32 set (guint32 in, SPDocument * doc, Inkscape::XML::Node * node); - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::list <std::string> &list) const { return Parameter::string(list); } + void string(std::list <std::string> &list) const override { return Parameter::string(list); } - virtual void string (std::string &string) const; + void string (std::string &string) const override; sigc::signal<void> * _changeSignal; diff --git a/src/extension/param/description.h b/src/extension/param/description.h index 599c4db78..84e402890 100644 --- a/src/extension/param/description.h +++ b/src/extension/param/description.h @@ -38,7 +38,7 @@ public: Inkscape::XML::Node * xml, AppearanceMode mode); - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; private: /** \brief Internal value. */ gchar * _value; diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h index d34c0dcaa..b60eacf0f 100644 --- a/src/extension/param/enum.h +++ b/src/extension/param/enum.h @@ -60,14 +60,14 @@ public: int indent, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml); - virtual ~ParamComboBox(void); + ~ParamComboBox(void) override; - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::list <std::string> &list) const { return Parameter::string(list); } + void string(std::list <std::string> &list) const override { return Parameter::string(list); } - virtual void string(std::string &string) const; + void string(std::string &string) const override; gchar const *get(SPDocument const * /*doc*/, Inkscape::XML::Node const * /*node*/) const { return _value; } diff --git a/src/extension/param/float.h b/src/extension/param/float.h index d58253ccb..c7ac11c6f 100644 --- a/src/extension/param/float.h +++ b/src/extension/param/float.h @@ -49,12 +49,12 @@ public: float precision (void) { return _precision; } - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::list <std::string> &list) const { return Parameter::string(list); } + void string(std::list <std::string> &list) const override { return Parameter::string(list); } - virtual void string(std::string &string) const; + void string(std::string &string) const override; private: /** Internal value. */ diff --git a/src/extension/param/int.h b/src/extension/param/int.h index fcb1ef3f1..5b3cfb364 100644 --- a/src/extension/param/int.h +++ b/src/extension/param/int.h @@ -47,12 +47,12 @@ public: int min (void) { return _min; } - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::list <std::string> &list) const { return Parameter::string(list); } + void string(std::list <std::string> &list) const override { return Parameter::string(list); } - virtual void string(std::string &string) const; + void string(std::string &string) const override; private: /** Internal value. */ diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h index f1bebd372..52577dd48 100644 --- a/src/extension/param/notebook.h +++ b/src/extension/param/notebook.h @@ -55,12 +55,12 @@ private: bool hidden, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml); - ~ParamNotebookPage(void); + ~ParamNotebookPage(void) override; - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; void paramString (std::list <std::string> &list); gchar * get_text (void) {return _text;}; - Parameter * get_param (const gchar * name); + Parameter * get_param (const gchar * name) override; }; /* class ParamNotebookPage */ @@ -75,21 +75,21 @@ public: int indent, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml); - virtual ~ParamNotebook(void); + ~ParamNotebook(void) override; - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; /** * A function to get the currentpage and the parameters in a string form. * @return A string with the 'value' and all the parameters on all pages as command line arguments. */ - virtual void string (std::list <std::string> &list) const; + void string (std::list <std::string> &list) const override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::string &string) const {return Parameter::string(string);} + void string(std::string &string) const override {return Parameter::string(string);} - Parameter * get_param (const gchar * name); + Parameter * get_param (const gchar * name) override; const gchar * get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; } const gchar * set (const int in, SPDocument * doc, Inkscape::XML::Node * node); diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 890b92219..5598081f3 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -237,7 +237,7 @@ public: { this->signal_changed().connect(sigc::mem_fun(this, &ComboWdg::changed)); } - virtual ~ComboWdg() {} + ~ComboWdg() override {} void changed (void); }; diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h index e3ced8eb8..b96defe10 100644 --- a/src/extension/param/radiobutton.h +++ b/src/extension/param/radiobutton.h @@ -43,14 +43,14 @@ public: Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml, AppearanceMode mode); - virtual ~ParamRadioButton(void); + ~ParamRadioButton(void) override; - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::list <std::string> &list) const { return Parameter::string(list); } + void string(std::list <std::string> &list) const override { return Parameter::string(list); } - virtual void string(std::string &string) const; + void string(std::string &string) const override; Glib::ustring value_from_label(const Glib::ustring label); diff --git a/src/extension/param/string.h b/src/extension/param/string.h index 82eebee7f..e911565fe 100644 --- a/src/extension/param/string.h +++ b/src/extension/param/string.h @@ -30,19 +30,19 @@ public: int indent, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml); - virtual ~ParamString(void); + ~ParamString(void) override; /** \brief Returns \c _value, with a \i const to protect it. */ const gchar *get(SPDocument const * /*doc*/, Inkscape::XML::Node const * /*node*/) const { return _value; } const gchar * set (const gchar * in, SPDocument * doc, Inkscape::XML::Node * node); - Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal); + Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override; // Explicitly call superclass version to avoid method being hidden. - virtual void string(std::list <std::string> &list) const { return Parameter::string(list); } + void string(std::list <std::string> &list) const override { return Parameter::string(list); } - virtual void string(std::string &string) const; + void string(std::string &string) const override; void setMaxLength(int maxLenght) { _max_length = maxLenght; } int getMaxLength(void) { return _max_length; } diff --git a/src/extension/patheffect.h b/src/extension/patheffect.h index 0c00ae093..a89651ae3 100644 --- a/src/extension/patheffect.h +++ b/src/extension/patheffect.h @@ -21,7 +21,7 @@ class PathEffect : public Extension { public: PathEffect (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp); - virtual ~PathEffect (void); + ~PathEffect (void) override; void processPath (SPDocument * doc, Inkscape::XML::Node * path, Inkscape::XML::Node * def); diff --git a/src/extension/plugins/grid2/grid.h b/src/extension/plugins/grid2/grid.h index b4997bb18..8f139b917 100644 --- a/src/extension/plugins/grid2/grid.h +++ b/src/extension/plugins/grid2/grid.h @@ -32,8 +32,8 @@ namespace Internal { class Grid : public Inkscape::Extension::Implementation::Implementation { public: - bool load(Inkscape::Extension::Extension *module); - void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); + bool load(Inkscape::Extension::Extension *module) override; + void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); }; diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h index 4714c2c3f..0c0bfcb88 100644 --- a/src/extension/prefdialog.h +++ b/src/extension/prefdialog.h @@ -66,14 +66,14 @@ class PrefDialog : public Gtk::Dialog { void preview_toggle(void); void param_change(void); bool param_timer_expire(void); - void on_response (int signal); + void on_response (int signal) override; public: PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * controls = NULL, Effect * effect = NULL); - virtual ~PrefDialog (); + ~PrefDialog () override; }; diff --git a/src/extension/print.h b/src/extension/print.h index b5e6c1065..23a58b3fc 100644 --- a/src/extension/print.h +++ b/src/extension/print.h @@ -34,8 +34,8 @@ public: /* TODO: These are public for the short term, but this should be fixed * public: Print (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp); - virtual ~Print (void); - virtual bool check (void); + ~Print (void) override; + bool check (void) override; /* FALSE means user hit cancel */ unsigned int setup (void); diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp index 437c147ca..ff00370bd 100644 --- a/src/graphlayout.cpp +++ b/src/graphlayout.cpp @@ -58,7 +58,7 @@ struct CheckProgress: TestConvergence { , rs(rs) , nodelookup(nodelookup) {} - bool operator()(const double new_stress, valarray<double> & X, valarray<double> & Y) { + bool operator()(const double new_stress, valarray<double> & X, valarray<double> & Y) override { /* This is where, if we wanted to animate the layout, we would need to update * the positions of all objects and redraw the canvas and maybe sleep a bit cout << "stress="<<new_stress<<endl; diff --git a/src/guide-snapper.h b/src/guide-snapper.h index 938056410..15338048f 100644 --- a/src/guide-snapper.h +++ b/src/guide-snapper.h @@ -25,17 +25,17 @@ class GuideSnapper : public LineSnapper { public: GuideSnapper(SnapManager *sm, Geom::Coord const d); - bool ThisSnapperMightSnap() const; + bool ThisSnapperMightSnap() const override; - Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) - bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance + Geom::Coord getSnapperTolerance() const override; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) + bool getSnapperAlwaysSnap() const override; //if true, then the snapper will always snap, regardless of its tolerance private: - LineList _getSnapLines(Geom::Point const &p) const; - void _addSnappedLine(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const &normal_to_line, Geom::Point const &point_on_line) const; - void _addSnappedLinesOrigin(IntermSnapResults &isr, Geom::Point const &origin, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const; - void _addSnappedLinePerpendicularly(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const; - void _addSnappedPoint(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const; + LineList _getSnapLines(Geom::Point const &p) const override; + void _addSnappedLine(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const &normal_to_line, Geom::Point const &point_on_line) const override; + void _addSnappedLinesOrigin(IntermSnapResults &isr, Geom::Point const &origin, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const override; + void _addSnappedLinePerpendicularly(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const override; + void _addSnappedPoint(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const override; }; } diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 52072de0b..410376ede 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -99,9 +99,9 @@ public: InkErrorHandler(bool useGui) : Inkscape::ErrorReporter(), _useGui(useGui) {} - virtual ~InkErrorHandler() {} + ~InkErrorHandler() override {} - virtual void handleError( Glib::ustring const& primary, Glib::ustring const& secondary ) const + void handleError( Glib::ustring const& primary, Glib::ustring const& secondary ) const override { if (_useGui) { Gtk::MessageDialog err(primary, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true); diff --git a/src/io/base64stream.h b/src/io/base64stream.h index 4bc99acac..697f64678 100644 --- a/src/io/base64stream.h +++ b/src/io/base64stream.h @@ -43,13 +43,13 @@ public: Base64InputStream(InputStream &sourceStream); - virtual ~Base64InputStream(); + ~Base64InputStream() override; - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual int get(); + int get() override; private: @@ -82,13 +82,13 @@ public: Base64OutputStream(OutputStream &destinationStream); - virtual ~Base64OutputStream(); + ~Base64OutputStream() override; - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual int put(gunichar ch); + int put(gunichar ch) override; /** * Sets the maximum line length for base64 output. If diff --git a/src/io/bufferstream.h b/src/io/bufferstream.h index af5580efb..e1b57252d 100644 --- a/src/io/bufferstream.h +++ b/src/io/bufferstream.h @@ -54,10 +54,10 @@ class BufferInputStream : public InputStream public: BufferInputStream(const std::vector<unsigned char> &sourceBuffer); - virtual ~BufferInputStream(); - virtual int available(); - virtual void close(); - virtual int get(); + ~BufferInputStream() override; + int available() override; + void close() override; + int get() override; private: const std::vector<unsigned char> &buffer; @@ -83,10 +83,10 @@ class BufferOutputStream : public OutputStream public: BufferOutputStream(); - virtual ~BufferOutputStream(); - virtual void close(); - virtual void flush(); - virtual int put(gunichar ch); + ~BufferOutputStream() override; + void close() override; + void flush() override; + int put(gunichar ch) override; virtual std::vector<unsigned char> &getBuffer() { return buffer; } diff --git a/src/io/gzipstream.h b/src/io/gzipstream.h index 390ec1225..1fc137b41 100644 --- a/src/io/gzipstream.h +++ b/src/io/gzipstream.h @@ -41,13 +41,13 @@ public: GzipInputStream(InputStream &sourceStream); - virtual ~GzipInputStream(); + ~GzipInputStream() override; - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual int get(); + int get() override; private: @@ -92,13 +92,13 @@ public: GzipOutputStream(OutputStream &destinationStream); - virtual ~GzipOutputStream(); + ~GzipOutputStream() override; - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual int put(gunichar ch); + int put(gunichar ch) override; private: diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h index d19dbbe95..3537b8872 100644 --- a/src/io/inkscapestream.h +++ b/src/io/inkscapestream.h @@ -25,9 +25,9 @@ public: { reason = theReason; } StreamException(Glib::ustring &theReason) throw() { reason = theReason; } - virtual ~StreamException() throw() + ~StreamException() throw() override { } - char const *what() const throw() + char const *what() const throw() override { return reason.c_str(); } private: @@ -102,13 +102,13 @@ public: BasicInputStream(InputStream &sourceStream); - virtual ~BasicInputStream() {} + ~BasicInputStream() override {} - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual int get(); + int get() override; protected: @@ -130,13 +130,13 @@ class StdInputStream : public InputStream { public: - int available() + int available() override { return 0; } - void close() + void close() override { /* do nothing */ } - int get() + int get() override { return getchar(); } }; @@ -206,13 +206,13 @@ public: BasicOutputStream(OutputStream &destinationStream); - virtual ~BasicOutputStream() {} + ~BasicOutputStream() override {} - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual int put(gunichar ch); + int put(gunichar ch) override; protected: @@ -232,13 +232,13 @@ class StdOutputStream : public OutputStream { public: - void close() + void close() override { } - void flush() + void flush() override { } - int put(gunichar ch) + int put(gunichar ch) override {return putchar(ch); } }; @@ -324,53 +324,53 @@ public: BasicReader(Reader &sourceStream); - virtual ~BasicReader() {} + ~BasicReader() override {} - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual gunichar get(); + gunichar get() override; - virtual Glib::ustring readLine(); + Glib::ustring readLine() override; - virtual Glib::ustring readWord(); + Glib::ustring readWord() override; /* Input formatting */ - virtual const Reader& readBool (bool& val ); - virtual const Reader& operator>> (bool& val ) + const Reader& readBool (bool& val ) override; + const Reader& operator>> (bool& val ) override { return readBool(val); } - virtual const Reader& readShort (short &val); - virtual const Reader& operator>> (short &val) + const Reader& readShort (short &val) override; + const Reader& operator>> (short &val) override { return readShort(val); } - virtual const Reader& readUnsignedShort (unsigned short &val); - virtual const Reader& operator>> (unsigned short &val) + const Reader& readUnsignedShort (unsigned short &val) override; + const Reader& operator>> (unsigned short &val) override { return readUnsignedShort(val); } - virtual const Reader& readInt (int &val); - virtual const Reader& operator>> (int &val) + const Reader& readInt (int &val) override; + const Reader& operator>> (int &val) override { return readInt(val); } - virtual const Reader& readUnsignedInt (unsigned int &val); - virtual const Reader& operator>> (unsigned int &val) + const Reader& readUnsignedInt (unsigned int &val) override; + const Reader& operator>> (unsigned int &val) override { return readUnsignedInt(val); } - virtual const Reader& readLong (long &val); - virtual const Reader& operator>> (long &val) + const Reader& readLong (long &val) override; + const Reader& operator>> (long &val) override { return readLong(val); } - virtual const Reader& readUnsignedLong (unsigned long &val); - virtual const Reader& operator>> (unsigned long &val) + const Reader& readUnsignedLong (unsigned long &val) override; + const Reader& operator>> (unsigned long &val) override { return readUnsignedLong(val); } - virtual const Reader& readFloat (float &val); - virtual const Reader& operator>> (float &val) + const Reader& readFloat (float &val) override; + const Reader& operator>> (float &val) override { return readFloat(val); } - virtual const Reader& readDouble (double &val); - virtual const Reader& operator>> (double &val) + const Reader& readDouble (double &val) override; + const Reader& operator>> (double &val) override { return readDouble(val); } @@ -398,11 +398,11 @@ public: InputStreamReader(InputStream &inputStreamSource); /*Overload these 3 for your implementation*/ - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual gunichar get(); + gunichar get() override; private: @@ -422,14 +422,14 @@ public: StdReader(); - virtual ~StdReader(); + ~StdReader() override; /*Overload these 3 for your implementation*/ - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual gunichar get(); + gunichar get() override; private: @@ -517,45 +517,45 @@ public: BasicWriter(Writer &destinationWriter); - virtual ~BasicWriter() {} + ~BasicWriter() override {} /*Overload these 3 for your implementation*/ - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual void put(gunichar ch); + void put(gunichar ch) override; /* Formatted output */ - virtual Writer &printf(char const *fmt, ...) G_GNUC_PRINTF(2,3); + Writer &printf(char const *fmt, ...) override G_GNUC_PRINTF(2,3); - virtual Writer& writeChar(char val); + Writer& writeChar(char val) override; - virtual Writer& writeUString(Glib::ustring &val); + Writer& writeUString(Glib::ustring &val) override; - virtual Writer& writeStdString(std::string &val); + Writer& writeStdString(std::string &val) override; - virtual Writer& writeString(const char *str); + Writer& writeString(const char *str) override; - virtual Writer& writeBool (bool val ); + Writer& writeBool (bool val ) override; - virtual Writer& writeShort (short val ); + Writer& writeShort (short val ) override; - virtual Writer& writeUnsignedShort (unsigned short val ); + Writer& writeUnsignedShort (unsigned short val ) override; - virtual Writer& writeInt (int val ); + Writer& writeInt (int val ) override; - virtual Writer& writeUnsignedInt (unsigned int val ); + Writer& writeUnsignedInt (unsigned int val ) override; - virtual Writer& writeLong (long val ); + Writer& writeLong (long val ) override; - virtual Writer& writeUnsignedLong (unsigned long val ); + Writer& writeUnsignedLong (unsigned long val ) override; - virtual Writer& writeFloat (float val ); + Writer& writeFloat (float val ) override; - virtual Writer& writeDouble (double val ); + Writer& writeDouble (double val ) override; protected: @@ -611,11 +611,11 @@ public: OutputStreamWriter(OutputStream &outputStreamDest); /*Overload these 3 for your implementation*/ - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual void put(gunichar ch); + void put(gunichar ch) override; private: @@ -634,16 +634,16 @@ class StdWriter : public BasicWriter public: StdWriter(); - virtual ~StdWriter(); + ~StdWriter() override; - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual void put(gunichar ch); + void put(gunichar ch) override; private: diff --git a/src/io/stringstream.h b/src/io/stringstream.h index 248e42e50..91285f850 100644 --- a/src/io/stringstream.h +++ b/src/io/stringstream.h @@ -27,13 +27,13 @@ public: StringInputStream(Glib::ustring &sourceString); - virtual ~StringInputStream(); + ~StringInputStream() override; - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual int get(); + int get() override; private: @@ -61,13 +61,13 @@ public: StringOutputStream(); - virtual ~StringOutputStream(); + ~StringOutputStream() override; - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual int put(gunichar ch); + int put(gunichar ch) override; virtual Glib::ustring &getString() { return buffer; } diff --git a/src/io/uristream.h b/src/io/uristream.h index f51df6e74..531f5f484 100644 --- a/src/io/uristream.h +++ b/src/io/uristream.h @@ -44,13 +44,13 @@ public: UriInputStream(Inkscape::URI &source); - virtual ~UriInputStream(); + ~UriInputStream() override; - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual int get(); + int get() override; private: Inkscape::URI &uri; @@ -78,13 +78,13 @@ public: UriReader(Inkscape::URI &source); - virtual ~UriReader(); + ~UriReader() override; - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual gunichar get(); + gunichar get() override; private: @@ -112,13 +112,13 @@ public: UriOutputStream(Inkscape::URI &destination); - virtual ~UriOutputStream(); + ~UriOutputStream() override; - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual int put(gunichar ch); + int put(gunichar ch) override; private: @@ -149,13 +149,13 @@ public: UriWriter(Inkscape::URI &source); - virtual ~UriWriter(); + ~UriWriter() override; - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual void put(gunichar ch); + void put(gunichar ch) override; private: diff --git a/src/io/xsltstream.h b/src/io/xsltstream.h index 105e6207a..b1ad57faa 100644 --- a/src/io/xsltstream.h +++ b/src/io/xsltstream.h @@ -76,13 +76,13 @@ public: XsltInputStream(InputStream &xmlSource, XsltStyleSheet &stylesheet); - virtual ~XsltInputStream(); + ~XsltInputStream() override; - virtual int available(); + int available() override; - virtual void close(); + void close() override; - virtual int get(); + int get() override; private: @@ -112,13 +112,13 @@ public: XsltOutputStream(OutputStream &destination, XsltStyleSheet &stylesheet); - virtual ~XsltOutputStream(); + ~XsltOutputStream() override; - virtual void close(); + void close() override; - virtual void flush(); + void flush() override; - virtual int put(gunichar ch); + int put(gunichar ch) override; private: diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h index 043da4cd9..1466cf243 100644 --- a/src/knot-holder-entity.h +++ b/src/knot-holder-entity.h @@ -105,8 +105,8 @@ protected: class PatternKnotHolderEntityXY : public KnotHolderEntity { public: PatternKnotHolderEntityXY(bool fill) : KnotHolderEntity(), _fill(fill) {} - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; private: // true if the entity tracks fill, false for stroke bool _fill; @@ -115,8 +115,8 @@ private: class PatternKnotHolderEntityAngle : public KnotHolderEntity { public: PatternKnotHolderEntityAngle(bool fill) : KnotHolderEntity(), _fill(fill) {} - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; private: bool _fill; }; @@ -124,8 +124,8 @@ private: class PatternKnotHolderEntityScale : public KnotHolderEntity { public: PatternKnotHolderEntityScale(bool fill) : KnotHolderEntity(), _fill(fill) {} - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; private: bool _fill; }; @@ -134,8 +134,8 @@ private: class FilterKnotHolderEntity : public KnotHolderEntity { public: FilterKnotHolderEntity(bool topleft) : KnotHolderEntity(), _topleft(topleft) {} - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; private: bool _topleft; // true for topleft point, false for bottomright }; diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index a42f0d4cc..010411fc4 100644 --- a/src/layer-manager.cpp +++ b/src/layer-manager.cpp @@ -43,11 +43,11 @@ public: _labelAttr(g_quark_from_string("inkscape:label")) {} - virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {} - virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {} - virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) {} - 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 notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override {} + void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override {} + void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) override {} + 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 ( name == _lockedAttr || name == _labelAttr ) { if ( _mgr && _obj ) { _mgr->_objectModified( _obj, 0 ); diff --git a/src/layer-manager.h b/src/layer-manager.h index a304929c6..7333f4424 100644 --- a/src/layer-manager.h +++ b/src/layer-manager.h @@ -27,7 +27,7 @@ class LayerManager : public DocumentSubset, { public: LayerManager(SPDesktop *desktop); - virtual ~LayerManager(); + ~LayerManager() override; void setCurrentLayer( SPObject* obj ); void renameLayer( SPObject* obj, char const *label, bool uniquify ); diff --git a/src/libnrtype/Layout-TNG-Scanline-Maker.h b/src/libnrtype/Layout-TNG-Scanline-Maker.h index 7c90ea8cc..786f44e51 100644 --- a/src/libnrtype/Layout-TNG-Scanline-Maker.h +++ b/src/libnrtype/Layout-TNG-Scanline-Maker.h @@ -92,27 +92,27 @@ class Layout::InfiniteScanlineMaker : public Layout::ScanlineMaker { public: InfiniteScanlineMaker(double initial_x, double initial_y, Layout::Direction block_progression); - virtual ~InfiniteScanlineMaker(); + ~InfiniteScanlineMaker() override; /** Returns a single infinite run at the current location */ - virtual std::vector<ScanRun> makeScanline(Layout::FontMetrics const &line_height); + std::vector<ScanRun> makeScanline(Layout::FontMetrics const &line_height) override; /** Increments the current y by the current line height */ - virtual void completeLine(); + void completeLine() override; - virtual double yCoordinate() + double yCoordinate() override {return _y;} /** Just changes y */ - virtual void setNewYCoordinate(double new_y); + void setNewYCoordinate(double new_y) override; /** Always true, but has to save the new height */ - virtual bool canExtendCurrentScanline(Layout::FontMetrics const &line_height); + bool canExtendCurrentScanline(Layout::FontMetrics const &line_height) override; /** Sets current line block height. Call before completeLine() to correct for actually used line height (in case some chunks with larger font-size rolled back). */ - virtual void setLineHeight(Layout::FontMetrics const &line_height); + void setLineHeight(Layout::FontMetrics const &line_height) override; private: double _x, _y; @@ -130,23 +130,23 @@ class Layout::ShapeScanlineMaker : public Layout::ScanlineMaker { public: ShapeScanlineMaker(Shape const *shape, Layout::Direction block_progression); - virtual ~ShapeScanlineMaker(); + ~ShapeScanlineMaker() override; - virtual std::vector<ScanRun> makeScanline(Layout::FontMetrics const &line_height); + std::vector<ScanRun> makeScanline(Layout::FontMetrics const &line_height) override; - virtual void completeLine(); + void completeLine() override; - virtual double yCoordinate(); + double yCoordinate() override; - virtual void setNewYCoordinate(double new_y); + void setNewYCoordinate(double new_y) override; /** never true */ - virtual bool canExtendCurrentScanline(Layout::FontMetrics const &line_height); + bool canExtendCurrentScanline(Layout::FontMetrics const &line_height) override; /** Sets current line block height. Call before completeLine() to correct for actually used line height (in case some chunks with larger font-size rolled back). */ - virtual void setLineHeight(Layout::FontMetrics const &line_height); + void setLineHeight(Layout::FontMetrics const &line_height) override; private: /** To generate scanlines for top-to-bottom text it is easiest if we diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index c8a7c21f0..c33d14630 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -703,8 +703,8 @@ private: Most of the members are copies of the values passed to appendText(). */ class InputStreamTextSource : public InputStreamItem { public: - virtual InputStreamItemType Type() {return TEXT_SOURCE;} - virtual ~InputStreamTextSource(); + InputStreamItemType Type() override {return TEXT_SOURCE;} + ~InputStreamTextSource() override; Glib::ustring const *text; /// owned by the caller Glib::ustring::const_iterator text_begin, text_end; int text_length; /// in characters, from text_start to text_end only @@ -734,7 +734,7 @@ private: appendControlCode(). */ class InputStreamControlCode : public InputStreamItem { public: - virtual InputStreamItemType Type() {return CONTROL_CODE;} + InputStreamItemType Type() override {return CONTROL_CODE;} TextControlCode code; double ascent; double descent; diff --git a/src/line-snapper.h b/src/line-snapper.h index b2fc3d389..d22b0044c 100644 --- a/src/line-snapper.h +++ b/src/line-snapper.h @@ -28,14 +28,14 @@ public: Inkscape::SnapCandidatePoint const &p, Geom::OptRect const &bbox_to_snap, std::vector<SPItem const *> const *it, - std::vector<Inkscape::SnapCandidatePoint> *unselected_nodes) const; + std::vector<Inkscape::SnapCandidatePoint> *unselected_nodes) const override; void constrainedSnap(IntermSnapResults &isr, Inkscape::SnapCandidatePoint const &p, Geom::OptRect const &bbox_to_snap, SnapConstraint const &c, std::vector<SPItem const *> const *it, - std::vector<SnapCandidatePoint> *unselected_nodes) const; + std::vector<SnapCandidatePoint> *unselected_nodes) const override; protected: typedef std::list<std::pair<Geom::Point, Geom::Point> > LineList; diff --git a/src/livarot/path-description.h b/src/livarot/path-description.h index e9818b55b..ed978d4c2 100644 --- a/src/livarot/path-description.h +++ b/src/livarot/path-description.h @@ -51,10 +51,10 @@ struct PathDescrMoveTo : public PathDescr PathDescrMoveTo(Geom::Point const &pp) : PathDescr(descr_moveto), p(pp) {} - void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const; - PathDescr *clone() const; - void transform(Geom::Affine const &t); - void dump(std::ostream &s) const; + void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const override; + PathDescr *clone() const override; + void transform(Geom::Affine const &t) override; + void dump(std::ostream &s) const override; Geom::Point p; }; @@ -64,10 +64,10 @@ struct PathDescrLineTo : public PathDescr PathDescrLineTo(Geom::Point const &pp) : PathDescr(descr_lineto), p(pp) {} - void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const; - PathDescr *clone() const; - void transform(Geom::Affine const &t); - void dump(std::ostream &s) const; + void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const override; + PathDescr *clone() const override; + void transform(Geom::Affine const &t) override; + void dump(std::ostream &s) const override; Geom::Point p; }; @@ -78,9 +78,9 @@ struct PathDescrBezierTo : public PathDescr PathDescrBezierTo(Geom::Point const &pp, int n) : PathDescr(descr_bezierto), p(pp), nb(n) {} - PathDescr *clone() const; - void transform(Geom::Affine const &t); - void dump(std::ostream &s) const; + PathDescr *clone() const override; + void transform(Geom::Affine const &t) override; + void dump(std::ostream &s) const override; Geom::Point p; // the endpoint's coordinates int nb; // number of control points, stored in the next path description commands @@ -94,9 +94,9 @@ struct PathDescrIntermBezierTo : public PathDescr PathDescrIntermBezierTo(Geom::Point const &pp) : PathDescr(descr_interm_bezier), p(pp) {} - PathDescr *clone() const; - void transform(Geom::Affine const &t); - void dump(std::ostream &s) const; + PathDescr *clone() const override; + void transform(Geom::Affine const &t) override; + void dump(std::ostream &s) const override; Geom::Point p; // control point coordinates }; @@ -107,10 +107,10 @@ struct PathDescrCubicTo : public PathDescr PathDescrCubicTo(Geom::Point const &pp, Geom::Point const &s, Geom::Point const& e) : PathDescr(descr_cubicto), p(pp), start(s), end(e) {} - void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const; - PathDescr *clone() const; - void transform(Geom::Affine const &t); - void dump(std::ostream &s) const; + void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const override; + PathDescr *clone() const override; + void transform(Geom::Affine const &t) override; + void dump(std::ostream &s) const override; Geom::Point p; Geom::Point start; @@ -123,10 +123,10 @@ struct PathDescrArcTo : public PathDescr PathDescrArcTo(Geom::Point const &pp, double x, double y, double a, bool l, bool c) : PathDescr(descr_arcto), p(pp), rx(x), ry(y), angle(a), large(l), clockwise(c) {} - void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const; - PathDescr *clone() const; - void transform(Geom::Affine const &t); - void dump(std::ostream &s) const; + void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const override; + PathDescr *clone() const override; + void transform(Geom::Affine const &t) override; + void dump(std::ostream &s) const override; Geom::Point p; double rx; @@ -140,7 +140,7 @@ struct PathDescrForced : public PathDescr { PathDescrForced() : PathDescr(descr_forced), p(0, 0) {} - PathDescr *clone() const; + PathDescr *clone() const override; /* FIXME: not sure whether _forced should have a point associated with it; ** Path::ConvertForcedToMoveTo suggests that maybe it should. @@ -152,8 +152,8 @@ struct PathDescrClose : public PathDescr { PathDescrClose() : PathDescr(descr_close) {} - void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const; - PathDescr *clone() const; + void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const override; + PathDescr *clone() const override; /* FIXME: not sure whether _forced should have a point associated with it; ** Path::ConvertForcedToMoveTo suggests that maybe it should. diff --git a/src/livarot/sweep-tree.h b/src/livarot/sweep-tree.h index bbb027b24..319763809 100644 --- a/src/livarot/sweep-tree.h +++ b/src/livarot/sweep-tree.h @@ -27,7 +27,7 @@ public: int startPoint; ///< point index in the result Shape associated with the upper end of the edge SweepTree(); - virtual ~SweepTree(); + ~SweepTree() override; // Inits a brand new node. void MakeNew(Shape *iSrc, int iBord, int iWeight, int iStartPoint); diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp index 4b64f048e..150bb4124 100644 --- a/src/live_effects/lpe-angle_bisector.cpp +++ b/src/live_effects/lpe-angle_bisector.cpp @@ -24,15 +24,15 @@ namespace AB { class KnotHolderEntityLeftEnd : public LPEKnotHolderEntity { public: KnotHolderEntityLeftEnd(LPEAngleBisector* effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public LPEKnotHolderEntity { public: KnotHolderEntityRightEnd(LPEAngleBisector* effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace AB diff --git a/src/live_effects/lpe-angle_bisector.h b/src/live_effects/lpe-angle_bisector.h index 400cbf6b6..a35f5b370 100644 --- a/src/live_effects/lpe-angle_bisector.h +++ b/src/live_effects/lpe-angle_bisector.h @@ -26,9 +26,9 @@ namespace AB { class LPEAngleBisector : public Effect { public: LPEAngleBisector(LivePathEffectObject *lpeobject); - virtual ~LPEAngleBisector(); + ~LPEAngleBisector() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; friend class AB::KnotHolderEntityLeftEnd; friend class AB::KnotHolderEntityRightEnd; diff --git a/src/live_effects/lpe-attach-path.h b/src/live_effects/lpe-attach-path.h index 6b3a863d2..bed209426 100644 --- a/src/live_effects/lpe-attach-path.h +++ b/src/live_effects/lpe-attach-path.h @@ -23,10 +23,10 @@ namespace LivePathEffect { class LPEAttachPath : public Effect { public: LPEAttachPath(LivePathEffectObject *lpeobject); - virtual ~LPEAttachPath(); + ~LPEAttachPath() override; - virtual void doEffect (SPCurve * curve); - virtual void resetDefaults(SPItem const * item); + void doEffect (SPCurve * curve) override; + void resetDefaults(SPItem const * item) override; private: LPEAttachPath(const LPEAttachPath&) = delete; diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index 11694249a..7b739256e 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -43,13 +43,13 @@ namespace BeP { class KnotHolderEntityWidthBendPath : public LPEKnotHolderEntity { public: KnotHolderEntityWidthBendPath(LPEBendPath * effect) : LPEKnotHolderEntity(effect) {} - virtual ~KnotHolderEntityWidthBendPath() + ~KnotHolderEntityWidthBendPath() override { LPEBendPath *lpe = dynamic_cast<LPEBendPath *> (_effect); lpe->_knot_entity = NULL; } - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // BeP diff --git a/src/live_effects/lpe-bendpath.h b/src/live_effects/lpe-bendpath.h index 18389391f..4909a490a 100644 --- a/src/live_effects/lpe-bendpath.h +++ b/src/live_effects/lpe-bendpath.h @@ -35,19 +35,19 @@ class KnotHolderEntityWidthBendPath; class LPEBendPath : public Effect, GroupBBoxEffect { public: LPEBendPath(LivePathEffectObject *lpeobject); - virtual ~LPEBendPath(); + ~LPEBendPath() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; - virtual void transform_multiply(Geom::Affine const& postmul, bool set); + void transform_multiply(Geom::Affine const& postmul, bool set) override; - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; PathParam bend_path; diff --git a/src/live_effects/lpe-bool.h b/src/live_effects/lpe-bool.h index b7c522eb3..7742dca3f 100644 --- a/src/live_effects/lpe-bool.h +++ b/src/live_effects/lpe-bool.h @@ -22,10 +22,10 @@ namespace LivePathEffect { class LPEBool : public Effect { public: LPEBool(LivePathEffectObject *lpeobject); - virtual ~LPEBool(); + ~LPEBool() override; - void doEffect(SPCurve *curve); - virtual void resetDefaults(SPItem const *item); + void doEffect(SPCurve *curve) override; + void resetDefaults(SPItem const *item) override; enum bool_op_ex { bool_op_ex_union = bool_op_union, diff --git a/src/live_effects/lpe-bounding-box.h b/src/live_effects/lpe-bounding-box.h index fe90ff0ec..4b3d14f9c 100644 --- a/src/live_effects/lpe-bounding-box.h +++ b/src/live_effects/lpe-bounding-box.h @@ -18,9 +18,9 @@ namespace LivePathEffect { class LPEBoundingBox : public Effect { public: LPEBoundingBox(LivePathEffectObject *lpeobject); - virtual ~LPEBoundingBox(); + ~LPEBoundingBox() override; - virtual void doEffect (SPCurve * curve); + void doEffect (SPCurve * curve) override; private: OriginalPathParam linked_path; diff --git a/src/live_effects/lpe-bspline.h b/src/live_effects/lpe-bspline.h index 44d0e4c26..a1c91d512 100644 --- a/src/live_effects/lpe-bspline.h +++ b/src/live_effects/lpe-bspline.h @@ -16,18 +16,18 @@ namespace LivePathEffect { class LPEBSpline : public Effect { public: LPEBSpline(LivePathEffectObject *lpeobject); - virtual ~LPEBSpline(); + ~LPEBSpline() override; - virtual LPEPathFlashType pathFlashType() const + LPEPathFlashType pathFlashType() const override { return SUPPRESS_FLASH; } - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doEffect(SPCurve *curve); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doOnApply(SPLPEItem const* lpeitem) override; + void doEffect(SPCurve *curve) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; void doBSplineFromWidget(SPCurve *curve, double value); - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); - virtual Gtk::Widget *newWidget(); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; + Gtk::Widget *newWidget() override; void changeWeight(double weightValue); void toDefaultWeight(); void toMakeCusp(); diff --git a/src/live_effects/lpe-circle_3pts.h b/src/live_effects/lpe-circle_3pts.h index 8ef11008b..bf2c26c7c 100644 --- a/src/live_effects/lpe-circle_3pts.h +++ b/src/live_effects/lpe-circle_3pts.h @@ -25,9 +25,9 @@ namespace LivePathEffect { class LPECircle3Pts : public Effect { public: LPECircle3Pts(LivePathEffectObject *lpeobject); - virtual ~LPECircle3Pts(); + ~LPECircle3Pts() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: LPECircle3Pts(const LPECircle3Pts&) = delete; diff --git a/src/live_effects/lpe-circle_with_radius.h b/src/live_effects/lpe-circle_with_radius.h index 97b5c8859..18215ae9b 100644 --- a/src/live_effects/lpe-circle_with_radius.h +++ b/src/live_effects/lpe-circle_with_radius.h @@ -23,10 +23,10 @@ namespace LivePathEffect { class LPECircleWithRadius : public Effect { public: LPECircleWithRadius(LivePathEffectObject *lpeobject); - virtual ~LPECircleWithRadius(); + ~LPECircleWithRadius() override; // Choose to implement one of the doEffect functions. You can delete or comment out the others. - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: // add the parameters for your effect here: diff --git a/src/live_effects/lpe-clone-original.h b/src/live_effects/lpe-clone-original.h index 172cd0e0e..0518ab16e 100644 --- a/src/live_effects/lpe-clone-original.h +++ b/src/live_effects/lpe-clone-original.h @@ -30,9 +30,9 @@ enum Clonelpemethod { class LPECloneOriginal : public Effect, GroupBBoxEffect { public: LPECloneOriginal(LivePathEffectObject *lpeobject); - virtual ~LPECloneOriginal(); - virtual void doEffect (SPCurve * curve); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + ~LPECloneOriginal() override; + void doEffect (SPCurve * curve) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; void cloneAttrbutes(SPObject *origin, SPObject *dest, const gchar * attributes, const gchar * style_attributes); void modified(SPObject */*obj*/, guint /*flags*/); void start_listening(); diff --git a/src/live_effects/lpe-constructgrid.h b/src/live_effects/lpe-constructgrid.h index be6a638ba..b074a5c63 100644 --- a/src/live_effects/lpe-constructgrid.h +++ b/src/live_effects/lpe-constructgrid.h @@ -23,9 +23,9 @@ namespace LivePathEffect { class LPEConstructGrid : public Effect { public: LPEConstructGrid(LivePathEffectObject *lpeobject); - virtual ~LPEConstructGrid(); + ~LPEConstructGrid() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: ScalarParam nr_x; diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 63db722cb..ae0d95779 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -34,17 +34,17 @@ enum RotateMethod { class LPECopyRotate : public Effect, GroupBBoxEffect { public: LPECopyRotate(LivePathEffectObject *lpeobject); - virtual ~LPECopyRotate(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doAfterEffect (SPLPEItem const* lpeitem); + ~LPECopyRotate() override; + void doOnApply (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doAfterEffect (SPLPEItem const* lpeitem) override; void split(Geom::PathVector &path_in, Geom::Path const ÷r); - virtual void resetDefaults(SPItem const* item); - virtual void transform_multiply(Geom::Affine const& postmul, bool set); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + void resetDefaults(SPItem const* item) override; + void transform_multiply(Geom::Affine const& postmul, bool set) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; Geom::PathVector doEffect_path_post (Geom::PathVector const & path_in); void toItem(Geom::Affine transform, size_t i, bool reset); void cloneD(SPObject *orig, SPObject *dest, Geom::Affine transform, bool reset); @@ -52,7 +52,7 @@ public: void resetStyles(); //virtual void setFusion(Geom::PathVector &path_in, Geom::Path divider, double sizeDivider); protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; private: EnumParam<RotateMethod> method; diff --git a/src/live_effects/lpe-curvestitch.h b/src/live_effects/lpe-curvestitch.h index 1c5a39cf5..e59c91889 100644 --- a/src/live_effects/lpe-curvestitch.h +++ b/src/live_effects/lpe-curvestitch.h @@ -26,13 +26,13 @@ namespace LivePathEffect { class LPECurveStitch : public Effect { public: LPECurveStitch(LivePathEffectObject *lpeobject); - virtual ~LPECurveStitch(); + ~LPECurveStitch() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void transform_multiply(Geom::Affine const& postmul, bool set); + void transform_multiply(Geom::Affine const& postmul, bool set) override; private: PathParam strokepath; diff --git a/src/live_effects/lpe-dash-stroke.h b/src/live_effects/lpe-dash-stroke.h index 84921fe27..c84bd1960 100644 --- a/src/live_effects/lpe-dash-stroke.h +++ b/src/live_effects/lpe-dash-stroke.h @@ -16,9 +16,9 @@ namespace LivePathEffect { class LPEDashStroke : public Effect { public: LPEDashStroke(LivePathEffectObject *lpeobject); - virtual ~LPEDashStroke(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + ~LPEDashStroke() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; double timeAtLength(double const A, Geom::Path const &segment); double timeAtLength(double const A, Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2); private: diff --git a/src/live_effects/lpe-dynastroke.h b/src/live_effects/lpe-dynastroke.h index ee2642fd3..8362746a0 100644 --- a/src/live_effects/lpe-dynastroke.h +++ b/src/live_effects/lpe-dynastroke.h @@ -40,9 +40,9 @@ enum DynastrokeCappingType { class LPEDynastroke : public Effect { public: LPEDynastroke(LivePathEffectObject *lpeobject); - virtual ~LPEDynastroke(); + ~LPEDynastroke() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: EnumParam<DynastrokeMethod> method; diff --git a/src/live_effects/lpe-ellipse_5pts.h b/src/live_effects/lpe-ellipse_5pts.h index 467a0d522..8b9eabc0e 100644 --- a/src/live_effects/lpe-ellipse_5pts.h +++ b/src/live_effects/lpe-ellipse_5pts.h @@ -24,9 +24,9 @@ namespace LivePathEffect { class LPEEllipse5Pts : public Effect { public: LPEEllipse5Pts(LivePathEffectObject *lpeobject); - virtual ~LPEEllipse5Pts(); + ~LPEEllipse5Pts() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: LPEEllipse5Pts(const LPEEllipse5Pts&) = delete; diff --git a/src/live_effects/lpe-embrodery-stitch.h b/src/live_effects/lpe-embrodery-stitch.h index 32404e87f..271ef553d 100644 --- a/src/live_effects/lpe-embrodery-stitch.h +++ b/src/live_effects/lpe-embrodery-stitch.h @@ -24,13 +24,13 @@ class LPEEmbroderyStitch : public Effect { public: LPEEmbroderyStitch(LivePathEffectObject *lpeobject); - virtual ~LPEEmbroderyStitch(); + ~LPEEmbroderyStitch() override; - virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in); + Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override; - virtual void resetDefaults(SPItem const *item); + void resetDefaults(SPItem const *item) override; - virtual void transform_multiply(Geom::Affine const &postmul, bool set); + void transform_multiply(Geom::Affine const &postmul, bool set) override; enum order_method { order_method_no_reorder, diff --git a/src/live_effects/lpe-envelope.h b/src/live_effects/lpe-envelope.h index 64f6a4c0c..877750559 100644 --- a/src/live_effects/lpe-envelope.h +++ b/src/live_effects/lpe-envelope.h @@ -29,13 +29,13 @@ namespace LivePathEffect { class LPEEnvelope : public Effect, GroupBBoxEffect { public: LPEEnvelope(LivePathEffectObject *lpeobject); - virtual ~LPEEnvelope(); + ~LPEEnvelope() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; private: PathParam bend_path1; diff --git a/src/live_effects/lpe-extrude.h b/src/live_effects/lpe-extrude.h index 32549a66a..34a8681a7 100644 --- a/src/live_effects/lpe-extrude.h +++ b/src/live_effects/lpe-extrude.h @@ -22,11 +22,11 @@ namespace LivePathEffect { class LPEExtrude : public Effect { public: LPEExtrude(LivePathEffectObject *lpeobject); - virtual ~LPEExtrude(); + ~LPEExtrude() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; private: VectorParam extrude_vector; diff --git a/src/live_effects/lpe-fill-between-many.h b/src/live_effects/lpe-fill-between-many.h index 796638d51..601dce5c6 100644 --- a/src/live_effects/lpe-fill-between-many.h +++ b/src/live_effects/lpe-fill-between-many.h @@ -27,9 +27,9 @@ enum Filllpemethod { class LPEFillBetweenMany : public Effect { public: LPEFillBetweenMany(LivePathEffectObject *lpeobject); - virtual ~LPEFillBetweenMany(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual void doEffect (SPCurve * curve); + ~LPEFillBetweenMany() override; + void doOnApply (SPLPEItem const* lpeitem) override; + void doEffect (SPCurve * curve) override; private: OriginalPathArrayParam linked_paths; diff --git a/src/live_effects/lpe-fill-between-strokes.h b/src/live_effects/lpe-fill-between-strokes.h index da3842797..b3b1da2c6 100644 --- a/src/live_effects/lpe-fill-between-strokes.h +++ b/src/live_effects/lpe-fill-between-strokes.h @@ -18,8 +18,8 @@ namespace LivePathEffect { class LPEFillBetweenStrokes : public Effect { public: LPEFillBetweenStrokes(LivePathEffectObject *lpeobject); - virtual ~LPEFillBetweenStrokes(); - virtual void doEffect (SPCurve * curve); + ~LPEFillBetweenStrokes() override; + void doEffect (SPCurve * curve) override; private: OriginalPathParam linked_path; diff --git a/src/live_effects/lpe-fillet-chamfer.h b/src/live_effects/lpe-fillet-chamfer.h index c628added..46887255e 100644 --- a/src/live_effects/lpe-fillet-chamfer.h +++ b/src/live_effects/lpe-fillet-chamfer.h @@ -33,13 +33,13 @@ enum Filletmethod { class LPEFilletChamfer : public Effect { public: LPEFilletChamfer(LivePathEffectObject *lpeobject); - virtual void doBeforeEffect(SPLPEItem const *lpeItem); - virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in); - virtual void doOnApply(SPLPEItem const *lpeItem); - virtual Gtk::Widget *newWidget(); + void doBeforeEffect(SPLPEItem const *lpeItem) override; + Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override; + void doOnApply(SPLPEItem const *lpeItem) override; + Gtk::Widget *newWidget() override; Geom::Ray getRay(Geom::Point start, Geom::Point end, Geom::Curve *curve, bool reverse); void addChamferSteps(Geom::Path &tmp_path, Geom::Path path_chamfer, Geom::Point end_arc_point, size_t steps); - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; void updateSatelliteType(SatelliteType satellitetype); void setSelected(PathVectorSatellites *_pathvector_satellites); //void convertUnit(); diff --git a/src/live_effects/lpe-gears.h b/src/live_effects/lpe-gears.h index 945cae8cc..8d54a699e 100644 --- a/src/live_effects/lpe-gears.h +++ b/src/live_effects/lpe-gears.h @@ -20,9 +20,9 @@ namespace LivePathEffect { class LPEGears : public Effect { public: LPEGears(LivePathEffectObject *lpeobject); - virtual ~LPEGears(); + ~LPEGears() override; - virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in); + Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override; private: ScalarParam teeth; diff --git a/src/live_effects/lpe-interpolate.h b/src/live_effects/lpe-interpolate.h index 629b6906f..4da384fff 100644 --- a/src/live_effects/lpe-interpolate.h +++ b/src/live_effects/lpe-interpolate.h @@ -25,11 +25,11 @@ namespace LivePathEffect { class LPEInterpolate : public Effect { public: LPEInterpolate(LivePathEffectObject *lpeobject); - virtual ~LPEInterpolate(); + ~LPEInterpolate() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; private: PathParam trajectory_path; ScalarParam number_of_steps; diff --git a/src/live_effects/lpe-interpolate_points.h b/src/live_effects/lpe-interpolate_points.h index 395fbc9fb..fd78f07b0 100644 --- a/src/live_effects/lpe-interpolate_points.h +++ b/src/live_effects/lpe-interpolate_points.h @@ -23,9 +23,9 @@ namespace LivePathEffect { class LPEInterpolatePoints : public Effect { public: LPEInterpolatePoints(LivePathEffectObject *lpeobject); - virtual ~LPEInterpolatePoints(); + ~LPEInterpolatePoints() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: EnumParam<unsigned> interpolator_type; diff --git a/src/live_effects/lpe-jointype.h b/src/live_effects/lpe-jointype.h index 24f667d29..5f73dc4e7 100644 --- a/src/live_effects/lpe-jointype.h +++ b/src/live_effects/lpe-jointype.h @@ -20,11 +20,11 @@ namespace LivePathEffect { class LPEJoinType : public Effect {
public:
LPEJoinType(LivePathEffectObject *lpeobject);
- virtual ~LPEJoinType();
+ ~LPEJoinType() override;
- virtual void doOnApply(SPLPEItem const* lpeitem);
- virtual void doOnRemove(SPLPEItem const* lpeitem);
- virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in);
+ void doOnApply(SPLPEItem const* lpeitem) override;
+ void doOnRemove(SPLPEItem const* lpeitem) override;
+ Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override;
private:
LPEJoinType(const LPEJoinType&) = delete;
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp index d62965ca8..f42ee75e4 100644 --- a/src/live_effects/lpe-knot.cpp +++ b/src/live_effects/lpe-knot.cpp @@ -42,9 +42,9 @@ namespace LivePathEffect { class KnotHolderEntityCrossingSwitcher : public LPEKnotHolderEntity { public: KnotHolderEntityCrossingSwitcher(LPEKnot *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; - virtual void knot_click(guint state); + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; + void knot_click(guint state) override; }; diff --git a/src/live_effects/lpe-knot.h b/src/live_effects/lpe-knot.h index 4f8ba95f6..1f63be686 100644 --- a/src/live_effects/lpe-knot.h +++ b/src/live_effects/lpe-knot.h @@ -56,17 +56,17 @@ public: class LPEKnot : public Effect, GroupBBoxEffect { public: LPEKnot(LivePathEffectObject *lpeobject); - virtual ~LPEKnot(); + ~LPEKnot() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & input_path); + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & input_path) override; /* the knotholder entity classes must be declared friends */ friend class KnotHolderEntityCrossingSwitcher; - void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; Geom::PathVector supplied_path; //for knotholder business private: diff --git a/src/live_effects/lpe-lattice.h b/src/live_effects/lpe-lattice.h index 52e1a0b9f..ba47c25e4 100644 --- a/src/live_effects/lpe-lattice.h +++ b/src/live_effects/lpe-lattice.h @@ -29,13 +29,13 @@ class LPELattice : public Effect, GroupBBoxEffect { public: LPELattice(LivePathEffectObject *lpeobject); - virtual ~LPELattice(); + ~LPELattice() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; protected: //virtual void addHelperPathsImpl(SPLPEItem *lpeitem, SPDesktop *desktop); diff --git a/src/live_effects/lpe-lattice2.h b/src/live_effects/lpe-lattice2.h index 17bb67f23..f51ece4cd 100644 --- a/src/live_effects/lpe-lattice2.h +++ b/src/live_effects/lpe-lattice2.h @@ -35,15 +35,15 @@ class LPELattice2 : public Effect, GroupBBoxEffect { public: LPELattice2(LivePathEffectObject *lpeobject); - virtual ~LPELattice2(); + ~LPELattice2() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void doBeforeEffect(SPLPEItem const* lpeitem); + void doBeforeEffect(SPLPEItem const* lpeitem) override; - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; void calculateCurve(Geom::Point a,Geom::Point b, SPCurve *c, bool horizontal, bool move); @@ -58,7 +58,7 @@ public: void resetGrid(); protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: BoolParam horizontal_mirror; diff --git a/src/live_effects/lpe-line_segment.h b/src/live_effects/lpe-line_segment.h index c5c0e7476..bde36f2ee 100644 --- a/src/live_effects/lpe-line_segment.h +++ b/src/live_effects/lpe-line_segment.h @@ -30,11 +30,11 @@ enum EndType { class LPELineSegment : public Effect { public: LPELineSegment(LivePathEffectObject *lpeobject); - virtual ~LPELineSegment(); + ~LPELineSegment() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; //private: EnumParam<EndType> end_type; diff --git a/src/live_effects/lpe-measure-segments.h b/src/live_effects/lpe-measure-segments.h index e4cde08a0..92bb51b91 100644 --- a/src/live_effects/lpe-measure-segments.h +++ b/src/live_effects/lpe-measure-segments.h @@ -34,13 +34,13 @@ enum OrientationMethod { class LPEMeasureSegments : public Effect { public: LPEMeasureSegments(LivePathEffectObject *lpeobject); - virtual ~LPEMeasureSegments(); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doOnRemove(SPLPEItem const* /*lpeitem*/); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + ~LPEMeasureSegments() override; + void doOnApply(SPLPEItem const* lpeitem) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doOnRemove(SPLPEItem const* /*lpeitem*/) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; void createLine(Geom::Point start,Geom::Point end, Glib::ustring name, size_t counter, bool main, bool remove, bool arrows = false); void createTextLabel(Geom::Point pos, size_t counter, double length, Geom::Coord angle, bool remove, bool valid); void createArrowMarker(Glib::ustring mode); diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 1b5e936dd..4ebf878ef 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -40,15 +40,15 @@ enum ModeType { class LPEMirrorSymmetry : public Effect, GroupBBoxEffect { public: LPEMirrorSymmetry(LivePathEffectObject *lpeobject); - virtual ~LPEMirrorSymmetry(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doAfterEffect (SPLPEItem const* lpeitem); - virtual void transform_multiply(Geom::Affine const& postmul, bool set); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + ~LPEMirrorSymmetry() override; + void doOnApply (SPLPEItem const* lpeitem) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doAfterEffect (SPLPEItem const* lpeitem) override; + void transform_multiply(Geom::Affine const& postmul, bool set) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; void toMirror(Geom::Affine transform, bool reset); void cloneD(SPObject *orig, SPObject *dest, bool reset); Inkscape::XML::Node * createPathBase(SPObject *elemref); @@ -57,7 +57,7 @@ public: void centerHoriz(); protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; private: EnumParam<ModeType> mode; diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp index 257d02c83..02b3c8eed 100644 --- a/src/live_effects/lpe-offset.cpp +++ b/src/live_effects/lpe-offset.cpp @@ -48,8 +48,8 @@ namespace OfS { class KnotHolderEntityOffsetPoint : public LPEKnotHolderEntity { public: KnotHolderEntityOffsetPoint(LPEOffset * effect) : LPEKnotHolderEntity(effect) {inset = false; previous = Geom::Point(Geom::infinity(),Geom::infinity());} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; private: bool inset; Geom::Point previous; diff --git a/src/live_effects/lpe-offset.h b/src/live_effects/lpe-offset.h index ae8426578..b7303d7ab 100644 --- a/src/live_effects/lpe-offset.h +++ b/src/live_effects/lpe-offset.h @@ -31,17 +31,17 @@ class KnotHolderEntityOffsetPoint; class LPEOffset : public Effect, GroupBBoxEffect { public: LPEOffset(LivePathEffectObject *lpeobject); - virtual ~LPEOffset(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual Gtk::Widget *newWidget(); + ~LPEOffset() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnApply(SPLPEItem const* lpeitem) override; + Gtk::Widget *newWidget() override; void calculateOffset (Geom::PathVector const & path_in); void drawHandle(Geom::Point p); - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; friend class OfS::KnotHolderEntityOffsetPoint; protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: ScalarParam offset; diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp index 9c3b714cc..7c6de10bb 100644 --- a/src/live_effects/lpe-parallel.cpp +++ b/src/live_effects/lpe-parallel.cpp @@ -28,15 +28,15 @@ namespace Pl { class KnotHolderEntityLeftEnd : public LPEKnotHolderEntity { public: KnotHolderEntityLeftEnd(LPEParallel *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public LPEKnotHolderEntity { public: KnotHolderEntityRightEnd(LPEParallel *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace Pl diff --git a/src/live_effects/lpe-parallel.h b/src/live_effects/lpe-parallel.h index 56ee1b9ea..1decf3046 100644 --- a/src/live_effects/lpe-parallel.h +++ b/src/live_effects/lpe-parallel.h @@ -30,11 +30,11 @@ namespace Pl { class LPEParallel : public Effect { public: LPEParallel(LivePathEffectObject *lpeobject); - virtual ~LPEParallel(); + ~LPEParallel() override; - virtual void doOnApply (SPLPEItem const* lpeitem); + void doOnApply (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; /* the knotholder entity classes must be declared friends */ friend class Pl::KnotHolderEntityLeftEnd; diff --git a/src/live_effects/lpe-path_length.h b/src/live_effects/lpe-path_length.h index 6530e9fa1..ba61279c2 100644 --- a/src/live_effects/lpe-path_length.h +++ b/src/live_effects/lpe-path_length.h @@ -25,9 +25,9 @@ namespace LivePathEffect { class LPEPathLength : public Effect { public: LPEPathLength(LivePathEffectObject *lpeobject); - virtual ~LPEPathLength(); + ~LPEPathLength() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: LPEPathLength(const LPEPathLength&) = delete; diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index 115c777d0..09794f7a7 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -50,13 +50,13 @@ namespace WPAP { class KnotHolderEntityWidthPatternAlongPath : public LPEKnotHolderEntity { public: KnotHolderEntityWidthPatternAlongPath(LPEPatternAlongPath * effect) : LPEKnotHolderEntity(effect) {} - virtual ~KnotHolderEntityWidthPatternAlongPath() + ~KnotHolderEntityWidthPatternAlongPath() override { LPEPatternAlongPath *lpe = dynamic_cast<LPEPatternAlongPath *> (_effect); lpe->_knot_entity = NULL; } - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // WPAP diff --git a/src/live_effects/lpe-patternalongpath.h b/src/live_effects/lpe-patternalongpath.h index 50ff19e51..8148bc140 100644 --- a/src/live_effects/lpe-patternalongpath.h +++ b/src/live_effects/lpe-patternalongpath.h @@ -33,17 +33,17 @@ enum PAPCopyType { class LPEPatternAlongPath : public Effect { public: LPEPatternAlongPath(LivePathEffectObject *lpeobject); - virtual ~LPEPatternAlongPath(); + ~LPEPatternAlongPath() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void transform_multiply(Geom::Affine const& postmul, bool set); + void transform_multiply(Geom::Affine const& postmul, bool set) override; - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; PathParam pattern; diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp index afaa6b9ca..6fa874a4d 100644 --- a/src/live_effects/lpe-perp_bisector.cpp +++ b/src/live_effects/lpe-perp_bisector.cpp @@ -35,15 +35,15 @@ public: class KnotHolderEntityLeftEnd : public KnotHolderEntityEnd { public: KnotHolderEntityLeftEnd(LPEPerpBisector *effect) : KnotHolderEntityEnd(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public KnotHolderEntityEnd { public: KnotHolderEntityRightEnd(LPEPerpBisector *effect) : KnotHolderEntityEnd(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; Geom::Point diff --git a/src/live_effects/lpe-perp_bisector.h b/src/live_effects/lpe-perp_bisector.h index 219cd6156..5604bef45 100644 --- a/src/live_effects/lpe-perp_bisector.h +++ b/src/live_effects/lpe-perp_bisector.h @@ -33,14 +33,14 @@ namespace PB { class LPEPerpBisector : public Effect { public: LPEPerpBisector(LivePathEffectObject *lpeobject); - virtual ~LPEPerpBisector(); + ~LPEPerpBisector() override; virtual EffectType effectType () { return PERP_BISECTOR; } - void doOnApply (SPLPEItem const* lpeitem); + void doOnApply (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > - doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > + doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; /* the knotholder entity functions must be declared friends */ friend class PB::KnotHolderEntityEnd; diff --git a/src/live_effects/lpe-perspective-envelope.h b/src/live_effects/lpe-perspective-envelope.h index 5bf130ca7..6d0e4a9c4 100644 --- a/src/live_effects/lpe-perspective-envelope.h +++ b/src/live_effects/lpe-perspective-envelope.h @@ -30,9 +30,9 @@ public: LPEPerspectiveEnvelope(LivePathEffectObject *lpeobject); - virtual ~LPEPerspectiveEnvelope(); + ~LPEPerspectiveEnvelope() override; - virtual void doEffect(SPCurve *curve); + void doEffect(SPCurve *curve) override; virtual Geom::Point projectPoint(Geom::Point p); @@ -40,22 +40,22 @@ public: virtual Geom::Point pointAtRatio(Geom::Coord ratio,Geom::Point A, Geom::Point B); - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; virtual void vertical(PointParam ¶mA,PointParam ¶mB, Geom::Line vert); virtual void horizontal(PointParam ¶mA,PointParam ¶mB,Geom::Line horiz); - virtual void doBeforeEffect(SPLPEItem const* lpeitem); + void doBeforeEffect(SPLPEItem const* lpeitem) override; - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; virtual void setDefaults(); virtual void resetGrid(); protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: BoolParam horizontal_mirror; diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp index deed40bde..0387e52ba 100644 --- a/src/live_effects/lpe-perspective_path.cpp +++ b/src/live_effects/lpe-perspective_path.cpp @@ -35,8 +35,8 @@ class KnotHolderEntityOffset : public LPEKnotHolderEntity { public: KnotHolderEntityOffset(LPEPerspectivePath *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace PP diff --git a/src/live_effects/lpe-perspective_path.h b/src/live_effects/lpe-perspective_path.h index d55d7fe8c..b2de8be0a 100644 --- a/src/live_effects/lpe-perspective_path.h +++ b/src/live_effects/lpe-perspective_path.h @@ -32,16 +32,16 @@ namespace PP { class LPEPerspectivePath : public Effect, GroupBBoxEffect { public: LPEPerspectivePath(LivePathEffectObject *lpeobject); - virtual ~LPEPerspectivePath(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + ~LPEPerspectivePath() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doOnApply(SPLPEItem const* lpeitem) override; + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; virtual void refresh(Gtk::Entry* perspective); - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; /* the knotholder entity classes must be declared friends */ friend class PP::KnotHolderEntityOffset; - void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; private: // add the parameters for your effect here: diff --git a/src/live_effects/lpe-powerclip.h b/src/live_effects/lpe-powerclip.h index 3aa963c71..2cd3943cc 100644 --- a/src/live_effects/lpe-powerclip.h +++ b/src/live_effects/lpe-powerclip.h @@ -17,14 +17,14 @@ namespace LivePathEffect { class LPEPowerClip : public Effect { public: LPEPowerClip(LivePathEffectObject *lpeobject); - virtual ~LPEPowerClip(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + ~LPEPowerClip() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; //virtual void transform_multiply(Geom::Affine const& postmul, bool set); - virtual void doOnVisibilityToggled(SPLPEItem const* lpeitem); - virtual void doAfterEffect (SPLPEItem const* lpeitem); + void doOnVisibilityToggled(SPLPEItem const* lpeitem) override; + void doAfterEffect (SPLPEItem const* lpeitem) override; void addInverse (SPItem * clip_data); void removeInverse (SPItem * clip_data); void flattenClip(SPItem * clip_data, Geom::PathVector &path_in); diff --git a/src/live_effects/lpe-powermask.h b/src/live_effects/lpe-powermask.h index e81b34fe3..ecf448e53 100644 --- a/src/live_effects/lpe-powermask.h +++ b/src/live_effects/lpe-powermask.h @@ -18,11 +18,11 @@ namespace LivePathEffect { class LPEPowerMask : public Effect { public: LPEPowerMask(LivePathEffectObject *lpeobject); - virtual ~LPEPowerMask(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doEffect (SPCurve * curve); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual void doOnVisibilityToggled(SPLPEItem const* lpeitem); + ~LPEPowerMask() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doEffect (SPCurve * curve) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + void doOnVisibilityToggled(SPLPEItem const* lpeitem) override; void toggleMaskVisibility(); void setMask(); private: diff --git a/src/live_effects/lpe-powerstroke-interpolators.h b/src/live_effects/lpe-powerstroke-interpolators.h index c0a60fa81..ce792302f 100644 --- a/src/live_effects/lpe-powerstroke-interpolators.h +++ b/src/live_effects/lpe-powerstroke-interpolators.h @@ -49,9 +49,9 @@ private: class Linear : public Interpolator { public: Linear() {}; - virtual ~Linear() {}; + ~Linear() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path path; path.start( points.at(0) ); for (unsigned int i = 1 ; i < points.size(); ++i) { @@ -69,9 +69,9 @@ private: class CubicBezierFit : public Interpolator { public: CubicBezierFit() {}; - virtual ~CubicBezierFit() {}; + ~CubicBezierFit() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { unsigned int n_points = points.size(); // worst case gives us 2 segment per point int max_segs = 8*n_points; @@ -110,9 +110,9 @@ public: CubicBezierJohan(double beta = 0.2) { _beta = beta; }; - virtual ~CubicBezierJohan() {}; + ~CubicBezierJohan() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; fit.start(points.at(0)); for (unsigned int i = 1; i < points.size(); ++i) { @@ -141,9 +141,9 @@ public: CubicBezierSmooth(double beta = 0.2) { _beta = beta; }; - virtual ~CubicBezierSmooth() {}; + ~CubicBezierSmooth() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; fit.start(points.at(0)); unsigned int num_points = points.size(); @@ -176,9 +176,9 @@ private: class SpiroInterpolator : public Interpolator { public: SpiroInterpolator() {}; - virtual ~SpiroInterpolator() {}; + ~SpiroInterpolator() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; Coord scale_y = 100.; @@ -210,9 +210,9 @@ private: class CentripetalCatmullRomInterpolator : public Interpolator { public: CentripetalCatmullRomInterpolator() {}; - virtual ~CentripetalCatmullRomInterpolator() {}; + ~CentripetalCatmullRomInterpolator() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { unsigned int n_points = points.size(); Geom::Path fit(points.front()); diff --git a/src/live_effects/lpe-powerstroke.h b/src/live_effects/lpe-powerstroke.h index 685a40614..d41f5672b 100644 --- a/src/live_effects/lpe-powerstroke.h +++ b/src/live_effects/lpe-powerstroke.h @@ -23,13 +23,13 @@ namespace LivePathEffect { class LPEPowerStroke : public Effect { public: LPEPowerStroke(LivePathEffectObject *lpeobject); - virtual ~LPEPowerStroke(); + ~LPEPowerStroke() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doBeforeEffect(SPLPEItem const *lpeItem); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doOnRemove(SPLPEItem const* lpeitem); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doBeforeEffect(SPLPEItem const *lpeItem) override; + void doOnApply(SPLPEItem const* lpeitem) override; + void doOnRemove(SPLPEItem const* lpeitem) override; // methods called by path-manipulator upon edits void adjustForNewPath(Geom::PathVector const & path_in); diff --git a/src/live_effects/lpe-pts2ellipse.h b/src/live_effects/lpe-pts2ellipse.h index d7a6d2d40..9b8ba4658 100644 --- a/src/live_effects/lpe-pts2ellipse.h +++ b/src/live_effects/lpe-pts2ellipse.h @@ -33,9 +33,9 @@ enum EllipseMethod { class LPEPts2Ellipse : public Effect { public: LPEPts2Ellipse(LivePathEffectObject *lpeobject); - virtual ~LPEPts2Ellipse(); + ~LPEPts2Ellipse() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: LPEPts2Ellipse(const LPEPts2Ellipse&) = delete; diff --git a/src/live_effects/lpe-recursiveskeleton.h b/src/live_effects/lpe-recursiveskeleton.h index 42040e668..9745454b7 100644 --- a/src/live_effects/lpe-recursiveskeleton.h +++ b/src/live_effects/lpe-recursiveskeleton.h @@ -22,9 +22,9 @@ namespace LivePathEffect { class LPERecursiveSkeleton : public Effect { public: LPERecursiveSkeleton(LivePathEffectObject *lpeobject); - virtual ~LPERecursiveSkeleton(); + ~LPERecursiveSkeleton() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: ScalarParam iterations; diff --git a/src/live_effects/lpe-rough-hatches.h b/src/live_effects/lpe-rough-hatches.h index ab1bf098c..08e763d97 100644 --- a/src/live_effects/lpe-rough-hatches.h +++ b/src/live_effects/lpe-rough-hatches.h @@ -26,14 +26,14 @@ namespace LivePathEffect { class LPERoughHatches : public Effect { public: LPERoughHatches(LivePathEffectObject *lpeobject); - virtual ~LPERoughHatches(); + ~LPERoughHatches() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > - doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > + doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void doBeforeEffect(SPLPEItem const* item); + void doBeforeEffect(SPLPEItem const* item) override; std::vector<double> generateLevels(Geom::Interval const &domain, double x_org); diff --git a/src/live_effects/lpe-roughen.h b/src/live_effects/lpe-roughen.h index aebc0e313..5e989766d 100644 --- a/src/live_effects/lpe-roughen.h +++ b/src/live_effects/lpe-roughen.h @@ -41,16 +41,16 @@ class LPERoughen : public Effect { public: LPERoughen(LivePathEffectObject *lpeobject); - virtual ~LPERoughen(); + ~LPERoughen() override; - virtual void doEffect(SPCurve *curve); + void doEffect(SPCurve *curve) override; virtual double sign(double randNumber); virtual Geom::Point randomize(double max_lenght, bool is_node = false); - virtual void doBeforeEffect(SPLPEItem const * lpeitem); + void doBeforeEffect(SPLPEItem const * lpeitem) override; virtual SPCurve const * addNodesAndJitter(Geom::Curve const * A, Geom::Point &prev, Geom::Point &last_move, double t, bool last); virtual SPCurve *jitter(Geom::Curve const * A, Geom::Point &prev, Geom::Point &last_move); virtual Geom::Point tPoint(Geom::Point A, Geom::Point B, double t = 0.5); - virtual Gtk::Widget *newWidget(); + Gtk::Widget *newWidget() override; private: EnumParam<DivisionMethod> method; diff --git a/src/live_effects/lpe-ruler.h b/src/live_effects/lpe-ruler.h index 64c6bf40e..15194f562 100644 --- a/src/live_effects/lpe-ruler.h +++ b/src/live_effects/lpe-ruler.h @@ -43,9 +43,9 @@ enum BorderMarkType { class LPERuler : public Effect { public: LPERuler(LivePathEffectObject *lpeobject); - virtual ~LPERuler(); + ~LPERuler() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: Geom::Piecewise<Geom::D2<Geom::SBasis> > ruler_mark(Geom::Point const &A, Geom::Point const &n, MarkType const &marktype); diff --git a/src/live_effects/lpe-show_handles.h b/src/live_effects/lpe-show_handles.h index 7efa799f3..a5256548c 100644 --- a/src/live_effects/lpe-show_handles.h +++ b/src/live_effects/lpe-show_handles.h @@ -20,11 +20,11 @@ class LPEShowHandles : public Effect , GroupBBoxEffect { public: LPEShowHandles(LivePathEffectObject *lpeobject); - virtual ~LPEShowHandles() {} + ~LPEShowHandles() override {} - virtual void doOnApply(SPLPEItem const* lpeitem); + void doOnApply(SPLPEItem const* lpeitem) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; virtual void generateHelperPath(Geom::PathVector result); @@ -36,7 +36,7 @@ public: protected: - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: diff --git a/src/live_effects/lpe-simplify.h b/src/live_effects/lpe-simplify.h index c206e45e8..29f9ac07b 100644 --- a/src/live_effects/lpe-simplify.h +++ b/src/live_effects/lpe-simplify.h @@ -17,15 +17,15 @@ class LPESimplify : public Effect , GroupBBoxEffect { public: LPESimplify(LivePathEffectObject *lpeobject); - virtual ~LPESimplify(); + ~LPESimplify() override; - virtual void doEffect(SPCurve *curve); + void doEffect(SPCurve *curve) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; virtual void generateHelperPathAndSmooth(Geom::PathVector &result); - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; virtual void drawNode(Geom::Point p); @@ -34,7 +34,7 @@ public: virtual void drawHandleLine(Geom::Point p,Geom::Point p2); protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: ScalarParam steps; diff --git a/src/live_effects/lpe-skeleton.h b/src/live_effects/lpe-skeleton.h index 51d96777f..5487a6b67 100644 --- a/src/live_effects/lpe-skeleton.h +++ b/src/live_effects/lpe-skeleton.h @@ -32,12 +32,12 @@ namespace Skeleton { class LPESkeleton : public Effect { public: LPESkeleton(LivePathEffectObject *lpeobject); - virtual ~LPESkeleton(); + ~LPESkeleton() override; // Choose to implement one of the doEffect functions. You can delete or comment out the others. // virtual void doEffect (SPCurve * curve); // virtual Geom::PathVector doEffect_path (Geom::PathVector const &path_in); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in) override; /* the knotholder entity classes (if any) can be declared friends */ //friend class Skeleton::KnotHolderEntityMyHandle; diff --git a/src/live_effects/lpe-sketch.h b/src/live_effects/lpe-sketch.h index 5d178269e..7d50020b3 100644 --- a/src/live_effects/lpe-sketch.h +++ b/src/live_effects/lpe-sketch.h @@ -27,11 +27,11 @@ namespace LivePathEffect { class LPESketch : public Effect { public: LPESketch(LivePathEffectObject *lpeobject); - virtual ~LPESketch(); + ~LPESketch() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; private: // add the parameters for your effect here: diff --git a/src/live_effects/lpe-spiro.h b/src/live_effects/lpe-spiro.h index 14a026da4..31a35720d 100644 --- a/src/live_effects/lpe-spiro.h +++ b/src/live_effects/lpe-spiro.h @@ -16,11 +16,11 @@ namespace LivePathEffect { class LPESpiro : public Effect { public: LPESpiro(LivePathEffectObject *lpeobject); - virtual ~LPESpiro(); + ~LPESpiro() override; - virtual LPEPathFlashType pathFlashType() const { return SUPPRESS_FLASH; } + LPEPathFlashType pathFlashType() const override { return SUPPRESS_FLASH; } - virtual void doEffect(SPCurve * curve); + void doEffect(SPCurve * curve) override; private: LPESpiro(const LPESpiro&) = delete; diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp index 3a225c0be..ee2e6552b 100644 --- a/src/live_effects/lpe-tangent_to_curve.cpp +++ b/src/live_effects/lpe-tangent_to_curve.cpp @@ -31,23 +31,23 @@ namespace TtC { class KnotHolderEntityAttachPt : public LPEKnotHolderEntity { public: KnotHolderEntityAttachPt(LPETangentToCurve *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityLeftEnd : public LPEKnotHolderEntity { public: KnotHolderEntityLeftEnd(LPETangentToCurve *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public LPEKnotHolderEntity { public: KnotHolderEntityRightEnd(LPETangentToCurve *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace TtC diff --git a/src/live_effects/lpe-tangent_to_curve.h b/src/live_effects/lpe-tangent_to_curve.h index 5761a3cd7..575a54c7d 100644 --- a/src/live_effects/lpe-tangent_to_curve.h +++ b/src/live_effects/lpe-tangent_to_curve.h @@ -33,15 +33,15 @@ namespace TtC { class LPETangentToCurve : public Effect { public: LPETangentToCurve(LivePathEffectObject *lpeobject); - virtual ~LPETangentToCurve(); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > - doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + ~LPETangentToCurve() override; + Geom::Piecewise<Geom::D2<Geom::SBasis> > + doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; /* the knotholder entity classes must be declared friends */ friend class TtC::KnotHolderEntityLeftEnd; friend class TtC::KnotHolderEntityRightEnd; friend class TtC::KnotHolderEntityAttachPt; - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; private: ScalarParam angle; diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp index b5e440767..212485ecf 100644 --- a/src/live_effects/lpe-taperstroke.cpp +++ b/src/live_effects/lpe-taperstroke.cpp @@ -46,15 +46,15 @@ namespace TpS { class KnotHolderEntityAttachBegin : public LPEKnotHolderEntity { public: KnotHolderEntityAttachBegin(LPETaperStroke * effect) : LPEKnotHolderEntity(effect) {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityAttachEnd : public LPEKnotHolderEntity { public: KnotHolderEntityAttachEnd(LPETaperStroke * effect) : LPEKnotHolderEntity(effect) {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // TpS diff --git a/src/live_effects/lpe-taperstroke.h b/src/live_effects/lpe-taperstroke.h index 9e3de772c..5e650b9ac 100644 --- a/src/live_effects/lpe-taperstroke.h +++ b/src/live_effects/lpe-taperstroke.h @@ -28,15 +28,15 @@ class KnotHolderEntityAttachEnd; class LPETaperStroke : public Effect { public: LPETaperStroke(LivePathEffectObject *lpeobject); - virtual ~LPETaperStroke() {} + ~LPETaperStroke() override {} - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doOnRemove(SPLPEItem const* lpeitem); + void doOnApply(SPLPEItem const* lpeitem) override; + void doOnRemove(SPLPEItem const* lpeitem) override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const& path_in); + Geom::PathVector doEffect_path (Geom::PathVector const& path_in) override; Geom::PathVector doEffect_simplePath(Geom::PathVector const& path_in); - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; friend class TpS::KnotHolderEntityAttachBegin; friend class TpS::KnotHolderEntityAttachEnd; diff --git a/src/live_effects/lpe-test-doEffect-stack.h b/src/live_effects/lpe-test-doEffect-stack.h index 525774075..3b1916d7b 100644 --- a/src/live_effects/lpe-test-doEffect-stack.h +++ b/src/live_effects/lpe-test-doEffect-stack.h @@ -24,11 +24,11 @@ namespace LivePathEffect { class LPEdoEffectStackTest : public Effect { public: LPEdoEffectStackTest(LivePathEffectObject *lpeobject); - virtual ~LPEdoEffectStackTest(); + ~LPEdoEffectStackTest() override; - virtual void doEffect (SPCurve * curve); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + void doEffect (SPCurve * curve) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: ScalarParam step; diff --git a/src/live_effects/lpe-text_label.h b/src/live_effects/lpe-text_label.h index aef50a79a..d399f40ac 100644 --- a/src/live_effects/lpe-text_label.h +++ b/src/live_effects/lpe-text_label.h @@ -23,9 +23,9 @@ namespace LivePathEffect { class LPETextLabel : public Effect { public: LPETextLabel(LivePathEffectObject *lpeobject); - virtual ~LPETextLabel(); + ~LPETextLabel() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: TextParam label; diff --git a/src/live_effects/lpe-transform_2pts.h b/src/live_effects/lpe-transform_2pts.h index 632cae51d..ca04ae589 100644 --- a/src/live_effects/lpe-transform_2pts.h +++ b/src/live_effects/lpe-transform_2pts.h @@ -25,15 +25,15 @@ namespace LivePathEffect { class LPETransform2Pts : public Effect, GroupBBoxEffect { public: LPETransform2Pts(LivePathEffectObject *lpeobject); - virtual ~LPETransform2Pts(); + ~LPETransform2Pts() override; - virtual void doOnApply (SPLPEItem const* lpeitem); + void doOnApply (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Gtk::Widget *newWidget(); + Gtk::Widget *newWidget() override; void updateIndex(); @@ -46,7 +46,7 @@ public: void reset(); protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; private: ToggleButtonParam elastic; diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h index e762030d7..1ee9acce0 100644 --- a/src/live_effects/lpe-vonkoch.h +++ b/src/live_effects/lpe-vonkoch.h @@ -26,8 +26,8 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){} - virtual ~VonKochPathParam(){} - virtual void param_setup_nodepath(Inkscape::NodePath::Path *np); + ~VonKochPathParam() override{} + void param_setup_nodepath(Inkscape::NodePath::Path *np) override; }; //FIXME: a path is used here instead of 2 points to work around path/point param incompatibility bug. @@ -39,21 +39,21 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){} - virtual ~VonKochRefPathParam(){} - virtual void param_setup_nodepath(Inkscape::NodePath::Path *np); - virtual bool param_readSVGValue(const gchar * strvalue); + ~VonKochRefPathParam() override{} + void param_setup_nodepath(Inkscape::NodePath::Path *np) override; + bool param_readSVGValue(const gchar * strvalue) override; }; class LPEVonKoch : public Effect, GroupBBoxEffect { public: LPEVonKoch(LivePathEffectObject *lpeobject); - virtual ~LPEVonKoch(); + ~LPEVonKoch() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void doBeforeEffect(SPLPEItem const* item); + void doBeforeEffect(SPLPEItem const* item) override; //Useful?? // protected: diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h index f22bea2b5..328fa9eaf 100644 --- a/src/live_effects/lpeobject-reference.h +++ b/src/live_effects/lpeobject-reference.h @@ -29,7 +29,7 @@ namespace LivePathEffect { class LPEObjectReference : public Inkscape::URIReference { public: LPEObjectReference(SPObject *owner); - virtual ~LPEObjectReference(); + ~LPEObjectReference() override; SPObject *owner; @@ -50,7 +50,7 @@ public: void (*user_unlink) (LPEObjectReference *me, SPObject *user); protected: - bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; }; diff --git a/src/live_effects/lpeobject.h b/src/live_effects/lpeobject.h index 9a95775aa..3f510edf9 100644 --- a/src/live_effects/lpeobject.h +++ b/src/live_effects/lpeobject.h @@ -30,7 +30,7 @@ namespace Inkscape { class LivePathEffectObject : public SPObject { public: LivePathEffectObject(); - virtual ~LivePathEffectObject(); + ~LivePathEffectObject() override; Inkscape::LivePathEffect::EffectType effecttype; @@ -50,12 +50,12 @@ public: Inkscape::LivePathEffect::Effect *lpe; // this can be NULL in a valid LivePathEffectObject protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h index b5ee8b5cf..be19889b3 100644 --- a/src/live_effects/parameter/array.h +++ b/src/live_effects/parameter/array.h @@ -37,7 +37,7 @@ public: } - virtual ~ArrayParam() { + ~ArrayParam() override { }; @@ -45,11 +45,11 @@ public: return _vector; } - virtual Gtk::Widget * param_newWidget() { + Gtk::Widget * param_newWidget() override { return NULL; } - virtual bool param_readSVGValue(const gchar * strvalue) { + bool param_readSVGValue(const gchar * strvalue) override { _vector.clear(); gchar ** strarray = g_strsplit(strvalue, "|", 0); gchar ** iter = strarray; @@ -60,14 +60,14 @@ public: g_strfreev (strarray); return true; } - virtual void param_update_default(const gchar * default_value){}; - virtual gchar * param_getSVGValue() const { + void param_update_default(const gchar * default_value) override{}; + gchar * param_getSVGValue() const override { Inkscape::SVGOStringStream os; writesvg(os, _vector); return g_strdup(os.str().c_str()); } - virtual gchar * param_getDefaultSVGValue() const { + gchar * param_getDefaultSVGValue() const override { return g_strdup(""); } @@ -75,7 +75,7 @@ public: _vector = new_vector; } - void param_set_default() { + void param_set_default() override { param_setValue( std::vector<StorageType>(_default_size) ); } diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h index 2437c97c7..dd474302c 100644 --- a/src/live_effects/parameter/bool.h +++ b/src/live_effects/parameter/bool.h @@ -26,18 +26,18 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, bool default_value = false); - virtual ~BoolParam(); + ~BoolParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(bool newvalue); - virtual void param_set_default(); + void param_set_default() override; void param_update_default(bool const default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; bool get_value() const { return value; }; inline operator bool() const { return value; }; diff --git a/src/live_effects/parameter/colorpicker.h b/src/live_effects/parameter/colorpicker.h index 34b11284f..965435fba 100644 --- a/src/live_effects/parameter/colorpicker.h +++ b/src/live_effects/parameter/colorpicker.h @@ -22,17 +22,17 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const guint32 default_color = 0x000000ff); - virtual ~ColorPickerParam() {} + ~ColorPickerParam() override {} - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - void param_update_default(const gchar * default_value); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + void param_update_default(const gchar * default_value) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(guint32 newvalue); - virtual void param_set_default(); + void param_set_default() override; const guint32 get_value() const { return value; }; diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h index eef176591..354eb74f6 100644 --- a/src/live_effects/parameter/enum.h +++ b/src/live_effects/parameter/enum.h @@ -37,9 +37,9 @@ public: sorted = sort; }; - virtual ~EnumParam() { }; + ~EnumParam() override { }; - virtual Gtk::Widget * param_newWidget() { + Gtk::Widget * param_newWidget() override { Inkscape::UI::Widget::RegisteredEnum<E> *regenum = Gtk::manage ( new Inkscape::UI::Widget::RegisteredEnum<E>( param_label, param_tooltip, param_key, *enumdataconv, *param_wr, param_effect->getRepr(), param_effect->getSPDoc(), sorted ) ); @@ -50,7 +50,7 @@ public: return dynamic_cast<Gtk::Widget *> (regenum); }; - bool param_readSVGValue(const gchar * strvalue) { + bool param_readSVGValue(const gchar * strvalue) override { if (!strvalue) { param_set_default(); return true; @@ -60,11 +60,11 @@ public: return true; }; - gchar * param_getSVGValue() const { + gchar * param_getSVGValue() const override { return g_strdup( enumdataconv->get_key(value).c_str() ); }; - gchar * param_getDefaultSVGValue() const { + gchar * param_getDefaultSVGValue() const override { return g_strdup( enumdataconv->get_key(defvalue).c_str() ); }; @@ -76,7 +76,7 @@ public: return value; }; - void param_set_default() { + void param_set_default() override { param_set_value(defvalue); } @@ -84,7 +84,7 @@ public: defvalue = default_value; } - virtual void param_update_default(const gchar * default_value) { + void param_update_default(const gchar * default_value) override { param_update_default(enumdataconv->get_id_from_key(Glib::ustring(default_value))); } diff --git a/src/live_effects/parameter/fontbutton.h b/src/live_effects/parameter/fontbutton.h index f028492a7..466202ee1 100644 --- a/src/live_effects/parameter/fontbutton.h +++ b/src/live_effects/parameter/fontbutton.h @@ -22,17 +22,17 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const Glib::ustring default_value = "Sans 10"); - virtual ~FontButtonParam() {} + ~FontButtonParam() override {} - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - void param_update_default(const gchar * default_value); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + void param_update_default(const gchar * default_value) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(Glib::ustring newvalue); - virtual void param_set_default(); + void param_set_default() override; const Glib::ustring get_value() const { return defvalue; }; diff --git a/src/live_effects/parameter/hidden.h b/src/live_effects/parameter/hidden.h index e6df8ceea..df55bfb5a 100644 --- a/src/live_effects/parameter/hidden.h +++ b/src/live_effects/parameter/hidden.h @@ -31,17 +31,17 @@ public: Effect* effect, const Glib::ustring default_value = "", bool widget_is_visible = false); - virtual ~HiddenParam() {} + ~HiddenParam() override {} - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(Glib::ustring newvalue, bool write = false); - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + void param_set_default() override; + void param_update_default(const gchar * default_value) override; const Glib::ustring get_value() const { return value; }; diff --git a/src/live_effects/parameter/item-reference.h b/src/live_effects/parameter/item-reference.h index 603453ec5..50d4f9dab 100644 --- a/src/live_effects/parameter/item-reference.h +++ b/src/live_effects/parameter/item-reference.h @@ -29,7 +29,7 @@ public: } protected: - virtual bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; private: ItemReference(const ItemReference&) = delete; diff --git a/src/live_effects/parameter/item.h b/src/live_effects/parameter/item.h index 7ccfc6a9f..dca7f7cb6 100644 --- a/src/live_effects/parameter/item.h +++ b/src/live_effects/parameter/item.h @@ -29,16 +29,16 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = ""); - virtual ~ItemParam(); - virtual Gtk::Widget * param_newWidget(); - - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + ~ItemParam() override; + Gtk::Widget * param_newWidget() override; + + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; + void param_update_default(const gchar * default_value) override; void param_set_and_write_default(); - virtual void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec) override; sigc::signal <void> signal_item_pasted; sigc::signal <void> signal_item_changed; Geom::Affine last_transform; diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h index 255f4b016..bbee74998 100644 --- a/src/live_effects/parameter/message.h +++ b/src/live_effects/parameter/message.h @@ -22,17 +22,17 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_message = "Default message"); - virtual ~MessageParam() {} + ~MessageParam() override {} - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - void param_update_default(const gchar * default_value); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + void param_update_default(const gchar * default_value) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(const gchar * message); - virtual void param_set_default(); + void param_set_default() override; void param_set_min_height(int height); const gchar * get_value() const { return message; }; diff --git a/src/live_effects/parameter/originalitem.h b/src/live_effects/parameter/originalitem.h index 23720c74a..4b285f8e1 100644 --- a/src/live_effects/parameter/originalitem.h +++ b/src/live_effects/parameter/originalitem.h @@ -22,15 +22,15 @@ public: const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalItemParam(); + ~OriginalItemParam() override; bool linksToItem() const { return (href != NULL); } SPItem * getObject() const { return ref.getObject(); } - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; protected: - virtual void linked_modified_callback(SPObject *linked_obj, guint flags); - virtual void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item); + void linked_modified_callback(SPObject *linked_obj, guint flags) override; + void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item) override; void on_select_original_button_click(); diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp index a801d25f6..5a0d67d26 100644 --- a/src/live_effects/parameter/originalitemarray.cpp +++ b/src/live_effects/parameter/originalitemarray.cpp @@ -46,7 +46,7 @@ public: add(_colLabel); add(_colActive); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<ItemAndActive*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/live_effects/parameter/originalitemarray.h b/src/live_effects/parameter/originalitemarray.h index ac5e486ea..edb5a3be5 100644 --- a/src/live_effects/parameter/originalitemarray.h +++ b/src/live_effects/parameter/originalitemarray.h @@ -58,18 +58,18 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalItemArrayParam(); - - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value){}; + ~OriginalItemArrayParam() override; + + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; + void param_update_default(const gchar * default_value) override{}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {}; + void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) override {}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) {}; + void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) override {}; std::vector<ItemAndActive*> _vector; diff --git a/src/live_effects/parameter/originalpath.h b/src/live_effects/parameter/originalpath.h index 6e9888d42..bd7b10741 100644 --- a/src/live_effects/parameter/originalpath.h +++ b/src/live_effects/parameter/originalpath.h @@ -22,21 +22,21 @@ public: const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalPathParam(); + ~OriginalPathParam() override; bool linksToPath() const { return (href != NULL); } SPItem * getObject() const { return ref.getObject(); } - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {}; + void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) override {}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) {}; + void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) override {}; void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; }; protected: - virtual void linked_modified_callback(SPObject *linked_obj, guint flags); - virtual void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item); + void linked_modified_callback(SPObject *linked_obj, guint flags) override; + void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item) override; void on_select_original_button_click(); diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index 70f17ccb8..2091c4d71 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -57,7 +57,7 @@ public: add(_colReverse); add(_colVisible); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<PathAndDirectionAndVisible*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/live_effects/parameter/originalpatharray.h b/src/live_effects/parameter/originalpatharray.h index 36d5b78a6..92edff103 100644 --- a/src/live_effects/parameter/originalpatharray.h +++ b/src/live_effects/parameter/originalpatharray.h @@ -62,18 +62,18 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalPathArrayParam(); - - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value){}; + ~OriginalPathArrayParam() override; + + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; + void param_update_default(const gchar * default_value) override{}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {}; + void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) override {}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) {}; + void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) override {}; void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; update();}; void allowOnlyBsplineSpiro(bool allow_only_bspline_spiro){ _allow_only_bspline_spiro = allow_only_bspline_spiro; update();}; diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h index 33d91d4df..a956a9ed4 100644 --- a/src/live_effects/parameter/parameter.h +++ b/src/live_effects/parameter/parameter.h @@ -106,15 +106,15 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, gdouble default_value = 1.0); - virtual ~ScalarParam(); + ~ScalarParam() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; - virtual void param_set_default(); + void param_set_default() override; void param_update_default(gdouble default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; void param_set_value(gdouble val); void param_make_integer(bool yes = true); void param_set_range(gdouble min, gdouble max); @@ -124,7 +124,7 @@ public: double param_get_max() { return max; }; double param_get_min() { return min; }; void param_set_undo(bool set_undo); - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; inline operator gdouble() const { return value; }; diff --git a/src/live_effects/parameter/path-reference.h b/src/live_effects/parameter/path-reference.h index ccd94dd1d..8f8382b80 100644 --- a/src/live_effects/parameter/path-reference.h +++ b/src/live_effects/parameter/path-reference.h @@ -29,7 +29,7 @@ public: } protected: - virtual bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; private: PathReference(const PathReference&) = delete; diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h index 998874980..97f97d3dd 100644 --- a/src/live_effects/parameter/path.h +++ b/src/live_effects/parameter/path.h @@ -29,28 +29,28 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"); - virtual ~PathParam(); + ~PathParam() override; Geom::PathVector const & get_pathvector() const; Geom::Piecewise<Geom::D2<Geom::SBasis> > const & get_pwd2(); - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + void param_set_default() override; + void param_update_default(const gchar * default_value) override; void param_set_and_write_default(); void set_new_value (Geom::PathVector const &newpath, bool write_to_svg); void set_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &newpath, bool write_to_svg); void set_buttons(bool edit_button, bool copy_button, bool paste_button, bool link_button); - virtual void param_editOncanvas(SPItem * item, SPDesktop * dt); - virtual void param_setup_nodepath(Inkscape::NodePath::Path *np); - virtual void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec); + void param_editOncanvas(SPItem * item, SPDesktop * dt) override; + void param_setup_nodepath(Inkscape::NodePath::Path *np) override; + void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec) override; - virtual void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/); + void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/) override; void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; }; sigc::signal <void> signal_path_pasted; diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp index b811b7f2b..fe0699a19 100644 --- a/src/live_effects/parameter/point.cpp +++ b/src/live_effects/parameter/point.cpp @@ -185,11 +185,11 @@ PointParam::set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint class PointParamKnotHolderEntity : public KnotHolderEntity { public: PointParamKnotHolderEntity(PointParam *p) { this->pparam = p; } - virtual ~PointParamKnotHolderEntity() { this->pparam->_knot_entity = NULL;} + ~PointParamKnotHolderEntity() override { this->pparam->_knot_entity = NULL;} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; - virtual void knot_click(guint state); + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; + void knot_click(guint state) override; private: PointParam *pparam; diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h index 9d4164c9b..4f93b5354 100644 --- a/src/live_effects/parameter/point.h +++ b/src/live_effects/parameter/point.h @@ -32,28 +32,28 @@ public: const gchar *handle_tip = NULL,// tip for automatically associated on-canvas handle Geom::Point default_value = Geom::Point(0,0), bool live_update = true ); - virtual ~PointParam(); + ~PointParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - bool param_readSVGValue(const gchar * strvalue); - gchar * param_getSVGValue() const; - gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; inline const gchar *handleTip() const { return handle_tip ? handle_tip : param_tooltip.c_str(); } void param_setValue(Geom::Point newpoint, bool write = false); - void param_set_default(); + void param_set_default() override; void param_hide_knot(bool hide); Geom::Point param_get_default() const; void param_set_liveupdate(bool live_update); void param_update_default(Geom::Point default_point); - virtual void param_update_default(const gchar * default_point); - virtual void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/); + void param_update_default(const gchar * default_point) override; + void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/) override; void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); - virtual bool providesKnotHolderEntities() const { return true; } - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + bool providesKnotHolderEntities() const override { return true; } + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; friend class PointParamKnotHolderEntity; private: PointParam(const PointParam&) = delete; diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h index d028d706d..a3712c2d2 100644 --- a/src/live_effects/parameter/powerstrokepointarray.h +++ b/src/live_effects/parameter/powerstrokepointarray.h @@ -27,20 +27,20 @@ public: const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~PowerStrokePointArrayParam(); + ~PowerStrokePointArrayParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual void param_transform_multiply(Geom::Affine const& postmul, bool /*set*/); + void param_transform_multiply(Geom::Affine const& postmul, bool /*set*/) override; void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); float median_width(); - virtual bool providesKnotHolderEntities() const { return true; } - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); - virtual void param_update_default(const gchar * default_value){}; + bool providesKnotHolderEntities() const override { return true; } + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; + void param_update_default(const gchar * default_value) override{}; void set_pwd2(Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in, Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_normal_in); Geom::Piecewise<Geom::D2<Geom::SBasis> > const & get_pwd2() const { return last_pwd2; } @@ -67,12 +67,12 @@ private: class PowerStrokePointArrayParamKnotHolderEntity : public KnotHolderEntity { public: PowerStrokePointArrayParamKnotHolderEntity(PowerStrokePointArrayParam *p, unsigned int index); - virtual ~PowerStrokePointArrayParamKnotHolderEntity() {} + ~PowerStrokePointArrayParamKnotHolderEntity() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; virtual void knot_set_offset(Geom::Point offset); - virtual void knot_click(guint state); + void knot_click(guint state) override; /** Checks whether the index falls within the size of the parameter's vector */ bool valid_index(unsigned int index) const { diff --git a/src/live_effects/parameter/random.h b/src/live_effects/parameter/random.h index 9f0114ad2..ae037083a 100644 --- a/src/live_effects/parameter/random.h +++ b/src/live_effects/parameter/random.h @@ -27,20 +27,20 @@ public: Effect* effect, gdouble default_value = 1.0, long default_seed = 0); - virtual ~RandomParam(); + ~RandomParam() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; void param_set_value(gdouble val, long newseed); void param_make_integer(bool yes = true); void param_set_range(gdouble min, gdouble max); void param_update_default(gdouble default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; void resetRandomizer(); operator gdouble(); inline gdouble get_value() { return value; } ; diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h index e7d61af22..30e196e41 100644 --- a/src/live_effects/parameter/satellitesarray.h +++ b/src/live_effects/parameter/satellitesarray.h @@ -36,21 +36,21 @@ public: const Glib::ustring &key, Inkscape::UI::Widget::Registry *wr, Effect *effect); - virtual Gtk::Widget *param_newWidget() + Gtk::Widget *param_newWidget() override { return NULL; } virtual void setHelperSize(int hs); - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item, bool mirror); - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; virtual void updateCanvasIndicators(); virtual void updateCanvasIndicators(bool mirror); - virtual bool providesKnotHolderEntities() const + bool providesKnotHolderEntities() const override { return true; } - void param_transform_multiply(Geom::Affine const &postmul, bool /*set*/); + void param_transform_multiply(Geom::Affine const &postmul, bool /*set*/) override; void setUseDistance(bool use_knot_distance); void setCurrentZoom(double current_zoom); void setGlobalKnotHide(bool global_knot_hide); @@ -85,15 +85,15 @@ private: class FilletChamferKnotHolderEntity : public KnotHolderEntity { public: FilletChamferKnotHolderEntity(SatellitesArrayParam *p, size_t index); - virtual ~FilletChamferKnotHolderEntity() + ~FilletChamferKnotHolderEntity() override { _pparam->_knoth = NULL; } - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, - guint state); - virtual Geom::Point knot_get() const; - virtual void knot_click(guint state); + void knot_set(Geom::Point const &p, Geom::Point const &origin, + guint state) override; + Geom::Point knot_get() const override; + void knot_click(guint state) override; void knot_set_offset(Satellite); /** Checks whether the index falls within the size of the parameter's vector */ diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h index 51651edcf..cd1176bc2 100644 --- a/src/live_effects/parameter/text.h +++ b/src/live_effects/parameter/text.h @@ -32,19 +32,19 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const Glib::ustring default_value = ""); - virtual ~TextParam() {} + ~TextParam() override {} - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(Glib::ustring newvalue); void param_hide_canvas_text(); void setTextParam(Inkscape::UI::Widget::RegisteredText *rsu); - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + void param_set_default() override; + void param_update_default(const gchar * default_value) override; void setPos(Geom::Point pos); void setPosAndAnchor(const Geom::Piecewise<Geom::D2<Geom::SBasis> > &pwd2, const double t, const double length, bool use_curvature = false); @@ -75,7 +75,7 @@ public: TextParamInternal(Effect* effect) : TextParam("", "", "", NULL, effect) {} - virtual Gtk::Widget * param_newWidget() { return NULL; } + Gtk::Widget * param_newWidget() override { return NULL; } }; } //namespace LivePathEffect diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h index 6d42c5155..7476698f5 100644 --- a/src/live_effects/parameter/togglebutton.h +++ b/src/live_effects/parameter/togglebutton.h @@ -34,16 +34,16 @@ public: char const * icon_active = NULL, char const * icon_inactive = NULL, GtkIconSize icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR); - virtual ~ToggleButtonParam(); + ~ToggleButtonParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(bool newvalue); - virtual void param_set_default(); + void param_set_default() override; bool get_value() const { return value; }; @@ -52,7 +52,7 @@ public: sigc::signal<void>& signal_toggled() { return _signal_toggled; } virtual void toggled(); void param_update_default(bool default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; private: ToggleButtonParam(const ToggleButtonParam&) = delete; diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp index ab66e7256..d94f8964c 100644 --- a/src/live_effects/parameter/transformedpoint.cpp +++ b/src/live_effects/parameter/transformedpoint.cpp @@ -165,18 +165,18 @@ TransformedPointParam::set_oncanvas_color(guint32 color) class TransformedPointParamKnotHolderEntity_Vector : public KnotHolderEntity { public: TransformedPointParamKnotHolderEntity_Vector(TransformedPointParam *p) : param(p) { } - virtual ~TransformedPointParamKnotHolderEntity_Vector() {} + ~TransformedPointParamKnotHolderEntity_Vector() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) { + void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override { Geom::Point const s = p - param->origin; /// @todo implement angle snapping when holding CTRL param->setVector(s); sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false); }; - virtual Geom::Point knot_get() const{ + Geom::Point knot_get() const override{ return param->origin + param->vector; }; - virtual void knot_click(guint /*state*/){ + void knot_click(guint /*state*/) override{ g_print ("This is the vector handle associated to parameter '%s'\n", param->param_key.c_str()); }; diff --git a/src/live_effects/parameter/transformedpoint.h b/src/live_effects/parameter/transformedpoint.h index b2d3203ac..e732146a8 100644 --- a/src/live_effects/parameter/transformedpoint.h +++ b/src/live_effects/parameter/transformedpoint.h @@ -30,32 +30,32 @@ public: Effect* effect, Geom::Point default_vector = Geom::Point(1,0), bool dontTransform = false); - virtual ~TransformedPointParam(); + ~TransformedPointParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; inline const gchar *handleTip() const { return param_tooltip.c_str(); } - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; Geom::Point getVector() const { return vector; }; Geom::Point getOrigin() const { return origin; }; void setValues(Geom::Point const &new_origin, Geom::Point const &new_vector) { setVector(new_vector); setOrigin(new_origin); }; void setVector(Geom::Point const &new_vector) { vector = new_vector; }; void setOrigin(Geom::Point const &new_origin) { origin = new_origin; }; - virtual void param_set_default(); + void param_set_default() override; void set_and_write_new_values(Geom::Point const &new_origin, Geom::Point const &new_vector); - virtual void param_transform_multiply(Geom::Affine const &postmul, bool set); + void param_transform_multiply(Geom::Affine const &postmul, bool set) override; void set_vector_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); void set_oncanvas_color(guint32 color); Geom::Point param_get_default() { return defvalue; } void param_update_default(Geom::Point default_point); - virtual void param_update_default(const gchar * default_point); - virtual bool providesKnotHolderEntities() const { return true; } + void param_update_default(const gchar * default_point) override; + bool providesKnotHolderEntities() const override { return true; } virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); private: diff --git a/src/live_effects/parameter/unit.h b/src/live_effects/parameter/unit.h index 8e3e3cb69..97514248e 100644 --- a/src/live_effects/parameter/unit.h +++ b/src/live_effects/parameter/unit.h @@ -27,16 +27,16 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, Glib::ustring default_unit = "px"); - virtual ~UnitParam(); + ~UnitParam() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; void param_set_value(Inkscape::Util::Unit const &val); - virtual void param_update_default(const gchar * default_unit); + void param_update_default(const gchar * default_unit) override; const gchar *get_abbreviation() const; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; operator Inkscape::Util::Unit const *() const { return unit; } diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp index 1207a05da..56895276c 100644 --- a/src/live_effects/parameter/vector.cpp +++ b/src/live_effects/parameter/vector.cpp @@ -172,17 +172,17 @@ VectorParam::set_oncanvas_color(guint32 color) class VectorParamKnotHolderEntity_Origin : public KnotHolderEntity { public: VectorParamKnotHolderEntity_Origin(VectorParam *p) : param(p) { } - virtual ~VectorParamKnotHolderEntity_Origin() {} + ~VectorParamKnotHolderEntity_Origin() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { + void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) override { Geom::Point const s = snap_knot_position(p, state); param->setOrigin(s); sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false); }; - virtual Geom::Point knot_get() const { + Geom::Point knot_get() const override { return param->origin; }; - virtual void knot_click(guint /*state*/){ + void knot_click(guint /*state*/) override{ g_print ("This is the origin handle associated to parameter '%s'\n", param->param_key.c_str()); }; @@ -193,18 +193,18 @@ private: class VectorParamKnotHolderEntity_Vector : public KnotHolderEntity { public: VectorParamKnotHolderEntity_Vector(VectorParam *p) : param(p) { } - virtual ~VectorParamKnotHolderEntity_Vector() {} + ~VectorParamKnotHolderEntity_Vector() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) { + void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override { Geom::Point const s = p - param->origin; /// @todo implement angle snapping when holding CTRL param->setVector(s); sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false); }; - virtual Geom::Point knot_get() const { + Geom::Point knot_get() const override { return param->origin + param->vector; }; - virtual void knot_click(guint /*state*/){ + void knot_click(guint /*state*/) override{ g_print ("This is the vector handle associated to parameter '%s'\n", param->param_key.c_str()); }; diff --git a/src/live_effects/parameter/vector.h b/src/live_effects/parameter/vector.h index 412d4f0bb..059f706e4 100644 --- a/src/live_effects/parameter/vector.h +++ b/src/live_effects/parameter/vector.h @@ -29,33 +29,33 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, Geom::Point default_vector = Geom::Point(1,0) ); - virtual ~VectorParam(); + ~VectorParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; inline const gchar *handleTip() const { return param_tooltip.c_str(); } - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; Geom::Point getVector() const { return vector; }; Geom::Point getOrigin() const { return origin; }; void setValues(Geom::Point const &new_origin, Geom::Point const &new_vector) { setVector(new_vector); setOrigin(new_origin); }; void setVector(Geom::Point const &new_vector) { vector = new_vector; }; void setOrigin(Geom::Point const &new_origin) { origin = new_origin; }; - virtual void param_set_default(); + void param_set_default() override; void set_and_write_new_values(Geom::Point const &new_origin, Geom::Point const &new_vector); - virtual void param_transform_multiply(Geom::Affine const &postmul, bool set); + void param_transform_multiply(Geom::Affine const &postmul, bool set) override; void set_vector_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); void set_origin_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); void set_oncanvas_color(guint32 color); void param_update_default(Geom::Point default_point); - virtual void param_update_default(const gchar * default_point); - virtual bool providesKnotHolderEntities() const { return true; } - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void param_update_default(const gchar * default_point) override; + bool providesKnotHolderEntities() const override { return true; } + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; private: VectorParam(const VectorParam&) = delete; diff --git a/src/live_effects/spiro-converters.h b/src/live_effects/spiro-converters.h index b6b1c8da8..7def6d23d 100644 --- a/src/live_effects/spiro-converters.h +++ b/src/live_effects/spiro-converters.h @@ -27,10 +27,10 @@ public: : _curve(curve) {} - virtual void moveto(double x, double y); - virtual void lineto(double x, double y, bool close_last); - virtual void quadto(double x1, double y1, double x2, double y2, bool close_last); - virtual void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last); + void moveto(double x, double y) override; + void lineto(double x, double y, bool close_last) override; + void quadto(double x1, double y1, double x2, double y2, bool close_last) override; + void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) override; private: SPCurve &_curve; @@ -47,10 +47,10 @@ class ConverterPath : public ConverterBase { public: ConverterPath(Geom::Path &path); - virtual void moveto(double x, double y); - virtual void lineto(double x, double y, bool close_last); - virtual void quadto(double x1, double y1, double x2, double y2, bool close_last); - virtual void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last); + void moveto(double x, double y) override; + void lineto(double x, double y, bool close_last) override; + void quadto(double x1, double y1, double x2, double y2, bool close_last) override; + void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) override; private: Geom::Path &_path; diff --git a/src/main-cmdlinexact.h b/src/main-cmdlinexact.h index 8634f3875..431b046fa 100644 --- a/src/main-cmdlinexact.h +++ b/src/main-cmdlinexact.h @@ -30,8 +30,8 @@ class CmdLineXAction : public CmdLineAction { public: CmdLineXAction (gchar const * arg, xaction_args_values_map_t &values_map); - virtual void doItX (ActionContext const & context); - virtual bool isExtended(); + void doItX (ActionContext const & context) override; + bool isExtended() override; static void createActionsFromYAML( gchar const *filename ); }; diff --git a/src/message-stack.h b/src/message-stack.h index a8cbf08df..64d42033a 100644 --- a/src/message-stack.h +++ b/src/message-stack.h @@ -53,7 +53,7 @@ class MessageStack : public GC::Managed<>, { public: MessageStack(); - ~MessageStack(); + ~MessageStack() override; /** @brief returns the type of message currently at the top of the stack */ MessageType currentMessageType() { diff --git a/src/object-snapper.h b/src/object-snapper.h index 8cffd147e..58cb3b3a4 100644 --- a/src/object-snapper.h +++ b/src/object-snapper.h @@ -30,32 +30,32 @@ class ObjectSnapper : public Snapper public: ObjectSnapper(SnapManager *sm, Geom::Coord const d); - ~ObjectSnapper(); + ~ObjectSnapper() override; /** * @return true if this Snapper will snap at least one kind of point. */ - bool ThisSnapperMightSnap() const; + bool ThisSnapperMightSnap() const override; /** * @return Snap tolerance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels. */ - Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) + Geom::Coord getSnapperTolerance() const override; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom) - bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance + bool getSnapperAlwaysSnap() const override; //if true, then the snapper will always snap, regardless of its tolerance void freeSnap(IntermSnapResults &isr, Inkscape::SnapCandidatePoint const &p, Geom::OptRect const &bbox_to_snap, std::vector<SPItem const *> const *it, - std::vector<SnapCandidatePoint> *unselected_nodes) const; + std::vector<SnapCandidatePoint> *unselected_nodes) const override; void constrainedSnap(IntermSnapResults &isr, Inkscape::SnapCandidatePoint const &p, Geom::OptRect const &bbox_to_snap, SnapConstraint const &c, std::vector<SPItem const *> const *it, - std::vector<SnapCandidatePoint> *unselected_nodes) const; + std::vector<SnapCandidatePoint> *unselected_nodes) const override; private: //store some lists of candidates, points and paths, so we don't have to rebuild them for each point we want to snap diff --git a/src/object/box3d-side.h b/src/object/box3d-side.h index 29f17b8f3..bd8b33e3a 100644 --- a/src/object/box3d-side.h +++ b/src/object/box3d-side.h @@ -25,7 +25,7 @@ class Persp3D; class Box3DSide : public SPPolygon { public: Box3DSide(); - virtual ~Box3DSide(); + ~Box3DSide() override; Box3D::Axis dir1; Box3D::Axis dir2; @@ -33,12 +33,12 @@ public: int getFaceId(); static Box3DSide * createBox3DSide(SPBox3D *box); - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual void update(SPCtx *ctx, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + void update(SPCtx *ctx, unsigned int flags) override; - virtual void set_shape(); + void set_shape() override; }; void box3d_side_position_set (Box3DSide *side); // FIXME: Replace this by box3d_side_set_shape?? diff --git a/src/object/box3d.h b/src/object/box3d.h index 85f481e5b..ee68b415c 100644 --- a/src/object/box3d.h +++ b/src/object/box3d.h @@ -29,7 +29,7 @@ class Persp3DReference; class SPBox3D : public SPGroup { public: SPBox3D(); - virtual ~SPBox3D(); + ~SPBox3D() override; int z_orders[6]; // z_orders[i] holds the ID of the face at position #i in the group (from top to bottom) @@ -51,17 +51,17 @@ public: */ static SPBox3D * createBox3D(SPItem * parent); - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx *ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; virtual const char* display_name(); - virtual Geom::Affine set_transform(Geom::Affine const &transform); - virtual void convert_to_guides() const; - virtual const char* displayName() const; - virtual char *description() const; + Geom::Affine set_transform(Geom::Affine const &transform) override; + void convert_to_guides() const override; + const char* displayName() const override; + char *description() const override; }; void box3d_position_set (SPBox3D *box); diff --git a/src/object/color-profile.h b/src/object/color-profile.h index 4c5222843..e8cc859d2 100644 --- a/src/object/color-profile.h +++ b/src/object/color-profile.h @@ -31,7 +31,7 @@ class ColorProfileImpl; class ColorProfile : public SPObject { public: ColorProfile(); - virtual ~ColorProfile(); + ~ColorProfile() override; bool operator<(ColorProfile const &other) const; @@ -82,12 +82,12 @@ public: protected: ColorProfileImpl *impl; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; } // namespace Inkscape diff --git a/src/object/filters/blend.h b/src/object/filters/blend.h index d5af9fe7d..689c53977 100644 --- a/src/object/filters/blend.h +++ b/src/object/filters/blend.h @@ -22,22 +22,22 @@ class SPFeBlend : public SPFilterPrimitive { public: SPFeBlend(); - virtual ~SPFeBlend(); + ~SPFeBlend() override; Inkscape::Filters::FilterBlendMode blend_mode; int in2; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEBLEND_H_SEEN */ diff --git a/src/object/filters/colormatrix.h b/src/object/filters/colormatrix.h index 2a1c403f1..fdc28c02e 100644 --- a/src/object/filters/colormatrix.h +++ b/src/object/filters/colormatrix.h @@ -21,23 +21,23 @@ class SPFeColorMatrix : public SPFilterPrimitive { public: SPFeColorMatrix(); - virtual ~SPFeColorMatrix(); + ~SPFeColorMatrix() override; Inkscape::Filters::FilterColorMatrixType type; gdouble value; std::vector<gdouble> values; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FECOLORMATRIX_H_SEEN */ diff --git a/src/object/filters/componenttransfer-funcnode.h b/src/object/filters/componenttransfer-funcnode.h index f4bb88594..3f303e663 100644 --- a/src/object/filters/componenttransfer-funcnode.h +++ b/src/object/filters/componenttransfer-funcnode.h @@ -27,7 +27,7 @@ public: }; SPFeFuncNode(Channel channel); - virtual ~SPFeFuncNode(); + ~SPFeFuncNode() override; Inkscape::Filters::FilterComponentTransferType type; std::vector<double> tableValues; @@ -39,14 +39,14 @@ public: Channel channel; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; }; #endif /* !SP_FECOMPONENTTRANSFER_FUNCNODE_H_SEEN */ diff --git a/src/object/filters/componenttransfer.h b/src/object/filters/componenttransfer.h index 8dbe91db1..46d337450 100644 --- a/src/object/filters/componenttransfer.h +++ b/src/object/filters/componenttransfer.h @@ -24,24 +24,24 @@ class FilterComponentTransfer; class SPFeComponentTransfer : public SPFilterPrimitive { public: SPFeComponentTransfer(); - virtual ~SPFeComponentTransfer(); + ~SPFeComponentTransfer() override; Inkscape::Filters::FilterComponentTransfer *renderer; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FECOMPONENTTRANSFER_H_SEEN */ diff --git a/src/object/filters/composite.h b/src/object/filters/composite.h index 12f7b5344..f1c21ddf3 100644 --- a/src/object/filters/composite.h +++ b/src/object/filters/composite.h @@ -43,23 +43,23 @@ enum FeCompositeOperator { class SPFeComposite : public SPFilterPrimitive { public: SPFeComposite(); - virtual ~SPFeComposite(); + ~SPFeComposite() override; FeCompositeOperator composite_operator; double k1, k2, k3, k4; int in2; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FECOMPOSITE_H_SEEN */ diff --git a/src/object/filters/convolvematrix.h b/src/object/filters/convolvematrix.h index 9783eaa47..196f93ec5 100644 --- a/src/object/filters/convolvematrix.h +++ b/src/object/filters/convolvematrix.h @@ -24,7 +24,7 @@ class SPFeConvolveMatrix : public SPFilterPrimitive { public: SPFeConvolveMatrix(); - virtual ~SPFeConvolveMatrix(); + ~SPFeConvolveMatrix() override; NumberOptNumber order; std::vector<gdouble> kernelMatrix; @@ -40,16 +40,16 @@ public: bool kernelMatrixIsSet; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FECONVOLVEMATRIX_H_SEEN */ diff --git a/src/object/filters/diffuselighting.h b/src/object/filters/diffuselighting.h index f41c6c056..68008af89 100644 --- a/src/object/filters/diffuselighting.h +++ b/src/object/filters/diffuselighting.h @@ -28,7 +28,7 @@ class FilterDiffuseLighting; class SPFeDiffuseLighting : public SPFilterPrimitive { public: SPFeDiffuseLighting(); - virtual ~SPFeDiffuseLighting(); + ~SPFeDiffuseLighting() override; gfloat surfaceScale; guint surfaceScale_set : 1; @@ -41,21 +41,21 @@ public: SVGICCColor *icc; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr); + void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr) override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEDIFFUSELIGHTING_H_SEEN */ diff --git a/src/object/filters/displacementmap.h b/src/object/filters/displacementmap.h index 85a6beaaa..b3f6db1b1 100644 --- a/src/object/filters/displacementmap.h +++ b/src/object/filters/displacementmap.h @@ -28,7 +28,7 @@ enum FilterDisplacementMapChannelSelector { class SPFeDisplacementMap : public SPFilterPrimitive { public: SPFeDisplacementMap(); - virtual ~SPFeDisplacementMap(); + ~SPFeDisplacementMap() override; int in2; double scale; @@ -36,16 +36,16 @@ public: FilterDisplacementMapChannelSelector yChannelSelector; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEDISPLACEMENTMAP_H_SEEN */ diff --git a/src/object/filters/distantlight.h b/src/object/filters/distantlight.h index 1aa68a1d0..15b257f31 100644 --- a/src/object/filters/distantlight.h +++ b/src/object/filters/distantlight.h @@ -24,7 +24,7 @@ class SPFeDistantLight : public SPObject { public: SPFeDistantLight(); - virtual ~SPFeDistantLight(); + ~SPFeDistantLight() override; /** azimuth attribute */ float azimuth; @@ -34,14 +34,14 @@ public: unsigned int elevation_set : 1; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif /* !SP_FEDISTANTLIGHT_H_SEEN */ diff --git a/src/object/filters/flood.h b/src/object/filters/flood.h index 75e332b73..192643e36 100644 --- a/src/object/filters/flood.h +++ b/src/object/filters/flood.h @@ -21,23 +21,23 @@ class SPFeFlood : public SPFilterPrimitive { public: SPFeFlood(); - virtual ~SPFeFlood(); + ~SPFeFlood() override; guint32 color; SVGICCColor *icc; double opacity; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEFLOOD_H_SEEN */ diff --git a/src/object/filters/gaussian-blur.h b/src/object/filters/gaussian-blur.h index 00de8a95f..57d9f28ce 100644 --- a/src/object/filters/gaussian-blur.h +++ b/src/object/filters/gaussian-blur.h @@ -21,22 +21,22 @@ class SPGaussianBlur : public SPFilterPrimitive { public: SPGaussianBlur(); - virtual ~SPGaussianBlur(); + ~SPGaussianBlur() override; /** stdDeviation attribute */ NumberOptNumber stdDeviation; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; void sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num); diff --git a/src/object/filters/image.h b/src/object/filters/image.h index 26524c166..040b8543d 100644 --- a/src/object/filters/image.h +++ b/src/object/filters/image.h @@ -27,7 +27,7 @@ class URIReference; class SPFeImage : public SPFilterPrimitive { public: SPFeImage(); - virtual ~SPFeImage(); + ~SPFeImage() override; gchar *href; @@ -42,16 +42,16 @@ public: sigc::connection _href_modified_connection; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEIMAGE_H_SEEN */ diff --git a/src/object/filters/merge.h b/src/object/filters/merge.h index 68257c38e..b7eaafb29 100644 --- a/src/object/filters/merge.h +++ b/src/object/filters/merge.h @@ -18,19 +18,19 @@ class SPFeMerge : public SPFilterPrimitive { public: SPFeMerge(); - virtual ~SPFeMerge(); + ~SPFeMerge() override; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEMERGE_H_SEEN */ diff --git a/src/object/filters/mergenode.h b/src/object/filters/mergenode.h index f2d204ad4..b02fac29f 100644 --- a/src/object/filters/mergenode.h +++ b/src/object/filters/mergenode.h @@ -23,19 +23,19 @@ class SPFeMergeNode : public SPObject { public: SPFeMergeNode(); - virtual ~SPFeMergeNode(); + ~SPFeMergeNode() override; int input; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; }; #endif /* !SP_FEMERGENODE_H_SEEN */ diff --git a/src/object/filters/morphology.h b/src/object/filters/morphology.h index f84a7271e..8edab6967 100644 --- a/src/object/filters/morphology.h +++ b/src/object/filters/morphology.h @@ -22,22 +22,22 @@ class SPFeMorphology : public SPFilterPrimitive { public: SPFeMorphology(); - virtual ~SPFeMorphology(); + ~SPFeMorphology() override; Inkscape::Filters::FilterMorphologyOperator Operator; NumberOptNumber radius; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEMORPHOLOGY_H_SEEN */ diff --git a/src/object/filters/offset.h b/src/object/filters/offset.h index 0d26f6f90..fadcb3493 100644 --- a/src/object/filters/offset.h +++ b/src/object/filters/offset.h @@ -20,21 +20,21 @@ class SPFeOffset : public SPFilterPrimitive { public: SPFeOffset(); - virtual ~SPFeOffset(); + ~SPFeOffset() override; double dx, dy; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FEOFFSET_H_SEEN */ diff --git a/src/object/filters/pointlight.h b/src/object/filters/pointlight.h index 2bd5496e1..c04ef90f3 100644 --- a/src/object/filters/pointlight.h +++ b/src/object/filters/pointlight.h @@ -23,7 +23,7 @@ class SPFePointLight : public SPObject { public: SPFePointLight(); - virtual ~SPFePointLight(); + ~SPFePointLight() override; /** x coordinate of the light source */ float x; @@ -36,14 +36,14 @@ public: unsigned int z_set : 1; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif /* !SP_FEPOINTLIGHT_H_SEEN */ diff --git a/src/object/filters/sp-filter-primitive.h b/src/object/filters/sp-filter-primitive.h index cebac8b1c..d45ac590e 100644 --- a/src/object/filters/sp-filter-primitive.h +++ b/src/object/filters/sp-filter-primitive.h @@ -29,19 +29,19 @@ class FilterPrimitive; class SPFilterPrimitive : public SPObject, public SPDimensions { public: SPFilterPrimitive(); - virtual ~SPFilterPrimitive(); + ~SPFilterPrimitive() override; int image_in, image_out; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; public: virtual void build_renderer(Inkscape::Filters::Filter* filter) = 0; diff --git a/src/object/filters/specularlighting.h b/src/object/filters/specularlighting.h index 1de32ec58..751858046 100644 --- a/src/object/filters/specularlighting.h +++ b/src/object/filters/specularlighting.h @@ -31,7 +31,7 @@ class FilterSpecularLighting; class SPFeSpecularLighting : public SPFilterPrimitive { public: SPFeSpecularLighting(); - virtual ~SPFeSpecularLighting(); + ~SPFeSpecularLighting() override; gfloat surfaceScale; guint surfaceScale_set : 1; @@ -47,21 +47,21 @@ public: Inkscape::Filters::FilterSpecularLighting *renderer; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr); + void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr) override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FESPECULARLIGHTING_H_SEEN */ diff --git a/src/object/filters/spotlight.h b/src/object/filters/spotlight.h index c82d24301..7ffb11b57 100644 --- a/src/object/filters/spotlight.h +++ b/src/object/filters/spotlight.h @@ -23,7 +23,7 @@ class SPFeSpotLight : public SPObject { public: SPFeSpotLight(); - virtual ~SPFeSpotLight(); + ~SPFeSpotLight() override; /** x coordinate of the light source */ float x; @@ -52,14 +52,14 @@ public: //other fields protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif /* !SP_FESPOTLIGHT_H_SEEN */ diff --git a/src/object/filters/tile.h b/src/object/filters/tile.h index cc1a006dd..94619abf6 100644 --- a/src/object/filters/tile.h +++ b/src/object/filters/tile.h @@ -21,19 +21,19 @@ class SPFeTile : public SPFilterPrimitive { public: SPFeTile(); - virtual ~SPFeTile(); + ~SPFeTile() override; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FETILE_H_SEEN */ diff --git a/src/object/filters/turbulence.h b/src/object/filters/turbulence.h index 89e6d4a19..a4b348807 100644 --- a/src/object/filters/turbulence.h +++ b/src/object/filters/turbulence.h @@ -25,7 +25,7 @@ class SPFeTurbulence : public SPFilterPrimitive { public: SPFeTurbulence(); - virtual ~SPFeTurbulence(); + ~SPFeTurbulence() override; /** TURBULENCE ATTRIBUTES HERE */ NumberOptNumber baseFrequency; @@ -37,16 +37,16 @@ public: bool updated; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const gchar* value); + void set(unsigned int key, const gchar* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual void build_renderer(Inkscape::Filters::Filter* filter); + void build_renderer(Inkscape::Filters::Filter* filter) override; }; #endif /* !SP_FETURBULENCE_H_SEEN */ diff --git a/src/object/persp3d-reference.h b/src/object/persp3d-reference.h index 871b29623..808d50e4d 100644 --- a/src/object/persp3d-reference.h +++ b/src/object/persp3d-reference.h @@ -27,7 +27,7 @@ class Node; class Persp3DReference : public Inkscape::URIReference { public: Persp3DReference(SPObject *obj); - ~Persp3DReference(); + ~Persp3DReference() override; Persp3D *getObject() const { return SP_PERSP3D(URIReference::getObject()); @@ -50,7 +50,7 @@ public: void quit_listening(void); protected: - virtual bool _acceptObject(SPObject *obj) const; + bool _acceptObject(SPObject *obj) const override; }; diff --git a/src/object/persp3d.h b/src/object/persp3d.h index a6ca43177..eef0ff5b6 100644 --- a/src/object/persp3d.h +++ b/src/object/persp3d.h @@ -58,19 +58,19 @@ public: class Persp3D : public SPObject { public: Persp3D(); - virtual ~Persp3D(); + ~Persp3D() override; Persp3DImpl *perspective_impl; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-anchor.h b/src/object/sp-anchor.h index 2dd81f74c..99c3b0ef9 100644 --- a/src/object/sp-anchor.h +++ b/src/object/sp-anchor.h @@ -21,22 +21,22 @@ class SPAnchor : public SPGroup { public: SPAnchor(); - virtual ~SPAnchor(); + ~SPAnchor() override; char *href; char *type; char *title; SPDocument *page; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, char const* value) override; virtual void updatePageAnchor(); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual const char* displayName() const; - virtual char* description() const; - virtual int event(SPEvent *event); + const char* displayName() const override; + char* description() const override; + int event(SPEvent *event) override; }; #endif diff --git a/src/object/sp-clippath.h b/src/object/sp-clippath.h index 87b5be92c..e2c60789a 100644 --- a/src/object/sp-clippath.h +++ b/src/object/sp-clippath.h @@ -35,7 +35,7 @@ class DrawingItem; class SPClipPath : public SPObjectGroup { public: SPClipPath(); - virtual ~SPClipPath(); + ~SPClipPath() override; class Reference; @@ -53,17 +53,17 @@ public: Geom::OptRect geometricBounds(Geom::Affine const &transform); protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; @@ -81,7 +81,7 @@ protected: * \return false if obj is not a clippath or if obj is a parent of this * reference's owner element. True otherwise. */ - virtual bool _acceptObject(SPObject *obj) const { + bool _acceptObject(SPObject *obj) const override { if (!SP_IS_CLIPPATH(obj)) { return false; } diff --git a/src/object/sp-defs.h b/src/object/sp-defs.h index c122cb2a9..87e120f5d 100644 --- a/src/object/sp-defs.h +++ b/src/object/sp-defs.h @@ -21,13 +21,13 @@ class SPDefs : public SPObject { public: SPDefs(); - virtual ~SPDefs(); + ~SPDefs() override; protected: - virtual void release(); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void release() override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; #endif // !SEEN_SP_DEFS_H diff --git a/src/object/sp-desc.h b/src/object/sp-desc.h index 40888bee4..8dbae9b8d 100644 --- a/src/object/sp-desc.h +++ b/src/object/sp-desc.h @@ -20,10 +20,10 @@ class SPDesc : public SPObject { public: SPDesc(); - virtual ~SPDesc(); + ~SPDesc() override; protected: - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif diff --git a/src/object/sp-ellipse.h b/src/object/sp-ellipse.h index a173f39f1..2721fc74f 100644 --- a/src/object/sp-ellipse.h +++ b/src/object/sp-ellipse.h @@ -39,7 +39,7 @@ enum GenericEllipseArcType { class SPGenericEllipse : public SPShape { public: SPGenericEllipse(); - virtual ~SPGenericEllipse(); + ~SPGenericEllipse() override; // Regardless of type, the ellipse/circle/arc is stored // internally with these variables. (Circle radius is rx). @@ -56,21 +56,21 @@ public: GenericEllipseType type; GenericEllipseArcType arc_type; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; - virtual void set(unsigned int key, char const *value); - virtual void update(SPCtx *ctx, unsigned int flags); + void set(unsigned int key, char const *value) override; + void update(SPCtx *ctx, unsigned int flags) override; - virtual Inkscape::XML::Node *write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual const char *displayName() const; + Inkscape::XML::Node *write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + const char *displayName() const override; - virtual void set_shape(); - virtual void update_patheffect(bool write); - virtual Geom::Affine set_transform(Geom::Affine const &xform); + void set_shape() override; + void update_patheffect(bool write) override; + Geom::Affine set_transform(Geom::Affine const &xform) override; - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; - virtual void modified(unsigned int flags); + void modified(unsigned int flags) override; /** * @brief Makes sure that start and end lie between 0 and 2 * PI. diff --git a/src/object/sp-filter-reference.h b/src/object/sp-filter-reference.h index 5901dca07..f591b8bd8 100644 --- a/src/object/sp-filter-reference.h +++ b/src/object/sp-filter-reference.h @@ -17,7 +17,7 @@ public: } protected: - virtual bool _acceptObject(SPObject *obj) const; + bool _acceptObject(SPObject *obj) const override; }; #endif /* !SEEN_SP_FILTER_REFERENCE_H */ diff --git a/src/object/sp-filter.h b/src/object/sp-filter.h index 054562d39..b82ae745d 100644 --- a/src/object/sp-filter.h +++ b/src/object/sp-filter.h @@ -42,7 +42,7 @@ struct ltstr { class SPFilter : public SPObject, public SPDimensions { public: SPFilter(); - virtual ~SPFilter(); + ~SPFilter() override; SPFilterUnits filterUnits; unsigned int filterUnits_set : 1; @@ -61,17 +61,17 @@ public: int _image_number_next; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void set(unsigned int key, const char* value); + void set(unsigned int key, const char* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; void sp_filter_set_filter_units(SPFilter *filter, SPFilterUnits filterUnits); diff --git a/src/object/sp-flowdiv.h b/src/object/sp-flowdiv.h index 4a3690726..3875fc520 100644 --- a/src/object/sp-flowdiv.h +++ b/src/object/sp-flowdiv.h @@ -26,71 +26,71 @@ class SPFlowdiv : public SPItem { public: SPFlowdiv(); - virtual ~SPFlowdiv(); + ~SPFlowdiv() override; protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; class SPFlowtspan : public SPItem { public: SPFlowtspan(); - virtual ~SPFlowtspan(); + ~SPFlowtspan() override; protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; class SPFlowpara : public SPItem { public: SPFlowpara(); - virtual ~SPFlowpara(); + ~SPFlowpara() override; protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; // these do not need any style class SPFlowline : public SPObject { public: SPFlowline(); - virtual ~SPFlowline(); + ~SPFlowline() override; protected: - virtual void release(); - virtual void modified(unsigned int flags); + void release() override; + void modified(unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; class SPFlowregionbreak : public SPObject { public: SPFlowregionbreak(); - virtual ~SPFlowregionbreak(); + ~SPFlowregionbreak() override; protected: - virtual void release(); - virtual void modified(unsigned int flags); + void release() override; + void modified(unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; #endif diff --git a/src/object/sp-flowregion.h b/src/object/sp-flowregion.h index 024a298b8..58c67c8d1 100644 --- a/src/object/sp-flowregion.h +++ b/src/object/sp-flowregion.h @@ -20,35 +20,35 @@ class FloatLigne; class SPFlowregion : public SPItem { public: SPFlowregion(); - virtual ~SPFlowregion(); + ~SPFlowregion() override; std::vector<Shape*> computed; void UpdateComputed(void); - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node *child); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual void modified(guint flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual const char* displayName() const; + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node *child) override; + void update(SPCtx *ctx, unsigned int flags) override; + void modified(guint flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + const char* displayName() const override; }; class SPFlowregionExclude : public SPItem { public: SPFlowregionExclude(); - virtual ~SPFlowregionExclude(); + ~SPFlowregionExclude() override; Shape *computed; void UpdateComputed(void); - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node *child); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual void modified(guint flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual const char* displayName() const; + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node *child) override; + void update(SPCtx *ctx, unsigned int flags) override; + void modified(guint flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + const char* displayName() const override; }; #endif diff --git a/src/object/sp-flowtext.h b/src/object/sp-flowtext.h index d0b0a19a4..321000d25 100644 --- a/src/object/sp-flowtext.h +++ b/src/object/sp-flowtext.h @@ -23,7 +23,7 @@ class DrawingGroup; class SPFlowtext : public SPItem { public: SPFlowtext(); - virtual ~SPFlowtext(); + ~SPFlowtext() override; /** Completely recalculates the layout. */ void rebuildLayout(); @@ -68,26 +68,26 @@ private: Shape* _buildExclusionShape() const; public: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void set(unsigned int key, const char* value); - virtual Geom::Affine set_transform(Geom::Affine const& xform); + void set(unsigned int key, const char* value) override; + Geom::Affine set_transform(Geom::Affine const& xform) override; - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; - virtual void print(SPPrintContext *ctx); - virtual const char* displayName() const; - virtual char* description() const; - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void hide(unsigned int key); - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const override; + void print(SPPrintContext *ctx) override; + const char* displayName() const override; + char* description() const override; + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void hide(unsigned int key) override; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; }; SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, Geom::Point p1, Geom::Point p2); diff --git a/src/object/sp-font-face.h b/src/object/sp-font-face.h index 669b93197..cbe43b4b6 100644 --- a/src/object/sp-font-face.h +++ b/src/object/sp-font-face.h @@ -70,7 +70,7 @@ enum FontFaceUnicodeRangeType{ class SPFontFace : public SPObject { public: SPFontFace(); - virtual ~SPFontFace(); + ~SPFontFace() override; char* font_family; std::vector<FontFaceStyleType> font_style; @@ -107,17 +107,17 @@ public: double overline_thickness; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void set(unsigned int key, const char* value); + void set(unsigned int key, const char* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif //#ifndef __SP_FONTFACE_H__ diff --git a/src/object/sp-font.h b/src/object/sp-font.h index 6e26a02b2..9e08507c5 100644 --- a/src/object/sp-font.h +++ b/src/object/sp-font.h @@ -20,7 +20,7 @@ class SPFont : public SPObject { public: SPFont(); - virtual ~SPFont(); + ~SPFont() override; double horiz_origin_x; double horiz_origin_y; @@ -30,17 +30,17 @@ public: double vert_adv_y; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif //#ifndef SP_FONT_H_SEEN diff --git a/src/object/sp-glyph-kerning.h b/src/object/sp-glyph-kerning.h index c96c0b6e4..10624f17d 100644 --- a/src/object/sp-glyph-kerning.h +++ b/src/object/sp-glyph-kerning.h @@ -35,7 +35,7 @@ private: class SPGlyphKerning : public SPObject { public: SPGlyphKerning(); - virtual ~SPGlyphKerning() {} + ~SPGlyphKerning() override {} // FIXME encapsulation UnicodeRange* u1; @@ -45,19 +45,19 @@ public: double k; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; class SPHkern : public SPGlyphKerning { - virtual ~SPHkern() {} + ~SPHkern() override {} }; class SPVkern : public SPGlyphKerning { - virtual ~SPVkern() {} + ~SPVkern() override {} }; #endif // !SEEN_SP_GLYPH_KERNING_H diff --git a/src/object/sp-glyph.h b/src/object/sp-glyph.h index 297ac930e..49c644b21 100644 --- a/src/object/sp-glyph.h +++ b/src/object/sp-glyph.h @@ -35,7 +35,7 @@ enum glyphOrientation { class SPGlyph : public SPObject { public: SPGlyph(); - virtual ~SPGlyph() {} + ~SPGlyph() override {} // FIXME encapsulation Glib::ustring unicode; @@ -50,11 +50,11 @@ public: double vert_adv_y; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, const char* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, const char* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-gradient-reference.h b/src/object/sp-gradient-reference.h index 96980fd6f..e32bd6089 100644 --- a/src/object/sp-gradient-reference.h +++ b/src/object/sp-gradient-reference.h @@ -15,7 +15,7 @@ public: } protected: - virtual bool _acceptObject(SPObject *obj) const; + bool _acceptObject(SPObject *obj) const override; }; diff --git a/src/object/sp-gradient.h b/src/object/sp-gradient.h index 9a0d5070f..5d644925a 100644 --- a/src/object/sp-gradient.h +++ b/src/object/sp-gradient.h @@ -86,7 +86,7 @@ std::vector<PaintTarget> const &allPaintTargets(); class SPGradient : public SPPaintServer { public: SPGradient(); - virtual ~SPGradient(); + ~SPGradient() override; private: /** gradientUnits attribute */ @@ -192,15 +192,15 @@ private: void rebuildArray(); protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual void child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref); - virtual void remove_child(Inkscape::XML::Node *child); + void child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) override; + void remove_child(Inkscape::XML::Node *child) override; - virtual void set(unsigned key, char const *value); + void set(unsigned key, char const *value) override; }; void diff --git a/src/object/sp-guide.h b/src/object/sp-guide.h index 25a0e5af8..3ce3cc3de 100644 --- a/src/object/sp-guide.h +++ b/src/object/sp-guide.h @@ -35,7 +35,7 @@ struct SPGuideLine; class SPGuide : public SPObject { public: SPGuide(); - virtual ~SPGuide() {} + ~SPGuide() override {} void set_color(const unsigned r, const unsigned g, const unsigned b, bool const commit); void setColor(guint32 c); @@ -74,9 +74,9 @@ public: Geom::Point getPositionFrom(Geom::Point const &pt) const; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, const char* value); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, const char* value) override; char* label; std::vector<SPGuideLine *> views; // contains an object of type SPGuideline (see display/guideline.cpp for definition) diff --git a/src/object/sp-hatch-path.h b/src/object/sp-hatch-path.h index 11fc274ec..ca00ae79d 100644 --- a/src/object/sp-hatch-path.h +++ b/src/object/sp-hatch-path.h @@ -32,7 +32,7 @@ class DrawingShape; class SPHatchPath : public SPObject { public: SPHatchPath(); - virtual ~SPHatchPath(); + ~SPHatchPath() override; SVGLength offset; @@ -49,10 +49,10 @@ public: SPCurve *calculateRenderCurve(unsigned key) const; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, const gchar* value); - virtual void update(SPCtx* ctx, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, const gchar* value) override; + void update(SPCtx* ctx, unsigned int flags) override; private: class View { diff --git a/src/object/sp-hatch.h b/src/object/sp-hatch.h index 546f06a1e..0b7e98577 100644 --- a/src/object/sp-hatch.h +++ b/src/object/sp-hatch.h @@ -63,7 +63,7 @@ public: }; SPHatch(); - virtual ~SPHatch(); + ~SPHatch() override; // Reference (href) Glib::ustring href; @@ -81,23 +81,23 @@ public: std::vector<SPHatchPath *> hatchPaths(); std::vector<SPHatchPath const *> hatchPaths() const; - bool isValid() const; + bool isValid() const override; - Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptRect bbox); - void hide(unsigned int key); - virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptRect bbox) override; + void hide(unsigned int key) override; + cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) override; RenderInfo calculateRenderInfo(unsigned key) const; Geom::Interval bounds() const; - void setBBox(unsigned int key, Geom::OptRect const &bbox); + void setBBox(unsigned int key, Geom::OptRect const &bbox) override; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void set(unsigned int key, const gchar* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void set(unsigned int key, const gchar* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; private: class View { @@ -167,7 +167,7 @@ public: } protected: - virtual bool _acceptObject(SPObject *obj) const { + bool _acceptObject(SPObject *obj) const override { return dynamic_cast<SPHatch *>(obj) != NULL && URIReference::_acceptObject(obj); } }; diff --git a/src/object/sp-image.h b/src/object/sp-image.h index 9a45f819c..04e1df7fa 100644 --- a/src/object/sp-image.h +++ b/src/object/sp-image.h @@ -30,7 +30,7 @@ namespace Inkscape { class Pixbuf; } class SPImage : public SPItem, public SPViewBox, public SPDimensions { public: SPImage(); - virtual ~SPImage(); + ~SPImage() override; Geom::Rect clipbox; double sx, sy; @@ -45,20 +45,20 @@ public: Inkscape::Pixbuf *pixbuf; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual void modified(unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx *ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; - virtual void print(SPPrintContext *ctx); - virtual const char* displayName() const; - virtual char* description() const; - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; - virtual Geom::Affine set_transform(Geom::Affine const &transform); + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const override; + void print(SPPrintContext *ctx) override; + const char* displayName() const override; + char* description() const override; + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; + Geom::Affine set_transform(Geom::Affine const &transform) override; #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) void apply_profile(Inkscape::Pixbuf *pixbuf); diff --git a/src/object/sp-item-group.h b/src/object/sp-item-group.h index a96d77aa9..38cdf1bdd 100644 --- a/src/object/sp-item-group.h +++ b/src/object/sp-item-group.h @@ -31,7 +31,7 @@ class DrawingItem; class SPGroup : public SPLPEItem { public: SPGroup(); - virtual ~SPGroup(); + ~SPGroup() override; enum LayerMode { GROUP, LAYER, MASK_HELPER }; @@ -69,29 +69,29 @@ private: void _updateLayerMode(unsigned int display_key=0); public: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node *child); - virtual void order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node *child) override; + void order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) override; - virtual void update(SPCtx *ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual void set(unsigned int key, char const* value); + void update(SPCtx *ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + void set(unsigned int key, char const* value) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const; - virtual void print(SPPrintContext *ctx); - virtual const char* displayName() const; - virtual char *description() const; - virtual Inkscape::DrawingItem *show (Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void hide (unsigned int key); + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const override; + void print(SPPrintContext *ctx) override; + const char* displayName() const override; + char *description() const override; + Inkscape::DrawingItem *show (Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void hide (unsigned int key) override; - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; - virtual void update_patheffect(bool write); + void update_patheffect(bool write) override; }; diff --git a/src/object/sp-item.h b/src/object/sp-item.h index 88fca9779..82aca1250 100644 --- a/src/object/sp-item.h +++ b/src/object/sp-item.h @@ -134,7 +134,7 @@ public: }; SPItem(); - virtual ~SPItem(); + ~SPItem() override; unsigned int sensitive : 1; unsigned int stop_paint: 1; @@ -386,12 +386,12 @@ private: static void stroke_ps_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item); public: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx *ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; virtual void print(SPPrintContext *ctx); diff --git a/src/object/sp-line.h b/src/object/sp-line.h index 6c720d403..4420b01c8 100644 --- a/src/object/sp-line.h +++ b/src/object/sp-line.h @@ -23,23 +23,23 @@ class SPLine : public SPShape { public: SPLine(); - virtual ~SPLine(); + ~SPLine() override; SVGLength x1; SVGLength y1; SVGLength x2; SVGLength y2; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual void set(unsigned int key, char const* value); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + void set(unsigned int key, char const* value) override; - virtual const char* displayName() const; - virtual Geom::Affine set_transform(Geom::Affine const &transform); - virtual void convert_to_guides() const; - virtual void update(SPCtx* ctx, unsigned int flags); + const char* displayName() const override; + Geom::Affine set_transform(Geom::Affine const &transform) override; + void convert_to_guides() const override; + void update(SPCtx* ctx, unsigned int flags) override; - virtual void set_shape(); + void set_shape() override; }; #endif // SEEN_SP_LINE_H diff --git a/src/object/sp-linear-gradient.h b/src/object/sp-linear-gradient.h index a152e7fe2..c3ffe7610 100644 --- a/src/object/sp-linear-gradient.h +++ b/src/object/sp-linear-gradient.h @@ -15,19 +15,19 @@ class SPLinearGradient : public SPGradient { public: SPLinearGradient(); - virtual ~SPLinearGradient(); + ~SPLinearGradient() override; SVGLength x1; SVGLength y1; SVGLength x2; SVGLength y2; - virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) override; protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void set(unsigned key, char const *value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void set(unsigned key, char const *value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; #endif /* !SP_LINEAR_GRADIENT_H */ diff --git a/src/object/sp-lpe-item.h b/src/object/sp-lpe-item.h index 0e6049d4e..665dbcd7d 100644 --- a/src/object/sp-lpe-item.h +++ b/src/object/sp-lpe-item.h @@ -41,7 +41,7 @@ typedef std::list<Inkscape::LivePathEffect::LPEObjectReference *> PathEffectList class SPLPEItem : public SPItem { public: SPLPEItem(); - virtual ~SPLPEItem(); + ~SPLPEItem() override; int path_effects_enabled; @@ -55,18 +55,18 @@ public: std::vector<LivePathEffectObject const *> const &new_lpeobjs ); - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; virtual void update_patheffect(bool write); diff --git a/src/object/sp-marker.h b/src/object/sp-marker.h index bae13243b..5394d9376 100644 --- a/src/object/sp-marker.h +++ b/src/object/sp-marker.h @@ -44,7 +44,7 @@ enum markerOrient { class SPMarker : public SPGroup, public SPViewBox { public: SPMarker(); - virtual ~SPMarker(); + ~SPMarker() override; /* units */ unsigned int markerUnits_set : 1; @@ -71,18 +71,18 @@ public: */ std::map<unsigned int, SPMarkerView> views_map; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, gchar const* value); - virtual void update(SPCtx *ctx, guint flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, gchar const* value) override; + void update(SPCtx *ctx, guint flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) override; - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; virtual Inkscape::DrawingItem* private_show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void hide(unsigned int key); + void hide(unsigned int key) override; - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; - virtual void print(SPPrintContext *ctx); + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const override; + void print(SPPrintContext *ctx) override; }; class SPMarkerReference : public Inkscape::URIReference { @@ -91,7 +91,7 @@ class SPMarkerReference : public Inkscape::URIReference { return static_cast<SPMarker *>(URIReference::getObject()); } protected: - virtual bool _acceptObject(SPObject *obj) const { + bool _acceptObject(SPObject *obj) const override { return SP_IS_MARKER(obj) && URIReference::_acceptObject(obj); } }; diff --git a/src/object/sp-mask.h b/src/object/sp-mask.h index 26e510830..f02a486b3 100644 --- a/src/object/sp-mask.h +++ b/src/object/sp-mask.h @@ -34,7 +34,7 @@ class DrawingItem; class SPMask : public SPObjectGroup { public: SPMask(); - virtual ~SPMask(); + ~SPMask() override; unsigned int maskUnits_set : 1; unsigned int maskUnits : 1; @@ -54,17 +54,17 @@ public: void sp_mask_set_bbox(unsigned int key, Geom::OptRect const &bbox); protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; - virtual void set(unsigned int key, const char* value); + void set(unsigned int key, const char* value) override; - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; class SPMaskReference : public Inkscape::URIReference { @@ -80,7 +80,7 @@ protected: * \return false if obj is not a mask or if obj is a parent of this * reference's owner element. True otherwise. */ - virtual bool _acceptObject(SPObject *obj) const { + bool _acceptObject(SPObject *obj) const override { if (!SP_IS_MASK(obj)) { return false; } diff --git a/src/object/sp-mesh-gradient.h b/src/object/sp-mesh-gradient.h index a221554a3..c542ea830 100644 --- a/src/object/sp-mesh-gradient.h +++ b/src/object/sp-mesh-gradient.h @@ -15,18 +15,18 @@ class SPMeshGradient : public SPGradient { public: SPMeshGradient(); - virtual ~SPMeshGradient(); + ~SPMeshGradient() override; SVGLength x; // Upper left corner of meshgradient SVGLength y; // Upper right corner of mesh SPMeshType type; bool type_set; - virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) override; protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void set(unsigned key, char const *value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void set(unsigned key, char const *value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; #endif /* !SP_MESH_GRADIENT_H */ diff --git a/src/object/sp-mesh-patch.h b/src/object/sp-mesh-patch.h index e018b81ea..5a7834ec7 100644 --- a/src/object/sp-mesh-patch.h +++ b/src/object/sp-mesh-patch.h @@ -22,7 +22,7 @@ class SPMeshpatch : public SPObject { public: SPMeshpatch(); - virtual ~SPMeshpatch(); + ~SPMeshpatch() override; SPMeshpatch* getNextMeshpatch(); SPMeshpatch* getPrevMeshpatch(); @@ -31,10 +31,10 @@ public: //SVGLength ty[4]; // Tensor points protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void set(unsigned int key, const char* value); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void set(unsigned int key, const char* value) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif /* !SEEN_SP_MESHPATCH_H */ diff --git a/src/object/sp-mesh-row.h b/src/object/sp-mesh-row.h index 40335e2b9..669c7f237 100644 --- a/src/object/sp-mesh-row.h +++ b/src/object/sp-mesh-row.h @@ -20,16 +20,16 @@ class SPMeshrow : public SPObject { public: SPMeshrow(); - virtual ~SPMeshrow(); + ~SPMeshrow() override; SPMeshrow* getNextMeshrow(); SPMeshrow* getPrevMeshrow(); protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void set(unsigned int key, const char* value); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void set(unsigned int key, const char* value) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif /* !SEEN_SP_MESHROW_H */ diff --git a/src/object/sp-metadata.h b/src/object/sp-metadata.h index a89020390..2ca53c6a2 100644 --- a/src/object/sp-metadata.h +++ b/src/object/sp-metadata.h @@ -22,15 +22,15 @@ class SPMetadata : public SPObject { public: SPMetadata(); - virtual ~SPMetadata(); + ~SPMetadata() override; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, const char* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void set(unsigned int key, const char* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; SPMetadata * sp_document_metadata (SPDocument *document); diff --git a/src/object/sp-missing-glyph.h b/src/object/sp-missing-glyph.h index 06bc92231..75652da02 100644 --- a/src/object/sp-missing-glyph.h +++ b/src/object/sp-missing-glyph.h @@ -20,15 +20,15 @@ class SPMissingGlyph : public SPObject { public: SPMissingGlyph(); - virtual ~SPMissingGlyph(); + ~SPMissingGlyph() override; char* d; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; private: double horiz_adv_x; diff --git a/src/object/sp-namedview.h b/src/object/sp-namedview.h index 8a46d3fd5..1dd2a5f5b 100644 --- a/src/object/sp-namedview.h +++ b/src/object/sp-namedview.h @@ -41,7 +41,7 @@ enum { class SPNamedView : public SPObjectGroup { public: SPNamedView(); - virtual ~SPNamedView(); + ~SPNamedView() override; unsigned int editable : 1; unsigned int showguides : 1; @@ -105,14 +105,14 @@ private: friend class SPDocument; protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, char const* value) override; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; diff --git a/src/object/sp-object-group.h b/src/object/sp-object-group.h index dcaa8a1d0..1def4a8d1 100644 --- a/src/object/sp-object-group.h +++ b/src/object/sp-object-group.h @@ -22,15 +22,15 @@ class SPObjectGroup : public SPObject { public: SPObjectGroup(); - virtual ~SPObjectGroup(); + ~SPObjectGroup() override; protected: - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old, Inkscape::XML::Node* new_repr); + void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old, Inkscape::XML::Node* new_repr) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; #endif // SEEN_SP_OBJECTGROUP_H diff --git a/src/object/sp-offset.h b/src/object/sp-offset.h index 117a3308e..f99124b88 100644 --- a/src/object/sp-offset.h +++ b/src/object/sp-offset.h @@ -52,7 +52,7 @@ class SPUseReference; class SPOffset : public SPShape { public: SPOffset(); - virtual ~SPOffset(); + ~SPOffset() override; void *originalPath; ///< will be a livarot Path, just don't declare it here to please the gcc linker FIXME what? char *original; ///< SVG description of the source path @@ -75,17 +75,17 @@ public: sigc::connection _changed_connection; sigc::connection _transformed_connection; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned flags); - virtual void release(); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void set(unsigned int key, char const* value) override; + void update(SPCtx *ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned flags) override; + void release() override; - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; - virtual const char* displayName() const; - virtual char* description() const; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; + const char* displayName() const override; + char* description() const override; - virtual void set_shape(); + void set_shape() override; }; double sp_offset_distance_to_original (SPOffset * offset, Geom::Point px); diff --git a/src/object/sp-paint-server-reference.h b/src/object/sp-paint-server-reference.h index bbd9c25fa..a4dcf7808 100644 --- a/src/object/sp-paint-server-reference.h +++ b/src/object/sp-paint-server-reference.h @@ -28,7 +28,7 @@ public: SPPaintServer *getObject() const; protected: - virtual bool _acceptObject(SPObject *obj) const; + bool _acceptObject(SPObject *obj) const override; }; #endif // SEEN_SP_PAINT_SERVER_REFERENCE_H diff --git a/src/object/sp-paint-server.h b/src/object/sp-paint-server.h index 7f3bfcba0..23d0399af 100644 --- a/src/object/sp-paint-server.h +++ b/src/object/sp-paint-server.h @@ -33,7 +33,7 @@ class DrawingPattern; class SPPaintServer : public SPObject { public: SPPaintServer(); - virtual ~SPPaintServer(); + ~SPPaintServer() override; bool isSwatch() const; bool isSolid() const; diff --git a/src/object/sp-path.h b/src/object/sp-path.h index 661e346f7..3bd7f5a54 100644 --- a/src/object/sp-path.h +++ b/src/object/sp-path.h @@ -31,24 +31,24 @@ class SPCurve; class SPPath : public SPShape { public: SPPath(); - virtual ~SPPath(); + ~SPPath() override; int nodesInPath() const; friend class SPConnEndPair; SPConnEndPair connEndPair; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void update(SPCtx* ctx, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void update(SPCtx* ctx, unsigned int flags) override; - virtual void set(unsigned int key, char const* value); - virtual void update_patheffect(bool write); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void set(unsigned int key, char const* value) override; + void update_patheffect(bool write) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual const char* displayName() const; - virtual char* description() const; - virtual Geom::Affine set_transform(Geom::Affine const &transform); - virtual void convert_to_guides() const; + const char* displayName() const override; + char* description() const override; + Geom::Affine set_transform(Geom::Affine const &transform) override; + void convert_to_guides() const override; private: SPStyleSrc d_source; // Source of 'd' value, saved for output. }; diff --git a/src/object/sp-pattern.h b/src/object/sp-pattern.h index a5e7be1d4..dd590280e 100644 --- a/src/object/sp-pattern.h +++ b/src/object/sp-pattern.h @@ -41,7 +41,7 @@ public: enum PatternUnits { UNITS_USERSPACEONUSE, UNITS_OBJECTBOUNDINGBOX }; SPPattern(); - virtual ~SPPattern(); + ~SPPattern() override; /* Reference (href) */ Glib::ustring href; @@ -67,16 +67,16 @@ public: static const gchar *produce(const std::vector<Inkscape::XML::Node *> &reprs, Geom::Rect bounds, SPDocument *document, Geom::Affine transform, Geom::Affine move); - bool isValid() const; + bool isValid() const override; - virtual cairo_pattern_t *pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + cairo_pattern_t *pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) override; protected: - virtual void build(SPDocument *doc, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, const gchar *value); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void build(SPDocument *doc, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, const gchar *value) override; + void update(SPCtx *ctx, unsigned int flags) override; + void modified(unsigned int flags) override; private: bool _hasItemChildren() const; @@ -129,7 +129,7 @@ public: } protected: - virtual bool _acceptObject(SPObject *obj) const { + bool _acceptObject(SPObject *obj) const override { return SP_IS_PATTERN (obj)&& URIReference::_acceptObject(obj); } }; diff --git a/src/object/sp-polygon.h b/src/object/sp-polygon.h index 438fdf794..ef853c6de 100644 --- a/src/object/sp-polygon.h +++ b/src/object/sp-polygon.h @@ -21,12 +21,12 @@ class SPPolygon : public SPShape { public: SPPolygon(); - virtual ~SPPolygon(); + ~SPPolygon() override; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual void set(unsigned int key, char const* value); - virtual char* description() const; + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + void set(unsigned int key, char const* value) override; + char* description() const override; }; // made 'public' so that SPCurve can set it as friend: diff --git a/src/object/sp-polyline.h b/src/object/sp-polyline.h index 1ca102a9e..6a689a6f0 100644 --- a/src/object/sp-polyline.h +++ b/src/object/sp-polyline.h @@ -9,13 +9,13 @@ class SPPolyLine : public SPShape { public: SPPolyLine(); - virtual ~SPPolyLine(); + ~SPPolyLine() override; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual char* description() const; + char* description() const override; }; #endif // SEEN_SP_POLYLINE_H diff --git a/src/object/sp-radial-gradient.h b/src/object/sp-radial-gradient.h index f90c8c7a9..d31f63966 100644 --- a/src/object/sp-radial-gradient.h +++ b/src/object/sp-radial-gradient.h @@ -18,7 +18,7 @@ typedef struct _cairo_pattern cairo_pattern_t; class SPRadialGradient : public SPGradient { public: SPRadialGradient(); - virtual ~SPRadialGradient(); + ~SPRadialGradient() override; SVGLength cx; SVGLength cy; @@ -27,12 +27,12 @@ public: SVGLength fy; SVGLength fr; // Focus radius. Added in SVG 2 - virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) override; protected: - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void set(unsigned key, char const *value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void set(unsigned key, char const *value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; #endif /* !SP_RADIAL_GRADIENT_H */ diff --git a/src/object/sp-rect.h b/src/object/sp-rect.h index 757229724..68d2507a4 100644 --- a/src/object/sp-rect.h +++ b/src/object/sp-rect.h @@ -25,7 +25,7 @@ class SPRect : public SPShape { public: SPRect(); - virtual ~SPRect(); + ~SPRect() override; void setPosition(double x, double y, double width, double height); @@ -49,19 +49,19 @@ public: void compensateRxRy(Geom::Affine xform); - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - virtual void set(unsigned key, char const *value); - virtual void update(SPCtx* ctx, unsigned int flags); + void set(unsigned key, char const *value) override; + void update(SPCtx* ctx, unsigned int flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual const char* displayName() const; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + const char* displayName() const override; - virtual void set_shape(); - virtual Geom::Affine set_transform(Geom::Affine const& xform); + void set_shape() override; + Geom::Affine set_transform(Geom::Affine const& xform) override; - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; - virtual void convert_to_guides() const; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; + void convert_to_guides() const override; SVGLength x; SVGLength y; diff --git a/src/object/sp-root.h b/src/object/sp-root.h index 4a37840d9..9bf3fb0db 100644 --- a/src/object/sp-root.h +++ b/src/object/sp-root.h @@ -29,7 +29,7 @@ class SPDefs; class SPRoot : public SPGroup, public SPViewBox, public SPDimensions { public: SPRoot(); - virtual ~SPRoot(); + ~SPRoot() override; struct { Inkscape::Version svg; @@ -46,19 +46,19 @@ public: */ SPDefs *defs; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx *ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual void modified(unsigned int flags); - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); + void modified(unsigned int flags) override; + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void print(SPPrintContext *ctx); - virtual const char* displayName() const; + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void print(SPPrintContext *ctx) override; + const char* displayName() const override; private: void unset_x_and_y(); void setRootDimensions(); diff --git a/src/object/sp-script.h b/src/object/sp-script.h index cdacb8493..794ba5e70 100644 --- a/src/object/sp-script.h +++ b/src/object/sp-script.h @@ -20,17 +20,17 @@ class SPScript : public SPObject { public: SPScript(); - virtual ~SPScript(); + ~SPScript() override; char *xlinkhref; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif diff --git a/src/object/sp-shape.h b/src/object/sp-shape.h index be097e390..1fa8dbe4d 100644 --- a/src/object/sp-shape.h +++ b/src/object/sp-shape.h @@ -37,7 +37,7 @@ namespace Inkscape { class DrawingItem; } class SPShape : public SPLPEItem { public: SPShape(); - virtual ~SPShape(); + ~SPShape() override; SPCurve * getCurve (unsigned int owner = FALSE) const; SPCurve * getCurveBeforeLPE (unsigned int owner = FALSE) const; @@ -58,24 +58,24 @@ public: sigc::connection _release_connect [SP_MARKER_LOC_QTY]; sigc::connection _modified_connect [SP_MARKER_LOC_QTY]; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const; - virtual void print(SPPrintContext* ctx); + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const override; + void print(SPPrintContext* ctx) override; - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void hide(unsigned int key); + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void hide(unsigned int key) override; - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; virtual void set_shape(); - virtual void update_patheffect(bool write); + void update_patheffect(bool write) override; }; diff --git a/src/object/sp-solid-color.h b/src/object/sp-solid-color.h index 4dbb573b0..6b20ab006 100644 --- a/src/object/sp-solid-color.h +++ b/src/object/sp-solid-color.h @@ -24,14 +24,14 @@ typedef struct _cairo_pattern cairo_pattern_t; class SPSolidColor : public SPPaintServer { public: SPSolidColor(); - virtual ~SPSolidColor(); + ~SPSolidColor() override; - virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) override; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void set(unsigned int key, char const* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void set(unsigned int key, char const* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif /* !SEEN_SP_SOLIDCOLOR_H */ diff --git a/src/object/sp-spiral.h b/src/object/sp-spiral.h index 672c913dd..4b92c6156 100644 --- a/src/object/sp-spiral.h +++ b/src/object/sp-spiral.h @@ -42,7 +42,7 @@ class SPSpiral : public SPShape { public: SPSpiral(); - virtual ~SPSpiral(); + ~SPSpiral() override; float cx, cy; float exp; ///< Spiral expansion factor @@ -53,7 +53,7 @@ public: /* Lowlevel interface */ void setPosition(double cx, double cy, double exp, double revo, double rad, double arg, double t0); - virtual Geom::Affine set_transform(Geom::Affine const& xform); + Geom::Affine set_transform(Geom::Affine const& xform) override; Geom::Point getXY(double t) const; @@ -61,16 +61,16 @@ public: bool isInvalid() const; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual void set(unsigned int key, char const* value); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + void update(SPCtx *ctx, unsigned int flags) override; + void set(unsigned int key, char const* value) override; - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; - virtual const char* displayName() const; - virtual char* description() const; - virtual void update_patheffect(bool write); - virtual void set_shape(); + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; + const char* displayName() const override; + char* description() const override; + void update_patheffect(bool write) override; + void set_shape() override; private: Geom::Point getTangent(double t) const; diff --git a/src/object/sp-star.h b/src/object/sp-star.h index e09f82741..27f3557c9 100644 --- a/src/object/sp-star.h +++ b/src/object/sp-star.h @@ -28,7 +28,7 @@ typedef enum { class SPStar : public SPPolygon { public: SPStar(); - virtual ~SPStar(); + ~SPStar() override; int sides; @@ -45,17 +45,17 @@ public: // So shouldn't star be derived from shape instead of polygon? // What does polygon have that shape doesn't? - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx* ctx, unsigned int flags); - - virtual const char* displayName() const; - virtual char* description() const; - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; - virtual void update_patheffect(bool write); - virtual void set_shape(); - virtual Geom::Affine set_transform(Geom::Affine const& xform); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + void set(unsigned int key, char const* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + + const char* displayName() const override; + char* description() const override; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; + void update_patheffect(bool write) override; + void set_shape() override; + Geom::Affine set_transform(Geom::Affine const& xform) override; }; void sp_star_position_set (SPStar *star, int sides, Geom::Point center, double r1, double r2, double arg1, double arg2, bool isflat, double rounded, double randomized); diff --git a/src/object/sp-stop.h b/src/object/sp-stop.h index f7b3a677a..a82775b6a 100644 --- a/src/object/sp-stop.h +++ b/src/object/sp-stop.h @@ -24,7 +24,7 @@ class ustring; class SPStop : public SPObject { public: SPStop(); - virtual ~SPStop(); + ~SPStop() override; /// \todo fixme: Should be SPSVGPercentage float offset; @@ -53,9 +53,9 @@ public: guint32 get_rgba32() const; protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void set(unsigned int key, const char* value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void set(unsigned int key, const char* value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-string.h b/src/object/sp-string.h index b80b4b8bf..50bc037d5 100644 --- a/src/object/sp-string.h +++ b/src/object/sp-string.h @@ -16,16 +16,16 @@ class SPString : public SPObject { public: SPString(); - virtual ~SPString(); + ~SPString() override; Glib::ustring string; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void read_content(); + void read_content() override; - virtual void update(SPCtx* ctx, unsigned int flags); + void update(SPCtx* ctx, unsigned int flags) override; }; #endif diff --git a/src/object/sp-style-elem.h b/src/object/sp-style-elem.h index a3f4bdc70..3d0919a2f 100644 --- a/src/object/sp-style-elem.h +++ b/src/object/sp-style-elem.h @@ -7,15 +7,15 @@ class SPStyleElem : public SPObject { public: SPStyleElem(); - virtual ~SPStyleElem(); + ~SPStyleElem() override; Media media; bool is_css; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void set(unsigned int key, char const* value); - virtual void read_content(); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void set(unsigned int key, char const* value) override; + void read_content() override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-switch.h b/src/object/sp-switch.h index 57ce8b236..b1f17305d 100644 --- a/src/object/sp-switch.h +++ b/src/object/sp-switch.h @@ -24,12 +24,12 @@ class SPSwitch : public SPGroup { public: SPSwitch(); - virtual ~SPSwitch(); + ~SPSwitch() override; void resetChildEvaluated() { _reevaluate(); } std::vector<SPObject*> _childList(bool add_ref, SPObject::Action action); - virtual void _showChildren (Inkscape::Drawing &drawing, Inkscape::DrawingItem *ai, unsigned int key, unsigned int flags); + void _showChildren (Inkscape::Drawing &drawing, Inkscape::DrawingItem *ai, unsigned int key, unsigned int flags) override; SPObject *_evaluateFirst(); void _reevaluate(bool add_to_arena = false); @@ -39,11 +39,11 @@ public: SPObject *_cached_item; sigc::connection _release_connection; - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node *child); - virtual void order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref); - virtual const char* displayName() const; - virtual gchar *description() const; + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node *child) override; + void order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) override; + const char* displayName() const override; + gchar *description() const override; }; #endif diff --git a/src/object/sp-symbol.h b/src/object/sp-symbol.h index 6b46a8c1a..761227255 100644 --- a/src/object/sp-symbol.h +++ b/src/object/sp-symbol.h @@ -28,21 +28,21 @@ class SPSymbol : public SPGroup, public SPViewBox { public: SPSymbol(); - virtual ~SPSymbol(); + ~SPSymbol() override; - virtual void build(SPDocument *document, Inkscape::XML::Node *repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx *ctx, unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + void build(SPDocument *document, Inkscape::XML::Node *repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx *ctx, unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - virtual void modified(unsigned int flags); - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); + void modified(unsigned int flags) override; + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void print(SPPrintContext *ctx); - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; - virtual void hide (unsigned int key); + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void print(SPPrintContext *ctx) override; + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const override; + void hide (unsigned int key) override; }; #endif diff --git a/src/object/sp-tag-use-reference.h b/src/object/sp-tag-use-reference.h index 0895be010..c7a193d42 100644 --- a/src/object/sp-tag-use-reference.h +++ b/src/object/sp-tag-use-reference.h @@ -35,7 +35,7 @@ public: } protected: - virtual bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; }; @@ -54,7 +54,7 @@ public: sigc::connection _changed_connection; SPTagUsePath(SPObject* i_owner); - ~SPTagUsePath(void); + ~SPTagUsePath(void) override; void link(char* to); void unlink(void); diff --git a/src/object/sp-tag-use.h b/src/object/sp-tag-use.h index 651c8f045..122f11efe 100644 --- a/src/object/sp-tag-use.h +++ b/src/object/sp-tag-use.h @@ -35,12 +35,12 @@ public: gchar *href; public: SPTagUse(); - virtual ~SPTagUse(); + ~SPTagUse() override; - virtual void build(SPDocument *doc, Inkscape::XML::Node *repr); - virtual void set(unsigned key, gchar const *value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); - virtual void release(); + void build(SPDocument *doc, Inkscape::XML::Node *repr) override; + void set(unsigned key, gchar const *value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; + void release() override; virtual void href_changed(SPObject* old_ref, SPObject* ref); diff --git a/src/object/sp-tag.h b/src/object/sp-tag.h index 36459a04b..cb06ab2cb 100644 --- a/src/object/sp-tag.h +++ b/src/object/sp-tag.h @@ -24,14 +24,14 @@ class SPTag; class SPTag : public SPObject { public: SPTag() {} - virtual ~SPTag() {} + ~SPTag() override {} - virtual void build(SPDocument * doc, Inkscape::XML::Node *repr); + void build(SPDocument * doc, Inkscape::XML::Node *repr) override; //virtual void release(); - virtual void set(unsigned key, const gchar* value); - virtual void update(SPCtx * ctx, unsigned flags); + void set(unsigned key, const gchar* value) override; + void update(SPCtx * ctx, unsigned flags) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; bool expanded() const { return _expanded; } void setExpanded(bool isexpanded); diff --git a/src/object/sp-text.h b/src/object/sp-text.h index 67613d043..ba0163ae4 100644 --- a/src/object/sp-text.h +++ b/src/object/sp-text.h @@ -33,7 +33,7 @@ class SPText : public SPItem { public: SPText(); - virtual ~SPText(); + ~SPText() override; /** Converts the text object to its component curves */ SPCurve *getNormalizedBpath() const @@ -76,23 +76,23 @@ public: void optimizeTextpathText() {_optimizeTextpathText = true;} - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); - virtual void remove_child(Inkscape::XML::Node* child); - virtual void set(unsigned int key, const char* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); - - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; - virtual void print(SPPrintContext *ctx); - virtual const char* displayName() const; - virtual char* description() const; - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void hide(unsigned int key); - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; - virtual Geom::Affine set_transform(Geom::Affine const &transform); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; + void remove_child(Inkscape::XML::Node* child) override; + void set(unsigned int key, const char* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; + + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const override; + void print(SPPrintContext *ctx) override; + const char* displayName() const override; + char* description() const override; + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void hide(unsigned int key) override; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; + Geom::Affine set_transform(Geom::Affine const &transform) override; }; #endif diff --git a/src/object/sp-textpath.h b/src/object/sp-textpath.h index 9d4f1c465..4e71ff9c5 100644 --- a/src/object/sp-textpath.h +++ b/src/object/sp-textpath.h @@ -19,7 +19,7 @@ enum TextPathSide { class SPTextPath : public SPItem { public: SPTextPath(); - virtual ~SPTextPath(); + ~SPTextPath() override; TextTagAttributes attributes; SVGLength startOffset; @@ -29,12 +29,12 @@ public: bool isUpdating; SPUsePath *sourcePath; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, const char* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, const char* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #define SP_IS_TEXT_TEXTPATH(obj) (SP_IS_TEXT(obj) && obj->firstChild() && SP_IS_TEXTPATH(obj->firstChild())) diff --git a/src/object/sp-title.h b/src/object/sp-title.h index 04f3829c6..71ff85dae 100644 --- a/src/object/sp-title.h +++ b/src/object/sp-title.h @@ -20,9 +20,9 @@ class SPTitle : public SPObject { public: SPTitle(); - virtual ~SPTitle(); + ~SPTitle() override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; #endif diff --git a/src/object/sp-tref-reference.h b/src/object/sp-tref-reference.h index 516e125c1..0cad4e912 100644 --- a/src/object/sp-tref-reference.h +++ b/src/object/sp-tref-reference.h @@ -31,7 +31,7 @@ public: updateObserver(); } - virtual ~SPTRefReference() { + ~SPTRefReference() override { if (subtreeObserved) { subtreeObserved->removeObserver(*this); delete subtreeObserved; @@ -47,20 +47,20 @@ public: ///////////////////////////////////////////////////////////////////// // Node Observer Functions // ----------------------- - virtual void notifyChildAdded(Inkscape::XML::Node &node, Inkscape::XML::Node &child, Inkscape::XML::Node *prev); - virtual void notifyChildRemoved(Inkscape::XML::Node &node, Inkscape::XML::Node &child, Inkscape::XML::Node *prev); - virtual void notifyChildOrderChanged(Inkscape::XML::Node &node, Inkscape::XML::Node &child, - Inkscape::XML::Node *old_prev, Inkscape::XML::Node *new_prev); - virtual void notifyContentChanged(Inkscape::XML::Node &node, + void notifyChildAdded(Inkscape::XML::Node &node, Inkscape::XML::Node &child, Inkscape::XML::Node *prev) override; + void notifyChildRemoved(Inkscape::XML::Node &node, Inkscape::XML::Node &child, Inkscape::XML::Node *prev) override; + void notifyChildOrderChanged(Inkscape::XML::Node &node, Inkscape::XML::Node &child, + Inkscape::XML::Node *old_prev, Inkscape::XML::Node *new_prev) override; + void notifyContentChanged(Inkscape::XML::Node &node, Inkscape::Util::ptr_shared old_content, - Inkscape::Util::ptr_shared new_content); - virtual void notifyAttributeChanged(Inkscape::XML::Node &node, GQuark name, + Inkscape::Util::ptr_shared new_content) override; + void notifyAttributeChanged(Inkscape::XML::Node &node, GQuark name, Inkscape::Util::ptr_shared old_value, - Inkscape::Util::ptr_shared new_value); + Inkscape::Util::ptr_shared new_value) override; ///////////////////////////////////////////////////////////////////// protected: - virtual bool _acceptObject(SPObject * obj) const; + bool _acceptObject(SPObject * obj) const override; Inkscape::XML::Subtree *subtreeObserved; }; diff --git a/src/object/sp-tref.h b/src/object/sp-tref.h index 1727620cd..9df993430 100644 --- a/src/object/sp-tref.h +++ b/src/object/sp-tref.h @@ -28,7 +28,7 @@ class SPTRef : public SPItem { public: SPTRef(); - virtual ~SPTRef(); + ~SPTRef() override; // Attributes that are used in the same way they would be in a tspan TextTagAttributes attributes; @@ -51,16 +51,16 @@ public: SPObject * getObjectReferredTo(); SPObject const *getObjectReferredTo() const; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, char const* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, char const* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; - virtual const char* displayName() const; - virtual char* description() const; + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const override; + const char* displayName() const override; + char* description() const override; }; void sp_tref_update_text(SPTRef *tref); diff --git a/src/object/sp-tspan.h b/src/object/sp-tspan.h index 1aef4cd0c..24a8a3bbf 100644 --- a/src/object/sp-tspan.h +++ b/src/object/sp-tspan.h @@ -20,20 +20,20 @@ enum { class SPTSpan : public SPItem { public: SPTSpan(); - virtual ~SPTSpan(); + ~SPTSpan() override; unsigned int role : 2; TextTagAttributes attributes; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned int key, const char* value); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned int key, const char* value) override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; - virtual const char* displayName() const; + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const override; + const char* displayName() const override; }; #endif /* !INKSCAPE_SP_TSPAN_H */ diff --git a/src/object/sp-use-reference.h b/src/object/sp-use-reference.h index 650bce2a8..3dc1ae32b 100644 --- a/src/object/sp-use-reference.h +++ b/src/object/sp-use-reference.h @@ -32,7 +32,7 @@ public: } protected: - virtual bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; }; @@ -53,7 +53,7 @@ public: sigc::connection _transformed_connection; SPUsePath(SPObject* i_owner); - ~SPUsePath(void); + ~SPUsePath(void) override; void link(char* to); void unlink(void); diff --git a/src/object/sp-use.h b/src/object/sp-use.h index bcf0a8513..1c482bae7 100644 --- a/src/object/sp-use.h +++ b/src/object/sp-use.h @@ -28,7 +28,7 @@ class SPUseReference; class SPUse : public SPItem, public SPDimensions { public: SPUse(); - virtual ~SPUse(); + ~SPUse() override; // item built from the original's repr (the visible clone) // relative to the SPUse itself, it is treated as a child, similar to a grouped item relative to its group @@ -47,20 +47,20 @@ public: // a sigc connection for transformed signal, used to do move compensation sigc::connection _transformed_connection; - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); - virtual void set(unsigned key, char const *value); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags); - virtual void update(SPCtx* ctx, unsigned int flags); - virtual void modified(unsigned int flags); - - virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const; - virtual const char* displayName() const; - virtual char* description() const; - virtual void print(SPPrintContext *ctx); - virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); - virtual void hide(unsigned int key); - virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; + void set(unsigned key, char const *value) override; + Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; + void update(SPCtx* ctx, unsigned int flags) override; + void modified(unsigned int flags) override; + + Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const override; + const char* displayName() const override; + char* description() const override; + void print(SPPrintContext *ctx) override; + Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override; + void hide(unsigned int key) override; + void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; SPItem *root(); SPItem const *root() const; diff --git a/src/preferences.cpp b/src/preferences.cpp index 958e879f8..69601f9a9 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -75,8 +75,8 @@ public: _observer(o), _filter(filter) {} - virtual ~PrefNodeObserver() {} - virtual void notifyAttributeChanged(XML::Node &node, GQuark name, Util::ptr_shared, Util::ptr_shared); + ~PrefNodeObserver() override {} + void notifyAttributeChanged(XML::Node &node, GQuark name, Util::ptr_shared, Util::ptr_shared) override; private: Observer &_observer; Glib::ustring const _filter; diff --git a/src/profile-manager.h b/src/profile-manager.h index dee21f018..b76b98cde 100644 --- a/src/profile-manager.h +++ b/src/profile-manager.h @@ -25,7 +25,7 @@ class ProfileManager : public DocumentSubset, { public: ProfileManager(SPDocument *document); - ~ProfileManager(); + ~ProfileManager() override; ColorProfile* find(char const* name); diff --git a/src/pure-transform.h b/src/pure-transform.h index 98aa9772a..a4c84d8d5 100644 --- a/src/pure-transform.h +++ b/src/pure-transform.h @@ -46,14 +46,14 @@ protected: Geom::Point _vector; Geom::Point _vector_snapped; - virtual SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const; - virtual Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const; - virtual void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point); + SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override; + Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const override; + void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point) override; public: // PureTranslate(); // Default constructor // PureTranslate(PureTranslate const &); // Copy constructor - virtual ~PureTranslate() {}; + ~PureTranslate() override {}; PureTranslate(Geom::Point vector = Geom::Point()) : _vector(vector), _vector_snapped(vector) {} Geom::Point getTranslationSnapped() {return _vector_snapped;} @@ -65,10 +65,10 @@ class PureTranslateConstrained: public PureTranslate { protected: Geom::Dim2 _direction; - virtual SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const; + SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override; public: - virtual ~PureTranslateConstrained() {}; + ~PureTranslateConstrained() override {}; PureTranslateConstrained(Geom::Coord displacement, Geom::Dim2 direction): PureTranslate() { _vector[direction] = displacement; @@ -88,14 +88,14 @@ protected: Geom::Point _origin; bool _uniform; - virtual SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const; - virtual Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const; - virtual void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point); + SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override; + Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const override; + void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point) override; public: // PureScale(); // Default constructor // PureScale(PureScale const &); // Copy constructor - virtual ~PureScale() {}; + ~PureScale() override {}; PureScale(Geom::Scale scale, Geom::Point origin, bool uniform) : _scale (scale), @@ -111,10 +111,10 @@ public: class PureScaleConstrained: public PureScale { //Magnitude of the scale components will be the same, but the sign could still be different () protected: - virtual SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const; + SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override; public: - virtual ~PureScaleConstrained() {}; + ~PureScaleConstrained() override {}; PureScaleConstrained(Geom::Scale scale, Geom::Point origin): PureScale(scale, origin, true) {}; // Non-uniform constrained scaling is not supported @@ -133,12 +133,12 @@ protected: Geom::Dim2 _direction; bool _uniform; - virtual SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const; - virtual Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const; - virtual void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point); + SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override; + Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const override; + void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point) override; public: - virtual ~PureStretchConstrained() {}; + ~PureStretchConstrained() override {}; PureStretchConstrained(Geom::Coord magnitude, Geom::Point origin, Geom::Dim2 direction, bool uniform) : _magnitude (magnitude), _stretch_snapped (Geom::Scale(magnitude, magnitude)), @@ -170,12 +170,12 @@ protected: Geom::Point _origin; Geom::Dim2 _direction; - virtual SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const; - Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const; - virtual void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point); + SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override; + Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const override; + void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point) override; public: - virtual ~PureSkewConstrained() {}; + ~PureSkewConstrained() override {}; PureSkewConstrained(Geom::Coord skew, Geom::Coord scale, Geom::Point origin, Geom::Dim2 direction) : _skew (skew), _skew_snapped (skew), @@ -201,14 +201,14 @@ protected: Geom::Point _origin; bool _uniform; - virtual SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const; - virtual Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const; - virtual void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point); + SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override; + Geom::Point getTransformedPoint(SnapCandidatePoint const &p) const override; + void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point) override; public: // PureRotate(); // Default constructor // PureRotate(PureRotate const &); // Copy constructor - virtual ~PureRotateConstrained() {}; + ~PureRotateConstrained() override {}; PureRotateConstrained(double angle, Geom::Point origin) : _angle (angle), // in radians! diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp index 0176a4abe..4fdc45ff0 100644 --- a/src/resource-manager.cpp +++ b/src/resource-manager.cpp @@ -107,9 +107,9 @@ static std::string convertPathToRelative( std::string const &path, std::string c class ResourceManagerImpl : public ResourceManager { public: ResourceManagerImpl(); - virtual ~ResourceManagerImpl(); + ~ResourceManagerImpl() override; - virtual bool fixupBrokenLinks(SPDocument *doc); + bool fixupBrokenLinks(SPDocument *doc) override; /** diff --git a/src/resource-manager.h b/src/resource-manager.h index 9452c5d69..b4d88c7e6 100644 --- a/src/resource-manager.h +++ b/src/resource-manager.h @@ -24,7 +24,7 @@ public: protected: ResourceManager(); - virtual ~ResourceManager(); + ~ResourceManager() override; private: ResourceManager(ResourceManager const &) = delete; // no copy diff --git a/src/selcue.h b/src/selcue.h index bac25da32..fb716aea3 100644 --- a/src/selcue.h +++ b/src/selcue.h @@ -45,7 +45,7 @@ private: public: BoundingBoxPrefsObserver(SelCue &sel_cue); - void notify(Preferences::Entry const &val); + void notify(Preferences::Entry const &val) override; private: SelCue &_sel_cue; diff --git a/src/selection.h b/src/selection.h index dc43dcf4f..4fbd0fc39 100644 --- a/src/selection.h +++ b/src/selection.h @@ -67,7 +67,7 @@ public: * @param desktop the desktop associated with the layer model, or NULL if in console mode */ Selection(LayerModel *layers, SPDesktop *desktop); - ~Selection(); + ~Selection() override; /** * Returns the layer model the selection is bound to (works in console or GUI mode) @@ -201,9 +201,9 @@ public: std::list<std::string> params; protected: - void _emitSignals(); - void _connectSignals(SPObject* object); - void _releaseSignals(SPObject* object); + void _emitSignals() override; + void _connectSignals(SPObject* object) override; + void _releaseSignals(SPObject* object) override; private: /** no copy. */ diff --git a/src/seltrans.h b/src/seltrans.h index bd248e5f4..80ad2c92a 100644 --- a/src/seltrans.h +++ b/src/seltrans.h @@ -105,7 +105,7 @@ private: public: BoundingBoxPrefsObserver(SelTrans &sel_trans); - void notify(Preferences::Entry const &val); + void notify(Preferences::Entry const &val) override; private: SelTrans &_sel_trans; diff --git a/src/style-internal.h b/src/style-internal.h index 7d2b3a89b..504aa73db 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -245,18 +245,18 @@ public: value_default(value_default) {} - virtual ~SPIFloat() {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + ~SPIFloat() override {} + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); value = value_default; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIFloat& operator=(const SPIFloat& rhs) { SPIBase::operator=(rhs); @@ -265,8 +265,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -325,20 +325,20 @@ public: value_default(value) {} - virtual ~SPIScale24() + ~SPIScale24() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); value = value_default; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIScale24& operator=(const SPIScale24& rhs) { SPIBase::operator=(rhs); @@ -347,8 +347,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -398,21 +398,21 @@ public: value_default(value) {} - virtual ~SPILength() + ~SPILength() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); unit = SP_CSS_UNIT_NONE, value = value_default; computed = value_default; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPILength& operator=(const SPILength& rhs) { SPIBase::operator=(rhs); @@ -423,8 +423,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -455,20 +455,20 @@ public: normal(true) {} - virtual ~SPILengthOrNormal() + ~SPILengthOrNormal() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPILength::clear(); normal = true; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPILengthOrNormal& operator=(const SPILengthOrNormal& rhs) { SPILength::operator=(rhs); @@ -476,8 +476,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -503,21 +503,21 @@ public: normal(true) {} - virtual ~SPIFontVariationSettings() + ~SPIFontVariationSettings() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); axes.clear(); normal = true; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIFontVariationSettings& operator=(const SPIFontVariationSettings& rhs) { SPIBase::operator=(rhs); @@ -526,8 +526,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -573,20 +573,20 @@ public: computed_default(computed) {} - virtual ~SPIEnum() + ~SPIEnum() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); value = value_default, computed = computed_default; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIEnum& operator=(const SPIEnum& rhs) { SPIBase::operator=(rhs); @@ -597,8 +597,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -628,13 +628,13 @@ public: SPIEnum( name, enums, value, inherits ) {} - virtual ~SPIEnumBits() + ~SPIEnumBits() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; + SPIBase const *const base = NULL ) const override; }; @@ -655,13 +655,13 @@ public: SPIEnum( name, enums, SP_CSS_FONT_VARIANT_LIGATURES_NORMAL ) {} - virtual ~SPILigatures() + ~SPILigatures() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; + SPIBase const *const base = NULL ) const override; }; @@ -679,13 +679,13 @@ public: SPIEnum( name, enums, SP_CSS_FONT_VARIANT_NUMERIC_NORMAL ) {} - virtual ~SPINumeric() + ~SPINumeric() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; + SPIBase const *const base = NULL ) const override; }; @@ -703,13 +703,13 @@ public: SPIEnum( name, enums, SP_CSS_FONT_VARIANT_EAST_ASIAN_NORMAL ) {} - virtual ~SPIEastAsian() + ~SPIEastAsian() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; + SPIBase const *const base = NULL ) const override; }; @@ -731,18 +731,18 @@ public: value_default(value_default_in ? g_strdup(value_default_in) : NULL) {} - virtual ~SPIString() { + ~SPIString() override { g_free(value); g_free(value_default); } - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear(); // TODO check about value and value_default - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + SPIBase const *const base = NULL ) const override; + void clear() override; // TODO check about value and value_default + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIString& operator=(const SPIString& rhs) { SPIBase::operator=(rhs); @@ -753,8 +753,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -781,20 +781,20 @@ public: value.color.set(0); } - virtual ~SPIColor() + ~SPIColor() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); value.color.set(0); } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIColor& operator=(const SPIColor& rhs) { SPIBase::operator=(rhs); @@ -803,8 +803,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -864,16 +864,16 @@ public: clear(); // Sets defaults } - virtual ~SPIPaint(); // Clear and delete href. - virtual void read( gchar const *str ); + ~SPIPaint() override; // Clear and delete href. + void read( gchar const *str ) override; virtual void read( gchar const *str, SPStyle &style, SPDocument *document = 0); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear(); + SPIBase const *const base = NULL ) const override; + void clear() override; virtual void reset( bool init ); // Used internally when reading or cascading - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIPaint& operator=(const SPIPaint& rhs) { SPIBase::operator=(rhs); @@ -885,8 +885,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -962,15 +962,15 @@ public: this->clear(); } - virtual ~SPIPaintOrder() { + ~SPIPaintOrder() override { g_free( value ); } - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); for( unsigned i = 0; i < PAINT_ORDER_LAYERS; ++i ) { layer[i] = SP_CSS_PAINT_ORDER_NORMAL; @@ -979,8 +979,8 @@ public: g_free(value); value = NULL; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIPaintOrder& operator=(const SPIPaintOrder& rhs) { SPIBase::operator=(rhs); @@ -993,8 +993,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -1016,20 +1016,20 @@ public: : SPIBase( "stroke-dasharray" ) {} // Only one instance of SPIDashArray - virtual ~SPIDashArray() + ~SPIDashArray() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); values.clear(); } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIDashArray& operator=(const SPIDashArray& rhs) { SPIBase::operator=(rhs); @@ -1037,8 +1037,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -1058,14 +1058,14 @@ public: href(NULL) {} - virtual ~SPIFilter(); - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + ~SPIFilter() override; + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear(); - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + SPIBase const *const base = NULL ) const override; + void clear() override; + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIFilter& operator=(const SPIFilter& rhs) { SPIBase::operator=(rhs); @@ -1073,8 +1073,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -1101,21 +1101,21 @@ public: this->clear(); } - virtual ~SPIFontSize() + ~SPIFontSize() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); type = SP_FONT_SIZE_LITERAL, unit = SP_CSS_UNIT_NONE, literal = SP_CSS_FONT_SIZE_MEDIUM, value = 12.0, computed = 12.0; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIFontSize& operator=(const SPIFontSize& rhs) { SPIBase::operator=(rhs); @@ -1127,8 +1127,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -1158,21 +1158,21 @@ public: : SPIBase( "font" ) {} - virtual ~SPIFont() + ~SPIFont() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); } - virtual void cascade( const SPIBase* const /*parent*/ ) + void cascade( const SPIBase* const /*parent*/ ) override {} // Done in dependent properties - virtual void merge( const SPIBase* const /*parent*/ ) + void merge( const SPIBase* const /*parent*/ ) override {} SPIFont& operator=(const SPIFont& rhs) { @@ -1180,8 +1180,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } }; @@ -1203,21 +1203,21 @@ public: this->clear(); } - virtual ~SPIBaselineShift() + ~SPIBaselineShift() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); type=SP_BASELINE_SHIFT_LITERAL, unit=SP_CSS_UNIT_NONE, literal = SP_CSS_BASELINE_SHIFT_BASELINE, value = 0.0, computed = 0.0; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPIBaselineShift& operator=(const SPIBaselineShift& rhs) { SPIBase::operator=(rhs); @@ -1230,8 +1230,8 @@ public: } // This is not used but we have it for completeness, it has not been tested. - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -1260,20 +1260,20 @@ public: this->clear(); } - virtual ~SPITextDecorationLine() + ~SPITextDecorationLine() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); underline = false, overline = false, line_through = false, blink = false; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPITextDecorationLine& operator=(const SPITextDecorationLine& rhs) { SPIBase::operator=(rhs); @@ -1284,8 +1284,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -1308,20 +1308,20 @@ public: this->clear(); } - virtual ~SPITextDecorationStyle() + ~SPITextDecorationStyle() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); solid = true, isdouble = false, dotted = false, dashed = false, wavy = false; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPITextDecorationStyle& operator=(const SPITextDecorationStyle& rhs) { SPIBase::operator=(rhs); @@ -1333,8 +1333,8 @@ public: return *this; } - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } @@ -1365,20 +1365,20 @@ public: style_td( NULL ) {} - virtual ~SPITextDecoration() + ~SPITextDecoration() override {} - virtual void read( gchar const *str ); - virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, + void read( gchar const *str ) override; + const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP, - SPIBase const *const base = NULL ) const; - virtual void clear() { + SPIBase const *const base = NULL ) const override; + void clear() override { SPIBase::clear(); style_td = NULL; } - virtual void cascade( const SPIBase* const parent ); - virtual void merge( const SPIBase* const parent ); + void cascade( const SPIBase* const parent ) override; + void merge( const SPIBase* const parent ) override; SPITextDecoration& operator=(const SPITextDecoration& rhs) { SPIBase::operator=(rhs); @@ -1386,8 +1386,8 @@ public: } // Use CSS2 value - virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { + bool operator==(const SPIBase& rhs) override; + bool operator!=(const SPIBase& rhs) override { return !(*this == rhs); } diff --git a/src/svg-view.h b/src/svg-view.h index bd6fd683a..93f2b7dfd 100644 --- a/src/svg-view.h +++ b/src/svg-view.h @@ -37,7 +37,7 @@ public: */ SPSVGView(SPCanvasGroup* parent); - virtual ~SPSVGView(); + ~SPSVGView() override; /** * Rescales SPSVGView to given proportions. @@ -57,25 +57,25 @@ public: /** * Callback connected with set_document signal. */ - virtual void setDocument(SPDocument *document); + void setDocument(SPDocument *document) override; - virtual void mouseover(); + void mouseover() override; - virtual void mouseout(); + void mouseout() override; - virtual bool shutdown() { return true; } + bool shutdown() override { return true; } private: virtual void onPositionSet(double, double) {} - virtual void onResized(double, double) {} - virtual void onRedrawRequested() {} - virtual void onStatusMessage(Inkscape::MessageType /*type*/, gchar const */*message*/) {} - virtual void onDocumentURISet(gchar const* /*uri*/) {} + void onResized(double, double) override {} + void onRedrawRequested() override {} + void onStatusMessage(Inkscape::MessageType /*type*/, gchar const */*message*/) override {} + void onDocumentURISet(gchar const* /*uri*/) override {} /** * Callback connected with document_resized signal. */ - virtual void onDocumentResized(double, double); + void onDocumentResized(double, double) override; }; #endif // SEEN_SP_SVG_VIEW_H diff --git a/src/trace/potrace/inkscape-potrace.h b/src/trace/potrace/inkscape-potrace.h index e8e654973..c3600f6bb 100644 --- a/src/trace/potrace/inkscape-potrace.h +++ b/src/trace/potrace/inkscape-potrace.h @@ -53,7 +53,7 @@ class PotraceTracingEngine : public TracingEngine /** * */ - ~PotraceTracingEngine(); + ~PotraceTracingEngine() override; /** @@ -219,13 +219,13 @@ class PotraceTracingEngine : public TracingEngine * return the path data that is compatible with the d="" attribute * of an SVG <path> element. */ - virtual std::vector<TracingEngineResult> trace( - Glib::RefPtr<Gdk::Pixbuf> pixbuf); + std::vector<TracingEngineResult> trace( + Glib::RefPtr<Gdk::Pixbuf> pixbuf) override; /** * Abort the thread that is executing getPathDataFromPixbuf() */ - virtual void abort(); + void abort() override; /** * diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 5595b2544..bd52d7a57 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -164,14 +164,14 @@ public: /** * */ - virtual ~TraceSioxObserver () + ~TraceSioxObserver () override { } /** * Informs the observer how much has been completed. * Return false if the processing should be aborted. */ - virtual bool progress(float /*percentCompleted*/) + bool progress(float /*percentCompleted*/) override { //Tracer *tracer = (Tracer *)context; //## Allow the GUI to update @@ -185,7 +185,7 @@ public: * Send an error string to the Observer. Processing will * be halted. */ - virtual void error(const std::string &/*msg*/) + void error(const std::string &/*msg*/) override { //Tracer *tracer = (Tracer *)context; } diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 4f6adec4f..e719b2607 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -98,20 +98,20 @@ namespace UI { */ class ClipboardManagerImpl : public ClipboardManager { public: - virtual void copy(ObjectSet *set); - virtual void copyPathParameter(Inkscape::LivePathEffect::PathParam *); - virtual void copySymbol(Inkscape::XML::Node* symbol, gchar const* style, bool user_symbol); - virtual bool paste(SPDesktop *desktop, bool in_place); - virtual bool pasteStyle(ObjectSet *set); - virtual bool pasteSize(ObjectSet *set, bool separately, bool apply_x, bool apply_y); - virtual bool pastePathEffect(ObjectSet *set); - virtual Glib::ustring getPathParameter(SPDesktop* desktop); - virtual Glib::ustring getShapeOrTextObjectId(SPDesktop *desktop); - virtual std::vector<Glib::ustring> getElementsOfType(SPDesktop *desktop, gchar const* type = "*", gint maxdepth = -1); - virtual const gchar *getFirstObjectID(); + void copy(ObjectSet *set) override; + void copyPathParameter(Inkscape::LivePathEffect::PathParam *) override; + void copySymbol(Inkscape::XML::Node* symbol, gchar const* style, bool user_symbol) override; + bool paste(SPDesktop *desktop, bool in_place) override; + bool pasteStyle(ObjectSet *set) override; + bool pasteSize(ObjectSet *set, bool separately, bool apply_x, bool apply_y) override; + bool pastePathEffect(ObjectSet *set) override; + Glib::ustring getPathParameter(SPDesktop* desktop) override; + Glib::ustring getShapeOrTextObjectId(SPDesktop *desktop) override; + std::vector<Glib::ustring> getElementsOfType(SPDesktop *desktop, gchar const* type = "*", gint maxdepth = -1) override; + const gchar *getFirstObjectID() override; ClipboardManagerImpl(); - ~ClipboardManagerImpl(); + ~ClipboardManagerImpl() override; private: void _copySelection(ObjectSet *); diff --git a/src/ui/contextmenu.h b/src/ui/contextmenu.h index 465767604..29a090530 100644 --- a/src/ui/contextmenu.h +++ b/src/ui/contextmenu.h @@ -53,7 +53,7 @@ class ContextMenu : public Gtk::Menu * @param item SPItem pointer to the object selected at the time the ContextMenu is created. */ ContextMenu(SPDesktop *desktop, SPItem *item); - ~ContextMenu(void); + ~ContextMenu(void) override; private: SPItem *_item; // pointer to the object selected at the time the ContextMenu is created diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index d0106bfcd..866f2eda7 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -92,9 +92,9 @@ private: { public: PrefListener(ControlManagerImpl &manager) : Inkscape::Preferences::Observer("/options/grabsize/value"), _mgr(manager) {} - virtual ~PrefListener() {} + ~PrefListener() override {} - virtual void notify(Inkscape::Preferences::Entry const &val) { + void notify(Inkscape::Preferences::Entry const &val) override { int size = val.getIntLimited(3, 1, 7); _mgr.setControlSize(size); } diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 75c217af9..1dc79474e 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -286,7 +286,7 @@ public : {} private : - virtual void on_button_click() { + void on_button_click() override { //Retrieve selected objects SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; @@ -411,7 +411,7 @@ private : Geom::Dim2 _orientation; bool _distribute; - virtual void on_button_click() { + void on_button_click() override { if (!_dialog.getDesktop()) { return; } @@ -477,7 +477,7 @@ public: } private : - virtual void on_button_click() + void on_button_click() override { if (!_dialog.getDesktop()) return; @@ -513,7 +513,7 @@ public: {} private : - virtual void on_button_click() + void on_button_click() override { if (!_dialog.getDesktop()) return; @@ -575,7 +575,7 @@ private : return sp_item_repr_compare_position(a,b)<0; } - virtual void on_button_click() + void on_button_click() override { SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; @@ -641,7 +641,7 @@ public : {} private : - virtual void on_button_click() + void on_button_click() override { if (!_dialog.getDesktop()) return; @@ -673,7 +673,7 @@ public : {} private : - virtual void on_button_click() + void on_button_click() override { SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; @@ -767,7 +767,7 @@ public : private : Geom::Dim2 _orientation; bool _distribute; - virtual void on_button_click() + void on_button_click() override { SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h index 34d0230bf..d34bb8cc8 100644 --- a/src/ui/dialog/align-and-distribute.h +++ b/src/ui/dialog/align-and-distribute.h @@ -43,7 +43,7 @@ class Action; class AlignAndDistribute : public Widget::Panel { public: AlignAndDistribute(); - virtual ~AlignAndDistribute(); + ~AlignAndDistribute() override; static AlignAndDistribute &getInstance() { return *new AlignAndDistribute(); } @@ -184,7 +184,7 @@ public : private : - virtual void on_button_click() { + void on_button_click() override { //Retrieve selected objects SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; diff --git a/src/ui/dialog/arrange-tab.h b/src/ui/dialog/arrange-tab.h index 3ffe1ef4c..55baf775f 100644 --- a/src/ui/dialog/arrange-tab.h +++ b/src/ui/dialog/arrange-tab.h @@ -26,7 +26,7 @@ class ArrangeTab : public Gtk::VBox { public: ArrangeTab() {}; - virtual ~ArrangeTab() {}; + ~ArrangeTab() override {}; /** * Do the actual work! This method is invoked to actually arrange the diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h index c70e8ae98..6d8fa5c64 100644 --- a/src/ui/dialog/calligraphic-profile-rename.h +++ b/src/ui/dialog/calligraphic-profile-rename.h @@ -32,7 +32,7 @@ namespace Dialog { class CalligraphicProfileRename : public Gtk::Dialog { public: CalligraphicProfileRename(); - virtual ~CalligraphicProfileRename() {} + ~CalligraphicProfileRename() override {} Glib::ustring getName() const { return "CalligraphicProfileRename"; } diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h index 4fd8f95cf..c2f6fd337 100644 --- a/src/ui/dialog/clonetiler.h +++ b/src/ui/dialog/clonetiler.h @@ -41,7 +41,7 @@ namespace Dialog { class CloneTiler : public Widget::Panel { public: CloneTiler(); - virtual ~CloneTiler(); + ~CloneTiler() override; static CloneTiler &getInstance() { return *new CloneTiler(); } void show_page_trace(); @@ -169,7 +169,7 @@ private: /** * Can be invoked for setting the desktop. Currently not used. */ - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; /** * Is invoked by the desktop tracker when the desktop changes. diff --git a/src/ui/dialog/color-item.h b/src/ui/dialog/color-item.h index 3a0b33193..fea108cb7 100644 --- a/src/ui/dialog/color-item.h +++ b/src/ui/dialog/color-item.h @@ -47,14 +47,14 @@ public: ColorItem( ege::PaintDef::ColorType type ); ColorItem( unsigned int r, unsigned int g, unsigned int b, Glib::ustring& name ); - virtual ~ColorItem(); + ~ColorItem() override; ColorItem(ColorItem const &other); virtual ColorItem &operator=(ColorItem const &other); - virtual Gtk::Widget* getPreview(PreviewStyle style, + Gtk::Widget* getPreview(PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, - guint border); + guint border) override; void buttonClicked(bool secondary = false); void setGradient(SPGradient *grad); diff --git a/src/ui/dialog/cssdialog.h b/src/ui/dialog/cssdialog.h index 31eb67e3f..76c98ee8d 100644 --- a/src/ui/dialog/cssdialog.h +++ b/src/ui/dialog/cssdialog.h @@ -37,7 +37,7 @@ class CssDialog : public UI::Widget::Panel { public: CssDialog(); - ~CssDialog(); + ~CssDialog() override; static CssDialog &getInstance() { return *new CssDialog(); } @@ -78,7 +78,7 @@ public: SPDesktop* _desktop; // Helper functions - void setDesktop(SPDesktop* desktop); + void setDesktop(SPDesktop* desktop) override; void _styleButton(Gtk::Button& btn, char const* iconName, char const* tooltip); // Signal handlers diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index d062bf863..8771f935a 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -33,14 +33,14 @@ class DebugDialogImpl : public DebugDialog, public Gtk::Dialog { public: DebugDialogImpl(); - ~DebugDialogImpl(); - - void show(); - void hide(); - void clear(); - void message(char const *msg); - void captureLogMessages(); - void releaseLogMessages(); + ~DebugDialogImpl() override; + + void show() override; + void hide() override; + void clear() override; + void message(char const *msg) override; + void captureLogMessages() override; + void releaseLogMessages() override; private: Gtk::MenuBar menuBar; diff --git a/src/ui/dialog/dock-behavior.h b/src/ui/dialog/dock-behavior.h index 15429f1c9..e64297955 100644 --- a/src/ui/dialog/dock-behavior.h +++ b/src/ui/dialog/dock-behavior.h @@ -30,38 +30,38 @@ class DockBehavior : public Behavior { public: static Behavior *create(Dialog& dialog); - ~DockBehavior(); + ~DockBehavior() override; /** Gtk::Dialog methods */ - operator Gtk::Widget&(); - GtkWidget *gobj(); - void present(); - Gtk::VBox *get_vbox(); - void show(); - void hide(); - void show_all_children(); - void resize(int width, int height); - void move(int x, int y); - void set_position(Gtk::WindowPosition); - void set_size_request(int width, int height); - void size_request(Gtk::Requisition& requisition); - void get_position(int& x, int& y); - void get_size(int& width, int& height); - void set_title(Glib::ustring title); - void set_sensitive(bool sensitive); + operator Gtk::Widget&() override; + GtkWidget *gobj() override; + void present() override; + Gtk::VBox *get_vbox() override; + void show() override; + void hide() override; + void show_all_children() override; + void resize(int width, int height) override; + void move(int x, int y) override; + void set_position(Gtk::WindowPosition) override; + void set_size_request(int width, int height) override; + void size_request(Gtk::Requisition& requisition) override; + void get_position(int& x, int& y) override; + void get_size(int& width, int& height) override; + void set_title(Glib::ustring title) override; + void set_sensitive(bool sensitive) override; /** Gtk::Dialog signal proxies */ - Glib::SignalProxy0<void> signal_show(); - Glib::SignalProxy0<void> signal_hide(); - Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event(); + Glib::SignalProxy0<void> signal_show() override; + Glib::SignalProxy0<void> signal_hide() override; + Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event() override; Glib::SignalProxy0<void> signal_drag_begin(); Glib::SignalProxy1<void, bool> signal_drag_end(); /** Custom signal handlers */ - void onHideF12(); - void onShowF12(); - void onDesktopActivated(SPDesktop *desktop); - void onShutdown(); + void onHideF12() override; + void onShowF12() override; + void onDesktopActivated(SPDesktop *desktop) override; + void onShutdown() override; private: Widget::DockItem _dock_item; diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h index 2c56e9317..fd4f76c88 100644 --- a/src/ui/dialog/document-metadata.h +++ b/src/ui/dialog/document-metadata.h @@ -67,7 +67,7 @@ protected: UI::Widget::Registry _wr; private: - virtual ~DocumentMetadata(); + ~DocumentMetadata() override; DocumentMetadata(); }; diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h index e59a375d5..89c87f5de 100644 --- a/src/ui/dialog/document-properties.h +++ b/src/ui/dialog/document-properties.h @@ -229,7 +229,7 @@ protected: private: DocumentProperties(); - virtual ~DocumentProperties(); + ~DocumentProperties() override; // callback methods for buttons on grids page. void onNewGrid(); diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h index 1f8e87dbc..281131cca 100644 --- a/src/ui/dialog/export.h +++ b/src/ui/dialog/export.h @@ -48,7 +48,7 @@ enum selection_type { class Export : public Widget::Panel { public: Export (); - ~Export (); + ~Export () override; static Export &getInstance() { return *new Export(); @@ -206,7 +206,7 @@ private: /** * Can be invoked for setting the desktop. Currently not used. */ - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; /** * Is invoked by the desktop tracker when the desktop changes. diff --git a/src/ui/dialog/extension-editor.h b/src/ui/dialog/extension-editor.h index 1fc9b5730..f4e1bfb56 100644 --- a/src/ui/dialog/extension-editor.h +++ b/src/ui/dialog/extension-editor.h @@ -28,7 +28,7 @@ namespace Dialog { class ExtensionEditor : public UI::Widget::Panel { public: ExtensionEditor(); - virtual ~ExtensionEditor(); + ~ExtensionEditor() override; static ExtensionEditor &getInstance() { return *new ExtensionEditor(); } diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h index 6b1f92d15..d09b371d3 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.h +++ b/src/ui/dialog/filedialogimpl-gtkmm.h @@ -85,7 +85,7 @@ public: SVGPreview(); - ~SVGPreview(); + ~SVGPreview() override; bool setDocument(SPDocument *doc); @@ -169,7 +169,7 @@ public: /** * */ - virtual ~FileDialogBaseGtk() + ~FileDialogBaseGtk() override {} protected: @@ -224,23 +224,23 @@ public: FileDialogType fileTypes, const Glib::ustring &title); - virtual ~FileOpenDialogImplGtk(); + ~FileOpenDialogImplGtk() override; - bool show(); + bool show() override; - Inkscape::Extension::Extension *getSelectionType(); + Inkscape::Extension::Extension *getSelectionType() override; Glib::ustring getFilename(); - std::vector<Glib::ustring> getFilenames(); + std::vector<Glib::ustring> getFilenames() override; - Glib::ustring getCurrentDirectory(); + Glib::ustring getCurrentDirectory() override; /// Add a custom file filter menu item /// @param name - Name of the filter (such as "Javscript") /// @param pattern - File filtering patter (such as "*.js") /// Use the FileDialogType::CUSTOM_TYPE in constructor to not include other file types - void addFilterMenu(Glib::ustring name, Glib::ustring pattern); + void addFilterMenu(Glib::ustring name, Glib::ustring pattern) override; private: @@ -283,15 +283,15 @@ public: const gchar* docTitle, const Inkscape::Extension::FileSaveMethod save_method); - virtual ~FileSaveDialogImplGtk(); + ~FileSaveDialogImplGtk() override; - bool show(); + bool show() override; - Inkscape::Extension::Extension *getSelectionType(); - virtual void setSelectionType( Inkscape::Extension::Extension * key ); + Inkscape::Extension::Extension *getSelectionType() override; + void setSelectionType( Inkscape::Extension::Extension * key ) override; - Glib::ustring getCurrentDirectory(); - void addFileType(Glib::ustring name, Glib::ustring pattern); + Glib::ustring getCurrentDirectory() override; + void addFileType(Glib::ustring name, Glib::ustring pattern) override; private: //void change_title(const Glib::ustring& title); diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h index ad59443ad..76bec9083 100644 --- a/src/ui/dialog/fill-and-stroke.h +++ b/src/ui/dialog/fill-and-stroke.h @@ -34,12 +34,12 @@ namespace Dialog { class FillAndStroke : public UI::Widget::Panel { public: FillAndStroke(); - virtual ~FillAndStroke(); + ~FillAndStroke() override; static FillAndStroke &getInstance() { return *new FillAndStroke(); } - virtual void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; //void selectionChanged(Inkscape::Selection *selection); diff --git a/src/ui/dialog/filter-editor.h b/src/ui/dialog/filter-editor.h index 5bf16dc10..8f18a0d45 100644 --- a/src/ui/dialog/filter-editor.h +++ b/src/ui/dialog/filter-editor.h @@ -35,7 +35,7 @@ class FilterEditorDialog : public UI::Widget::Panel { public: FilterEditorDialog(); - ~FilterEditorDialog(); + ~FilterEditorDialog() override; static FilterEditorDialog &getInstance() { return *new FilterEditorDialog(); } diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 4ad42bf1e..acf73554d 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -112,12 +112,12 @@ public: } } - Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { return get_active() ? _true_val : _false_val; } - void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { const gchar* val = attribute_value(o); if(val) { @@ -150,7 +150,7 @@ public: signal_value_changed().connect(signal_attr_changed().make_slot()); } - Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { const double val = get_value(); @@ -160,7 +160,7 @@ public: return Glib::Ascii::dtostr(val); } - void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { const gchar* val = attribute_value(o); if(val){ @@ -184,7 +184,7 @@ public: show_all(); } - ~ComboWithTooltip() + ~ComboWithTooltip() override { delete combo; } @@ -212,7 +212,7 @@ public: } } - ~MultiSpinButton() + ~MultiSpinButton() override { for(unsigned i = 0; i < _spins.size(); ++i) delete _spins[i]; @@ -263,7 +263,7 @@ public: return _s2; } - virtual Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { double v1 = _s1.get_value(); double v2 = _s2.get_value(); @@ -276,7 +276,7 @@ public: return Glib::Ascii::dtostr(v1) + " " + Glib::Ascii::dtostr(v2); } - virtual void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { const gchar* val = attribute_value(o); NumberOptNumber n; @@ -310,7 +310,7 @@ public: } // Returns the color in 'rgb(r,g,b)' form. - Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { // no doubles here, so we can use the standard string stream. std::ostringstream os; @@ -322,7 +322,7 @@ public: } - void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { const gchar* val = attribute_value(o); guint32 i = 0; @@ -353,12 +353,12 @@ public: } // No validity checking is done - Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { return get_text(); } - void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { const gchar* val = attribute_value(o); if(val) { @@ -412,7 +412,7 @@ public: } } - Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { // use SVGOStringStream to output SVG-compatible doubles Inkscape::SVGOStringStream os; @@ -427,7 +427,7 @@ public: return os.str(); } - void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { if(o) { if(SP_IS_FECONVOLVEMATRIX(o)) { @@ -534,7 +534,7 @@ public: set_shadow_type(Gtk::SHADOW_NONE); } - virtual void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { if(SP_IS_FECOLORMATRIX(o)) { SPFeColorMatrix* col = SP_FECOLORMATRIX(o); @@ -570,7 +570,7 @@ public: } } - virtual Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { const Widget* w = get_child(); if(w == &_label) @@ -635,13 +635,13 @@ public: } // Returns the element in xlink:href form. - Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { return _entry.get_text(); } - void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { const gchar* val = attribute_value(o); if(val) { @@ -1065,7 +1065,7 @@ public: } // Set new type and update widget visibility - virtual void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { // See componenttransfer.cpp if(SP_IS_FECOMPONENTTRANSFER(o)) { @@ -1138,7 +1138,7 @@ private: } public: - virtual Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { return ""; } @@ -1200,11 +1200,11 @@ public: return _box; } protected: - Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { return ""; } - void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { if(_locked) return; diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index d7bfff7d2..bae224964 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -45,21 +45,21 @@ class FilterEffectsDialog : public UI::Widget::Panel { public: FilterEffectsDialog(); - ~FilterEffectsDialog(); + ~FilterEffectsDialog() override; static FilterEffectsDialog &getInstance() { return *new FilterEffectsDialog(); } void set_attrs_locked(const bool); protected: - virtual void show_all_vfunc(); + void show_all_vfunc() override; private: class FilterModifier : public Gtk::VBox { public: FilterModifier(FilterEffectsDialog&); - ~FilterModifier(); + ~FilterModifier() override; SPFilter* get_selected_filter(); void select_filter(const SPFilter*); @@ -163,23 +163,23 @@ private: static const int size = 24; protected: - virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + void get_preferred_width_vfunc(Gtk::Widget& widget, int& minimum_width, - int& natural_width) const; + int& natural_width) const override; - virtual void get_preferred_width_for_height_vfunc(Gtk::Widget& widget, + void get_preferred_width_for_height_vfunc(Gtk::Widget& widget, int height, int& minimum_width, - int& natural_width) const; + int& natural_width) const override; - virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + void get_preferred_height_vfunc(Gtk::Widget& widget, int& minimum_height, - int& natural_height) const; + int& natural_height) const override; - virtual void get_preferred_height_for_width_vfunc(Gtk::Widget& widget, + void get_preferred_height_for_width_vfunc(Gtk::Widget& widget, int width, int& minimum_height, - int& natural_height) const; + int& natural_height) const override; private: // void* should be SPFilterPrimitive*, some weirdness with properties prevents this Glib::Property<void*> _primitive; @@ -209,10 +209,10 @@ private: bool on_draw_signal(const Cairo::RefPtr<Cairo::Context> &cr); - bool on_button_press_event(GdkEventButton*); - bool on_motion_notify_event(GdkEventMotion*); - bool on_button_release_event(GdkEventButton*); - void on_drag_end(const Glib::RefPtr<Gdk::DragContext>&); + bool on_button_press_event(GdkEventButton*) override; + bool on_motion_notify_event(GdkEventMotion*) override; + bool on_button_release_event(GdkEventButton*) override; + void on_drag_end(const Glib::RefPtr<Gdk::DragContext>&) override; private: void init_text(); diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index 2b4869def..c695bd9ac 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -50,7 +50,7 @@ namespace Dialog { class Find : public UI::Widget::Panel { public: Find(); - virtual ~Find(); + ~Find() override; /** * Helper function which returns a new instance of the dialog. @@ -187,7 +187,7 @@ protected: /** * Can be invoked for setting the desktop. Currently not used. */ - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; /** * Is invoked by the desktop tracker when the desktop changes. */ diff --git a/src/ui/dialog/floating-behavior.h b/src/ui/dialog/floating-behavior.h index 56ed76b41..4c998940a 100644 --- a/src/ui/dialog/floating-behavior.h +++ b/src/ui/dialog/floating-behavior.h @@ -30,36 +30,36 @@ class FloatingBehavior : public Behavior { public: static Behavior *create(Dialog &dialog); - ~FloatingBehavior(); + ~FloatingBehavior() override; /** Gtk::Dialog methods */ - operator Gtk::Widget &(); - GtkWidget *gobj(); - void present(); - Gtk::Box *get_vbox(); - void show(); - void hide(); - void show_all_children(); - void resize(int width, int height); - void move(int x, int y); - void set_position(Gtk::WindowPosition); - void set_size_request(int width, int height); - void size_request(Gtk::Requisition &requisition); - void get_position(int &x, int &y); - void get_size(int& width, int &height); - void set_title(Glib::ustring title); - void set_sensitive(bool sensitive); + operator Gtk::Widget &() override; + GtkWidget *gobj() override; + void present() override; + Gtk::Box *get_vbox() override; + void show() override; + void hide() override; + void show_all_children() override; + void resize(int width, int height) override; + void move(int x, int y) override; + void set_position(Gtk::WindowPosition) override; + void set_size_request(int width, int height) override; + void size_request(Gtk::Requisition &requisition) override; + void get_position(int &x, int &y) override; + void get_size(int& width, int &height) override; + void set_title(Glib::ustring title) override; + void set_sensitive(bool sensitive) override; /** Gtk::Dialog signal proxies */ - Glib::SignalProxy0<void> signal_show(); - Glib::SignalProxy0<void> signal_hide(); - Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event(); + Glib::SignalProxy0<void> signal_show() override; + Glib::SignalProxy0<void> signal_hide() override; + Glib::SignalProxy1<bool, GdkEventAny *> signal_delete_event() override; /** Custom signal handlers */ - void onHideF12(); - void onShowF12(); - void onDesktopActivated(SPDesktop *desktop); - void onShutdown(); + void onHideF12() override; + void onShowF12() override; + void onDesktopActivated(SPDesktop *desktop) override; + void onShutdown() override; private: FloatingBehavior(Dialog& dialog); diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h index d9eb30c7c..76d26eac8 100644 --- a/src/ui/dialog/glyphs.h +++ b/src/ui/dialog/glyphs.h @@ -38,11 +38,11 @@ class GlyphsPanel : public Inkscape::UI::Widget::Panel { public: GlyphsPanel(); - virtual ~GlyphsPanel(); + ~GlyphsPanel() override; static GlyphsPanel& getInstance(); - virtual void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; protected: diff --git a/src/ui/dialog/grid-arrange-tab.h b/src/ui/dialog/grid-arrange-tab.h index cba2af1b4..5dff1bcf6 100644 --- a/src/ui/dialog/grid-arrange-tab.h +++ b/src/ui/dialog/grid-arrange-tab.h @@ -39,12 +39,12 @@ class ArrangeDialog; class GridArrangeTab : public ArrangeTab { public: GridArrangeTab(ArrangeDialog *parent); - virtual ~GridArrangeTab() {}; + ~GridArrangeTab() override {}; /** * Do the actual work */ - virtual void arrange(); + void arrange() override; /** * Respond to selection change diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h index fd3fbd74f..aacbbce22 100644 --- a/src/ui/dialog/guides.h +++ b/src/ui/dialog/guides.h @@ -44,7 +44,7 @@ namespace Dialogs { class GuidelinePropertiesDialog : public Gtk::Dialog { public: GuidelinePropertiesDialog(SPGuide *guide, SPDesktop *desktop); - virtual ~GuidelinePropertiesDialog(); + ~GuidelinePropertiesDialog() override; Glib::ustring getName() const { return "GuidelinePropertiesDialog"; } diff --git a/src/ui/dialog/icon-preview.h b/src/ui/dialog/icon-preview.h index 2ad7e68b4..ac8b47d34 100644 --- a/src/ui/dialog/icon-preview.h +++ b/src/ui/dialog/icon-preview.h @@ -44,11 +44,11 @@ class IconPreviewPanel : public UI::Widget::Panel public: IconPreviewPanel(); //IconPreviewPanel(Glib::ustring const &label); - ~IconPreviewPanel(); + ~IconPreviewPanel() override; static IconPreviewPanel& getInstance(); - void setDesktop( SPDesktop* desktop ); + void setDesktop( SPDesktop* desktop ) override; void refreshPreview(); void modeToggled(); diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index 828859bb8..1cc55d88e 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -106,7 +106,7 @@ namespace Dialog { class InkscapePreferences : public UI::Widget::Panel { public: - virtual ~InkscapePreferences(); + ~InkscapePreferences() override; static InkscapePreferences &getInstance() { return *new InkscapePreferences(); } @@ -468,7 +468,7 @@ protected: add(shortcutid); add(user_set); } - virtual ~ModelColumns() { + ~ModelColumns() override { } Gtk::TreeModelColumn<Glib::ustring> name; @@ -491,19 +491,19 @@ protected: int _natural_width; int _natural_height; bool GetSizeRequest(const Gtk::TreeModel::iterator& iter); - void get_preferred_width_vfunc (int& minimum_width, int& natural_width) const { + void get_preferred_width_vfunc (int& minimum_width, int& natural_width) const override { minimum_width = _minimum_width; natural_width = _natural_width; } - void get_preferred_width_for_height_vfunc (int height, int& minimum_width, int& natural_width) const { + void get_preferred_width_for_height_vfunc (int height, int& minimum_width, int& natural_width) const override { minimum_width = _minimum_width; natural_width = _natural_width; } - void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const { + void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override { minimum_height = _minimum_height; natural_height = _natural_height; } - void get_preferred_height_for_width_vfunc (int width, int& minimum_height, int& natural_height) const { + void get_preferred_height_for_width_vfunc (int width, int& minimum_height, int& natural_height) const override { minimum_height = _minimum_height; natural_height = _natural_height; } diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp index 3fdd2a6cf..b6f9b8f01 100644 --- a/src/ui/dialog/input.cpp +++ b/src/ui/dialog/input.cpp @@ -377,21 +377,21 @@ static std::map<Glib::ustring, Gdk::InputMode> &getStringToMode() class InputDialogImpl : public InputDialog { public: InputDialogImpl(); - virtual ~InputDialogImpl() {} + ~InputDialogImpl() override {} private: class ConfPanel : public Gtk::VBox { public: ConfPanel(); - ~ConfPanel(); + ~ConfPanel() override; class Blink : public Preferences::Observer { public: Blink(ConfPanel &parent); - virtual ~Blink(); - virtual void notify(Preferences::Entry const &new_val); + ~Blink() override; + void notify(Preferences::Entry const &new_val) override; ConfPanel &parent; }; @@ -436,7 +436,7 @@ private: add(name); add(value); } - virtual ~KeysColumns() {} + ~KeysColumns() override {} Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<Glib::ustring> value; diff --git a/src/ui/dialog/input.h b/src/ui/dialog/input.h index f61b6972f..e79e32854 100644 --- a/src/ui/dialog/input.h +++ b/src/ui/dialog/input.h @@ -26,7 +26,7 @@ public: static InputDialog &getInstance(); InputDialog() : UI::Widget::Panel("/dialogs/inputdevices", SP_VERB_DIALOG_INPUT) {} - virtual ~InputDialog() {} + ~InputDialog() override {} }; } // namespace Dialog diff --git a/src/ui/dialog/knot-properties.h b/src/ui/dialog/knot-properties.h index 1297eae1f..4cf94a79a 100644 --- a/src/ui/dialog/knot-properties.h +++ b/src/ui/dialog/knot-properties.h @@ -30,7 +30,7 @@ namespace Dialogs { class KnotPropertiesDialog : public Gtk::Dialog { public: KnotPropertiesDialog(); - virtual ~KnotPropertiesDialog(); + ~KnotPropertiesDialog() override; Glib::ustring getName() const { return "LayerPropertiesDialog"; } diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h index 756f7a509..0e7f8b10d 100644 --- a/src/ui/dialog/layer-properties.h +++ b/src/ui/dialog/layer-properties.h @@ -39,7 +39,7 @@ namespace Dialogs { class LayerPropertiesDialog : public Gtk::Dialog { public: LayerPropertiesDialog(); - virtual ~LayerPropertiesDialog(); + ~LayerPropertiesDialog() override; Glib::ustring getName() const { return "LayerPropertiesDialog"; } @@ -61,18 +61,18 @@ protected: }; struct Rename : public Strategy { static Rename &instance() { static Rename instance; return instance; } - void setup(LayerPropertiesDialog &dialog); - void perform(LayerPropertiesDialog &dialog); + void setup(LayerPropertiesDialog &dialog) override; + void perform(LayerPropertiesDialog &dialog) override; }; struct Create : public Strategy { static Create &instance() { static Create instance; return instance; } - void setup(LayerPropertiesDialog &dialog); - void perform(LayerPropertiesDialog &dialog); + void setup(LayerPropertiesDialog &dialog) override; + void perform(LayerPropertiesDialog &dialog) override; }; struct Move : public Strategy { static Move &instance() { static Move instance; return instance; } - void setup(LayerPropertiesDialog &dialog); - void perform(LayerPropertiesDialog &dialog); + void setup(LayerPropertiesDialog &dialog) override; + void perform(LayerPropertiesDialog &dialog) override; }; friend struct Rename; @@ -112,7 +112,7 @@ protected: add(_colLocked); add(_colLabel); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<SPObject*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 6f609736a..6fa96e539 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -312,7 +312,7 @@ public: add(_colLocked); add(_colLabel); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<SPObject*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h index c2058ad48..89864664d 100644 --- a/src/ui/dialog/layers.h +++ b/src/ui/dialog/layers.h @@ -43,11 +43,11 @@ class LayersPanel : public UI::Widget::Panel { public: LayersPanel(); - virtual ~LayersPanel(); + ~LayersPanel() override; static LayersPanel& getInstance(); - void setDesktop( SPDesktop* desktop ); + void setDesktop( SPDesktop* desktop ) override; private: class ModelColumns; diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h index 90457c917..790feae29 100644 --- a/src/ui/dialog/livepatheffect-add.h +++ b/src/ui/dialog/livepatheffect-add.h @@ -30,7 +30,7 @@ namespace Dialog { class LivePathEffectAdd : public Gtk::Dialog { public: LivePathEffectAdd(); - virtual ~LivePathEffectAdd() {} + ~LivePathEffectAdd() override {} /** * Show the dialog @@ -86,7 +86,7 @@ private: //add(desc); add(data); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<Glib::ustring> name; /** diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h index 7f6f56fd2..e355bba6e 100644 --- a/src/ui/dialog/livepatheffect-editor.h +++ b/src/ui/dialog/livepatheffect-editor.h @@ -41,14 +41,14 @@ namespace Dialog { class LivePathEffectEditor : public UI::Widget::Panel { public: LivePathEffectEditor(); - virtual ~LivePathEffectEditor(); + ~LivePathEffectEditor() override; static LivePathEffectEditor &getInstance() { return *new LivePathEffectEditor(); } void onSelectionChanged(Inkscape::Selection *sel); void onSelectionModified(Inkscape::Selection *sel); virtual void on_effect_selection_changed(); - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; private: @@ -88,7 +88,7 @@ private: add(lperef); add(col_visible); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<Glib::ustring> col_name; Gtk::TreeModelColumn<LivePathEffect::LPEObjectReference *> lperef; diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h index 4021d6152..542a22bf6 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.h +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h @@ -21,7 +21,7 @@ namespace Dialogs { class FilletChamferPropertiesDialog : public Gtk::Dialog { public: FilletChamferPropertiesDialog(); - virtual ~FilletChamferPropertiesDialog(); + ~FilletChamferPropertiesDialog() override; Glib::ustring getName() const { diff --git a/src/ui/dialog/lpe-powerstroke-properties.h b/src/ui/dialog/lpe-powerstroke-properties.h index 56b6e499d..c7e70b298 100644 --- a/src/ui/dialog/lpe-powerstroke-properties.h +++ b/src/ui/dialog/lpe-powerstroke-properties.h @@ -25,7 +25,7 @@ namespace Dialogs { class PowerstrokePropertiesDialog : public Gtk::Dialog { public: PowerstrokePropertiesDialog(); - virtual ~PowerstrokePropertiesDialog(); + ~PowerstrokePropertiesDialog() override; Glib::ustring getName() const { return "LayerPropertiesDialog"; } diff --git a/src/ui/dialog/memory.h b/src/ui/dialog/memory.h index 5ba93977d..3353dc440 100644 --- a/src/ui/dialog/memory.h +++ b/src/ui/dialog/memory.h @@ -20,12 +20,12 @@ namespace Dialog { class Memory : public UI::Widget::Panel { public: Memory(); - ~Memory(); + ~Memory() override; static Memory &getInstance() { return *new Memory(); } protected: - void _apply(); + void _apply() override; private: Memory(Memory const &d) = delete; // no copy diff --git a/src/ui/dialog/messages.h b/src/ui/dialog/messages.h index ca2d5dc4e..d105ab46b 100644 --- a/src/ui/dialog/messages.h +++ b/src/ui/dialog/messages.h @@ -35,7 +35,7 @@ namespace Dialog { class Messages : public UI::Widget::Panel { public: Messages(); - virtual ~Messages(); + ~Messages() override; static Messages &getInstance() { return *new Messages(); } diff --git a/src/ui/dialog/new-from-template.h b/src/ui/dialog/new-from-template.h index c0b65affb..35c0b5aba 100644 --- a/src/ui/dialog/new-from-template.h +++ b/src/ui/dialog/new-from-template.h @@ -28,7 +28,7 @@ friend class TemplateLoadTab; public: static void load_new_from_template(); void setCreateButtonSensitive(bool value); - virtual ~NewFromTemplate(); + ~NewFromTemplate() override; private: NewFromTemplate(); diff --git a/src/ui/dialog/object-attributes.h b/src/ui/dialog/object-attributes.h index 956091989..f10667093 100644 --- a/src/ui/dialog/object-attributes.h +++ b/src/ui/dialog/object-attributes.h @@ -38,7 +38,7 @@ namespace Dialog { class ObjectAttributes : public Widget::Panel { public: ObjectAttributes (); - ~ObjectAttributes (); + ~ObjectAttributes () override; /** * Returns a new instance of the object attributes dialog. diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h index 8551d5fca..4ce72ae1a 100644 --- a/src/ui/dialog/object-properties.h +++ b/src/ui/dialog/object-properties.h @@ -66,7 +66,7 @@ namespace Dialog { class ObjectProperties : public Widget::Panel { public: ObjectProperties(); - ~ObjectProperties(); + ~ObjectProperties() override; static ObjectProperties &getInstance() { return *new ObjectProperties(); } diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index c2ee66cd7..9b2c12d40 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -137,26 +137,26 @@ public: _maskAttr(g_quark_from_string("mask")) {} - virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) + void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override { if ( _pnl && _obj ) { _pnl->_objectsChanged( _obj ); } } - virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) + void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override { if ( _pnl && _obj ) { _pnl->_objectsChanged( _obj ); } } - virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) + void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) override { if ( _pnl && _obj ) { _pnl->_objectsChanged( _obj ); } } - virtual void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) {} - virtual void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) { + void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) override {} + void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) override { if ( _pnl && _obj ) { if ( name == _lockedAttr || name == _labelAttr || name == _highlightAttr || name == _groupAttr || name == _styleAttr || name == _clipAttr || name == _maskAttr ) { _pnl->_updateObject(_obj, name == _highlightAttr); @@ -213,7 +213,7 @@ public: add(_colClipMask); //add(_colInsertOrder); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<SPItem*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h index 439e3af2a..13b632f61 100644 --- a/src/ui/dialog/objects.h +++ b/src/ui/dialog/objects.h @@ -51,11 +51,11 @@ class ObjectsPanel : public UI::Widget::Panel { public: ObjectsPanel(); - virtual ~ObjectsPanel(); + ~ObjectsPanel() override; static ObjectsPanel& getInstance(); - void setDesktop( SPDesktop* desktop ); + void setDesktop( SPDesktop* desktop ) override; void setDocument( SPDesktop* desktop, SPDocument* document); private: diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h index db3c60786..49befd411 100644 --- a/src/ui/dialog/ocaldialogs.h +++ b/src/ui/dialog/ocaldialogs.h @@ -84,7 +84,7 @@ public: /* * Destructor */ - virtual ~FileDialogBase() + ~FileDialogBase() override {} protected: @@ -403,7 +403,7 @@ public: * Destructor. * Perform any necessary cleanups. */ - ~ImportDialog(); + ~ImportDialog() override; /** * Show an OpenFile file selector. diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h index 97bb25154..47bb8db4f 100644 --- a/src/ui/dialog/panel-dialog.h +++ b/src/ui/dialog/panel-dialog.h @@ -77,12 +77,12 @@ public: */ PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num); - virtual ~PanelDialog() {} + ~PanelDialog() override {} template <typename T> static PanelDialog<Behavior> *create(); - inline virtual void present(); + inline void present() override; private: inline void _presentDialog(); @@ -100,12 +100,12 @@ class PanelDialog<Behavior::FloatingBehavior> : public: inline PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num); - virtual ~PanelDialog() {} + ~PanelDialog() override {} template <typename T> static PanelDialog<Behavior::FloatingBehavior> *create(); - inline virtual void present(); + inline void present() override; private: PanelDialog() = delete; diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp index 5b96febb7..0762450f8 100644 --- a/src/ui/dialog/pixelartdialog.cpp +++ b/src/ui/dialog/pixelartdialog.cpp @@ -67,7 +67,7 @@ class PixelArtDialogImpl : public PixelArtDialog public: PixelArtDialogImpl(); - ~PixelArtDialogImpl(); + ~PixelArtDialogImpl() override; private: struct Input @@ -87,7 +87,7 @@ private: SVGLength y; }; - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; void setTargetDesktop(SPDesktop *desktop); //############ Events diff --git a/src/ui/dialog/pixelartdialog.h b/src/ui/dialog/pixelartdialog.h index b928b4396..d0eac9296 100644 --- a/src/ui/dialog/pixelartdialog.h +++ b/src/ui/dialog/pixelartdialog.h @@ -36,7 +36,7 @@ public: static PixelArtDialog &getInstance(); - virtual ~PixelArtDialog() {}; + ~PixelArtDialog() override {}; }; diff --git a/src/ui/dialog/polar-arrange-tab.h b/src/ui/dialog/polar-arrange-tab.h index 6381f42bc..aeb8613ee 100644 --- a/src/ui/dialog/polar-arrange-tab.h +++ b/src/ui/dialog/polar-arrange-tab.h @@ -35,12 +35,12 @@ class ArrangeDialog; class PolarArrangeTab : public ArrangeTab { public: PolarArrangeTab(ArrangeDialog *parent_); - virtual ~PolarArrangeTab() {}; + ~PolarArrangeTab() override {}; /** * Do the actual arrangement */ - virtual void arrange(); + void arrange() override; /** * Respond to selection change diff --git a/src/ui/dialog/prototype.h b/src/ui/dialog/prototype.h index 3494d8594..ee955d59b 100644 --- a/src/ui/dialog/prototype.h +++ b/src/ui/dialog/prototype.h @@ -33,11 +33,11 @@ namespace Dialog { class Prototype : public UI::Widget::Panel { public: - virtual ~Prototype(); + ~Prototype() override; static Prototype& getInstance() { return *new Prototype(); }; - virtual void present(); + void present() override; private: diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h index aa89a7bdd..5156d0e00 100644 --- a/src/ui/dialog/spellcheck.h +++ b/src/ui/dialog/spellcheck.h @@ -56,7 +56,7 @@ namespace Dialog { class SpellCheck : public Widget::Panel { public: SpellCheck (); - ~SpellCheck (); + ~SpellCheck () override; static SpellCheck &getInstance() { return *new SpellCheck(); } @@ -154,7 +154,7 @@ private: /** * Can be invoked for setting the desktop. Currently not used. */ - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; /** * Is invoked by the desktop tracker when the desktop changes. @@ -262,7 +262,7 @@ private: { add(suggestions); } - virtual ~TreeColumns() {} + ~TreeColumns() override {} Gtk::TreeModelColumn<Glib::ustring> suggestions; }; TreeColumns tree_columns; diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 17850712f..fd7e9bad8 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -57,9 +57,9 @@ public: #endif }; - virtual void notifyContentChanged(Inkscape::XML::Node &node, + void notifyContentChanged(Inkscape::XML::Node &node, Inkscape::Util::ptr_shared old_content, - Inkscape::Util::ptr_shared new_content); + Inkscape::Util::ptr_shared new_content) override; StyleDialog * _styleDialog; }; @@ -93,28 +93,28 @@ public: #endif }; - virtual void notifyChildAdded( Inkscape::XML::Node &/*node*/, + void notifyChildAdded( Inkscape::XML::Node &/*node*/, Inkscape::XML::Node &child, - Inkscape::XML::Node */*prev*/ ) + Inkscape::XML::Node */*prev*/ ) override { if ( _styleDialog && _repr ) { _styleDialog->_nodeAdded( child ); } } - virtual void notifyChildRemoved( Inkscape::XML::Node &/*node*/, + void notifyChildRemoved( Inkscape::XML::Node &/*node*/, Inkscape::XML::Node &child, - Inkscape::XML::Node */*prev*/ ) + Inkscape::XML::Node */*prev*/ ) override { if ( _styleDialog && _repr ) { _styleDialog->_nodeRemoved( child ); } } - virtual void notifyAttributeChanged( Inkscape::XML::Node &node, + void notifyAttributeChanged( Inkscape::XML::Node &node, GQuark qname, Util::ptr_shared /*old_value*/, - Util::ptr_shared /*new_value*/ ) { + Util::ptr_shared /*new_value*/ ) override { if ( _styleDialog && _repr ) { // For the moment only care about attributes that are directly used in selectors. diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h index 39e3edfd7..d3e49ea17 100644 --- a/src/ui/dialog/styledialog.h +++ b/src/ui/dialog/styledialog.h @@ -45,7 +45,7 @@ namespace Dialog { class StyleDialog : public Widget::Panel { public: - ~StyleDialog(); + ~StyleDialog() override; static StyleDialog &getInstance() { return *new StyleDialog(); } diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h index 06586a34c..579948534 100644 --- a/src/ui/dialog/svg-fonts-dialog.h +++ b/src/ui/dialog/svg-fonts-dialog.h @@ -63,7 +63,7 @@ public: class SvgFontsDialog : public UI::Widget::Panel { public: SvgFontsDialog(); - ~SvgFontsDialog(); + ~SvgFontsDialog() override; static SvgFontsDialog &getInstance() { return *new SvgFontsDialog(); } diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h index b3b694a6a..b742896bf 100644 --- a/src/ui/dialog/swatches.h +++ b/src/ui/dialog/swatches.h @@ -41,11 +41,11 @@ class SwatchesPanel : public Inkscape::UI::Widget::Panel { public: SwatchesPanel(gchar const* prefsPath = "/dialogs/swatches"); - virtual ~SwatchesPanel(); + ~SwatchesPanel() override; static SwatchesPanel& getInstance(); - virtual void setDesktop( SPDesktop* desktop ); + void setDesktop( SPDesktop* desktop ) override; virtual SPDesktop* getDesktop() {return _currentDesktop;} virtual int getSelectedIndex() {return _currentIndex;} // temporary diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 0ef631a3a..dc65f299f 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -697,7 +697,7 @@ class REVENGE_API RVNGSVGDrawingGenerator_WithTitle : public RVNGSVGDrawingGener , _titles(titles) {} - void startPage(const RVNGPropertyList &propList) + void startPage(const RVNGPropertyList &propList) override { RVNGSVGDrawingGenerator::startPage(propList); if (propList["draw:name"]) { diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index a9be79a0c..b42309ef6 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -56,7 +56,7 @@ class SymbolsDialog : public UI::Widget::Panel { public: SymbolsDialog( gchar const* prefsPath = "/dialogs/symbols" ); - virtual ~SymbolsDialog(); + ~SymbolsDialog() override; static SymbolsDialog& getInstance(); diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index 24f167500..71a7e2ccf 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -84,26 +84,26 @@ public: _labelAttr(g_quark_from_string("inkscape:label")) {} - virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) + void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override { if ( _pnl && _obj ) { _pnl->_objectsChanged( _obj ); } } - virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) + void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) override { if ( _pnl && _obj ) { _pnl->_objectsChanged( _obj ); } } - virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) + void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) override { if ( _pnl && _obj ) { _pnl->_objectsChanged( _obj ); } } - virtual void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) {} - virtual void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) { + void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) override {} + void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) override { if ( _pnl && _obj ) { if ( name == _labelAttr ) { _pnl->_updateObject( _obj); @@ -279,7 +279,7 @@ public: add(_colAddRemove); add(_colAllowAddRemove); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<SPObject*> _colParentObject; Gtk::TreeModelColumn<SPObject*> _colObject; diff --git a/src/ui/dialog/tags.h b/src/ui/dialog/tags.h index 5f72f6f2f..68a041b32 100644 --- a/src/ui/dialog/tags.h +++ b/src/ui/dialog/tags.h @@ -41,11 +41,11 @@ class TagsPanel : public UI::Widget::Panel { public: TagsPanel(); - virtual ~TagsPanel(); + ~TagsPanel() override; static TagsPanel& getInstance(); - void setDesktop( SPDesktop* desktop ); + void setDesktop( SPDesktop* desktop ) override; void setDocument( SPDesktop* desktop, SPDocument* document); protected: diff --git a/src/ui/dialog/template-load-tab.h b/src/ui/dialog/template-load-tab.h index 0a5521d93..dd5d7e22e 100644 --- a/src/ui/dialog/template-load-tab.h +++ b/src/ui/dialog/template-load-tab.h @@ -50,7 +50,7 @@ public: }; TemplateLoadTab(NewFromTemplate* parent); - virtual ~TemplateLoadTab(); + ~TemplateLoadTab() override; virtual void createTemplate(); protected: diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index 8b2f39672..bcf14d63f 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -54,7 +54,7 @@ namespace Dialog { class TextEdit : public UI::Widget::Panel { public: TextEdit(); - virtual ~TextEdit(); + ~TextEdit() override; /** * Helper function which returns a new instance of the dialog. @@ -134,7 +134,7 @@ protected: /** * Can be invoked for setting the desktop. Currently not used. */ - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; /** * Is invoked by the desktop tracker when the desktop changes. diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h index 2c29f85b8..a368c7072 100644 --- a/src/ui/dialog/tile.h +++ b/src/ui/dialog/tile.h @@ -52,14 +52,14 @@ private: public: ArrangeDialog(); - virtual ~ArrangeDialog() {}; + ~ArrangeDialog() override {}; /** * Callback from Apply */ - virtual void _apply(); + void _apply() override; - virtual void on_show(); + void on_show() override; static ArrangeDialog& getInstance() { return *new ArrangeDialog(); } }; diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp index a1d4d88b8..72dfe60ec 100644 --- a/src/ui/dialog/tracedialog.cpp +++ b/src/ui/dialog/tracedialog.cpp @@ -58,7 +58,7 @@ class TraceDialogImpl : public TraceDialog /** * Destructor */ - ~TraceDialogImpl(); + ~TraceDialogImpl() override; /** * Callback from OK or Cancel @@ -89,7 +89,7 @@ class TraceDialogImpl : public TraceDialog void onSelectionModified( guint flags ); void onSetDefaults(); - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; void setTargetDesktop(SPDesktop *desktop); //############ General items diff --git a/src/ui/dialog/tracedialog.h b/src/ui/dialog/tracedialog.h index e6eb4fbde..2a6b7a1a0 100644 --- a/src/ui/dialog/tracedialog.h +++ b/src/ui/dialog/tracedialog.h @@ -44,7 +44,7 @@ public: /** * Destructor */ - virtual ~TraceDialog() {}; + ~TraceDialog() override {}; }; diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h index 357f4f8f8..953c6d27a 100644 --- a/src/ui/dialog/transformation.h +++ b/src/ui/dialog/transformation.h @@ -64,7 +64,7 @@ public: /** * Cleanup */ - virtual ~Transformation(); + ~Transformation() override; /** * Factory method. Create an instance of this class/interface @@ -166,7 +166,7 @@ protected: void layoutPageSkew(); void layoutPageTransform(); - virtual void _apply(); + void _apply() override; void presentPage(PageType page); void onSwitchPage(Gtk::Widget *page, guint pagenum); diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h index 019cff354..f582161d9 100644 --- a/src/ui/dialog/undo-history.h +++ b/src/ui/dialog/undo-history.h @@ -49,11 +49,11 @@ public: property_event_type() { return _property_event_type.get_proxy(); } protected: - virtual void render_vfunc(const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc(const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: Glib::Property<Glib::RefPtr<Gdk::Pixbuf> > _property_icon; @@ -85,18 +85,18 @@ public: static const Filter& no_filter; protected: - virtual void render_vfunc(const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc(const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: Glib::Property<int> _property_number; const Filter& _filter; - struct NoFilter : Filter { bool operator() (const int& /*x*/) const { return true; } }; + struct NoFilter : Filter { bool operator() (const int& /*x*/) const override { return true; } }; }; /** @@ -107,10 +107,10 @@ private: */ class UndoHistory : public Widget::Panel { public: - virtual ~UndoHistory(); + ~UndoHistory() override; static UndoHistory &getInstance(); - void setDesktop(SPDesktop* desktop); + void setDesktop(SPDesktop* desktop) override; sigc::connection _document_replaced_connection; @@ -153,7 +153,7 @@ private: struct GreaterThan : CellRendererInt::Filter { GreaterThan(int _i) : i (_i) {} - bool operator() (const int& x) const { return x > i; } + bool operator() (const int& x) const override { return x > i; } int i; }; diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h index 7a4709dd4..72622a070 100644 --- a/src/ui/dialog/xml-tree.h +++ b/src/ui/dialog/xml-tree.h @@ -54,7 +54,7 @@ namespace Dialog { class XmlTree : public Widget::Panel { public: XmlTree (); - ~XmlTree (); + ~XmlTree () override; static XmlTree &getInstance() { return *new XmlTree(); } @@ -170,7 +170,7 @@ private: void cmd_delete_attr(); void cmd_set_attr(); - virtual void present(); + void present() override; bool sp_xml_tree_key_press(GdkEventKey *event); @@ -179,7 +179,7 @@ private: /** * Can be invoked for setting the desktop. Currently not used. */ - void setDesktop(SPDesktop *desktop); + void setDesktop(SPDesktop *desktop) override; /** * Flag to ensure only one operation is performed at once diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 4ae0f4a6d..19dddf2c3 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -770,7 +770,7 @@ public: Observer("/options/maxrecentdocuments/value"), _rm(recent_menu) {} - virtual void notify(Inkscape::Preferences::Entry const &e) { + void notify(Inkscape::Preferences::Entry const &e) override { gtk_recent_chooser_set_limit(GTK_RECENT_CHOOSER(_rm), e.getInt()); // hack: the recent menu doesn't repopulate after changing the limit, so we force it g_signal_emit_by_name((gpointer) gtk_recent_manager_get_default(), "changed"); diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h index b12bd466e..cccc0ea9e 100644 --- a/src/ui/previewholder.h +++ b/src/ui/previewholder.h @@ -36,7 +36,7 @@ class PreviewHolder : public Gtk::Bin { public: PreviewHolder(); - virtual ~PreviewHolder(); + ~PreviewHolder() override; virtual void clear(); virtual void addPreview( Previewable* preview ); @@ -54,7 +54,7 @@ public: virtual bool getWrap() const { return _wrap; } protected: - virtual bool on_scroll_event(GdkEventScroll*); + bool on_scroll_event(GdkEventScroll*) override; private: void rebuildUI(); diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp index 1027dea7f..53829be0b 100644 --- a/src/ui/shape-editor-knotholders.cpp +++ b/src/ui/shape-editor-knotholders.cpp @@ -41,49 +41,49 @@ class RectKnotHolder : public KnotHolder { public: RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~RectKnotHolder() {}; + ~RectKnotHolder() override {}; }; class Box3DKnotHolder : public KnotHolder { public: Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~Box3DKnotHolder() {}; + ~Box3DKnotHolder() override {}; }; class ArcKnotHolder : public KnotHolder { public: ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~ArcKnotHolder() {}; + ~ArcKnotHolder() override {}; }; class StarKnotHolder : public KnotHolder { public: StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~StarKnotHolder() {}; + ~StarKnotHolder() override {}; }; class SpiralKnotHolder : public KnotHolder { public: SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~SpiralKnotHolder() {}; + ~SpiralKnotHolder() override {}; }; class OffsetKnotHolder : public KnotHolder { public: OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~OffsetKnotHolder() {}; + ~OffsetKnotHolder() override {}; }; class FlowtextKnotHolder : public KnotHolder { public: FlowtextKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~FlowtextKnotHolder() {}; + ~FlowtextKnotHolder() override {}; }; class MiscKnotHolder : public KnotHolder { public: MiscKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - virtual ~MiscKnotHolder() {}; + ~MiscKnotHolder() override {}; }; namespace { @@ -157,24 +157,24 @@ KnotHolder *createLPEKnotHolder(SPItem *item, SPDesktop *desktop) /* handle for horizontal rounding radius */ class RectKnotHolderEntityRX : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; /* handle for vertical rounding radius */ class RectKnotHolderEntityRY : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; /* handle for width/height adjustment */ class RectKnotHolderEntityWH : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; protected: void set_internal(Geom::Point const &p, Geom::Point const &origin, unsigned int state); @@ -183,15 +183,15 @@ protected: /* handle for x/y adjustment */ class RectKnotHolderEntityXY : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; /* handle for position */ class RectKnotHolderEntityCenter : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; Geom::Point @@ -572,8 +572,8 @@ RectKnotHolder::RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel class Box3DKnotHolderEntity : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const = 0; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) = 0; + Geom::Point knot_get() const override = 0; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override = 0; Geom::Point knot_get_generic(SPItem *item, unsigned int knot_id) const; void knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &p, unsigned int state); @@ -614,56 +614,56 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, Geom class Box3DKnotHolderEntity0 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntity1 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntity2 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntity3 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntity4 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntity5 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntity6 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntity7 : public Box3DKnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class Box3DKnotHolderEntityCenter : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; Geom::Point @@ -855,36 +855,36 @@ Box3DKnotHolder::Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderR class ArcKnotHolderEntityStart : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; class ArcKnotHolderEntityEnd : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; class ArcKnotHolderEntityRX : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; class ArcKnotHolderEntityRY : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; class ArcKnotHolderEntityCenter : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; /* @@ -1158,22 +1158,22 @@ ArcKnotHolder::ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRelea class StarKnotHolderEntity1 : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; class StarKnotHolderEntity2 : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; class StarKnotHolderEntityCenter : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; void @@ -1342,21 +1342,21 @@ StarKnotHolder::StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel class SpiralKnotHolderEntityInner : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); - virtual void knot_click(unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; + void knot_click(unsigned int state) override; }; class SpiralKnotHolderEntityOuter : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; class SpiralKnotHolderEntityCenter : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; @@ -1589,8 +1589,8 @@ SpiralKnotHolder::SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde class OffsetKnotHolderEntity : public KnotHolderEntity { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; void @@ -1636,8 +1636,8 @@ OffsetKnotHolder::OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde // sense logically. class FlowtextKnotHolderEntity : public RectKnotHolderEntityWH { public: - virtual Geom::Point knot_get() const; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); + Geom::Point knot_get() const override; + void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) override; }; Geom::Point diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h index d0cfce8d2..ca00800c0 100644 --- a/src/ui/tool/control-point-selection.h +++ b/src/ui/tool/control-point-selection.h @@ -41,7 +41,7 @@ namespace UI { class ControlPointSelection : public Manipulator, public sigc::trackable { public: ControlPointSelection(SPDesktop *d, SPCanvasGroup *th_group); - ~ControlPointSelection(); + ~ControlPointSelection() override; typedef INK_UNORDERED_SET<SelectableControlPoint *> set_type; typedef set_type Set; // convenience alias @@ -91,7 +91,7 @@ public: void invertSelection(); void spatialGrow(SelectableControlPoint *origin, int dir); - virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *); + bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override; void transform(Geom::Affine const &m); void align(Geom::Dim2 d); diff --git a/src/ui/tool/curve-drag-point.h b/src/ui/tool/curve-drag-point.h index c1d40575f..925d8d05d 100644 --- a/src/ui/tool/curve-drag-point.h +++ b/src/ui/tool/curve-drag-point.h @@ -37,16 +37,16 @@ public: double getTimeValue() { return _t; } void setIterator(NodeList::iterator i) { first = i; } NodeList::iterator getIterator() { return first; } - virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event); + bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override; protected: - virtual Glib::ustring _getTip(unsigned state) const; - virtual void dragged(Geom::Point &, GdkEventMotion *); - virtual bool grabbed(GdkEventMotion *); - virtual void ungrabbed(GdkEventButton *); - virtual bool clicked(GdkEventButton *); - virtual bool doubleclicked(GdkEventButton *); + Glib::ustring _getTip(unsigned state) const override; + void dragged(Geom::Point &, GdkEventMotion *) override; + bool grabbed(GdkEventMotion *) override; + void ungrabbed(GdkEventButton *) override; + bool clicked(GdkEventButton *) override; + bool doubleclicked(GdkEventButton *) override; private: double _t; diff --git a/src/ui/tool/manipulator.h b/src/ui/tool/manipulator.h index 66b47ce98..96861e660 100644 --- a/src/ui/tool/manipulator.h +++ b/src/ui/tool/manipulator.h @@ -145,7 +145,7 @@ public: } } - virtual bool event(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) { + bool event(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override { for (typename MapType::iterator i = _mmap.begin(); i != _mmap.end(); ++i) { if ((*i).second->event(event_context, event)) return true; } diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h index 742c6d421..46f0d17ba 100644 --- a/src/ui/tool/multi-path-manipulator.h +++ b/src/ui/tool/multi-path-manipulator.h @@ -35,8 +35,8 @@ struct PathSharedData; class MultiPathManipulator : public PointManipulator { public: MultiPathManipulator(PathSharedData &data, sigc::connection &chg); - virtual ~MultiPathManipulator(); - virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *event); + ~MultiPathManipulator() override; + bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *event) override; bool empty() { return _mmap.empty(); } unsigned size() { return _mmap.size(); } diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h index 231f57b7c..6a766125a 100644 --- a/src/ui/tool/node.h +++ b/src/ui/tool/node.h @@ -79,15 +79,15 @@ struct NodeSharedData { class Handle : public ControlPoint { public: - virtual ~Handle(); + ~Handle() override; inline Geom::Point relativePos() const; inline double length() const; bool isDegenerate() const { return _degenerate; } // True if the handle is retracted, i.e. has zero length. - virtual void setVisible(bool); - virtual void move(Geom::Point const &p); + void setVisible(bool) override; + void move(Geom::Point const &p) override; - virtual void setPosition(Geom::Point const &p); + void setPosition(Geom::Point const &p) override; inline void setRelativePos(Geom::Point const &p); void setLength(double len); void retract(); @@ -103,15 +103,15 @@ protected: Handle(NodeSharedData const &data, Geom::Point const &initial_pos, Node *parent); virtual void handle_2button_press(); - virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event); - virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event); - virtual bool grabbed(GdkEventMotion *event); - virtual void ungrabbed(GdkEventButton *event); - virtual bool clicked(GdkEventButton *event); + bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override; + void dragged(Geom::Point &new_pos, GdkEventMotion *event) override; + bool grabbed(GdkEventMotion *event) override; + void ungrabbed(GdkEventButton *event) override; + bool clicked(GdkEventButton *event) override; - virtual Glib::ustring _getTip(unsigned state) const; - virtual Glib::ustring _getDragTip(GdkEventMotion *event) const; - virtual bool _hasDragTips() const { return true; } + Glib::ustring _getTip(unsigned state) const override; + Glib::ustring _getDragTip(GdkEventMotion *event) const override; + bool _hasDragTips() const override { return true; } private: @@ -146,9 +146,9 @@ public: */ Node(NodeSharedData const &data, Geom::Point const &pos); - virtual void move(Geom::Point const &p); - virtual void transform(Geom::Affine const &m); - virtual Geom::Rect bounds() const; + void move(Geom::Point const &p) override; + void transform(Geom::Affine const &m) override; + Geom::Rect bounds() const override; NodeType type() const { return _type; } @@ -216,20 +216,20 @@ public: // temporarily public /** Customized event handler to catch scroll events needed for selection grow/shrink. */ - virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event); + bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override; Inkscape::SnapCandidatePoint snapCandidatePoint(); protected: - virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event); - virtual bool grabbed(GdkEventMotion *event); - virtual bool clicked(GdkEventButton *event); + void dragged(Geom::Point &new_pos, GdkEventMotion *event) override; + bool grabbed(GdkEventMotion *event) override; + bool clicked(GdkEventButton *event) override; - virtual void _setState(State state); - virtual Glib::ustring _getTip(unsigned state) const; - virtual Glib::ustring _getDragTip(GdkEventMotion *event) const; - virtual bool _hasDragTips() const { return true; } + void _setState(State state) override; + Glib::ustring _getTip(unsigned state) const override; + Glib::ustring _getDragTip(GdkEventMotion *event) const override; + bool _hasDragTips() const override { return true; } private: diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 192a02fe2..6582501cb 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -68,13 +68,13 @@ public: _node->addObserver(*this); } - ~PathManipulatorObserver() { + ~PathManipulatorObserver() override { _node->removeObserver(*this); Inkscape::GC::release(_node); } - virtual void notifyAttributeChanged(Inkscape::XML::Node &/*node*/, GQuark attr, - Util::ptr_shared, Util::ptr_shared) + void notifyAttributeChanged(Inkscape::XML::Node &/*node*/, GQuark attr, + Util::ptr_shared, Util::ptr_shared) override { // do nothing if blocked if (_blocked) return; diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h index 5fa24c23b..cf5142600 100644 --- a/src/ui/tool/path-manipulator.h +++ b/src/ui/tool/path-manipulator.h @@ -54,8 +54,8 @@ public: PathManipulator(MultiPathManipulator &mpm, SPPath *path, Geom::Affine const &edit_trans, guint32 outline_color, Glib::ustring lpe_key); - ~PathManipulator(); - virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *); + ~PathManipulator() override; + bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override; bool empty(); void writeXML(); diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h index c16f639b1..b3020b47f 100644 --- a/src/ui/tool/selectable-control-point.h +++ b/src/ui/tool/selectable-control-point.h @@ -22,7 +22,7 @@ class ControlPointSelection; class SelectableControlPoint : public ControlPoint { public: - ~SelectableControlPoint(); + ~SelectableControlPoint() override; bool selected() const; void updateState() { _setState(_state); } virtual Geom::Rect bounds() const { @@ -44,12 +44,12 @@ protected: ControlPointSelection &sel, ColorSet const &cset = _default_scp_color_set, SPCanvasGroup *group = 0); - virtual void _setState(State state); + void _setState(State state) override; - virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event); - virtual bool grabbed(GdkEventMotion *event); - virtual void ungrabbed(GdkEventButton *event); - virtual bool clicked(GdkEventButton *event); + void dragged(Geom::Point &new_pos, GdkEventMotion *event) override; + bool grabbed(GdkEventMotion *event) override; + void ungrabbed(GdkEventButton *event) override; + bool clicked(GdkEventButton *event) override; ControlPointSelection &_selection; diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp index 84e96173d..3444de809 100644 --- a/src/ui/tool/selector.cpp +++ b/src/ui/tool/selector.cpp @@ -42,7 +42,7 @@ public: sp_canvas_item_hide(_rubber); } - ~SelectorPoint() { + ~SelectorPoint() override { sp_canvas_item_destroy(_rubber); } @@ -53,7 +53,7 @@ public: } protected: - virtual bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) { + bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEvent *event) override { if (event->type == GDK_KEY_PRESS && shortcut_key(event->key) == GDK_KEY_Escape && sp_canvas_item_is_visible(_rubber)) { @@ -65,27 +65,27 @@ protected: } private: - virtual bool grabbed(GdkEventMotion *) { + bool grabbed(GdkEventMotion *) override { _cancel = false; _start = position(); sp_canvas_item_show(_rubber); return false; } - virtual void dragged(Geom::Point &new_pos, GdkEventMotion *) { + void dragged(Geom::Point &new_pos, GdkEventMotion *) override { if (_cancel) return; Geom::Rect sel(_start, new_pos); _rubber->setRectangle(sel); } - virtual void ungrabbed(GdkEventButton *event) { + void ungrabbed(GdkEventButton *event) override { if (_cancel) return; sp_canvas_item_hide(_rubber); Geom::Rect sel(_start, position()); _selector->signal_area.emit(sel, event); } - virtual bool clicked(GdkEventButton *event) { + bool clicked(GdkEventButton *event) override { if (event->button != 1) return false; _selector->signal_point.emit(position(), event); return true; diff --git a/src/ui/tool/selector.h b/src/ui/tool/selector.h index bd8d3e1aa..450e318f6 100644 --- a/src/ui/tool/selector.h +++ b/src/ui/tool/selector.h @@ -27,8 +27,8 @@ class SelectorPoint; class Selector : public Manipulator { public: Selector(SPDesktop *d); - virtual ~Selector(); - virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *); + ~Selector() override; + bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override; virtual bool doubleClicked(); sigc::signal<void, Geom::Rect const &, GdkEventButton*> signal_area; diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp index 23cd6b79d..bb2e6c861 100644 --- a/src/ui/tool/transform-handle-set.cpp +++ b/src/ui/tool/transform-handle-set.cpp @@ -204,7 +204,7 @@ public: : TransformHandle(th, anchor, pb) {} protected: - virtual Glib::ustring _getTip(unsigned state) const { + Glib::ustring _getTip(unsigned state) const override { if (state_held_control(state)) { if (state_held_shift(state)) { return C_("Transform handle tip", @@ -225,12 +225,12 @@ protected: return C_("Transform handle tip", "<b>Scale handle</b>: drag to scale the selection"); } - virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) const { + Glib::ustring _getDragTip(GdkEventMotion */*event*/) const override { return format_tip(C_("Transform handle tip", "Scale by %.2f%% x %.2f%%"), _last_scale_x * 100, _last_scale_y * 100); } - virtual bool _hasDragTips() const { return true; } + bool _hasDragTips() const override { return true; } static double _last_scale_x, _last_scale_y; }; @@ -249,13 +249,13 @@ public: {} protected: - virtual void startTransform() { + void startTransform() override { _sc_center = _th.rotationCenter(); _sc_opposite = _th.bounds().corner(_corner + 2); _last_scale_x = _last_scale_y = 1.0; } - virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) { + Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override { Geom::Point scc = held_shift(*event) ? _sc_center : _sc_opposite; Geom::Point vold = _origin - scc, vnew = new_pos - scc; // avoid exploding the selection @@ -300,7 +300,7 @@ protected: return t; } - virtual CommitEvent getCommitEvent() { + CommitEvent getCommitEvent() override { return _last_transform.isUniformScale() ? COMMIT_MOUSE_SCALE_UNIFORM : COMMIT_MOUSE_SCALE; @@ -335,13 +335,13 @@ public: , _side(side) {} protected: - virtual void startTransform() { + void startTransform() override { _sc_center = _th.rotationCenter(); Geom::Rect b = _th.bounds(); _sc_opposite = Geom::middle_point(b.corner(_side + 2), b.corner(_side + 3)); _last_scale_x = _last_scale_y = 1.0; } - virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) { + Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override { Geom::Point scc = held_shift(*event) ? _sc_center : _sc_opposite; Geom::Point vs; Geom::Dim2 d1 = static_cast<Geom::Dim2>((_side + 1) % 2); @@ -386,7 +386,7 @@ protected: * Geom::Translate(scc); return t; } - virtual CommitEvent getCommitEvent() { + CommitEvent getCommitEvent() override { return _last_transform.isUniformScale() ? COMMIT_MOUSE_SCALE_UNIFORM : COMMIT_MOUSE_SCALE; @@ -415,13 +415,13 @@ public: {} protected: - virtual void startTransform() { + void startTransform() override { _rot_center = _th.rotationCenter(); _rot_opposite = _th.bounds().corner(_corner + 2); _last_angle = 0; } - virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) + Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override { Geom::Point rotc = held_shift(*event) ? _rot_opposite : _rot_center; double angle = Geom::angle_between(_origin - rotc, new_pos - rotc); @@ -446,9 +446,9 @@ protected: return t; } - virtual CommitEvent getCommitEvent() { return COMMIT_MOUSE_ROTATE; } + CommitEvent getCommitEvent() override { return COMMIT_MOUSE_ROTATE; } - virtual Glib::ustring _getTip(unsigned state) const { + Glib::ustring _getTip(unsigned state) const override { if (state_held_shift(state)) { if (state_held_control(state)) { return format_tip(C_("Transform handle tip", @@ -465,12 +465,12 @@ protected: "the selection around the rotation center"); } - virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) const { + Glib::ustring _getDragTip(GdkEventMotion */*event*/) const override { return format_tip(C_("Transform handle tip", "Rotate by %.2f°"), _last_angle * 180.0 / M_PI); } - virtual bool _hasDragTips() const { return true; } + bool _hasDragTips() const override { return true; } private: static Glib::RefPtr<Gdk::Pixbuf> _corner_to_pixbuf(unsigned c) { @@ -498,7 +498,7 @@ public: protected: - virtual void startTransform() { + void startTransform() override { _skew_center = _th.rotationCenter(); Geom::Rect b = _th.bounds(); _skew_opposite = Geom::middle_point(b.corner(_side + 2), b.corner(_side + 3)); @@ -506,7 +506,7 @@ protected: _last_horizontal = _side % 2; } - virtual Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) + Geom::Affine computeTransform(Geom::Point const &new_pos, GdkEventMotion *event) override { Geom::Point scc = held_shift(*event) ? _skew_center : _skew_opposite; Geom::Dim2 d1 = static_cast<Geom::Dim2>((_side + 1) % 2); @@ -581,13 +581,13 @@ protected: return t; } - virtual CommitEvent getCommitEvent() { + CommitEvent getCommitEvent() override { return (_side % 2) ? COMMIT_MOUSE_SKEW_Y : COMMIT_MOUSE_SKEW_X; } - virtual Glib::ustring _getTip(unsigned state) const { + Glib::ustring _getTip(unsigned state) const override { if (state_held_shift(state)) { if (state_held_control(state)) { return format_tip(C_("Transform handle tip", @@ -605,7 +605,7 @@ protected: "the opposite handle"); } - virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) const { + Glib::ustring _getDragTip(GdkEventMotion */*event*/) const override { if (_last_horizontal) { return format_tip(C_("Transform handle tip", "Skew horizontally by %.2f°"), _last_angle * 360.0); @@ -615,7 +615,7 @@ protected: } } - virtual bool _hasDragTips() const { return true; } + bool _hasDragTips() const override { return true; } private: @@ -650,7 +650,7 @@ public: } protected: - virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event) { + void dragged(Geom::Point &new_pos, GdkEventMotion *event) override { SnapManager &sm = _th._desktop->namedview->snap_manager; sm.setup(_th._desktop); bool snap = !held_shift(*event) && sm.someSnapperMightSnap(); @@ -667,7 +667,7 @@ protected: } sm.unSetup(); } - virtual Glib::ustring _getTip(unsigned /*state*/) const { + Glib::ustring _getTip(unsigned /*state*/) const override { return C_("Transform handle tip", "<b>Rotation center</b>: drag to change the origin of transforms"); } diff --git a/src/ui/tool/transform-handle-set.h b/src/ui/tool/transform-handle-set.h index 54f81adf5..023e4f855 100644 --- a/src/ui/tool/transform-handle-set.h +++ b/src/ui/tool/transform-handle-set.h @@ -39,8 +39,8 @@ public: }; TransformHandleSet(SPDesktop *d, SPCanvasGroup *th_group); - virtual ~TransformHandleSet(); - virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *); + ~TransformHandleSet() override; + bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *) override; bool visible() const { return _visible; } Mode mode() const { return _mode; } @@ -117,9 +117,9 @@ protected: std::vector<Inkscape::SnapCandidatePoint>::iterator _all_snap_sources_iter; private: - virtual bool grabbed(GdkEventMotion *); - virtual void dragged(Geom::Point &new_pos, GdkEventMotion *event); - virtual void ungrabbed(GdkEventButton *); + bool grabbed(GdkEventMotion *) override; + void dragged(Geom::Point &new_pos, GdkEventMotion *event) override; + void ungrabbed(GdkEventButton *) override; static ColorSet thandle_cset; }; diff --git a/src/ui/tools/arc-tool.h b/src/ui/tools/arc-tool.h index 55cbaf78c..7232f07af 100644 --- a/src/ui/tools/arc-tool.h +++ b/src/ui/tools/arc-tool.h @@ -39,16 +39,16 @@ namespace Tools { class ArcTool : public ToolBase { public: ArcTool(); - virtual ~ArcTool(); + ~ArcTool() override; static const std::string prefsPath; - virtual void setup(); - virtual void finish(); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void finish() override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: SPGenericEllipse *arc; diff --git a/src/ui/tools/box3d-tool.h b/src/ui/tools/box3d-tool.h index 33ae6d8e7..cbd7dbe08 100644 --- a/src/ui/tools/box3d-tool.h +++ b/src/ui/tools/box3d-tool.h @@ -46,18 +46,18 @@ namespace Tools { class Box3dTool : public ToolBase { public: Box3dTool(); - virtual ~Box3dTool(); + ~Box3dTool() override; Box3D::VPDrag * _vpdrag; static const std::string prefsPath; - virtual void setup(); - virtual void finish(); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void finish() override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: SPBox3D* box3d; diff --git a/src/ui/tools/calligraphic-tool.h b/src/ui/tools/calligraphic-tool.h index 83b4d73ff..ac8a7436b 100644 --- a/src/ui/tools/calligraphic-tool.h +++ b/src/ui/tools/calligraphic-tool.h @@ -44,15 +44,15 @@ namespace Tools { class CalligraphicTool : public DynamicBase { public: CalligraphicTool(); - virtual ~CalligraphicTool(); + ~CalligraphicTool() override; static const std::string prefsPath; - virtual void setup(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: /** newly created object remain selected */ diff --git a/src/ui/tools/connector-tool.h b/src/ui/tools/connector-tool.h index 8aef637e8..241a59dca 100644 --- a/src/ui/tools/connector-tool.h +++ b/src/ui/tools/connector-tool.h @@ -58,7 +58,7 @@ namespace Tools { class ConnectorTool : public ToolBase { public: ConnectorTool(); - virtual ~ConnectorTool(); + ~ConnectorTool() override; Inkscape::Selection *selection; Geom::Point p[5]; @@ -109,13 +109,13 @@ public: static std::string const prefsPath; - virtual void setup(); - virtual void finish(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void finish() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; - virtual std::string const& getPrefsPath(); + std::string const& getPrefsPath() override; void cc_clear_active_shape(); void cc_set_active_conn(SPItem *item); diff --git a/src/ui/tools/dropper-tool.h b/src/ui/tools/dropper-tool.h index 813f68296..049244b66 100644 --- a/src/ui/tools/dropper-tool.h +++ b/src/ui/tools/dropper-tool.h @@ -38,18 +38,18 @@ namespace Tools { class DropperTool : public ToolBase { public: DropperTool(); - virtual ~DropperTool(); + ~DropperTool() override; static const std::string prefsPath; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; guint32 get_color(bool invert=false); protected: - virtual void setup(); - virtual void finish(); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void finish() override; + bool root_handler(GdkEvent* event) override; private: double R; diff --git a/src/ui/tools/dynamic-base.h b/src/ui/tools/dynamic-base.h index b9ffd71ce..4b78ee416 100644 --- a/src/ui/tools/dynamic-base.h +++ b/src/ui/tools/dynamic-base.h @@ -40,9 +40,9 @@ namespace Tools { class DynamicBase : public ToolBase { public: DynamicBase(gchar const *const *cursor_shape); - virtual ~DynamicBase(); + ~DynamicBase() override; - virtual void set(const Inkscape::Preferences::Entry& val); + void set(const Inkscape::Preferences::Entry& val) override; protected: /** accumulated shape which ultimately goes in svg:path */ diff --git a/src/ui/tools/eraser-tool.h b/src/ui/tools/eraser-tool.h index bd0e98057..8a196d360 100644 --- a/src/ui/tools/eraser-tool.h +++ b/src/ui/tools/eraser-tool.h @@ -42,14 +42,14 @@ namespace Tools { class EraserTool : public DynamicBase { public: EraserTool(); - virtual ~EraserTool(); + ~EraserTool() override; static const std::string prefsPath; - virtual void setup(); - virtual bool root_handler(GdkEvent* event); + void setup() override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: void reset(Geom::Point p); diff --git a/src/ui/tools/flood-tool.h b/src/ui/tools/flood-tool.h index 7eadeea34..f6f49b9c4 100644 --- a/src/ui/tools/flood-tool.h +++ b/src/ui/tools/flood-tool.h @@ -30,7 +30,7 @@ namespace Tools { class FloodTool : public ToolBase { public: FloodTool(); - virtual ~FloodTool(); + ~FloodTool() override; SPItem *item; @@ -38,11 +38,11 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; static void set_channels(gint channels); static const std::vector<Glib::ustring> channel_list; diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h index 38b3851ff..ffc4b738f 100644 --- a/src/ui/tools/freehand-base.h +++ b/src/ui/tools/freehand-base.h @@ -45,7 +45,7 @@ namespace Tools { class FreehandBase : public ToolBase { public: FreehandBase(gchar const *const *cursor_shape); - virtual ~FreehandBase(); + ~FreehandBase() override; Inkscape::Selection *selection; SPCanvasItem *grab; @@ -101,13 +101,13 @@ public: bool is_tablet; gdouble pressure; - virtual void set(const Inkscape::Preferences::Entry& val); + void set(const Inkscape::Preferences::Entry& val) override; protected: - virtual void setup(); - virtual void finish(); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void finish() override; + bool root_handler(GdkEvent* event) override; }; /** diff --git a/src/ui/tools/gradient-tool.h b/src/ui/tools/gradient-tool.h index 6fe3bca9f..3b7a646e7 100644 --- a/src/ui/tools/gradient-tool.h +++ b/src/ui/tools/gradient-tool.h @@ -29,7 +29,7 @@ namespace Tools { class GradientTool : public ToolBase { public: GradientTool(); - virtual ~GradientTool(); + ~GradientTool() override; Geom::Point origin; @@ -44,10 +44,10 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual bool root_handler(GdkEvent* event); + void setup() override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: void selection_changed(Inkscape::Selection*); diff --git a/src/ui/tools/lpe-tool.h b/src/ui/tools/lpe-tool.h index df78c205c..d3a5a056e 100644 --- a/src/ui/tools/lpe-tool.h +++ b/src/ui/tools/lpe-tool.h @@ -48,7 +48,7 @@ namespace Tools { class LpeTool : public PenTool { public: LpeTool(); - virtual ~LpeTool(); + ~LpeTool() override; ShapeEditor* shape_editor; SPCanvasItem *canvas_bbox; @@ -61,13 +61,13 @@ public: static const std::string prefsPath; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; protected: - virtual void setup(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; }; int lpetool_mode_to_index(Inkscape::LivePathEffect::EffectType const type); diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h index 42122dca1..519e849c3 100644 --- a/src/ui/tools/measure-tool.h +++ b/src/ui/tools/measure-tool.h @@ -37,12 +37,12 @@ namespace Tools { class MeasureTool : public ToolBase { public: MeasureTool(); - virtual ~MeasureTool(); + ~MeasureTool() override; static const std::string prefsPath; - virtual void finish(); - virtual bool root_handler(GdkEvent* event); + void finish() override; + bool root_handler(GdkEvent* event) override; virtual void showCanvasItems(bool to_guides = false, bool to_item = false, bool to_phantom = false, Inkscape::XML::Node *measure_repr = NULL); virtual void reverseKnots(); virtual void toGuides(); @@ -52,7 +52,7 @@ public: virtual void reset(); virtual void setMarkers(); virtual void setMarker(bool isStart); - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; Geom::Point readMeasurePoint(bool is_start); void showInfoBox(Geom::Point cursor, bool into_groups); void showItemInfoText(Geom::Point pos, gchar *measure_str, double fontsize); diff --git a/src/ui/tools/mesh-tool.h b/src/ui/tools/mesh-tool.h index 9c13ec30e..59c60dad4 100644 --- a/src/ui/tools/mesh-tool.h +++ b/src/ui/tools/mesh-tool.h @@ -33,7 +33,7 @@ namespace Tools { class MeshTool : public ToolBase { public: MeshTool(); - virtual ~MeshTool(); + ~MeshTool() override; Geom::Point origin; @@ -44,11 +44,11 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: void selection_changed(Inkscape::Selection* sel); diff --git a/src/ui/tools/node-tool.h b/src/ui/tools/node-tool.h index dded2d9bd..a05eb5850 100644 --- a/src/ui/tools/node-tool.h +++ b/src/ui/tools/node-tool.h @@ -45,7 +45,7 @@ namespace Tools { class NodeTool : public ToolBase { public: NodeTool(); - virtual ~NodeTool(); + ~NodeTool() override; Inkscape::UI::ControlPointSelection* _selected_nodes; Inkscape::UI::MultiPathManipulator* _multipath; @@ -56,11 +56,11 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; boost::ptr_map<SPItem*, ShapeEditor> _shape_editors; private: diff --git a/src/ui/tools/pen-tool.h b/src/ui/tools/pen-tool.h index fe1947f81..7d442bfca 100644 --- a/src/ui/tools/pen-tool.h +++ b/src/ui/tools/pen-tool.h @@ -24,7 +24,7 @@ class PenTool : public FreehandBase { public: PenTool(); PenTool(gchar const *const *cursor_shape); - virtual ~PenTool(); + ~PenTool() override; enum Mode { MODE_CLICK, @@ -68,7 +68,7 @@ public: static const std::string prefsPath; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; int nextParaxialDirection(Geom::Point const &pt, Geom::Point const &origin, guint state) const; void setPolylineMode(); @@ -76,11 +76,11 @@ public: void waitForLPEMouseClicks(Inkscape::LivePathEffect::EffectType effect_type, unsigned int num_clicks, bool use_polylines = true); protected: - virtual void setup(); - virtual void finish(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void finish() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; private: bool _handleButtonPress(GdkEventButton const &bevent); diff --git a/src/ui/tools/pencil-tool.h b/src/ui/tools/pencil-tool.h index 24f2c8bfc..58b449c98 100644 --- a/src/ui/tools/pencil-tool.h +++ b/src/ui/tools/pencil-tool.h @@ -37,7 +37,7 @@ enum PencilState { class PencilTool : public FreehandBase { public: PencilTool(); - virtual ~PencilTool(); + ~PencilTool() override; Geom::Point p[16]; std::vector<Geom::Point> ps; std::vector<Geom::Point> points; @@ -47,12 +47,12 @@ public: Geom::Piecewise<Geom::D2<Geom::SBasis> > sketch_interpolation; // the current proposal from the sketched paths unsigned sketch_n; // number of sketches done static const std::string prefsPath; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; protected: - virtual void setup(); - virtual bool root_handler(GdkEvent* event); + void setup() override; + bool root_handler(GdkEvent* event) override; private: bool _handleButtonPress(GdkEventButton const &bevent); diff --git a/src/ui/tools/rect-tool.h b/src/ui/tools/rect-tool.h index ac056668f..4036bf35b 100644 --- a/src/ui/tools/rect-tool.h +++ b/src/ui/tools/rect-tool.h @@ -29,17 +29,17 @@ namespace Tools { class RectTool : public ToolBase { public: RectTool(); - virtual ~RectTool(); + ~RectTool() override; static const std::string prefsPath; - virtual void setup(); - virtual void finish(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void finish() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: SPRect *rect; diff --git a/src/ui/tools/select-tool.h b/src/ui/tools/select-tool.h index 420374661..f198686f2 100644 --- a/src/ui/tools/select-tool.h +++ b/src/ui/tools/select-tool.h @@ -32,7 +32,7 @@ namespace Tools { class SelectTool : public ToolBase { public: SelectTool(); - virtual ~SelectTool(); + ~SelectTool() override; bool dragging; bool moved; @@ -52,12 +52,12 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: bool sp_select_context_abort(); diff --git a/src/ui/tools/spiral-tool.h b/src/ui/tools/spiral-tool.h index add92342d..ca5acccd2 100644 --- a/src/ui/tools/spiral-tool.h +++ b/src/ui/tools/spiral-tool.h @@ -31,16 +31,16 @@ namespace Tools { class SpiralTool : public ToolBase { public: SpiralTool(); - virtual ~SpiralTool(); + ~SpiralTool() override; static const std::string prefsPath; - virtual void setup(); - virtual void finish(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void finish() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: SPSpiral * spiral; diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h index d5504d565..06fba80a9 100644 --- a/src/ui/tools/spray-tool.h +++ b/src/ui/tools/spray-tool.h @@ -56,7 +56,7 @@ enum { class SprayTool : public ToolBase { public: SprayTool(); - virtual ~SprayTool(); + ~SprayTool() override; //ToolBase event_context; //Inkscape::UI::Dialog::Dialog *dialog_option;//Attribut de type SprayOptionClass, localisé dans scr/ui/dialog @@ -114,12 +114,12 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual void set(const Inkscape::Preferences::Entry& val); + void setup() override; + void set(const Inkscape::Preferences::Entry& val) override; virtual void setCloneTilerPrefs(); - virtual bool root_handler(GdkEvent* event); + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; void update_cursor(bool /*with_shift*/); diff --git a/src/ui/tools/star-tool.h b/src/ui/tools/star-tool.h index a697582d3..2e973fad5 100644 --- a/src/ui/tools/star-tool.h +++ b/src/ui/tools/star-tool.h @@ -28,16 +28,16 @@ namespace Tools { class StarTool : public ToolBase { public: StarTool(); - virtual ~StarTool(); + ~StarTool() override; static const std::string prefsPath; - virtual void setup(); - virtual void finish(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void finish() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: SPStar* star; diff --git a/src/ui/tools/text-tool.h b/src/ui/tools/text-tool.h index f2e6fea1a..d8968544b 100644 --- a/src/ui/tools/text-tool.h +++ b/src/ui/tools/text-tool.h @@ -34,7 +34,7 @@ namespace Tools { class TextTool : public ToolBase { public: TextTool(); - virtual ~TextTool(); + ~TextTool() override; sigc::connection sel_changed_connection; sigc::connection sel_modified_connection; @@ -77,12 +77,12 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual void finish(); - virtual bool root_handler(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + void setup() override; + void finish() override; + bool root_handler(GdkEvent* event) override; + bool item_handler(SPItem* item, GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: void _selectionChanged(Inkscape::Selection *selection); diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h index 945e41a77..cb08e67b4 100644 --- a/src/ui/tools/tool-base.h +++ b/src/ui/tools/tool-base.h @@ -205,7 +205,7 @@ public: { } - virtual void notify(Inkscape::Preferences::Entry const &val) { + void notify(Inkscape::Preferences::Entry const &val) override { ec->set(val); } diff --git a/src/ui/tools/tweak-tool.h b/src/ui/tools/tweak-tool.h index 7fe4b1856..51f32daa9 100644 --- a/src/ui/tools/tweak-tool.h +++ b/src/ui/tools/tweak-tool.h @@ -44,7 +44,7 @@ enum { class TweakTool : public ToolBase { public: TweakTool(); - virtual ~TweakTool(); + ~TweakTool() override; /* extended input data */ gdouble pressure; @@ -76,11 +76,11 @@ public: static const std::string prefsPath; - virtual void setup(); - virtual void set(const Inkscape::Preferences::Entry& val); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void set(const Inkscape::Preferences::Entry& val) override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; void update_cursor(bool with_shift); diff --git a/src/ui/tools/zoom-tool.h b/src/ui/tools/zoom-tool.h index 6e5cca7aa..6a656eec4 100644 --- a/src/ui/tools/zoom-tool.h +++ b/src/ui/tools/zoom-tool.h @@ -25,15 +25,15 @@ namespace Tools { class ZoomTool : public ToolBase { public: ZoomTool(); - virtual ~ZoomTool(); + ~ZoomTool() override; static const std::string prefsPath; - virtual void setup(); - virtual void finish(); - virtual bool root_handler(GdkEvent* event); + void setup() override; + void finish() override; + bool root_handler(GdkEvent* event) override; - virtual const std::string& getPrefsPath(); + const std::string& getPrefsPath() override; private: SPCanvasItem *grabbed; diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index 3ec38edf9..5412d1fef 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -80,17 +80,17 @@ class UXManagerImpl : public UXManager { public: UXManagerImpl(); - virtual ~UXManagerImpl(); + ~UXManagerImpl() override; - virtual void addTrack( SPDesktopWidget* dtw ); - virtual void delTrack( SPDesktopWidget* dtw ); + void addTrack( SPDesktopWidget* dtw ) override; + void delTrack( SPDesktopWidget* dtw ) override; - virtual void connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop ); + void connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop ) override; - virtual gint getDefaultTask( SPDesktop *desktop ); - virtual void setTask(SPDesktop* dt, gint val); + gint getDefaultTask( SPDesktop *desktop ) override; + void setTask(SPDesktop* dt, gint val) override; - virtual bool isWidescreen() const; + bool isWidescreen() const override; private: bool _widescreen; diff --git a/src/ui/view/view.h b/src/ui/view/view.h index 21a5d0dfc..200b52e7a 100644 --- a/src/ui/view/view.h +++ b/src/ui/view/view.h @@ -76,7 +76,7 @@ public: /** * Deletes and nulls all View message stacks and disconnects it from signals. */ - virtual ~View(); + ~View() override; void close() { _close(); } diff --git a/src/ui/widget/addtoicon.h b/src/ui/widget/addtoicon.h index 93d66c8d5..f79d12cdf 100644 --- a/src/ui/widget/addtoicon.h +++ b/src/ui/widget/addtoicon.h @@ -24,33 +24,33 @@ namespace Widget { class AddToIcon : public Gtk::CellRendererPixbuf { public: AddToIcon(); - virtual ~AddToIcon() {}; + ~AddToIcon() override {}; Glib::PropertyProxy<bool> property_active() { return _property_active.get_proxy(); } Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on(); Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_off(); protected: - virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags ); + Gtk::CellRendererState flags ) override; - virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + void get_preferred_width_vfunc(Gtk::Widget& widget, int& min_w, - int& nat_w) const; + int& nat_w) const override; - virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + void get_preferred_height_vfunc(Gtk::Widget& widget, int& min_h, - int& nat_h) const; + int& nat_h) const override; - virtual bool activate_vfunc(GdkEvent *event, + bool activate_vfunc(GdkEvent *event, Gtk::Widget &widget, const Glib::ustring &path, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: diff --git a/src/ui/widget/alignment-selector.h b/src/ui/widget/alignment-selector.h index 43cd100ef..c1208477b 100644 --- a/src/ui/widget/alignment-selector.h +++ b/src/ui/widget/alignment-selector.h @@ -35,7 +35,7 @@ public: sigc::signal<void, int> &on_alignmentClicked() { return _alignmentClicked; } AlignmentSelector(); - virtual ~AlignmentSelector(); + ~AlignmentSelector() override; }; } // namespace Widget diff --git a/src/ui/widget/anchor-selector.h b/src/ui/widget/anchor-selector.h index e756e9aa0..ad3114c3f 100644 --- a/src/ui/widget/anchor-selector.h +++ b/src/ui/widget/anchor-selector.h @@ -44,7 +44,7 @@ public: void setAlignment(int horizontal, int vertical); AnchorSelector(); - virtual ~AnchorSelector(); + ~AnchorSelector() override; }; } // namespace Widget diff --git a/src/ui/widget/clipmaskicon.h b/src/ui/widget/clipmaskicon.h index deb4554df..d355a1caf 100644 --- a/src/ui/widget/clipmaskicon.h +++ b/src/ui/widget/clipmaskicon.h @@ -24,7 +24,7 @@ namespace Widget { class ClipMaskIcon : public Gtk::CellRendererPixbuf { public: ClipMaskIcon(); - virtual ~ClipMaskIcon() {}; + ~ClipMaskIcon() override {}; Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); } Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on(); @@ -32,26 +32,26 @@ public: protected: - virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags ); + Gtk::CellRendererState flags ) override; - virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + void get_preferred_width_vfunc(Gtk::Widget& widget, int& min_w, - int& nat_w) const; + int& nat_w) const override; - virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + void get_preferred_height_vfunc(Gtk::Widget& widget, int& min_h, - int& nat_h) const; + int& nat_h) const override; - virtual bool activate_vfunc(GdkEvent *event, + bool activate_vfunc(GdkEvent *event, Gtk::Widget &widget, const Glib::ustring &path, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: diff --git a/src/ui/widget/color-entry.h b/src/ui/widget/color-entry.h index 08537f26d..7197321e2 100644 --- a/src/ui/widget/color-entry.h +++ b/src/ui/widget/color-entry.h @@ -22,10 +22,10 @@ class ColorEntry : public Gtk::Entry { public: ColorEntry(SelectedColor &color); - virtual ~ColorEntry(); + ~ColorEntry() override; protected: - void on_changed(); + void on_changed() override; private: void _onColorChanged(); diff --git a/src/ui/widget/color-icc-selector.h b/src/ui/widget/color-icc-selector.h index aaa8372b8..43ef26858 100644 --- a/src/ui/widget/color-icc-selector.h +++ b/src/ui/widget/color-icc-selector.h @@ -26,12 +26,12 @@ class ColorICCSelector static const gchar *MODE_NAME; ColorICCSelector(SelectedColor &color); - virtual ~ColorICCSelector(); + ~ColorICCSelector() override; virtual void init(); protected: - void on_show(); + void on_show() override; virtual void _colorChanged(); @@ -50,8 +50,8 @@ class ColorICCSelector class ColorICCSelectorFactory : public ColorSelectorFactory { public: - Gtk::Widget *createWidget(SelectedColor &color) const; - Glib::ustring modeName() const; + Gtk::Widget *createWidget(SelectedColor &color) const override; + Glib::ustring modeName() const override; }; } } diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h index 7c43435d3..c34c4faf3 100644 --- a/src/ui/widget/color-notebook.h +++ b/src/ui/widget/color-notebook.h @@ -34,7 +34,7 @@ class ColorNotebook { public: ColorNotebook(SelectedColor &color); - virtual ~ColorNotebook(); + ~ColorNotebook() override; protected: struct Page { diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h index 7bb4947d5..c80571df0 100644 --- a/src/ui/widget/color-picker.h +++ b/src/ui/widget/color-picker.h @@ -41,7 +41,7 @@ public: const guint32 rgba, bool undo); - virtual ~ColorPicker(); + ~ColorPicker() override; void setRgba32 (guint32 rgba); @@ -53,7 +53,7 @@ public: protected: void _onSelectedColorChanged(); - virtual void on_clicked(); + void on_clicked() override; virtual void on_changed (guint32); ColorPreview _preview; @@ -82,7 +82,7 @@ public: const guint32 rgba, bool undo) : Labelled(label, tip, new ColorPicker(title, tip, rgba, undo)) {} - ~LabelledColorPicker() + ~LabelledColorPicker() override { static_cast<ColorPicker*>(_widget)->~ColorPicker(); } void setRgba32 (guint32 rgba) diff --git a/src/ui/widget/color-preview.h b/src/ui/widget/color-preview.h index 1276cf42b..520b6fe24 100644 --- a/src/ui/widget/color-preview.h +++ b/src/ui/widget/color-preview.h @@ -31,13 +31,13 @@ public: GdkPixbuf* toPixbuf (int width, int height); protected: - virtual void on_size_allocate (Gtk::Allocation &all); + void on_size_allocate (Gtk::Allocation &all) override; - virtual void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const; - virtual void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) const; - virtual void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const; - virtual void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) const; - virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr); + void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const override; + void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) const override; + void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const override; + void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) const override; + bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override; guint32 _rgba; }; diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h index 5d681cdfb..40e2fdad0 100644 --- a/src/ui/widget/color-scales.h +++ b/src/ui/widget/color-scales.h @@ -33,7 +33,7 @@ public: static void setScaled(GtkAdjustment *a, gfloat v, bool constrained = false); ColorScales(SelectedColor &color, SPColorScalesMode mode); - virtual ~ColorScales(); + ~ColorScales() override; virtual void _initUI(SPColorScalesMode mode); @@ -42,7 +42,7 @@ public: protected: void _onColorChanged(); - void on_show(); + void on_show() override; static void _adjustmentAnyChanged(GtkAdjustment *adjustment, ColorScales *cs); void _sliderAnyGrabbed(); @@ -79,10 +79,10 @@ class ColorScalesFactory : public Inkscape::UI::ColorSelectorFactory { public: ColorScalesFactory(SPColorScalesMode submode); - ~ColorScalesFactory(); + ~ColorScalesFactory() override; - Gtk::Widget *createWidget(Inkscape::UI::SelectedColor &color) const; - Glib::ustring modeName() const; + Gtk::Widget *createWidget(Inkscape::UI::SelectedColor &color) const override; + Glib::ustring modeName() const override; private: SPColorScalesMode _submode; diff --git a/src/ui/widget/color-slider.h b/src/ui/widget/color-slider.h index 9be6c356a..956615880 100644 --- a/src/ui/widget/color-slider.h +++ b/src/ui/widget/color-slider.h @@ -25,7 +25,7 @@ namespace Widget { class ColorSlider : public Gtk::Widget { public: ColorSlider(Glib::RefPtr<Gtk::Adjustment> adjustment); - ~ColorSlider(); + ~ColorSlider() override; void setAdjustment(Glib::RefPtr<Gtk::Adjustment> adjustment); @@ -41,17 +41,17 @@ public: sigc::signal<void> signal_value_changed; protected: - void on_size_allocate(Gtk::Allocation &allocation); - void on_realize(); - void on_unrealize(); - bool on_button_press_event(GdkEventButton *event); - bool on_button_release_event(GdkEventButton *event); - bool on_motion_notify_event(GdkEventMotion *event); - bool on_draw(const Cairo::RefPtr<Cairo::Context> &cr); - void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const; - void get_preferred_width_for_height_vfunc(int height, int &minimum_width, int &natural_width) const; - void get_preferred_height_vfunc(int &minimum_height, int &natural_height) const; - void get_preferred_height_for_width_vfunc(int width, int &minimum_height, int &natural_height) const; + void on_size_allocate(Gtk::Allocation &allocation) override; + void on_realize() override; + void on_unrealize() override; + bool on_button_press_event(GdkEventButton *event) override; + bool on_button_release_event(GdkEventButton *event) override; + bool on_motion_notify_event(GdkEventMotion *event) override; + bool on_draw(const Cairo::RefPtr<Cairo::Context> &cr) override; + void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const override; + void get_preferred_width_for_height_vfunc(int height, int &minimum_width, int &natural_width) const override; + void get_preferred_height_vfunc(int &minimum_height, int &natural_height) const override; + void get_preferred_height_for_width_vfunc(int width, int &minimum_height, int &natural_height) const override; private: void _onAdjustmentChanged(); diff --git a/src/ui/widget/color-wheel-selector.h b/src/ui/widget/color-wheel-selector.h index db9f7746b..67669fa2d 100644 --- a/src/ui/widget/color-wheel-selector.h +++ b/src/ui/widget/color-wheel-selector.h @@ -35,12 +35,12 @@ public: static const gchar *MODE_NAME; ColorWheelSelector(SelectedColor &color); - virtual ~ColorWheelSelector(); + ~ColorWheelSelector() override; protected: void _initUI(); - void on_show(); + void on_show() override; void _colorChanged(); void _adjustmentChanged(); @@ -68,8 +68,8 @@ private: class ColorWheelSelectorFactory : public ColorSelectorFactory { public: - Gtk::Widget *createWidget(SelectedColor &color) const; - Glib::ustring modeName() const; + Gtk::Widget *createWidget(SelectedColor &color) const override; + Glib::ustring modeName() const override; }; } } diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h index e7524ac71..6b69533d2 100644 --- a/src/ui/widget/combo-enums.h +++ b/src/ui/widget/combo-enums.h @@ -94,12 +94,12 @@ public: } } - virtual Glib::ustring get_as_attribute() const + Glib::ustring get_as_attribute() const override { return get_active_data()->key; } - virtual void set_from_attribute(SPObject* o) + void set_from_attribute(SPObject* o) override { setProgrammatically = true; const gchar* val = attribute_value(o); diff --git a/src/ui/widget/entity-entry.h b/src/ui/widget/entity-entry.h index 35f6ecfb4..19eea0fc8 100644 --- a/src/ui/widget/entity-entry.h +++ b/src/ui/widget/entity-entry.h @@ -46,23 +46,23 @@ protected: class EntityLineEntry : public EntityEntry { public: EntityLineEntry (rdf_work_entity_t* ent, Registry& wr); - ~EntityLineEntry(); - void update (SPDocument *doc); - void load_from_preferences(); + ~EntityLineEntry() override; + void update (SPDocument *doc) override; + void load_from_preferences() override; protected: - virtual void on_changed(); + void on_changed() override; }; class EntityMultiLineEntry : public EntityEntry { public: EntityMultiLineEntry (rdf_work_entity_t* ent, Registry& wr); - ~EntityMultiLineEntry(); - void update (SPDocument *doc); - void load_from_preferences(); + ~EntityMultiLineEntry() override; + void update (SPDocument *doc) override; + void load_from_preferences() override; protected: - virtual void on_changed(); + void on_changed() override; Gtk::TextView _v; }; diff --git a/src/ui/widget/font-selector-toolbar.h b/src/ui/widget/font-selector-toolbar.h index df6fa5fd5..1bddfac55 100644 --- a/src/ui/widget/font-selector-toolbar.h +++ b/src/ui/widget/font-selector-toolbar.h @@ -78,7 +78,7 @@ private: void on_style_changed(); void on_icon_pressed (Gtk::EntryIconPosition icon_position, const GdkEventButton* event); // bool on_match_selected (const Gtk::TreeModel::iterator& iter); - bool on_key_press_event (GdkEventKey* key_event); + bool on_key_press_event (GdkEventKey* key_event) override; // Signals sigc::signal<void> changed_signal; diff --git a/src/ui/widget/frame.h b/src/ui/widget/frame.h index 24dd716e6..3145eddfe 100644 --- a/src/ui/widget/frame.h +++ b/src/ui/widget/frame.h @@ -40,7 +40,7 @@ public: /** * Add a widget to this frame */ - virtual void add(Widget& widget); + void add(Widget& widget) override; /** * Set the frame label text and if bold or not diff --git a/src/ui/widget/highlight-picker.h b/src/ui/widget/highlight-picker.h index c459b0dcd..6cfdf162c 100644 --- a/src/ui/widget/highlight-picker.h +++ b/src/ui/widget/highlight-picker.h @@ -24,31 +24,31 @@ namespace Widget { class HighlightPicker : public Gtk::CellRendererPixbuf { public: HighlightPicker(); - virtual ~HighlightPicker(); + ~HighlightPicker() override; Glib::PropertyProxy<guint32> property_active() { return _property_active.get_proxy(); } protected: - virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags ); + Gtk::CellRendererState flags ) override; - virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + void get_preferred_width_vfunc(Gtk::Widget& widget, int& min_w, - int& nat_w) const; + int& nat_w) const override; - virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + void get_preferred_height_vfunc(Gtk::Widget& widget, int& min_h, - int& nat_h) const; + int& nat_h) const override; - virtual bool activate_vfunc(GdkEvent *event, + bool activate_vfunc(GdkEvent *event, Gtk::Widget &widget, const Glib::ustring &path, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: diff --git a/src/ui/widget/imageicon.h b/src/ui/widget/imageicon.h index 2ea8b8533..8b95e4d77 100644 --- a/src/ui/widget/imageicon.h +++ b/src/ui/widget/imageicon.h @@ -56,7 +56,7 @@ public: /** * Destructor */ - ~ImageIcon(); + ~ImageIcon() override; /** * diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h index d4f27cf11..f537cc74c 100644 --- a/src/ui/widget/imagetoggler.h +++ b/src/ui/widget/imagetoggler.h @@ -25,7 +25,7 @@ namespace Widget { class ImageToggler : public Gtk::CellRendererPixbuf { public: ImageToggler( char const *on, char const *off); - virtual ~ImageToggler() {}; + ~ImageToggler() override {}; sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;} sigc::signal<void, GdkEvent const *> signal_pre_toggle() { return _signal_pre_toggle; } @@ -36,26 +36,26 @@ public: Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_off(); protected: - virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags ); + Gtk::CellRendererState flags ) override; - virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + void get_preferred_width_vfunc(Gtk::Widget& widget, int& min_w, - int& nat_w) const; + int& nat_w) const override; - virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + void get_preferred_height_vfunc(Gtk::Widget& widget, int& min_h, - int& nat_h) const; + int& nat_h) const override; - virtual bool activate_vfunc(GdkEvent *event, + bool activate_vfunc(GdkEvent *event, Gtk::Widget &widget, const Glib::ustring &path, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: diff --git a/src/ui/widget/ink-select-one-action.h b/src/ui/widget/ink-select-one-action.h index 5cf7c934a..34495d346 100644 --- a/src/ui/widget/ink-select-one-action.h +++ b/src/ui/widget/ink-select-one-action.h @@ -80,8 +80,8 @@ public: protected: - virtual Gtk::Widget* create_menu_item_vfunc(); - virtual Gtk::Widget* create_tool_item_vfunc(); + Gtk::Widget* create_menu_item_vfunc() override; + Gtk::Widget* create_tool_item_vfunc() override; /* Signals */ sigc::signal<void, int> _changed; diff --git a/src/ui/widget/ink-spinscale.h b/src/ui/widget/ink-spinscale.h index 9eb297b1f..7cb82c92a 100644 --- a/src/ui/widget/ink-spinscale.h +++ b/src/ui/widget/ink-spinscale.h @@ -31,7 +31,7 @@ class InkScale : public Gtk::Scale { public: InkScale(Glib::RefPtr<Gtk::Adjustment>, Gtk::SpinButton* spinbutton); - ~InkScale() {}; + ~InkScale() override {}; void set_label(Glib::ustring label); @@ -71,7 +71,7 @@ class InkSpinScale : public Gtk::Box // Create an InkSpinScale with a preexisting adjustment. InkSpinScale(Glib::RefPtr<Gtk::Adjustment>); - virtual ~InkSpinScale() {}; + ~InkSpinScale() override {}; void set_label(Glib::ustring label); void set_digits(int digits); diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h index 43188fa5b..5c4c19603 100644 --- a/src/ui/widget/insertordericon.h +++ b/src/ui/widget/insertordericon.h @@ -25,7 +25,7 @@ namespace Widget { class InsertOrderIcon : public Gtk::CellRendererPixbuf { public: InsertOrderIcon(); - virtual ~InsertOrderIcon() {}; + ~InsertOrderIcon() override {}; Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); } Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on(); @@ -33,26 +33,26 @@ public: protected: - virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags ); + Gtk::CellRendererState flags ) override; - virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + void get_preferred_width_vfunc(Gtk::Widget& widget, int& min_w, - int& nat_w) const; + int& nat_w) const override; - virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + void get_preferred_height_vfunc(Gtk::Widget& widget, int& min_h, - int& nat_h) const; + int& nat_h) const override; - virtual bool activate_vfunc(GdkEvent *event, + bool activate_vfunc(GdkEvent *event, Gtk::Widget &widget, const Glib::ustring &path, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: diff --git a/src/ui/widget/labelled.h b/src/ui/widget/labelled.h index 824abf305..79dd271a0 100644 --- a/src/ui/widget/labelled.h +++ b/src/ui/widget/labelled.h @@ -58,7 +58,7 @@ public: void setTooltipText(const Glib::ustring &tooltip); private: - virtual bool on_mnemonic_activate( bool group_cycling ); + bool on_mnemonic_activate( bool group_cycling ) override; protected: diff --git a/src/ui/widget/layer-selector.h b/src/ui/widget/layer-selector.h index ff9e4ddfc..0b531231a 100644 --- a/src/ui/widget/layer-selector.h +++ b/src/ui/widget/layer-selector.h @@ -39,7 +39,7 @@ class DocumentTreeModel; class LayerSelector : public Gtk::HBox { public: LayerSelector(SPDesktop *desktop = NULL); - ~LayerSelector(); + ~LayerSelector() override; SPDesktop *desktop() { return _desktop; } void setDesktop(SPDesktop *desktop); diff --git a/src/ui/widget/layertypeicon.h b/src/ui/widget/layertypeicon.h index f12029c12..5f7e79c29 100644 --- a/src/ui/widget/layertypeicon.h +++ b/src/ui/widget/layertypeicon.h @@ -24,7 +24,7 @@ namespace Widget { class LayerTypeIcon : public Gtk::CellRendererPixbuf { public: LayerTypeIcon(); - virtual ~LayerTypeIcon() {}; + ~LayerTypeIcon() override {}; sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;} sigc::signal<void, GdkEvent const *> signal_pre_toggle() { return _signal_pre_toggle; } @@ -35,26 +35,26 @@ public: Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_off(); protected: - virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags ); + Gtk::CellRendererState flags ) override; - virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + void get_preferred_width_vfunc(Gtk::Widget& widget, int& min_w, - int& nat_w) const; + int& nat_w) const override; - virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + void get_preferred_height_vfunc(Gtk::Widget& widget, int& min_h, - int& nat_h) const; + int& nat_h) const override; - virtual bool activate_vfunc(GdkEvent *event, + bool activate_vfunc(GdkEvent *event, Gtk::Widget &widget, const Glib::ustring &path, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, - Gtk::CellRendererState flags); + Gtk::CellRendererState flags) override; private: diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp index 1e9ee361d..c9d46bc66 100644 --- a/src/ui/widget/licensor.cpp +++ b/src/ui/widget/licensor.cpp @@ -46,7 +46,7 @@ class LicenseItem : public Gtk::RadioButton { public: LicenseItem (struct rdf_license_t const* license, EntityEntry* entity, Registry &wr, Gtk::RadioButtonGroup *group); protected: - void on_toggled(); + void on_toggled() override; struct rdf_license_t const *_lic; EntityEntry *_eep; Registry &_wr; diff --git a/src/ui/widget/licensor.h b/src/ui/widget/licensor.h index b96162589..798d20d4e 100644 --- a/src/ui/widget/licensor.h +++ b/src/ui/widget/licensor.h @@ -29,7 +29,7 @@ class Registry; class Licensor : public Gtk::VBox { public: Licensor(); - virtual ~Licensor(); + ~Licensor() override; void init (Registry&); void update (SPDocument *doc); diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h index 9e810bc00..d71050ab3 100644 --- a/src/ui/widget/object-composite-settings.h +++ b/src/ui/widget/object-composite-settings.h @@ -35,7 +35,7 @@ class StyleSubject; class ObjectCompositeSettings : public Gtk::VBox { public: ObjectCompositeSettings(unsigned int verb_code, char const *history_prefix, int flags); - ~ObjectCompositeSettings(); + ~ObjectCompositeSettings() override; void setSubject(StyleSubject *subject); diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h index 29cd204b9..001c6a65d 100644 --- a/src/ui/widget/page-sizer.h +++ b/src/ui/widget/page-sizer.h @@ -143,7 +143,7 @@ public: /** * Destructor */ - virtual ~PageSizer(); + ~PageSizer() override; /** * Set up or reset this widget diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h index 1461bdf2a..aed90f99c 100644 --- a/src/ui/widget/panel.h +++ b/src/ui/widget/panel.h @@ -60,7 +60,7 @@ public: * @param verb_num the dialog verb. */ Panel(gchar const *prefs_path = 0, int verb_num = 0); - virtual ~Panel(); + ~Panel() override; gchar const *getPrefsPath() const; diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index 2578be533..2b10d1a81 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -55,7 +55,7 @@ public: sigc::signal<void, bool> changed_signal; protected: Glib::ustring _prefs_path; - void on_toggled(); + void on_toggled() override; }; class PrefRadioButton : public Gtk::RadioButton @@ -76,7 +76,7 @@ protected: VAL_STRING }; int _int_value; - void on_toggled(); + void on_toggled() override; }; class PrefSpinButton : public SpinButton @@ -89,7 +89,7 @@ protected: Glib::ustring _prefs_path; bool _is_int; bool _is_percent; - void on_value_changed(); + void on_value_changed() override; }; class PrefSpinUnit : public ScalarUnit @@ -119,7 +119,7 @@ public: static const double textpadding; private: - bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr); + bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override; void draw_marks(Cairo::RefPtr<Cairo::Context> cr, double dist, int major_interval); @@ -140,7 +140,7 @@ private: void on_slider_value_changed(); void on_spinbutton_value_changed(); void on_unit_changed(); - virtual bool on_mnemonic_activate( bool group_cycling ); + bool on_mnemonic_activate( bool group_cycling ) override; Inkscape::UI::Widget::SpinButton _sb; UnitMenu _unit; @@ -158,7 +158,7 @@ public: private: void on_slider_value_changed(); void on_spinbutton_value_changed(); - virtual bool on_mnemonic_activate( bool group_cycling ); + bool on_mnemonic_activate( bool group_cycling ) override; Glib::ustring _prefs_path; Inkscape::UI::Widget::SpinButton _sb; @@ -185,7 +185,7 @@ protected: Glib::ustring _prefs_path; std::vector<int> _values; std::vector<Glib::ustring> _ustr_values; ///< string key values used optionally instead of numeric _values - void on_changed(); + void on_changed() override; }; class PrefEntry : public Gtk::Entry @@ -194,7 +194,7 @@ public: void init(Glib::ustring const &prefs_path, bool mask); protected: Glib::ustring _prefs_path; - void on_changed(); + void on_changed() override; }; class PrefMultiEntry : public Gtk::ScrolledWindow @@ -220,7 +220,7 @@ protected: Gtk::Entry *relatedEntry; void onRelatedEntryChangedCallback(); void onRelatedButtonClickedCallback(); - virtual bool on_mnemonic_activate( bool group_cycling ); + bool on_mnemonic_activate( bool group_cycling ) override; }; class PrefEntryFileButtonHBox : public Gtk::HBox @@ -234,7 +234,7 @@ protected: Gtk::Entry *relatedEntry; void onRelatedEntryChangedCallback(); void onRelatedButtonClickedCallback(); - virtual bool on_mnemonic_activate( bool group_cycling ); + bool on_mnemonic_activate( bool group_cycling ) override; }; class PrefFileButton : public Gtk::FileChooserButton @@ -251,14 +251,14 @@ class PrefColorPicker : public ColorPicker { public: PrefColorPicker() : ColorPicker("", "", 0, false) {}; - virtual ~PrefColorPicker() {}; + ~PrefColorPicker() override {}; void init(Glib::ustring const &abel, Glib::ustring const &prefs_path, guint32 default_rgba); protected: Glib::ustring _prefs_path; - virtual void on_changed (guint32 rgba); + void on_changed (guint32 rgba) override; }; class PrefUnit : public UnitMenu @@ -267,7 +267,7 @@ public: void init(Glib::ustring const &prefs_path); protected: Glib::ustring _prefs_path; - void on_changed(); + void on_changed() override; }; class DialogPage : public Gtk::Grid diff --git a/src/ui/widget/registered-enums.h b/src/ui/widget/registered-enums.h index 1d5074836..04ed521cd 100644 --- a/src/ui/widget/registered-enums.h +++ b/src/ui/widget/registered-enums.h @@ -23,7 +23,7 @@ namespace Widget { template<typename E> class RegisteredEnum : public RegisteredWidget< LabelledComboBoxEnum<E> > { public: - virtual ~RegisteredEnum() { + ~RegisteredEnum() override { _changed_connection.disconnect(); } diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 02c1810cf..ca55e5397 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -83,7 +83,7 @@ protected: template< typename A, typename B, typename C, typename D, typename E , typename F, typename G> RegisteredWidget( A& a, B& b, C& c, D& d, E& e, F f, G& g): W( a, b, c, d, e, f, g) { construct(); } - virtual ~RegisteredWidget() {}; + ~RegisteredWidget() override {}; void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in) { @@ -147,7 +147,7 @@ private: class RegisteredCheckButton : public RegisteredWidget<Gtk::CheckButton> { public: - virtual ~RegisteredCheckButton(); + ~RegisteredCheckButton() override; RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *active_str = "true", char const *inactive_str = "false"); void setActive (bool); @@ -167,12 +167,12 @@ public: protected: char const *_active_str, *_inactive_str; sigc::connection _toggled_connection; - void on_toggled(); + void on_toggled() override; }; class RegisteredToggleButton : public RegisteredWidget<Gtk::ToggleButton> { public: - virtual ~RegisteredToggleButton(); + ~RegisteredToggleButton() override; RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *icon_active = "true", char const *icon_inactive = "false"); void setActive (bool); @@ -191,12 +191,12 @@ public: protected: sigc::connection _toggled_connection; - void on_toggled(); + void on_toggled() override; }; class RegisteredUnitMenu : public RegisteredWidget<Labelled> { public: - ~RegisteredUnitMenu(); + ~RegisteredUnitMenu() override; RegisteredUnitMenu ( const Glib::ustring& label, const Glib::ustring& key, Registry& wr, @@ -222,7 +222,7 @@ enum RSU_UserUnits { class RegisteredScalarUnit : public RegisteredWidget<ScalarUnit> { public: - ~RegisteredScalarUnit(); + ~RegisteredScalarUnit() override; RegisteredScalarUnit ( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, @@ -241,7 +241,7 @@ protected: class RegisteredScalar : public RegisteredWidget<Scalar> { public: - virtual ~RegisteredScalar(); + ~RegisteredScalar() override; RegisteredScalar (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, @@ -255,7 +255,7 @@ protected: class RegisteredText : public RegisteredWidget<Text> { public: - virtual ~RegisteredText(); + ~RegisteredText() override; RegisteredText (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, @@ -270,7 +270,7 @@ protected: class RegisteredColorPicker : public RegisteredWidget<LabelledColorPicker> { public: - virtual ~RegisteredColorPicker(); + ~RegisteredColorPicker() override; RegisteredColorPicker (const Glib::ustring& label, const Glib::ustring& title, @@ -292,7 +292,7 @@ protected: class RegisteredSuffixedInteger : public RegisteredWidget<Scalar> { public: - virtual ~RegisteredSuffixedInteger(); + ~RegisteredSuffixedInteger() override; RegisteredSuffixedInteger ( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& suffix, @@ -311,7 +311,7 @@ protected: class RegisteredRadioButtonPair : public RegisteredWidget<Gtk::HBox> { public: - virtual ~RegisteredRadioButtonPair(); + ~RegisteredRadioButtonPair() override; RegisteredRadioButtonPair ( const Glib::ustring& label, const Glib::ustring& label1, const Glib::ustring& label2, @@ -334,7 +334,7 @@ protected: class RegisteredPoint : public RegisteredWidget<Point> { public: - virtual ~RegisteredPoint(); + ~RegisteredPoint() override; RegisteredPoint ( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, @@ -351,7 +351,7 @@ protected: class RegisteredTransformedPoint : public RegisteredWidget<Point> { public: - virtual ~RegisteredTransformedPoint(); + ~RegisteredTransformedPoint() override; RegisteredTransformedPoint ( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, @@ -375,7 +375,7 @@ protected: class RegisteredVector : public RegisteredWidget<Point> { public: - virtual ~RegisteredVector(); + ~RegisteredVector() override; RegisteredVector (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, @@ -406,7 +406,7 @@ protected: class RegisteredRandom : public RegisteredWidget<Random> { public: - virtual ~RegisteredRandom(); + ~RegisteredRandom() override; RegisteredRandom ( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, @@ -424,7 +424,7 @@ protected: class RegisteredFontButton : public RegisteredWidget<FontButton> { public: - virtual ~RegisteredFontButton(); + ~RegisteredFontButton() override; RegisteredFontButton ( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, diff --git a/src/ui/widget/rotateable.h b/src/ui/widget/rotateable.h index 6404c3550..5ed3c62c9 100644 --- a/src/ui/widget/rotateable.h +++ b/src/ui/widget/rotateable.h @@ -26,7 +26,7 @@ class Rotateable: public Gtk::EventBox public: Rotateable(); - ~Rotateable(); + ~Rotateable() override; bool on_click(GdkEventButton *event); bool on_motion(GdkEventMotion *event); diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h index b7f3d5dda..6f1841928 100644 --- a/src/ui/widget/selected-style.h +++ b/src/ui/widget/selected-style.h @@ -69,13 +69,13 @@ class RotateableSwatch: public Rotateable { public: RotateableSwatch(SelectedStyle *parent, guint mode); - ~RotateableSwatch(); + ~RotateableSwatch() override; double color_adjust (float *hsl, double by, guint32 cc, guint state); - virtual void do_motion (double by, guint state); - virtual void do_release (double by, guint state); - virtual void do_scroll (double by, guint state); + void do_motion (double by, guint state) override; + void do_release (double by, guint state) override; + void do_scroll (double by, guint state) override; private: guint fillstroke; @@ -95,12 +95,12 @@ class RotateableStrokeWidth: public Rotateable { public: RotateableStrokeWidth(SelectedStyle *parent); - ~RotateableStrokeWidth(); + ~RotateableStrokeWidth() override; double value_adjust(double current, double by, guint modifier, bool final); - virtual void do_motion (double by, guint state); - virtual void do_release (double by, guint state); - virtual void do_scroll (double by, guint state); + void do_motion (double by, guint state) override; + void do_release (double by, guint state) override; + void do_scroll (double by, guint state) override; private: SelectedStyle *parent; @@ -119,7 +119,7 @@ class SelectedStyle : public Gtk::HBox public: SelectedStyle(bool layout = true); - ~SelectedStyle(); + ~SelectedStyle() override; void setDesktop(SPDesktop *desktop); SPDesktop *getDesktop() {return _desktop;} diff --git a/src/ui/widget/spin-scale.h b/src/ui/widget/spin-scale.h index 123f527bb..316ac5a87 100644 --- a/src/ui/widget/spin-scale.h +++ b/src/ui/widget/spin-scale.h @@ -42,8 +42,8 @@ public: Glib::RefPtr<Gtk::Adjustment> adjustment, int digits, const SPAttributeEnum a = SP_ATTR_INVALID, const Glib::ustring tip_text = ""); - virtual Glib::ustring get_as_attribute() const; - virtual void set_from_attribute(SPObject*); + Glib::ustring get_as_attribute() const override; + void set_from_attribute(SPObject*) override; // Shortcuts to _adjustment Glib::SignalProxy0<void> signal_value_changed(); @@ -75,8 +75,8 @@ public: const SPAttributeEnum a, const Glib::ustring tip_text1, const Glib::ustring tip_text2); - virtual Glib::ustring get_as_attribute() const; - virtual void set_from_attribute(SPObject*); + Glib::ustring get_as_attribute() const override; + void set_from_attribute(SPObject*) override; sigc::signal<void>& signal_value_changed(); diff --git a/src/ui/widget/spin-slider.h b/src/ui/widget/spin-slider.h index 5a29c1b67..cd2d2a427 100644 --- a/src/ui/widget/spin-slider.h +++ b/src/ui/widget/spin-slider.h @@ -34,8 +34,8 @@ public: SpinSlider(double value, double lower, double upper, double step_inc, double climb_rate, int digits, const SPAttributeEnum a = SP_ATTR_INVALID, const char* tip_text = NULL); - virtual Glib::ustring get_as_attribute() const; - virtual void set_from_attribute(SPObject*); + Glib::ustring get_as_attribute() const override; + void set_from_attribute(SPObject*) override; // Shortcuts to _adjustment Glib::SignalProxy0<void> signal_value_changed(); @@ -71,8 +71,8 @@ public: DualSpinSlider(double value, double lower, double upper, double step_inc, double climb_rate, int digits, const SPAttributeEnum, char* tip_text1, char* tip_text2); - virtual Glib::ustring get_as_attribute() const; - virtual void set_from_attribute(SPObject*); + Glib::ustring get_as_attribute() const override; + void set_from_attribute(SPObject*) override; sigc::signal<void>& signal_value_changed(); diff --git a/src/ui/widget/spinbutton.h b/src/ui/widget/spinbutton.h index 9c015a3b2..a252743be 100644 --- a/src/ui/widget/spinbutton.h +++ b/src/ui/widget/spinbutton.h @@ -45,7 +45,7 @@ public: connect_signals(); }; - virtual ~SpinButton() {}; + ~SpinButton() override {}; void setUnitMenu(UnitMenu* unit_menu) { _unit_menu = unit_menu; }; @@ -65,7 +65,7 @@ protected: * @retval false No conversion done, continue with default handler. * @retval true Conversion successful, don't call default handler. */ - int on_input(double* newvalue); + int on_input(double* newvalue) override; /** * When focus is obtained, save the value to enable undo later. diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h index b75b3ffa7..398aab065 100644 --- a/src/ui/widget/style-subject.h +++ b/src/ui/widget/style-subject.h @@ -66,15 +66,15 @@ private: class StyleSubject::Selection : public StyleSubject { public: Selection(); - ~Selection(); + ~Selection() override; - virtual Geom::OptRect getBounds(SPItem::BBoxType type); - virtual int queryStyle(SPStyle *query, int property); - virtual void setCSS(SPCSSAttr *css); - virtual std::vector<SPObject*> list(); + Geom::OptRect getBounds(SPItem::BBoxType type) override; + int queryStyle(SPStyle *query, int property) override; + void setCSS(SPCSSAttr *css) override; + std::vector<SPObject*> list() override; protected: - virtual void _afterDesktopSwitch(SPDesktop *desktop); + void _afterDesktopSwitch(SPDesktop *desktop) override; private: Inkscape::Selection *_getSelection() const; @@ -87,15 +87,15 @@ private: class StyleSubject::CurrentLayer : public StyleSubject { public: CurrentLayer(); - ~CurrentLayer(); + ~CurrentLayer() override; - virtual Geom::OptRect getBounds(SPItem::BBoxType type); - virtual int queryStyle(SPStyle *query, int property); - virtual void setCSS(SPCSSAttr *css); - virtual std::vector<SPObject*> list(); + Geom::OptRect getBounds(SPItem::BBoxType type) override; + int queryStyle(SPStyle *query, int property) override; + void setCSS(SPCSSAttr *css) override; + std::vector<SPObject*> list() override; protected: - virtual void _afterDesktopSwitch(SPDesktop *desktop); + void _afterDesktopSwitch(SPDesktop *desktop) override; private: SPObject *_getLayer() const; diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index 14a6c4502..15928e300 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -52,7 +52,7 @@ public: Observer(path), _style_swatch(ss) {} - virtual void notify(Inkscape::Preferences::Entry const &val); + void notify(Inkscape::Preferences::Entry const &val) override; private: StyleSwatch &_style_swatch; }; @@ -69,7 +69,7 @@ public: Inkscape::Preferences *prefs = Inkscape::Preferences::get(); this->notify(prefs->getEntry(path)); } - virtual void notify(Inkscape::Preferences::Entry const &val) { + void notify(Inkscape::Preferences::Entry const &val) override { SPCSSAttr *css = val.getInheritedStyle(); _style_swatch.setStyle(css); sp_repr_css_attr_unref(css); diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h index 81a907d16..bda5ce315 100644 --- a/src/ui/widget/style-swatch.h +++ b/src/ui/widget/style-swatch.h @@ -46,7 +46,7 @@ class StyleSwatch : public Gtk::HBox public: StyleSwatch (SPCSSAttr *attr, gchar const *main_tip); - ~StyleSwatch(); + ~StyleSwatch() override; void setStyle(SPStyle *style); void setStyle(SPCSSAttr *attr); diff --git a/src/ui/widget/unit-menu.h b/src/ui/widget/unit-menu.h index f414660f7..a076c5168 100644 --- a/src/ui/widget/unit-menu.h +++ b/src/ui/widget/unit-menu.h @@ -31,7 +31,7 @@ public: */ UnitMenu(); - virtual ~UnitMenu(); + ~UnitMenu() override; /** * Adds the unit type to the widget. This extracts the corresponding diff --git a/src/util/expression-evaluator.h b/src/util/expression-evaluator.h index ace27339f..c912f248b 100644 --- a/src/util/expression-evaluator.h +++ b/src/util/expression-evaluator.h @@ -177,9 +177,9 @@ public: msgstr = os.str(); } - virtual ~EvaluatorException() throw() {} // necessary to destroy the string object!!! + ~EvaluatorException() throw() override {} // necessary to destroy the string object!!! - virtual const char *what() const throw () { + const char *what() const throw () override { return msgstr.c_str(); } protected: diff --git a/src/util/units.cpp b/src/util/units.cpp index cf4bfd146..cd7b66ba8 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -129,12 +129,12 @@ public: typedef Glib::Markup::ParseContext Ctx; UnitParser(UnitTable *table); - virtual ~UnitParser() {} + ~UnitParser() override {} protected: - virtual void on_start_element(Ctx &ctx, Glib::ustring const &name, AttrMap const &attrs); - virtual void on_end_element(Ctx &ctx, Glib::ustring const &name); - virtual void on_text(Ctx &ctx, Glib::ustring const &text); + void on_start_element(Ctx &ctx, Glib::ustring const &name, AttrMap const &attrs) override; + void on_end_element(Ctx &ctx, Glib::ustring const &name) override; + void on_text(Ctx &ctx, Glib::ustring const &text) override; public: UnitTable *tbl; diff --git a/src/verbs.cpp b/src/verbs.cpp index 75830f290..5e4ce8725 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -131,7 +131,7 @@ class FileVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ FileVerb(unsigned int const code, @@ -150,7 +150,7 @@ class EditVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ EditVerb(unsigned int const code, @@ -169,7 +169,7 @@ class SelectionVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ SelectionVerb(unsigned int const code, @@ -188,7 +188,7 @@ class LayerVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ LayerVerb(unsigned int const code, @@ -207,7 +207,7 @@ class ObjectVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ ObjectVerb(unsigned int const code, @@ -226,7 +226,7 @@ class TagVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ TagVerb(unsigned int const code, @@ -245,7 +245,7 @@ class ContextVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ ContextVerb(unsigned int const code, @@ -264,7 +264,7 @@ class ZoomVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ ZoomVerb(unsigned int const code, @@ -284,7 +284,7 @@ class DialogVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ DialogVerb(unsigned int const code, @@ -303,7 +303,7 @@ class HelpVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ HelpVerb(unsigned int const code, @@ -322,7 +322,7 @@ class TutorialVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ TutorialVerb(unsigned int const code, @@ -341,7 +341,7 @@ class TextVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ TextVerb(unsigned int const code, @@ -2401,7 +2401,7 @@ class EffectLastVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ EffectLastVerb(unsigned int const code, @@ -2464,7 +2464,7 @@ class FitCanvasVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ FitCanvasVerb(unsigned int const code, @@ -2530,7 +2530,7 @@ class LockAndHideVerb : public Verb { private: static void perform(SPAction *action, void *mydata); protected: - virtual SPAction *make_action(Inkscape::ActionContext const & context); + SPAction *make_action(Inkscape::ActionContext const & context) override; public: /** Use the Verb initializer with the same parameters. */ LockAndHideVerb(unsigned int const code, 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: diff --git a/src/xml/comment-node.h b/src/xml/comment-node.h index 7c37a0d24..cddd2e74b 100644 --- a/src/xml/comment-node.h +++ b/src/xml/comment-node.h @@ -35,10 +35,10 @@ struct CommentNode : public SimpleNode { CommentNode(CommentNode const &other, Document *doc) : SimpleNode(other, doc) {} - Inkscape::XML::NodeType type() const { return Inkscape::XML::COMMENT_NODE; } + Inkscape::XML::NodeType type() const override { return Inkscape::XML::COMMENT_NODE; } protected: - SimpleNode *_duplicate(Document* doc) const { return new CommentNode(*this, doc); } + SimpleNode *_duplicate(Document* doc) const override { return new CommentNode(*this, doc); } }; } diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp index 581a4c226..cff880aad 100644 --- a/src/xml/composite-node-observer.cpp +++ b/src/xml/composite-node-observer.cpp @@ -115,31 +115,31 @@ public: NodeEventVector const &vector; void * const data; - void notifyChildAdded(Node &node, Node &child, Node *prev) { + void notifyChildAdded(Node &node, Node &child, Node *prev) override { if (vector.child_added) { vector.child_added(&node, &child, prev, data); } } - void notifyChildRemoved(Node &node, Node &child, Node *prev) { + void notifyChildRemoved(Node &node, Node &child, Node *prev) override { if (vector.child_removed) { vector.child_removed(&node, &child, prev, data); } } - 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 (vector.order_changed) { vector.order_changed(&node, &child, old_prev, new_prev, data); } } - void notifyContentChanged(Node &node, Util::ptr_shared old_content, Util::ptr_shared new_content) { + void notifyContentChanged(Node &node, Util::ptr_shared old_content, Util::ptr_shared new_content) override { if (vector.content_changed) { vector.content_changed(&node, old_content, new_content, data); } } - void notifyAttributeChanged(Node &node, GQuark name, Util::ptr_shared old_value, Util::ptr_shared new_value) { + void notifyAttributeChanged(Node &node, GQuark name, Util::ptr_shared old_value, Util::ptr_shared new_value) override { if (vector.attr_changed) { vector.attr_changed(&node, g_quark_to_string(name), old_value, new_value, false, data); } diff --git a/src/xml/composite-node-observer.h b/src/xml/composite-node-observer.h index 1004617bf..c941acee8 100644 --- a/src/xml/composite-node-observer.h +++ b/src/xml/composite-node-observer.h @@ -67,20 +67,20 @@ public: */ void removeListenerByData(void *data); - void notifyChildAdded(Node &node, Node &child, Node *prev); + void notifyChildAdded(Node &node, Node &child, Node *prev) override; - void notifyChildRemoved(Node &node, Node &child, Node *prev); + void notifyChildRemoved(Node &node, Node &child, Node *prev) override; void notifyChildOrderChanged(Node &node, Node &child, - Node *old_prev, Node *new_prev); + Node *old_prev, Node *new_prev) override; void notifyContentChanged(Node &node, Util::ptr_shared old_content, - Util::ptr_shared new_content); + Util::ptr_shared new_content) override; void notifyAttributeChanged(Node &node, GQuark name, Util::ptr_shared old_value, - Util::ptr_shared new_value); + Util::ptr_shared new_value) override; private: unsigned _iterating; diff --git a/src/xml/element-node.h b/src/xml/element-node.h index 12df8dc97..99598241a 100644 --- a/src/xml/element-node.h +++ b/src/xml/element-node.h @@ -31,10 +31,10 @@ public: ElementNode(ElementNode const &other, Document *doc) : SimpleNode(other, doc) {} - Inkscape::XML::NodeType type() const { return Inkscape::XML::ELEMENT_NODE; } + Inkscape::XML::NodeType type() const override { return Inkscape::XML::ELEMENT_NODE; } protected: - SimpleNode *_duplicate(Document* doc) const { return new ElementNode(*this, doc); } + SimpleNode *_duplicate(Document* doc) const override { return new ElementNode(*this, doc); } }; } diff --git a/src/xml/event.cpp b/src/xml/event.cpp index 54f55d5c3..d0ba10e08 100644 --- a/src/xml/event.cpp +++ b/src/xml/event.cpp @@ -92,30 +92,30 @@ public: return singleton; } - void notifyChildAdded(Node &parent, Node &child, Node *ref) { + void notifyChildAdded(Node &parent, Node &child, Node *ref) override { parent.addChild(&child, ref); } - void notifyChildRemoved(Node &parent, Node &child, Node */*old_ref*/) { + void notifyChildRemoved(Node &parent, Node &child, Node */*old_ref*/) override { parent.removeChild(&child); } void notifyChildOrderChanged(Node &parent, Node &child, - Node */*old_ref*/, Node *new_ref) + Node */*old_ref*/, Node *new_ref) override { parent.changeOrder(&child, new_ref); } void notifyAttributeChanged(Node &node, GQuark name, Inkscape::Util::ptr_shared /*old_value*/, - Inkscape::Util::ptr_shared new_value) + Inkscape::Util::ptr_shared new_value) override { node.setAttribute(g_quark_to_string(name), new_value); } void notifyContentChanged(Node &node, Inkscape::Util::ptr_shared /*old_value*/, - Inkscape::Util::ptr_shared new_value) + Inkscape::Util::ptr_shared new_value) override { node.setContent(new_value); } @@ -446,23 +446,23 @@ public: } } - void notifyChildAdded(Node &parent, Node &child, Node *ref) { + void notifyChildAdded(Node &parent, Node &child, Node *ref) override { g_warning("Event: Added %s to %s after %s", node_to_string(parent).c_str(), node_to_string(child).c_str(), ref_to_string(ref).c_str()); } - void notifyChildRemoved(Node &parent, Node &child, Node */*ref*/) { + void notifyChildRemoved(Node &parent, Node &child, Node */*ref*/) override { g_warning("Event: Removed %s from %s", node_to_string(parent).c_str(), node_to_string(child).c_str()); } void notifyChildOrderChanged(Node &parent, Node &child, - Node */*old_ref*/, Node *new_ref) + Node */*old_ref*/, Node *new_ref) override { g_warning("Event: Moved %s after %s in %s", node_to_string(child).c_str(), ref_to_string(new_ref).c_str(), node_to_string(parent).c_str()); } void notifyAttributeChanged(Node &node, GQuark name, Inkscape::Util::ptr_shared /*old_value*/, - Inkscape::Util::ptr_shared new_value) + Inkscape::Util::ptr_shared new_value) override { if (new_value) { g_warning("Event: Set attribute %s to \"%s\" on %s", g_quark_to_string(name), new_value.pointer(), node_to_string(node).c_str()); @@ -473,7 +473,7 @@ public: void notifyContentChanged(Node &node, Inkscape::Util::ptr_shared /*old_value*/, - Inkscape::Util::ptr_shared new_value) + Inkscape::Util::ptr_shared new_value) override { if (new_value) { g_warning("Event: Set content of %s to \"%s\"", node_to_string(node).c_str(), new_value.pointer()); diff --git a/src/xml/event.h b/src/xml/event.h index 5210b232d..b11cbe9cb 100644 --- a/src/xml/event.h +++ b/src/xml/event.h @@ -137,9 +137,9 @@ public: Node *ref; private: - Event *_optimizeOne(); - void _undoOne(NodeObserver &observer) const; - void _replayOne(NodeObserver &observer) const; + Event *_optimizeOne() override; + void _undoOne(NodeObserver &observer) const override; + void _replayOne(NodeObserver &observer) const override; }; /** @@ -156,9 +156,9 @@ public: Node *ref; private: - Event *_optimizeOne(); - void _undoOne(NodeObserver &observer) const; - void _replayOne(NodeObserver &observer) const; + Event *_optimizeOne() override; + void _undoOne(NodeObserver &observer) const override; + void _replayOne(NodeObserver &observer) const override; }; /** @@ -181,9 +181,9 @@ public: Inkscape::Util::ptr_shared newval; private: - Event *_optimizeOne(); - void _undoOne(NodeObserver &observer) const; - void _replayOne(NodeObserver &observer) const; + Event *_optimizeOne() override; + void _undoOne(NodeObserver &observer) const override; + void _replayOne(NodeObserver &observer) const override; }; /** @@ -203,9 +203,9 @@ public: Inkscape::Util::ptr_shared newval; private: - Event *_optimizeOne(); - void _undoOne(NodeObserver &observer) const; - void _replayOne(NodeObserver &observer) const; + Event *_optimizeOne() override; + void _undoOne(NodeObserver &observer) const override; + void _replayOne(NodeObserver &observer) const override; }; /** @@ -225,9 +225,9 @@ public: Node *newref; private: - Event *_optimizeOne(); - void _undoOne(NodeObserver &observer) const; - void _replayOne(NodeObserver &observer) const; + Event *_optimizeOne() override; + void _undoOne(NodeObserver &observer) const override; + void _replayOne(NodeObserver &observer) const override; }; } diff --git a/src/xml/helper-observer.h b/src/xml/helper-observer.h index 4b728d295..53f4c80e6 100644 --- a/src/xml/helper-observer.h +++ b/src/xml/helper-observer.h @@ -18,15 +18,15 @@ class Node; class SignalObserver : public NodeObserver { public: SignalObserver(); - ~SignalObserver(); + ~SignalObserver() override; // Add this observer to the SPObject and remove it from any previous object void set(SPObject* o); - void notifyChildAdded(Node&, Node&, Node*); - void notifyChildRemoved(Node&, Node&, Node*); - void notifyChildOrderChanged(Node&, Node&, Node*, Node*); - void notifyContentChanged(Node&, Util::ptr_shared, Util::ptr_shared); - void notifyAttributeChanged(Node&, GQuark, Util::ptr_shared, Util::ptr_shared); + void notifyChildAdded(Node&, Node&, Node*) override; + void notifyChildRemoved(Node&, Node&, Node*) override; + void notifyChildOrderChanged(Node&, Node&, Node*, Node*) override; + void notifyContentChanged(Node&, Util::ptr_shared, Util::ptr_shared) override; + void notifyAttributeChanged(Node&, GQuark, Util::ptr_shared, Util::ptr_shared) override; sigc::signal<void>& signal_changed(); private: sigc::signal<void> _signal_changed; diff --git a/src/xml/node.h b/src/xml/node.h index 8d9fc19e4..85d9f6f12 100644 --- a/src/xml/node.h +++ b/src/xml/node.h @@ -78,7 +78,7 @@ enum NodeType { class Node : public Inkscape::GC::Anchored { public: Node() {} - virtual ~Node() {} + ~Node() override {} /** * @name Retrieve information about the node diff --git a/src/xml/pi-node.h b/src/xml/pi-node.h index eeed1632d..65b2f3482 100644 --- a/src/xml/pi-node.h +++ b/src/xml/pi-node.h @@ -32,10 +32,10 @@ struct PINode : public SimpleNode { PINode(PINode const &other, Document *doc) : SimpleNode(other, doc) {} - Inkscape::XML::NodeType type() const { return Inkscape::XML::PI_NODE; } + Inkscape::XML::NodeType type() const override { return Inkscape::XML::PI_NODE; } protected: - SimpleNode *_duplicate(Document* doc) const { return new PINode(*this, doc); } + SimpleNode *_duplicate(Document* doc) const override { return new PINode(*this, doc); } }; } diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index 63ad05e04..f0b7e0d8d 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -46,10 +46,10 @@ public: SPCSSAttrImpl(SPCSSAttrImpl const &other, Document *doc) : SimpleNode(other, doc) {} - NodeType type() const { return Inkscape::XML::ELEMENT_NODE; } + NodeType type() const override { return Inkscape::XML::ELEMENT_NODE; } protected: - SimpleNode *_duplicate(Document* doc) const { return new SPCSSAttrImpl(*this, doc); } + SimpleNode *_duplicate(Document* doc) const override { return new SPCSSAttrImpl(*this, doc); } }; static void sp_repr_css_add_components(SPCSSAttr *css, Node *repr, gchar const *attr); diff --git a/src/xml/simple-document.h b/src/xml/simple-document.h index 01933076f..078fa16a7 100644 --- a/src/xml/simple-document.h +++ b/src/xml/simple-document.h @@ -33,35 +33,35 @@ public: : SimpleNode(g_quark_from_static_string("xml"), this), _in_transaction(false), _is_CData(false) {} - NodeType type() const { return Inkscape::XML::DOCUMENT_NODE; } + NodeType type() const override { return Inkscape::XML::DOCUMENT_NODE; } - bool inTransaction() { return _in_transaction; } + bool inTransaction() override { return _in_transaction; } - void beginTransaction(); - void rollback(); - void commit(); - Inkscape::XML::Event *commitUndoable(); + void beginTransaction() override; + void rollback() override; + void commit() override; + Inkscape::XML::Event *commitUndoable() override; - Node *createElement(char const *name); - Node *createTextNode(char const *content); - Node *createTextNode(char const *content, bool const is_CData); - Node *createComment(char const *content); - Node *createPI(char const *target, char const *content); + Node *createElement(char const *name) override; + Node *createTextNode(char const *content) override; + Node *createTextNode(char const *content, bool const is_CData) override; + Node *createComment(char const *content) override; + Node *createPI(char const *target, char const *content) override; - void notifyChildAdded(Node &parent, Node &child, Node *prev); + void notifyChildAdded(Node &parent, Node &child, Node *prev) override; - void notifyChildRemoved(Node &parent, Node &child, Node *prev); + void notifyChildRemoved(Node &parent, Node &child, Node *prev) override; void notifyChildOrderChanged(Node &parent, Node &child, - Node *old_prev, Node *new_prev); + Node *old_prev, Node *new_prev) override; void notifyContentChanged(Node &node, Util::ptr_shared old_content, - Util::ptr_shared new_content); + Util::ptr_shared new_content) override; void notifyAttributeChanged(Node &node, GQuark name, Util::ptr_shared old_value, - Util::ptr_shared new_value); + Util::ptr_shared new_value) override; protected: SimpleDocument(SimpleDocument const &doc) @@ -69,11 +69,11 @@ protected: _in_transaction(false), _is_CData(false){} - SimpleNode *_duplicate(Document* /*doc*/) const + SimpleNode *_duplicate(Document* /*doc*/) const override { return new SimpleDocument(*this); } - NodeObserver *logger() { return this; } + NodeObserver *logger() override { return this; } private: bool _in_transaction; diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h index fd41e53a8..d7ea1f16d 100644 --- a/src/xml/simple-node.h +++ b/src/xml/simple-node.h @@ -39,91 +39,91 @@ class SimpleNode : virtual public Node, public Inkscape::GC::Managed<> { public: - char const *name() const; - int code() const { return _name; } - void setCodeUnsafe(int code) { + char const *name() const override; + int code() const override { return _name; } + void setCodeUnsafe(int code) override { _name = code; } - Document *document() { return _document; } - Document const *document() const { + Document *document() override { return _document; } + Document const *document() const override { return const_cast<SimpleNode *>(this)->document(); } - Node *duplicate(Document* doc) const { return _duplicate(doc); } + Node *duplicate(Document* doc) const override { return _duplicate(doc); } - Node *root(); - Node const *root() const { + Node *root() override; + Node const *root() const override { return const_cast<SimpleNode *>(this)->root(); } - Node *parent() { return _parent; } - Node const *parent() const { return _parent; } + Node *parent() override { return _parent; } + Node const *parent() const override { return _parent; } - Node *next() { return _next; } - Node const *next() const { return _next; } + Node *next() override { return _next; } + Node const *next() const override { return _next; } - Node *firstChild() { return _first_child; } - Node const *firstChild() const { return _first_child; } - Node *lastChild() { return _last_child; } - Node const *lastChild() const { return _last_child; } + Node *firstChild() override { return _first_child; } + Node const *firstChild() const override { return _first_child; } + Node *lastChild() override { return _last_child; } + Node const *lastChild() const override { return _last_child; } - unsigned childCount() const { return _child_count; } - Node *nthChild(unsigned index); - Node const *nthChild(unsigned index) const { + unsigned childCount() const override { return _child_count; } + Node *nthChild(unsigned index) override; + Node const *nthChild(unsigned index) const override { return const_cast<SimpleNode *>(this)->nthChild(index); } - void addChild(Node *child, Node *ref); - void appendChild(Node *child) { + void addChild(Node *child, Node *ref) override; + void appendChild(Node *child) override { SimpleNode::addChild(child, _last_child); } - void removeChild(Node *child); - void changeOrder(Node *child, Node *ref); + void removeChild(Node *child) override; + void changeOrder(Node *child, Node *ref) override; - unsigned position() const; - void setPosition(int pos); + unsigned position() const override; + void setPosition(int pos) override; - char const *attribute(char const *key) const; - void setAttribute(char const *key, char const *value, bool is_interactive=false); - bool matchAttributeName(char const *partial_name) const; + char const *attribute(char const *key) const override; + void setAttribute(char const *key, char const *value, bool is_interactive=false) override; + bool matchAttributeName(char const *partial_name) const override; - char const *content() const; - void setContent(char const *value); + char const *content() const override; + void setContent(char const *value) override; - void cleanOriginal(Node *src, gchar const *key); - bool equal(Node const *other, bool recursive); - void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false); + void cleanOriginal(Node *src, gchar const *key) override; + bool equal(Node const *other, bool recursive) override; + void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false) override; - Inkscape::Util::List<AttributeRecord const> attributeList() const { + Inkscape::Util::List<AttributeRecord const> attributeList() const override { return _attributes; } - void synthesizeEvents(NodeEventVector const *vector, void *data); - void synthesizeEvents(NodeObserver &observer); + void synthesizeEvents(NodeEventVector const *vector, void *data) override; + void synthesizeEvents(NodeObserver &observer) override; - void addListener(NodeEventVector const *vector, void *data) { + void addListener(NodeEventVector const *vector, void *data) override { assert(vector != NULL); _observers.addListener(*vector, data); } - void addObserver(NodeObserver &observer) { + void addObserver(NodeObserver &observer) override { _observers.add(observer); } - void removeListenerByData(void *data) { + void removeListenerByData(void *data) override { _observers.removeListenerByData(data); } - void removeObserver(NodeObserver &observer) { + void removeObserver(NodeObserver &observer) override { _observers.remove(observer); } - void addSubtreeObserver(NodeObserver &observer) { + void addSubtreeObserver(NodeObserver &observer) override { _subtree_observers.add(observer); } - void removeSubtreeObserver(NodeObserver &observer) { + void removeSubtreeObserver(NodeObserver &observer) override { _subtree_observers.remove(observer); } - void recursivePrintTree(unsigned level = 0); + void recursivePrintTree(unsigned level = 0) override; protected: SimpleNode(int code, Document *document); diff --git a/src/xml/text-node.h b/src/xml/text-node.h index 4d71203a5..ca7880acb 100644 --- a/src/xml/text-node.h +++ b/src/xml/text-node.h @@ -43,11 +43,11 @@ struct TextNode : public SimpleNode { _is_CData = other._is_CData; } - Inkscape::XML::NodeType type() const { return Inkscape::XML::TEXT_NODE; } + Inkscape::XML::NodeType type() const override { return Inkscape::XML::TEXT_NODE; } bool is_CData() const { return _is_CData; } protected: - SimpleNode *_duplicate(Document* doc) const { return new TextNode(*this, doc); } + SimpleNode *_duplicate(Document* doc) const override { return new TextNode(*this, doc); } bool _is_CData; }; |