diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-14 22:45:10 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-06-18 12:27:00 +0000 |
| commit | 7654fc11a6442e6ee2a463d6dee6458c0f53768f (patch) | |
| tree | 7eb16a57b879747842bb0401dfee7fb47cd16f95 /src/object | |
| parent | Fix build issue caused by f09962028d017896279b717a6621a4de772d1b4f on GTK+ <3... (diff) | |
| download | inkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.tar.gz inkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.zip | |
Run clang-tidy’s modernize-use-override pass.
This adds the override specifier on all methods which override a virtual
method, whether they were already virtual or missing this specifier.
Diffstat (limited to 'src/object')
92 files changed, 704 insertions, 704 deletions
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; |