diff options
Diffstat (limited to 'src/display')
26 files changed, 163 insertions, 163 deletions
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: |