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/live_effects | |
| 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/live_effects')
101 files changed, 501 insertions, 501 deletions
diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp index 4b64f048e..150bb4124 100644 --- a/src/live_effects/lpe-angle_bisector.cpp +++ b/src/live_effects/lpe-angle_bisector.cpp @@ -24,15 +24,15 @@ namespace AB { class KnotHolderEntityLeftEnd : public LPEKnotHolderEntity { public: KnotHolderEntityLeftEnd(LPEAngleBisector* effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public LPEKnotHolderEntity { public: KnotHolderEntityRightEnd(LPEAngleBisector* effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace AB diff --git a/src/live_effects/lpe-angle_bisector.h b/src/live_effects/lpe-angle_bisector.h index 400cbf6b6..a35f5b370 100644 --- a/src/live_effects/lpe-angle_bisector.h +++ b/src/live_effects/lpe-angle_bisector.h @@ -26,9 +26,9 @@ namespace AB { class LPEAngleBisector : public Effect { public: LPEAngleBisector(LivePathEffectObject *lpeobject); - virtual ~LPEAngleBisector(); + ~LPEAngleBisector() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; friend class AB::KnotHolderEntityLeftEnd; friend class AB::KnotHolderEntityRightEnd; diff --git a/src/live_effects/lpe-attach-path.h b/src/live_effects/lpe-attach-path.h index 6b3a863d2..bed209426 100644 --- a/src/live_effects/lpe-attach-path.h +++ b/src/live_effects/lpe-attach-path.h @@ -23,10 +23,10 @@ namespace LivePathEffect { class LPEAttachPath : public Effect { public: LPEAttachPath(LivePathEffectObject *lpeobject); - virtual ~LPEAttachPath(); + ~LPEAttachPath() override; - virtual void doEffect (SPCurve * curve); - virtual void resetDefaults(SPItem const * item); + void doEffect (SPCurve * curve) override; + void resetDefaults(SPItem const * item) override; private: LPEAttachPath(const LPEAttachPath&) = delete; diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index 11694249a..7b739256e 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -43,13 +43,13 @@ namespace BeP { class KnotHolderEntityWidthBendPath : public LPEKnotHolderEntity { public: KnotHolderEntityWidthBendPath(LPEBendPath * effect) : LPEKnotHolderEntity(effect) {} - virtual ~KnotHolderEntityWidthBendPath() + ~KnotHolderEntityWidthBendPath() override { LPEBendPath *lpe = dynamic_cast<LPEBendPath *> (_effect); lpe->_knot_entity = NULL; } - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // BeP diff --git a/src/live_effects/lpe-bendpath.h b/src/live_effects/lpe-bendpath.h index 18389391f..4909a490a 100644 --- a/src/live_effects/lpe-bendpath.h +++ b/src/live_effects/lpe-bendpath.h @@ -35,19 +35,19 @@ class KnotHolderEntityWidthBendPath; class LPEBendPath : public Effect, GroupBBoxEffect { public: LPEBendPath(LivePathEffectObject *lpeobject); - virtual ~LPEBendPath(); + ~LPEBendPath() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; - virtual void transform_multiply(Geom::Affine const& postmul, bool set); + void transform_multiply(Geom::Affine const& postmul, bool set) override; - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; PathParam bend_path; diff --git a/src/live_effects/lpe-bool.h b/src/live_effects/lpe-bool.h index b7c522eb3..7742dca3f 100644 --- a/src/live_effects/lpe-bool.h +++ b/src/live_effects/lpe-bool.h @@ -22,10 +22,10 @@ namespace LivePathEffect { class LPEBool : public Effect { public: LPEBool(LivePathEffectObject *lpeobject); - virtual ~LPEBool(); + ~LPEBool() override; - void doEffect(SPCurve *curve); - virtual void resetDefaults(SPItem const *item); + void doEffect(SPCurve *curve) override; + void resetDefaults(SPItem const *item) override; enum bool_op_ex { bool_op_ex_union = bool_op_union, diff --git a/src/live_effects/lpe-bounding-box.h b/src/live_effects/lpe-bounding-box.h index fe90ff0ec..4b3d14f9c 100644 --- a/src/live_effects/lpe-bounding-box.h +++ b/src/live_effects/lpe-bounding-box.h @@ -18,9 +18,9 @@ namespace LivePathEffect { class LPEBoundingBox : public Effect { public: LPEBoundingBox(LivePathEffectObject *lpeobject); - virtual ~LPEBoundingBox(); + ~LPEBoundingBox() override; - virtual void doEffect (SPCurve * curve); + void doEffect (SPCurve * curve) override; private: OriginalPathParam linked_path; diff --git a/src/live_effects/lpe-bspline.h b/src/live_effects/lpe-bspline.h index 44d0e4c26..a1c91d512 100644 --- a/src/live_effects/lpe-bspline.h +++ b/src/live_effects/lpe-bspline.h @@ -16,18 +16,18 @@ namespace LivePathEffect { class LPEBSpline : public Effect { public: LPEBSpline(LivePathEffectObject *lpeobject); - virtual ~LPEBSpline(); + ~LPEBSpline() override; - virtual LPEPathFlashType pathFlashType() const + LPEPathFlashType pathFlashType() const override { return SUPPRESS_FLASH; } - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doEffect(SPCurve *curve); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doOnApply(SPLPEItem const* lpeitem) override; + void doEffect(SPCurve *curve) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; void doBSplineFromWidget(SPCurve *curve, double value); - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); - virtual Gtk::Widget *newWidget(); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; + Gtk::Widget *newWidget() override; void changeWeight(double weightValue); void toDefaultWeight(); void toMakeCusp(); diff --git a/src/live_effects/lpe-circle_3pts.h b/src/live_effects/lpe-circle_3pts.h index 8ef11008b..bf2c26c7c 100644 --- a/src/live_effects/lpe-circle_3pts.h +++ b/src/live_effects/lpe-circle_3pts.h @@ -25,9 +25,9 @@ namespace LivePathEffect { class LPECircle3Pts : public Effect { public: LPECircle3Pts(LivePathEffectObject *lpeobject); - virtual ~LPECircle3Pts(); + ~LPECircle3Pts() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: LPECircle3Pts(const LPECircle3Pts&) = delete; diff --git a/src/live_effects/lpe-circle_with_radius.h b/src/live_effects/lpe-circle_with_radius.h index 97b5c8859..18215ae9b 100644 --- a/src/live_effects/lpe-circle_with_radius.h +++ b/src/live_effects/lpe-circle_with_radius.h @@ -23,10 +23,10 @@ namespace LivePathEffect { class LPECircleWithRadius : public Effect { public: LPECircleWithRadius(LivePathEffectObject *lpeobject); - virtual ~LPECircleWithRadius(); + ~LPECircleWithRadius() override; // Choose to implement one of the doEffect functions. You can delete or comment out the others. - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: // add the parameters for your effect here: diff --git a/src/live_effects/lpe-clone-original.h b/src/live_effects/lpe-clone-original.h index 172cd0e0e..0518ab16e 100644 --- a/src/live_effects/lpe-clone-original.h +++ b/src/live_effects/lpe-clone-original.h @@ -30,9 +30,9 @@ enum Clonelpemethod { class LPECloneOriginal : public Effect, GroupBBoxEffect { public: LPECloneOriginal(LivePathEffectObject *lpeobject); - virtual ~LPECloneOriginal(); - virtual void doEffect (SPCurve * curve); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + ~LPECloneOriginal() override; + void doEffect (SPCurve * curve) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; void cloneAttrbutes(SPObject *origin, SPObject *dest, const gchar * attributes, const gchar * style_attributes); void modified(SPObject */*obj*/, guint /*flags*/); void start_listening(); diff --git a/src/live_effects/lpe-constructgrid.h b/src/live_effects/lpe-constructgrid.h index be6a638ba..b074a5c63 100644 --- a/src/live_effects/lpe-constructgrid.h +++ b/src/live_effects/lpe-constructgrid.h @@ -23,9 +23,9 @@ namespace LivePathEffect { class LPEConstructGrid : public Effect { public: LPEConstructGrid(LivePathEffectObject *lpeobject); - virtual ~LPEConstructGrid(); + ~LPEConstructGrid() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: ScalarParam nr_x; diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 63db722cb..ae0d95779 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -34,17 +34,17 @@ enum RotateMethod { class LPECopyRotate : public Effect, GroupBBoxEffect { public: LPECopyRotate(LivePathEffectObject *lpeobject); - virtual ~LPECopyRotate(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doAfterEffect (SPLPEItem const* lpeitem); + ~LPECopyRotate() override; + void doOnApply (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doAfterEffect (SPLPEItem const* lpeitem) override; void split(Geom::PathVector &path_in, Geom::Path const ÷r); - virtual void resetDefaults(SPItem const* item); - virtual void transform_multiply(Geom::Affine const& postmul, bool set); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + void resetDefaults(SPItem const* item) override; + void transform_multiply(Geom::Affine const& postmul, bool set) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; Geom::PathVector doEffect_path_post (Geom::PathVector const & path_in); void toItem(Geom::Affine transform, size_t i, bool reset); void cloneD(SPObject *orig, SPObject *dest, Geom::Affine transform, bool reset); @@ -52,7 +52,7 @@ public: void resetStyles(); //virtual void setFusion(Geom::PathVector &path_in, Geom::Path divider, double sizeDivider); protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; private: EnumParam<RotateMethod> method; diff --git a/src/live_effects/lpe-curvestitch.h b/src/live_effects/lpe-curvestitch.h index 1c5a39cf5..e59c91889 100644 --- a/src/live_effects/lpe-curvestitch.h +++ b/src/live_effects/lpe-curvestitch.h @@ -26,13 +26,13 @@ namespace LivePathEffect { class LPECurveStitch : public Effect { public: LPECurveStitch(LivePathEffectObject *lpeobject); - virtual ~LPECurveStitch(); + ~LPECurveStitch() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void transform_multiply(Geom::Affine const& postmul, bool set); + void transform_multiply(Geom::Affine const& postmul, bool set) override; private: PathParam strokepath; diff --git a/src/live_effects/lpe-dash-stroke.h b/src/live_effects/lpe-dash-stroke.h index 84921fe27..c84bd1960 100644 --- a/src/live_effects/lpe-dash-stroke.h +++ b/src/live_effects/lpe-dash-stroke.h @@ -16,9 +16,9 @@ namespace LivePathEffect { class LPEDashStroke : public Effect { public: LPEDashStroke(LivePathEffectObject *lpeobject); - virtual ~LPEDashStroke(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + ~LPEDashStroke() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; double timeAtLength(double const A, Geom::Path const &segment); double timeAtLength(double const A, Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2); private: diff --git a/src/live_effects/lpe-dynastroke.h b/src/live_effects/lpe-dynastroke.h index ee2642fd3..8362746a0 100644 --- a/src/live_effects/lpe-dynastroke.h +++ b/src/live_effects/lpe-dynastroke.h @@ -40,9 +40,9 @@ enum DynastrokeCappingType { class LPEDynastroke : public Effect { public: LPEDynastroke(LivePathEffectObject *lpeobject); - virtual ~LPEDynastroke(); + ~LPEDynastroke() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: EnumParam<DynastrokeMethod> method; diff --git a/src/live_effects/lpe-ellipse_5pts.h b/src/live_effects/lpe-ellipse_5pts.h index 467a0d522..8b9eabc0e 100644 --- a/src/live_effects/lpe-ellipse_5pts.h +++ b/src/live_effects/lpe-ellipse_5pts.h @@ -24,9 +24,9 @@ namespace LivePathEffect { class LPEEllipse5Pts : public Effect { public: LPEEllipse5Pts(LivePathEffectObject *lpeobject); - virtual ~LPEEllipse5Pts(); + ~LPEEllipse5Pts() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: LPEEllipse5Pts(const LPEEllipse5Pts&) = delete; diff --git a/src/live_effects/lpe-embrodery-stitch.h b/src/live_effects/lpe-embrodery-stitch.h index 32404e87f..271ef553d 100644 --- a/src/live_effects/lpe-embrodery-stitch.h +++ b/src/live_effects/lpe-embrodery-stitch.h @@ -24,13 +24,13 @@ class LPEEmbroderyStitch : public Effect { public: LPEEmbroderyStitch(LivePathEffectObject *lpeobject); - virtual ~LPEEmbroderyStitch(); + ~LPEEmbroderyStitch() override; - virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in); + Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override; - virtual void resetDefaults(SPItem const *item); + void resetDefaults(SPItem const *item) override; - virtual void transform_multiply(Geom::Affine const &postmul, bool set); + void transform_multiply(Geom::Affine const &postmul, bool set) override; enum order_method { order_method_no_reorder, diff --git a/src/live_effects/lpe-envelope.h b/src/live_effects/lpe-envelope.h index 64f6a4c0c..877750559 100644 --- a/src/live_effects/lpe-envelope.h +++ b/src/live_effects/lpe-envelope.h @@ -29,13 +29,13 @@ namespace LivePathEffect { class LPEEnvelope : public Effect, GroupBBoxEffect { public: LPEEnvelope(LivePathEffectObject *lpeobject); - virtual ~LPEEnvelope(); + ~LPEEnvelope() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; private: PathParam bend_path1; diff --git a/src/live_effects/lpe-extrude.h b/src/live_effects/lpe-extrude.h index 32549a66a..34a8681a7 100644 --- a/src/live_effects/lpe-extrude.h +++ b/src/live_effects/lpe-extrude.h @@ -22,11 +22,11 @@ namespace LivePathEffect { class LPEExtrude : public Effect { public: LPEExtrude(LivePathEffectObject *lpeobject); - virtual ~LPEExtrude(); + ~LPEExtrude() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; private: VectorParam extrude_vector; diff --git a/src/live_effects/lpe-fill-between-many.h b/src/live_effects/lpe-fill-between-many.h index 796638d51..601dce5c6 100644 --- a/src/live_effects/lpe-fill-between-many.h +++ b/src/live_effects/lpe-fill-between-many.h @@ -27,9 +27,9 @@ enum Filllpemethod { class LPEFillBetweenMany : public Effect { public: LPEFillBetweenMany(LivePathEffectObject *lpeobject); - virtual ~LPEFillBetweenMany(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual void doEffect (SPCurve * curve); + ~LPEFillBetweenMany() override; + void doOnApply (SPLPEItem const* lpeitem) override; + void doEffect (SPCurve * curve) override; private: OriginalPathArrayParam linked_paths; diff --git a/src/live_effects/lpe-fill-between-strokes.h b/src/live_effects/lpe-fill-between-strokes.h index da3842797..b3b1da2c6 100644 --- a/src/live_effects/lpe-fill-between-strokes.h +++ b/src/live_effects/lpe-fill-between-strokes.h @@ -18,8 +18,8 @@ namespace LivePathEffect { class LPEFillBetweenStrokes : public Effect { public: LPEFillBetweenStrokes(LivePathEffectObject *lpeobject); - virtual ~LPEFillBetweenStrokes(); - virtual void doEffect (SPCurve * curve); + ~LPEFillBetweenStrokes() override; + void doEffect (SPCurve * curve) override; private: OriginalPathParam linked_path; diff --git a/src/live_effects/lpe-fillet-chamfer.h b/src/live_effects/lpe-fillet-chamfer.h index c628added..46887255e 100644 --- a/src/live_effects/lpe-fillet-chamfer.h +++ b/src/live_effects/lpe-fillet-chamfer.h @@ -33,13 +33,13 @@ enum Filletmethod { class LPEFilletChamfer : public Effect { public: LPEFilletChamfer(LivePathEffectObject *lpeobject); - virtual void doBeforeEffect(SPLPEItem const *lpeItem); - virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in); - virtual void doOnApply(SPLPEItem const *lpeItem); - virtual Gtk::Widget *newWidget(); + void doBeforeEffect(SPLPEItem const *lpeItem) override; + Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override; + void doOnApply(SPLPEItem const *lpeItem) override; + Gtk::Widget *newWidget() override; Geom::Ray getRay(Geom::Point start, Geom::Point end, Geom::Curve *curve, bool reverse); void addChamferSteps(Geom::Path &tmp_path, Geom::Path path_chamfer, Geom::Point end_arc_point, size_t steps); - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; void updateSatelliteType(SatelliteType satellitetype); void setSelected(PathVectorSatellites *_pathvector_satellites); //void convertUnit(); diff --git a/src/live_effects/lpe-gears.h b/src/live_effects/lpe-gears.h index 945cae8cc..8d54a699e 100644 --- a/src/live_effects/lpe-gears.h +++ b/src/live_effects/lpe-gears.h @@ -20,9 +20,9 @@ namespace LivePathEffect { class LPEGears : public Effect { public: LPEGears(LivePathEffectObject *lpeobject); - virtual ~LPEGears(); + ~LPEGears() override; - virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in); + Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override; private: ScalarParam teeth; diff --git a/src/live_effects/lpe-interpolate.h b/src/live_effects/lpe-interpolate.h index 629b6906f..4da384fff 100644 --- a/src/live_effects/lpe-interpolate.h +++ b/src/live_effects/lpe-interpolate.h @@ -25,11 +25,11 @@ namespace LivePathEffect { class LPEInterpolate : public Effect { public: LPEInterpolate(LivePathEffectObject *lpeobject); - virtual ~LPEInterpolate(); + ~LPEInterpolate() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; private: PathParam trajectory_path; ScalarParam number_of_steps; diff --git a/src/live_effects/lpe-interpolate_points.h b/src/live_effects/lpe-interpolate_points.h index 395fbc9fb..fd78f07b0 100644 --- a/src/live_effects/lpe-interpolate_points.h +++ b/src/live_effects/lpe-interpolate_points.h @@ -23,9 +23,9 @@ namespace LivePathEffect { class LPEInterpolatePoints : public Effect { public: LPEInterpolatePoints(LivePathEffectObject *lpeobject); - virtual ~LPEInterpolatePoints(); + ~LPEInterpolatePoints() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: EnumParam<unsigned> interpolator_type; diff --git a/src/live_effects/lpe-jointype.h b/src/live_effects/lpe-jointype.h index 24f667d29..5f73dc4e7 100644 --- a/src/live_effects/lpe-jointype.h +++ b/src/live_effects/lpe-jointype.h @@ -20,11 +20,11 @@ namespace LivePathEffect { class LPEJoinType : public Effect {
public:
LPEJoinType(LivePathEffectObject *lpeobject);
- virtual ~LPEJoinType();
+ ~LPEJoinType() override;
- virtual void doOnApply(SPLPEItem const* lpeitem);
- virtual void doOnRemove(SPLPEItem const* lpeitem);
- virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in);
+ void doOnApply(SPLPEItem const* lpeitem) override;
+ void doOnRemove(SPLPEItem const* lpeitem) override;
+ Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override;
private:
LPEJoinType(const LPEJoinType&) = delete;
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp index d62965ca8..f42ee75e4 100644 --- a/src/live_effects/lpe-knot.cpp +++ b/src/live_effects/lpe-knot.cpp @@ -42,9 +42,9 @@ namespace LivePathEffect { class KnotHolderEntityCrossingSwitcher : public LPEKnotHolderEntity { public: KnotHolderEntityCrossingSwitcher(LPEKnot *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; - virtual void knot_click(guint state); + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; + void knot_click(guint state) override; }; diff --git a/src/live_effects/lpe-knot.h b/src/live_effects/lpe-knot.h index 4f8ba95f6..1f63be686 100644 --- a/src/live_effects/lpe-knot.h +++ b/src/live_effects/lpe-knot.h @@ -56,17 +56,17 @@ public: class LPEKnot : public Effect, GroupBBoxEffect { public: LPEKnot(LivePathEffectObject *lpeobject); - virtual ~LPEKnot(); + ~LPEKnot() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & input_path); + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & input_path) override; /* the knotholder entity classes must be declared friends */ friend class KnotHolderEntityCrossingSwitcher; - void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; Geom::PathVector supplied_path; //for knotholder business private: diff --git a/src/live_effects/lpe-lattice.h b/src/live_effects/lpe-lattice.h index 52e1a0b9f..ba47c25e4 100644 --- a/src/live_effects/lpe-lattice.h +++ b/src/live_effects/lpe-lattice.h @@ -29,13 +29,13 @@ class LPELattice : public Effect, GroupBBoxEffect { public: LPELattice(LivePathEffectObject *lpeobject); - virtual ~LPELattice(); + ~LPELattice() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; protected: //virtual void addHelperPathsImpl(SPLPEItem *lpeitem, SPDesktop *desktop); diff --git a/src/live_effects/lpe-lattice2.h b/src/live_effects/lpe-lattice2.h index 17bb67f23..f51ece4cd 100644 --- a/src/live_effects/lpe-lattice2.h +++ b/src/live_effects/lpe-lattice2.h @@ -35,15 +35,15 @@ class LPELattice2 : public Effect, GroupBBoxEffect { public: LPELattice2(LivePathEffectObject *lpeobject); - virtual ~LPELattice2(); + ~LPELattice2() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void doBeforeEffect(SPLPEItem const* lpeitem); + void doBeforeEffect(SPLPEItem const* lpeitem) override; - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; void calculateCurve(Geom::Point a,Geom::Point b, SPCurve *c, bool horizontal, bool move); @@ -58,7 +58,7 @@ public: void resetGrid(); protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: BoolParam horizontal_mirror; diff --git a/src/live_effects/lpe-line_segment.h b/src/live_effects/lpe-line_segment.h index c5c0e7476..bde36f2ee 100644 --- a/src/live_effects/lpe-line_segment.h +++ b/src/live_effects/lpe-line_segment.h @@ -30,11 +30,11 @@ enum EndType { class LPELineSegment : public Effect { public: LPELineSegment(LivePathEffectObject *lpeobject); - virtual ~LPELineSegment(); + ~LPELineSegment() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; //private: EnumParam<EndType> end_type; diff --git a/src/live_effects/lpe-measure-segments.h b/src/live_effects/lpe-measure-segments.h index e4cde08a0..92bb51b91 100644 --- a/src/live_effects/lpe-measure-segments.h +++ b/src/live_effects/lpe-measure-segments.h @@ -34,13 +34,13 @@ enum OrientationMethod { class LPEMeasureSegments : public Effect { public: LPEMeasureSegments(LivePathEffectObject *lpeobject); - virtual ~LPEMeasureSegments(); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doOnRemove(SPLPEItem const* /*lpeitem*/); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + ~LPEMeasureSegments() override; + void doOnApply(SPLPEItem const* lpeitem) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doOnRemove(SPLPEItem const* /*lpeitem*/) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; void createLine(Geom::Point start,Geom::Point end, Glib::ustring name, size_t counter, bool main, bool remove, bool arrows = false); void createTextLabel(Geom::Point pos, size_t counter, double length, Geom::Coord angle, bool remove, bool valid); void createArrowMarker(Glib::ustring mode); diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 1b5e936dd..4ebf878ef 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -40,15 +40,15 @@ enum ModeType { class LPEMirrorSymmetry : public Effect, GroupBBoxEffect { public: LPEMirrorSymmetry(LivePathEffectObject *lpeobject); - virtual ~LPEMirrorSymmetry(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doAfterEffect (SPLPEItem const* lpeitem); - virtual void transform_multiply(Geom::Affine const& postmul, bool set); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + ~LPEMirrorSymmetry() override; + void doOnApply (SPLPEItem const* lpeitem) override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doAfterEffect (SPLPEItem const* lpeitem) override; + void transform_multiply(Geom::Affine const& postmul, bool set) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; void toMirror(Geom::Affine transform, bool reset); void cloneD(SPObject *orig, SPObject *dest, bool reset); Inkscape::XML::Node * createPathBase(SPObject *elemref); @@ -57,7 +57,7 @@ public: void centerHoriz(); protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; private: EnumParam<ModeType> mode; diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp index 257d02c83..02b3c8eed 100644 --- a/src/live_effects/lpe-offset.cpp +++ b/src/live_effects/lpe-offset.cpp @@ -48,8 +48,8 @@ namespace OfS { class KnotHolderEntityOffsetPoint : public LPEKnotHolderEntity { public: KnotHolderEntityOffsetPoint(LPEOffset * effect) : LPEKnotHolderEntity(effect) {inset = false; previous = Geom::Point(Geom::infinity(),Geom::infinity());} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; private: bool inset; Geom::Point previous; diff --git a/src/live_effects/lpe-offset.h b/src/live_effects/lpe-offset.h index ae8426578..b7303d7ab 100644 --- a/src/live_effects/lpe-offset.h +++ b/src/live_effects/lpe-offset.h @@ -31,17 +31,17 @@ class KnotHolderEntityOffsetPoint; class LPEOffset : public Effect, GroupBBoxEffect { public: LPEOffset(LivePathEffectObject *lpeobject); - virtual ~LPEOffset(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual Gtk::Widget *newWidget(); + ~LPEOffset() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnApply(SPLPEItem const* lpeitem) override; + Gtk::Widget *newWidget() override; void calculateOffset (Geom::PathVector const & path_in); void drawHandle(Geom::Point p); - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; friend class OfS::KnotHolderEntityOffsetPoint; protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: ScalarParam offset; diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp index 9c3b714cc..7c6de10bb 100644 --- a/src/live_effects/lpe-parallel.cpp +++ b/src/live_effects/lpe-parallel.cpp @@ -28,15 +28,15 @@ namespace Pl { class KnotHolderEntityLeftEnd : public LPEKnotHolderEntity { public: KnotHolderEntityLeftEnd(LPEParallel *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public LPEKnotHolderEntity { public: KnotHolderEntityRightEnd(LPEParallel *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace Pl diff --git a/src/live_effects/lpe-parallel.h b/src/live_effects/lpe-parallel.h index 56ee1b9ea..1decf3046 100644 --- a/src/live_effects/lpe-parallel.h +++ b/src/live_effects/lpe-parallel.h @@ -30,11 +30,11 @@ namespace Pl { class LPEParallel : public Effect { public: LPEParallel(LivePathEffectObject *lpeobject); - virtual ~LPEParallel(); + ~LPEParallel() override; - virtual void doOnApply (SPLPEItem const* lpeitem); + void doOnApply (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; /* the knotholder entity classes must be declared friends */ friend class Pl::KnotHolderEntityLeftEnd; diff --git a/src/live_effects/lpe-path_length.h b/src/live_effects/lpe-path_length.h index 6530e9fa1..ba61279c2 100644 --- a/src/live_effects/lpe-path_length.h +++ b/src/live_effects/lpe-path_length.h @@ -25,9 +25,9 @@ namespace LivePathEffect { class LPEPathLength : public Effect { public: LPEPathLength(LivePathEffectObject *lpeobject); - virtual ~LPEPathLength(); + ~LPEPathLength() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: LPEPathLength(const LPEPathLength&) = delete; diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index 115c777d0..09794f7a7 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -50,13 +50,13 @@ namespace WPAP { class KnotHolderEntityWidthPatternAlongPath : public LPEKnotHolderEntity { public: KnotHolderEntityWidthPatternAlongPath(LPEPatternAlongPath * effect) : LPEKnotHolderEntity(effect) {} - virtual ~KnotHolderEntityWidthPatternAlongPath() + ~KnotHolderEntityWidthPatternAlongPath() override { LPEPatternAlongPath *lpe = dynamic_cast<LPEPatternAlongPath *> (_effect); lpe->_knot_entity = NULL; } - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // WPAP diff --git a/src/live_effects/lpe-patternalongpath.h b/src/live_effects/lpe-patternalongpath.h index 50ff19e51..8148bc140 100644 --- a/src/live_effects/lpe-patternalongpath.h +++ b/src/live_effects/lpe-patternalongpath.h @@ -33,17 +33,17 @@ enum PAPCopyType { class LPEPatternAlongPath : public Effect { public: LPEPatternAlongPath(LivePathEffectObject *lpeobject); - virtual ~LPEPatternAlongPath(); + ~LPEPatternAlongPath() override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void transform_multiply(Geom::Affine const& postmul, bool set); + void transform_multiply(Geom::Affine const& postmul, bool set) override; - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; PathParam pattern; diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp index afaa6b9ca..6fa874a4d 100644 --- a/src/live_effects/lpe-perp_bisector.cpp +++ b/src/live_effects/lpe-perp_bisector.cpp @@ -35,15 +35,15 @@ public: class KnotHolderEntityLeftEnd : public KnotHolderEntityEnd { public: KnotHolderEntityLeftEnd(LPEPerpBisector *effect) : KnotHolderEntityEnd(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public KnotHolderEntityEnd { public: KnotHolderEntityRightEnd(LPEPerpBisector *effect) : KnotHolderEntityEnd(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; Geom::Point diff --git a/src/live_effects/lpe-perp_bisector.h b/src/live_effects/lpe-perp_bisector.h index 219cd6156..5604bef45 100644 --- a/src/live_effects/lpe-perp_bisector.h +++ b/src/live_effects/lpe-perp_bisector.h @@ -33,14 +33,14 @@ namespace PB { class LPEPerpBisector : public Effect { public: LPEPerpBisector(LivePathEffectObject *lpeobject); - virtual ~LPEPerpBisector(); + ~LPEPerpBisector() override; virtual EffectType effectType () { return PERP_BISECTOR; } - void doOnApply (SPLPEItem const* lpeitem); + void doOnApply (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > - doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > + doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; /* the knotholder entity functions must be declared friends */ friend class PB::KnotHolderEntityEnd; diff --git a/src/live_effects/lpe-perspective-envelope.h b/src/live_effects/lpe-perspective-envelope.h index 5bf130ca7..6d0e4a9c4 100644 --- a/src/live_effects/lpe-perspective-envelope.h +++ b/src/live_effects/lpe-perspective-envelope.h @@ -30,9 +30,9 @@ public: LPEPerspectiveEnvelope(LivePathEffectObject *lpeobject); - virtual ~LPEPerspectiveEnvelope(); + ~LPEPerspectiveEnvelope() override; - virtual void doEffect(SPCurve *curve); + void doEffect(SPCurve *curve) override; virtual Geom::Point projectPoint(Geom::Point p); @@ -40,22 +40,22 @@ public: virtual Geom::Point pointAtRatio(Geom::Coord ratio,Geom::Point A, Geom::Point B); - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; virtual void vertical(PointParam ¶mA,PointParam ¶mB, Geom::Line vert); virtual void horizontal(PointParam ¶mA,PointParam ¶mB,Geom::Line horiz); - virtual void doBeforeEffect(SPLPEItem const* lpeitem); + void doBeforeEffect(SPLPEItem const* lpeitem) override; - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; virtual void setDefaults(); virtual void resetGrid(); protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: BoolParam horizontal_mirror; diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp index deed40bde..0387e52ba 100644 --- a/src/live_effects/lpe-perspective_path.cpp +++ b/src/live_effects/lpe-perspective_path.cpp @@ -35,8 +35,8 @@ class KnotHolderEntityOffset : public LPEKnotHolderEntity { public: KnotHolderEntityOffset(LPEPerspectivePath *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace PP diff --git a/src/live_effects/lpe-perspective_path.h b/src/live_effects/lpe-perspective_path.h index d55d7fe8c..b2de8be0a 100644 --- a/src/live_effects/lpe-perspective_path.h +++ b/src/live_effects/lpe-perspective_path.h @@ -32,16 +32,16 @@ namespace PP { class LPEPerspectivePath : public Effect, GroupBBoxEffect { public: LPEPerspectivePath(LivePathEffectObject *lpeobject); - virtual ~LPEPerspectivePath(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + ~LPEPerspectivePath() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doOnApply(SPLPEItem const* lpeitem) override; + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; virtual void refresh(Gtk::Entry* perspective); - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; /* the knotholder entity classes must be declared friends */ friend class PP::KnotHolderEntityOffset; - void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; private: // add the parameters for your effect here: diff --git a/src/live_effects/lpe-powerclip.h b/src/live_effects/lpe-powerclip.h index 3aa963c71..2cd3943cc 100644 --- a/src/live_effects/lpe-powerclip.h +++ b/src/live_effects/lpe-powerclip.h @@ -17,14 +17,14 @@ namespace LivePathEffect { class LPEPowerClip : public Effect { public: LPEPowerClip(LivePathEffectObject *lpeobject); - virtual ~LPEPowerClip(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual Gtk::Widget * newWidget(); + ~LPEPowerClip() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + Gtk::Widget * newWidget() override; //virtual void transform_multiply(Geom::Affine const& postmul, bool set); - virtual void doOnVisibilityToggled(SPLPEItem const* lpeitem); - virtual void doAfterEffect (SPLPEItem const* lpeitem); + void doOnVisibilityToggled(SPLPEItem const* lpeitem) override; + void doAfterEffect (SPLPEItem const* lpeitem) override; void addInverse (SPItem * clip_data); void removeInverse (SPItem * clip_data); void flattenClip(SPItem * clip_data, Geom::PathVector &path_in); diff --git a/src/live_effects/lpe-powermask.h b/src/live_effects/lpe-powermask.h index e81b34fe3..ecf448e53 100644 --- a/src/live_effects/lpe-powermask.h +++ b/src/live_effects/lpe-powermask.h @@ -18,11 +18,11 @@ namespace LivePathEffect { class LPEPowerMask : public Effect { public: LPEPowerMask(LivePathEffectObject *lpeobject); - virtual ~LPEPowerMask(); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void doEffect (SPCurve * curve); - virtual void doOnRemove (SPLPEItem const* /*lpeitem*/); - virtual void doOnVisibilityToggled(SPLPEItem const* lpeitem); + ~LPEPowerMask() override; + void doBeforeEffect (SPLPEItem const* lpeitem) override; + void doEffect (SPCurve * curve) override; + void doOnRemove (SPLPEItem const* /*lpeitem*/) override; + void doOnVisibilityToggled(SPLPEItem const* lpeitem) override; void toggleMaskVisibility(); void setMask(); private: diff --git a/src/live_effects/lpe-powerstroke-interpolators.h b/src/live_effects/lpe-powerstroke-interpolators.h index c0a60fa81..ce792302f 100644 --- a/src/live_effects/lpe-powerstroke-interpolators.h +++ b/src/live_effects/lpe-powerstroke-interpolators.h @@ -49,9 +49,9 @@ private: class Linear : public Interpolator { public: Linear() {}; - virtual ~Linear() {}; + ~Linear() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path path; path.start( points.at(0) ); for (unsigned int i = 1 ; i < points.size(); ++i) { @@ -69,9 +69,9 @@ private: class CubicBezierFit : public Interpolator { public: CubicBezierFit() {}; - virtual ~CubicBezierFit() {}; + ~CubicBezierFit() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { unsigned int n_points = points.size(); // worst case gives us 2 segment per point int max_segs = 8*n_points; @@ -110,9 +110,9 @@ public: CubicBezierJohan(double beta = 0.2) { _beta = beta; }; - virtual ~CubicBezierJohan() {}; + ~CubicBezierJohan() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; fit.start(points.at(0)); for (unsigned int i = 1; i < points.size(); ++i) { @@ -141,9 +141,9 @@ public: CubicBezierSmooth(double beta = 0.2) { _beta = beta; }; - virtual ~CubicBezierSmooth() {}; + ~CubicBezierSmooth() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; fit.start(points.at(0)); unsigned int num_points = points.size(); @@ -176,9 +176,9 @@ private: class SpiroInterpolator : public Interpolator { public: SpiroInterpolator() {}; - virtual ~SpiroInterpolator() {}; + ~SpiroInterpolator() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; Coord scale_y = 100.; @@ -210,9 +210,9 @@ private: class CentripetalCatmullRomInterpolator : public Interpolator { public: CentripetalCatmullRomInterpolator() {}; - virtual ~CentripetalCatmullRomInterpolator() {}; + ~CentripetalCatmullRomInterpolator() override {}; - virtual Path interpolateToPath(std::vector<Point> const &points) const { + Path interpolateToPath(std::vector<Point> const &points) const override { unsigned int n_points = points.size(); Geom::Path fit(points.front()); diff --git a/src/live_effects/lpe-powerstroke.h b/src/live_effects/lpe-powerstroke.h index 685a40614..d41f5672b 100644 --- a/src/live_effects/lpe-powerstroke.h +++ b/src/live_effects/lpe-powerstroke.h @@ -23,13 +23,13 @@ namespace LivePathEffect { class LPEPowerStroke : public Effect { public: LPEPowerStroke(LivePathEffectObject *lpeobject); - virtual ~LPEPowerStroke(); + ~LPEPowerStroke() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual void doBeforeEffect(SPLPEItem const *lpeItem); - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doOnRemove(SPLPEItem const* lpeitem); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + void doBeforeEffect(SPLPEItem const *lpeItem) override; + void doOnApply(SPLPEItem const* lpeitem) override; + void doOnRemove(SPLPEItem const* lpeitem) override; // methods called by path-manipulator upon edits void adjustForNewPath(Geom::PathVector const & path_in); diff --git a/src/live_effects/lpe-pts2ellipse.h b/src/live_effects/lpe-pts2ellipse.h index d7a6d2d40..9b8ba4658 100644 --- a/src/live_effects/lpe-pts2ellipse.h +++ b/src/live_effects/lpe-pts2ellipse.h @@ -33,9 +33,9 @@ enum EllipseMethod { class LPEPts2Ellipse : public Effect { public: LPEPts2Ellipse(LivePathEffectObject *lpeobject); - virtual ~LPEPts2Ellipse(); + ~LPEPts2Ellipse() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: LPEPts2Ellipse(const LPEPts2Ellipse&) = delete; diff --git a/src/live_effects/lpe-recursiveskeleton.h b/src/live_effects/lpe-recursiveskeleton.h index 42040e668..9745454b7 100644 --- a/src/live_effects/lpe-recursiveskeleton.h +++ b/src/live_effects/lpe-recursiveskeleton.h @@ -22,9 +22,9 @@ namespace LivePathEffect { class LPERecursiveSkeleton : public Effect { public: LPERecursiveSkeleton(LivePathEffectObject *lpeobject); - virtual ~LPERecursiveSkeleton(); + ~LPERecursiveSkeleton() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: ScalarParam iterations; diff --git a/src/live_effects/lpe-rough-hatches.h b/src/live_effects/lpe-rough-hatches.h index ab1bf098c..08e763d97 100644 --- a/src/live_effects/lpe-rough-hatches.h +++ b/src/live_effects/lpe-rough-hatches.h @@ -26,14 +26,14 @@ namespace LivePathEffect { class LPERoughHatches : public Effect { public: LPERoughHatches(LivePathEffectObject *lpeobject); - virtual ~LPERoughHatches(); + ~LPERoughHatches() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > - doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > + doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void doBeforeEffect(SPLPEItem const* item); + void doBeforeEffect(SPLPEItem const* item) override; std::vector<double> generateLevels(Geom::Interval const &domain, double x_org); diff --git a/src/live_effects/lpe-roughen.h b/src/live_effects/lpe-roughen.h index aebc0e313..5e989766d 100644 --- a/src/live_effects/lpe-roughen.h +++ b/src/live_effects/lpe-roughen.h @@ -41,16 +41,16 @@ class LPERoughen : public Effect { public: LPERoughen(LivePathEffectObject *lpeobject); - virtual ~LPERoughen(); + ~LPERoughen() override; - virtual void doEffect(SPCurve *curve); + void doEffect(SPCurve *curve) override; virtual double sign(double randNumber); virtual Geom::Point randomize(double max_lenght, bool is_node = false); - virtual void doBeforeEffect(SPLPEItem const * lpeitem); + void doBeforeEffect(SPLPEItem const * lpeitem) override; virtual SPCurve const * addNodesAndJitter(Geom::Curve const * A, Geom::Point &prev, Geom::Point &last_move, double t, bool last); virtual SPCurve *jitter(Geom::Curve const * A, Geom::Point &prev, Geom::Point &last_move); virtual Geom::Point tPoint(Geom::Point A, Geom::Point B, double t = 0.5); - virtual Gtk::Widget *newWidget(); + Gtk::Widget *newWidget() override; private: EnumParam<DivisionMethod> method; diff --git a/src/live_effects/lpe-ruler.h b/src/live_effects/lpe-ruler.h index 64c6bf40e..15194f562 100644 --- a/src/live_effects/lpe-ruler.h +++ b/src/live_effects/lpe-ruler.h @@ -43,9 +43,9 @@ enum BorderMarkType { class LPERuler : public Effect { public: LPERuler(LivePathEffectObject *lpeobject); - virtual ~LPERuler(); + ~LPERuler() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: Geom::Piecewise<Geom::D2<Geom::SBasis> > ruler_mark(Geom::Point const &A, Geom::Point const &n, MarkType const &marktype); diff --git a/src/live_effects/lpe-show_handles.h b/src/live_effects/lpe-show_handles.h index 7efa799f3..a5256548c 100644 --- a/src/live_effects/lpe-show_handles.h +++ b/src/live_effects/lpe-show_handles.h @@ -20,11 +20,11 @@ class LPEShowHandles : public Effect , GroupBBoxEffect { public: LPEShowHandles(LivePathEffectObject *lpeobject); - virtual ~LPEShowHandles() {} + ~LPEShowHandles() override {} - virtual void doOnApply(SPLPEItem const* lpeitem); + void doOnApply(SPLPEItem const* lpeitem) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; virtual void generateHelperPath(Geom::PathVector result); @@ -36,7 +36,7 @@ public: protected: - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; private: diff --git a/src/live_effects/lpe-simplify.h b/src/live_effects/lpe-simplify.h index c206e45e8..29f9ac07b 100644 --- a/src/live_effects/lpe-simplify.h +++ b/src/live_effects/lpe-simplify.h @@ -17,15 +17,15 @@ class LPESimplify : public Effect , GroupBBoxEffect { public: LPESimplify(LivePathEffectObject *lpeobject); - virtual ~LPESimplify(); + ~LPESimplify() override; - virtual void doEffect(SPCurve *curve); + void doEffect(SPCurve *curve) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; virtual void generateHelperPathAndSmooth(Geom::PathVector &result); - virtual Gtk::Widget * newWidget(); + Gtk::Widget * newWidget() override; virtual void drawNode(Geom::Point p); @@ -34,7 +34,7 @@ public: virtual void drawHandleLine(Geom::Point p,Geom::Point p2); protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) override; private: ScalarParam steps; diff --git a/src/live_effects/lpe-skeleton.h b/src/live_effects/lpe-skeleton.h index 51d96777f..5487a6b67 100644 --- a/src/live_effects/lpe-skeleton.h +++ b/src/live_effects/lpe-skeleton.h @@ -32,12 +32,12 @@ namespace Skeleton { class LPESkeleton : public Effect { public: LPESkeleton(LivePathEffectObject *lpeobject); - virtual ~LPESkeleton(); + ~LPESkeleton() override; // Choose to implement one of the doEffect functions. You can delete or comment out the others. // virtual void doEffect (SPCurve * curve); // virtual Geom::PathVector doEffect_path (Geom::PathVector const &path_in); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in) override; /* the knotholder entity classes (if any) can be declared friends */ //friend class Skeleton::KnotHolderEntityMyHandle; diff --git a/src/live_effects/lpe-sketch.h b/src/live_effects/lpe-sketch.h index 5d178269e..7d50020b3 100644 --- a/src/live_effects/lpe-sketch.h +++ b/src/live_effects/lpe-sketch.h @@ -27,11 +27,11 @@ namespace LivePathEffect { class LPESketch : public Effect { public: LPESketch(LivePathEffectObject *lpeobject); - virtual ~LPESketch(); + ~LPESketch() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; private: // add the parameters for your effect here: diff --git a/src/live_effects/lpe-spiro.h b/src/live_effects/lpe-spiro.h index 14a026da4..31a35720d 100644 --- a/src/live_effects/lpe-spiro.h +++ b/src/live_effects/lpe-spiro.h @@ -16,11 +16,11 @@ namespace LivePathEffect { class LPESpiro : public Effect { public: LPESpiro(LivePathEffectObject *lpeobject); - virtual ~LPESpiro(); + ~LPESpiro() override; - virtual LPEPathFlashType pathFlashType() const { return SUPPRESS_FLASH; } + LPEPathFlashType pathFlashType() const override { return SUPPRESS_FLASH; } - virtual void doEffect(SPCurve * curve); + void doEffect(SPCurve * curve) override; private: LPESpiro(const LPESpiro&) = delete; diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp index 3a225c0be..ee2e6552b 100644 --- a/src/live_effects/lpe-tangent_to_curve.cpp +++ b/src/live_effects/lpe-tangent_to_curve.cpp @@ -31,23 +31,23 @@ namespace TtC { class KnotHolderEntityAttachPt : public LPEKnotHolderEntity { public: KnotHolderEntityAttachPt(LPETangentToCurve *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityLeftEnd : public LPEKnotHolderEntity { public: KnotHolderEntityLeftEnd(LPETangentToCurve *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityRightEnd : public LPEKnotHolderEntity { public: KnotHolderEntityRightEnd(LPETangentToCurve *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // namespace TtC diff --git a/src/live_effects/lpe-tangent_to_curve.h b/src/live_effects/lpe-tangent_to_curve.h index 5761a3cd7..575a54c7d 100644 --- a/src/live_effects/lpe-tangent_to_curve.h +++ b/src/live_effects/lpe-tangent_to_curve.h @@ -33,15 +33,15 @@ namespace TtC { class LPETangentToCurve : public Effect { public: LPETangentToCurve(LivePathEffectObject *lpeobject); - virtual ~LPETangentToCurve(); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > - doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + ~LPETangentToCurve() override; + Geom::Piecewise<Geom::D2<Geom::SBasis> > + doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; /* the knotholder entity classes must be declared friends */ friend class TtC::KnotHolderEntityLeftEnd; friend class TtC::KnotHolderEntityRightEnd; friend class TtC::KnotHolderEntityAttachPt; - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; private: ScalarParam angle; diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp index b5e440767..212485ecf 100644 --- a/src/live_effects/lpe-taperstroke.cpp +++ b/src/live_effects/lpe-taperstroke.cpp @@ -46,15 +46,15 @@ namespace TpS { class KnotHolderEntityAttachBegin : public LPEKnotHolderEntity { public: KnotHolderEntityAttachBegin(LPETaperStroke * effect) : LPEKnotHolderEntity(effect) {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; class KnotHolderEntityAttachEnd : public LPEKnotHolderEntity { public: KnotHolderEntityAttachEnd(LPETaperStroke * effect) : LPEKnotHolderEntity(effect) {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; }; } // TpS diff --git a/src/live_effects/lpe-taperstroke.h b/src/live_effects/lpe-taperstroke.h index 9e3de772c..5e650b9ac 100644 --- a/src/live_effects/lpe-taperstroke.h +++ b/src/live_effects/lpe-taperstroke.h @@ -28,15 +28,15 @@ class KnotHolderEntityAttachEnd; class LPETaperStroke : public Effect { public: LPETaperStroke(LivePathEffectObject *lpeobject); - virtual ~LPETaperStroke() {} + ~LPETaperStroke() override {} - virtual void doOnApply(SPLPEItem const* lpeitem); - virtual void doOnRemove(SPLPEItem const* lpeitem); + void doOnApply(SPLPEItem const* lpeitem) override; + void doOnRemove(SPLPEItem const* lpeitem) override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const& path_in); + Geom::PathVector doEffect_path (Geom::PathVector const& path_in) override; Geom::PathVector doEffect_simplePath(Geom::PathVector const& path_in); - virtual void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item); + void addKnotHolderEntities(KnotHolder * knotholder, SPItem * item) override; friend class TpS::KnotHolderEntityAttachBegin; friend class TpS::KnotHolderEntityAttachEnd; diff --git a/src/live_effects/lpe-test-doEffect-stack.h b/src/live_effects/lpe-test-doEffect-stack.h index 525774075..3b1916d7b 100644 --- a/src/live_effects/lpe-test-doEffect-stack.h +++ b/src/live_effects/lpe-test-doEffect-stack.h @@ -24,11 +24,11 @@ namespace LivePathEffect { class LPEdoEffectStackTest : public Effect { public: LPEdoEffectStackTest(LivePathEffectObject *lpeobject); - virtual ~LPEdoEffectStackTest(); + ~LPEdoEffectStackTest() override; - virtual void doEffect (SPCurve * curve); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + void doEffect (SPCurve * curve) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: ScalarParam step; diff --git a/src/live_effects/lpe-text_label.h b/src/live_effects/lpe-text_label.h index aef50a79a..d399f40ac 100644 --- a/src/live_effects/lpe-text_label.h +++ b/src/live_effects/lpe-text_label.h @@ -23,9 +23,9 @@ namespace LivePathEffect { class LPETextLabel : public Effect { public: LPETextLabel(LivePathEffectObject *lpeobject); - virtual ~LPETextLabel(); + ~LPETextLabel() override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; private: TextParam label; diff --git a/src/live_effects/lpe-transform_2pts.h b/src/live_effects/lpe-transform_2pts.h index 632cae51d..ca04ae589 100644 --- a/src/live_effects/lpe-transform_2pts.h +++ b/src/live_effects/lpe-transform_2pts.h @@ -25,15 +25,15 @@ namespace LivePathEffect { class LPETransform2Pts : public Effect, GroupBBoxEffect { public: LPETransform2Pts(LivePathEffectObject *lpeobject); - virtual ~LPETransform2Pts(); + ~LPETransform2Pts() override; - virtual void doOnApply (SPLPEItem const* lpeitem); + void doOnApply (SPLPEItem const* lpeitem) override; - virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); + Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) override; - virtual void doBeforeEffect (SPLPEItem const* lpeitem); + void doBeforeEffect (SPLPEItem const* lpeitem) override; - virtual Gtk::Widget *newWidget(); + Gtk::Widget *newWidget() override; void updateIndex(); @@ -46,7 +46,7 @@ public: void reset(); protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; private: ToggleButtonParam elastic; diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h index e762030d7..1ee9acce0 100644 --- a/src/live_effects/lpe-vonkoch.h +++ b/src/live_effects/lpe-vonkoch.h @@ -26,8 +26,8 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){} - virtual ~VonKochPathParam(){} - virtual void param_setup_nodepath(Inkscape::NodePath::Path *np); + ~VonKochPathParam() override{} + void param_setup_nodepath(Inkscape::NodePath::Path *np) override; }; //FIXME: a path is used here instead of 2 points to work around path/point param incompatibility bug. @@ -39,21 +39,21 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){} - virtual ~VonKochRefPathParam(){} - virtual void param_setup_nodepath(Inkscape::NodePath::Path *np); - virtual bool param_readSVGValue(const gchar * strvalue); + ~VonKochRefPathParam() override{} + void param_setup_nodepath(Inkscape::NodePath::Path *np) override; + bool param_readSVGValue(const gchar * strvalue) override; }; class LPEVonKoch : public Effect, GroupBBoxEffect { public: LPEVonKoch(LivePathEffectObject *lpeobject); - virtual ~LPEVonKoch(); + ~LPEVonKoch() override; - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; - virtual void resetDefaults(SPItem const* item); + void resetDefaults(SPItem const* item) override; - virtual void doBeforeEffect(SPLPEItem const* item); + void doBeforeEffect(SPLPEItem const* item) override; //Useful?? // protected: diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h index f22bea2b5..328fa9eaf 100644 --- a/src/live_effects/lpeobject-reference.h +++ b/src/live_effects/lpeobject-reference.h @@ -29,7 +29,7 @@ namespace LivePathEffect { class LPEObjectReference : public Inkscape::URIReference { public: LPEObjectReference(SPObject *owner); - virtual ~LPEObjectReference(); + ~LPEObjectReference() override; SPObject *owner; @@ -50,7 +50,7 @@ public: void (*user_unlink) (LPEObjectReference *me, SPObject *user); protected: - bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; }; diff --git a/src/live_effects/lpeobject.h b/src/live_effects/lpeobject.h index 9a95775aa..3f510edf9 100644 --- a/src/live_effects/lpeobject.h +++ b/src/live_effects/lpeobject.h @@ -30,7 +30,7 @@ namespace Inkscape { class LivePathEffectObject : public SPObject { public: LivePathEffectObject(); - virtual ~LivePathEffectObject(); + ~LivePathEffectObject() override; Inkscape::LivePathEffect::EffectType effecttype; @@ -50,12 +50,12 @@ public: Inkscape::LivePathEffect::Effect *lpe; // this can be NULL in a valid LivePathEffectObject protected: - virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void release(); + void build(SPDocument* doc, Inkscape::XML::Node* repr) override; + void release() override; - virtual void set(unsigned int key, char const* value); + void set(unsigned int key, char const* value) override; - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; #endif diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h index b5ee8b5cf..be19889b3 100644 --- a/src/live_effects/parameter/array.h +++ b/src/live_effects/parameter/array.h @@ -37,7 +37,7 @@ public: } - virtual ~ArrayParam() { + ~ArrayParam() override { }; @@ -45,11 +45,11 @@ public: return _vector; } - virtual Gtk::Widget * param_newWidget() { + Gtk::Widget * param_newWidget() override { return NULL; } - virtual bool param_readSVGValue(const gchar * strvalue) { + bool param_readSVGValue(const gchar * strvalue) override { _vector.clear(); gchar ** strarray = g_strsplit(strvalue, "|", 0); gchar ** iter = strarray; @@ -60,14 +60,14 @@ public: g_strfreev (strarray); return true; } - virtual void param_update_default(const gchar * default_value){}; - virtual gchar * param_getSVGValue() const { + void param_update_default(const gchar * default_value) override{}; + gchar * param_getSVGValue() const override { Inkscape::SVGOStringStream os; writesvg(os, _vector); return g_strdup(os.str().c_str()); } - virtual gchar * param_getDefaultSVGValue() const { + gchar * param_getDefaultSVGValue() const override { return g_strdup(""); } @@ -75,7 +75,7 @@ public: _vector = new_vector; } - void param_set_default() { + void param_set_default() override { param_setValue( std::vector<StorageType>(_default_size) ); } diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h index 2437c97c7..dd474302c 100644 --- a/src/live_effects/parameter/bool.h +++ b/src/live_effects/parameter/bool.h @@ -26,18 +26,18 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, bool default_value = false); - virtual ~BoolParam(); + ~BoolParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(bool newvalue); - virtual void param_set_default(); + void param_set_default() override; void param_update_default(bool const default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; bool get_value() const { return value; }; inline operator bool() const { return value; }; diff --git a/src/live_effects/parameter/colorpicker.h b/src/live_effects/parameter/colorpicker.h index 34b11284f..965435fba 100644 --- a/src/live_effects/parameter/colorpicker.h +++ b/src/live_effects/parameter/colorpicker.h @@ -22,17 +22,17 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const guint32 default_color = 0x000000ff); - virtual ~ColorPickerParam() {} + ~ColorPickerParam() override {} - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - void param_update_default(const gchar * default_value); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + void param_update_default(const gchar * default_value) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(guint32 newvalue); - virtual void param_set_default(); + void param_set_default() override; const guint32 get_value() const { return value; }; diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h index eef176591..354eb74f6 100644 --- a/src/live_effects/parameter/enum.h +++ b/src/live_effects/parameter/enum.h @@ -37,9 +37,9 @@ public: sorted = sort; }; - virtual ~EnumParam() { }; + ~EnumParam() override { }; - virtual Gtk::Widget * param_newWidget() { + Gtk::Widget * param_newWidget() override { Inkscape::UI::Widget::RegisteredEnum<E> *regenum = Gtk::manage ( new Inkscape::UI::Widget::RegisteredEnum<E>( param_label, param_tooltip, param_key, *enumdataconv, *param_wr, param_effect->getRepr(), param_effect->getSPDoc(), sorted ) ); @@ -50,7 +50,7 @@ public: return dynamic_cast<Gtk::Widget *> (regenum); }; - bool param_readSVGValue(const gchar * strvalue) { + bool param_readSVGValue(const gchar * strvalue) override { if (!strvalue) { param_set_default(); return true; @@ -60,11 +60,11 @@ public: return true; }; - gchar * param_getSVGValue() const { + gchar * param_getSVGValue() const override { return g_strdup( enumdataconv->get_key(value).c_str() ); }; - gchar * param_getDefaultSVGValue() const { + gchar * param_getDefaultSVGValue() const override { return g_strdup( enumdataconv->get_key(defvalue).c_str() ); }; @@ -76,7 +76,7 @@ public: return value; }; - void param_set_default() { + void param_set_default() override { param_set_value(defvalue); } @@ -84,7 +84,7 @@ public: defvalue = default_value; } - virtual void param_update_default(const gchar * default_value) { + void param_update_default(const gchar * default_value) override { param_update_default(enumdataconv->get_id_from_key(Glib::ustring(default_value))); } diff --git a/src/live_effects/parameter/fontbutton.h b/src/live_effects/parameter/fontbutton.h index f028492a7..466202ee1 100644 --- a/src/live_effects/parameter/fontbutton.h +++ b/src/live_effects/parameter/fontbutton.h @@ -22,17 +22,17 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const Glib::ustring default_value = "Sans 10"); - virtual ~FontButtonParam() {} + ~FontButtonParam() override {} - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - void param_update_default(const gchar * default_value); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + void param_update_default(const gchar * default_value) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(Glib::ustring newvalue); - virtual void param_set_default(); + void param_set_default() override; const Glib::ustring get_value() const { return defvalue; }; diff --git a/src/live_effects/parameter/hidden.h b/src/live_effects/parameter/hidden.h index e6df8ceea..df55bfb5a 100644 --- a/src/live_effects/parameter/hidden.h +++ b/src/live_effects/parameter/hidden.h @@ -31,17 +31,17 @@ public: Effect* effect, const Glib::ustring default_value = "", bool widget_is_visible = false); - virtual ~HiddenParam() {} + ~HiddenParam() override {} - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(Glib::ustring newvalue, bool write = false); - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + void param_set_default() override; + void param_update_default(const gchar * default_value) override; const Glib::ustring get_value() const { return value; }; diff --git a/src/live_effects/parameter/item-reference.h b/src/live_effects/parameter/item-reference.h index 603453ec5..50d4f9dab 100644 --- a/src/live_effects/parameter/item-reference.h +++ b/src/live_effects/parameter/item-reference.h @@ -29,7 +29,7 @@ public: } protected: - virtual bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; private: ItemReference(const ItemReference&) = delete; diff --git a/src/live_effects/parameter/item.h b/src/live_effects/parameter/item.h index 7ccfc6a9f..dca7f7cb6 100644 --- a/src/live_effects/parameter/item.h +++ b/src/live_effects/parameter/item.h @@ -29,16 +29,16 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = ""); - virtual ~ItemParam(); - virtual Gtk::Widget * param_newWidget(); - - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + ~ItemParam() override; + Gtk::Widget * param_newWidget() override; + + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; + void param_update_default(const gchar * default_value) override; void param_set_and_write_default(); - virtual void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec) override; sigc::signal <void> signal_item_pasted; sigc::signal <void> signal_item_changed; Geom::Affine last_transform; diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h index 255f4b016..bbee74998 100644 --- a/src/live_effects/parameter/message.h +++ b/src/live_effects/parameter/message.h @@ -22,17 +22,17 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_message = "Default message"); - virtual ~MessageParam() {} + ~MessageParam() override {} - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - void param_update_default(const gchar * default_value); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + void param_update_default(const gchar * default_value) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(const gchar * message); - virtual void param_set_default(); + void param_set_default() override; void param_set_min_height(int height); const gchar * get_value() const { return message; }; diff --git a/src/live_effects/parameter/originalitem.h b/src/live_effects/parameter/originalitem.h index 23720c74a..4b285f8e1 100644 --- a/src/live_effects/parameter/originalitem.h +++ b/src/live_effects/parameter/originalitem.h @@ -22,15 +22,15 @@ public: const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalItemParam(); + ~OriginalItemParam() override; bool linksToItem() const { return (href != NULL); } SPItem * getObject() const { return ref.getObject(); } - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; protected: - virtual void linked_modified_callback(SPObject *linked_obj, guint flags); - virtual void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item); + void linked_modified_callback(SPObject *linked_obj, guint flags) override; + void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item) override; void on_select_original_button_click(); diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp index a801d25f6..5a0d67d26 100644 --- a/src/live_effects/parameter/originalitemarray.cpp +++ b/src/live_effects/parameter/originalitemarray.cpp @@ -46,7 +46,7 @@ public: add(_colLabel); add(_colActive); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<ItemAndActive*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/live_effects/parameter/originalitemarray.h b/src/live_effects/parameter/originalitemarray.h index ac5e486ea..edb5a3be5 100644 --- a/src/live_effects/parameter/originalitemarray.h +++ b/src/live_effects/parameter/originalitemarray.h @@ -58,18 +58,18 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalItemArrayParam(); - - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value){}; + ~OriginalItemArrayParam() override; + + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; + void param_update_default(const gchar * default_value) override{}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {}; + void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) override {}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) {}; + void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) override {}; std::vector<ItemAndActive*> _vector; diff --git a/src/live_effects/parameter/originalpath.h b/src/live_effects/parameter/originalpath.h index 6e9888d42..bd7b10741 100644 --- a/src/live_effects/parameter/originalpath.h +++ b/src/live_effects/parameter/originalpath.h @@ -22,21 +22,21 @@ public: const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalPathParam(); + ~OriginalPathParam() override; bool linksToPath() const { return (href != NULL); } SPItem * getObject() const { return ref.getObject(); } - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {}; + void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) override {}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) {}; + void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) override {}; void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; }; protected: - virtual void linked_modified_callback(SPObject *linked_obj, guint flags); - virtual void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item); + void linked_modified_callback(SPObject *linked_obj, guint flags) override; + void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item) override; void on_select_original_button_click(); diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index 70f17ccb8..2091c4d71 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -57,7 +57,7 @@ public: add(_colReverse); add(_colVisible); } - virtual ~ModelColumns() {} + ~ModelColumns() override {} Gtk::TreeModelColumn<PathAndDirectionAndVisible*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/live_effects/parameter/originalpatharray.h b/src/live_effects/parameter/originalpatharray.h index 36d5b78a6..92edff103 100644 --- a/src/live_effects/parameter/originalpatharray.h +++ b/src/live_effects/parameter/originalpatharray.h @@ -62,18 +62,18 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~OriginalPathArrayParam(); - - virtual Gtk::Widget * param_newWidget(); - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value){}; + ~OriginalPathArrayParam() override; + + Gtk::Widget * param_newWidget() override; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; + void param_update_default(const gchar * default_value) override{}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {}; + void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) override {}; /** Disable the canvas indicators of parent class by overriding this method */ - virtual void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) {}; + void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) override {}; void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; update();}; void allowOnlyBsplineSpiro(bool allow_only_bspline_spiro){ _allow_only_bspline_spiro = allow_only_bspline_spiro; update();}; diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h index 33d91d4df..a956a9ed4 100644 --- a/src/live_effects/parameter/parameter.h +++ b/src/live_effects/parameter/parameter.h @@ -106,15 +106,15 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, gdouble default_value = 1.0); - virtual ~ScalarParam(); + ~ScalarParam() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; - virtual void param_set_default(); + void param_set_default() override; void param_update_default(gdouble default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; void param_set_value(gdouble val); void param_make_integer(bool yes = true); void param_set_range(gdouble min, gdouble max); @@ -124,7 +124,7 @@ public: double param_get_max() { return max; }; double param_get_min() { return min; }; void param_set_undo(bool set_undo); - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; inline operator gdouble() const { return value; }; diff --git a/src/live_effects/parameter/path-reference.h b/src/live_effects/parameter/path-reference.h index ccd94dd1d..8f8382b80 100644 --- a/src/live_effects/parameter/path-reference.h +++ b/src/live_effects/parameter/path-reference.h @@ -29,7 +29,7 @@ public: } protected: - virtual bool _acceptObject(SPObject * const obj) const; + bool _acceptObject(SPObject * const obj) const override; private: PathReference(const PathReference&) = delete; diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h index 998874980..97f97d3dd 100644 --- a/src/live_effects/parameter/path.h +++ b/src/live_effects/parameter/path.h @@ -29,28 +29,28 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"); - virtual ~PathParam(); + ~PathParam() override; Geom::PathVector const & get_pathvector() const; Geom::Piecewise<Geom::D2<Geom::SBasis> > const & get_pwd2(); - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + void param_set_default() override; + void param_update_default(const gchar * default_value) override; void param_set_and_write_default(); void set_new_value (Geom::PathVector const &newpath, bool write_to_svg); void set_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &newpath, bool write_to_svg); void set_buttons(bool edit_button, bool copy_button, bool paste_button, bool link_button); - virtual void param_editOncanvas(SPItem * item, SPDesktop * dt); - virtual void param_setup_nodepath(Inkscape::NodePath::Path *np); - virtual void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec); + void param_editOncanvas(SPItem * item, SPDesktop * dt) override; + void param_setup_nodepath(Inkscape::NodePath::Path *np) override; + void addCanvasIndicators(SPLPEItem const* lpeitem, std::vector<Geom::PathVector> &hp_vec) override; - virtual void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/); + void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/) override; void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; }; sigc::signal <void> signal_path_pasted; diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp index b811b7f2b..fe0699a19 100644 --- a/src/live_effects/parameter/point.cpp +++ b/src/live_effects/parameter/point.cpp @@ -185,11 +185,11 @@ PointParam::set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint class PointParamKnotHolderEntity : public KnotHolderEntity { public: PointParamKnotHolderEntity(PointParam *p) { this->pparam = p; } - virtual ~PointParamKnotHolderEntity() { this->pparam->_knot_entity = NULL;} + ~PointParamKnotHolderEntity() override { this->pparam->_knot_entity = NULL;} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; - virtual void knot_click(guint state); + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; + void knot_click(guint state) override; private: PointParam *pparam; diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h index 9d4164c9b..4f93b5354 100644 --- a/src/live_effects/parameter/point.h +++ b/src/live_effects/parameter/point.h @@ -32,28 +32,28 @@ public: const gchar *handle_tip = NULL,// tip for automatically associated on-canvas handle Geom::Point default_value = Geom::Point(0,0), bool live_update = true ); - virtual ~PointParam(); + ~PointParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - bool param_readSVGValue(const gchar * strvalue); - gchar * param_getSVGValue() const; - gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; inline const gchar *handleTip() const { return handle_tip ? handle_tip : param_tooltip.c_str(); } void param_setValue(Geom::Point newpoint, bool write = false); - void param_set_default(); + void param_set_default() override; void param_hide_knot(bool hide); Geom::Point param_get_default() const; void param_set_liveupdate(bool live_update); void param_update_default(Geom::Point default_point); - virtual void param_update_default(const gchar * default_point); - virtual void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/); + void param_update_default(const gchar * default_point) override; + void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/) override; void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); - virtual bool providesKnotHolderEntities() const { return true; } - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + bool providesKnotHolderEntities() const override { return true; } + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; friend class PointParamKnotHolderEntity; private: PointParam(const PointParam&) = delete; diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h index d028d706d..a3712c2d2 100644 --- a/src/live_effects/parameter/powerstrokepointarray.h +++ b/src/live_effects/parameter/powerstrokepointarray.h @@ -27,20 +27,20 @@ public: const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~PowerStrokePointArrayParam(); + ~PowerStrokePointArrayParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual void param_transform_multiply(Geom::Affine const& postmul, bool /*set*/); + void param_transform_multiply(Geom::Affine const& postmul, bool /*set*/) override; void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); float median_width(); - virtual bool providesKnotHolderEntities() const { return true; } - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); - virtual void param_update_default(const gchar * default_value){}; + bool providesKnotHolderEntities() const override { return true; } + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; + void param_update_default(const gchar * default_value) override{}; void set_pwd2(Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in, Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_normal_in); Geom::Piecewise<Geom::D2<Geom::SBasis> > const & get_pwd2() const { return last_pwd2; } @@ -67,12 +67,12 @@ private: class PowerStrokePointArrayParamKnotHolderEntity : public KnotHolderEntity { public: PowerStrokePointArrayParamKnotHolderEntity(PowerStrokePointArrayParam *p, unsigned int index); - virtual ~PowerStrokePointArrayParamKnotHolderEntity() {} + ~PowerStrokePointArrayParamKnotHolderEntity() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; + void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; + Geom::Point knot_get() const override; virtual void knot_set_offset(Geom::Point offset); - virtual void knot_click(guint state); + void knot_click(guint state) override; /** Checks whether the index falls within the size of the parameter's vector */ bool valid_index(unsigned int index) const { diff --git a/src/live_effects/parameter/random.h b/src/live_effects/parameter/random.h index 9f0114ad2..ae037083a 100644 --- a/src/live_effects/parameter/random.h +++ b/src/live_effects/parameter/random.h @@ -27,20 +27,20 @@ public: Effect* effect, gdouble default_value = 1.0, long default_seed = 0); - virtual ~RandomParam(); + ~RandomParam() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; void param_set_value(gdouble val, long newseed); void param_make_integer(bool yes = true); void param_set_range(gdouble min, gdouble max); void param_update_default(gdouble default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; void resetRandomizer(); operator gdouble(); inline gdouble get_value() { return value; } ; diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h index e7d61af22..30e196e41 100644 --- a/src/live_effects/parameter/satellitesarray.h +++ b/src/live_effects/parameter/satellitesarray.h @@ -36,21 +36,21 @@ public: const Glib::ustring &key, Inkscape::UI::Widget::Registry *wr, Effect *effect); - virtual Gtk::Widget *param_newWidget() + Gtk::Widget *param_newWidget() override { return NULL; } virtual void setHelperSize(int hs); - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item, bool mirror); - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); + void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override; virtual void updateCanvasIndicators(); virtual void updateCanvasIndicators(bool mirror); - virtual bool providesKnotHolderEntities() const + bool providesKnotHolderEntities() const override { return true; } - void param_transform_multiply(Geom::Affine const &postmul, bool /*set*/); + void param_transform_multiply(Geom::Affine const &postmul, bool /*set*/) override; void setUseDistance(bool use_knot_distance); void setCurrentZoom(double current_zoom); void setGlobalKnotHide(bool global_knot_hide); @@ -85,15 +85,15 @@ private: class FilletChamferKnotHolderEntity : public KnotHolderEntity { public: FilletChamferKnotHolderEntity(SatellitesArrayParam *p, size_t index); - virtual ~FilletChamferKnotHolderEntity() + ~FilletChamferKnotHolderEntity() override { _pparam->_knoth = NULL; } - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, - guint state); - virtual Geom::Point knot_get() const; - virtual void knot_click(guint state); + void knot_set(Geom::Point const &p, Geom::Point const &origin, + guint state) override; + Geom::Point knot_get() const override; + void knot_click(guint state) override; void knot_set_offset(Satellite); /** Checks whether the index falls within the size of the parameter's vector */ diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h index 51651edcf..cd1176bc2 100644 --- a/src/live_effects/parameter/text.h +++ b/src/live_effects/parameter/text.h @@ -32,19 +32,19 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const Glib::ustring default_value = ""); - virtual ~TextParam() {} + ~TextParam() override {} - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(Glib::ustring newvalue); void param_hide_canvas_text(); void setTextParam(Inkscape::UI::Widget::RegisteredText *rsu); - virtual void param_set_default(); - virtual void param_update_default(const gchar * default_value); + void param_set_default() override; + void param_update_default(const gchar * default_value) override; void setPos(Geom::Point pos); void setPosAndAnchor(const Geom::Piecewise<Geom::D2<Geom::SBasis> > &pwd2, const double t, const double length, bool use_curvature = false); @@ -75,7 +75,7 @@ public: TextParamInternal(Effect* effect) : TextParam("", "", "", NULL, effect) {} - virtual Gtk::Widget * param_newWidget() { return NULL; } + Gtk::Widget * param_newWidget() override { return NULL; } }; } //namespace LivePathEffect diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h index 6d42c5155..7476698f5 100644 --- a/src/live_effects/parameter/togglebutton.h +++ b/src/live_effects/parameter/togglebutton.h @@ -34,16 +34,16 @@ public: char const * icon_active = NULL, char const * icon_inactive = NULL, GtkIconSize icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR); - virtual ~ToggleButtonParam(); + ~ToggleButtonParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; void param_setValue(bool newvalue); - virtual void param_set_default(); + void param_set_default() override; bool get_value() const { return value; }; @@ -52,7 +52,7 @@ public: sigc::signal<void>& signal_toggled() { return _signal_toggled; } virtual void toggled(); void param_update_default(bool default_value); - virtual void param_update_default(const gchar * default_value); + void param_update_default(const gchar * default_value) override; private: ToggleButtonParam(const ToggleButtonParam&) = delete; diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp index ab66e7256..d94f8964c 100644 --- a/src/live_effects/parameter/transformedpoint.cpp +++ b/src/live_effects/parameter/transformedpoint.cpp @@ -165,18 +165,18 @@ TransformedPointParam::set_oncanvas_color(guint32 color) class TransformedPointParamKnotHolderEntity_Vector : public KnotHolderEntity { public: TransformedPointParamKnotHolderEntity_Vector(TransformedPointParam *p) : param(p) { } - virtual ~TransformedPointParamKnotHolderEntity_Vector() {} + ~TransformedPointParamKnotHolderEntity_Vector() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) { + void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override { Geom::Point const s = p - param->origin; /// @todo implement angle snapping when holding CTRL param->setVector(s); sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false); }; - virtual Geom::Point knot_get() const{ + Geom::Point knot_get() const override{ return param->origin + param->vector; }; - virtual void knot_click(guint /*state*/){ + void knot_click(guint /*state*/) override{ g_print ("This is the vector handle associated to parameter '%s'\n", param->param_key.c_str()); }; diff --git a/src/live_effects/parameter/transformedpoint.h b/src/live_effects/parameter/transformedpoint.h index b2d3203ac..e732146a8 100644 --- a/src/live_effects/parameter/transformedpoint.h +++ b/src/live_effects/parameter/transformedpoint.h @@ -30,32 +30,32 @@ public: Effect* effect, Geom::Point default_vector = Geom::Point(1,0), bool dontTransform = false); - virtual ~TransformedPointParam(); + ~TransformedPointParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; inline const gchar *handleTip() const { return param_tooltip.c_str(); } - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; Geom::Point getVector() const { return vector; }; Geom::Point getOrigin() const { return origin; }; void setValues(Geom::Point const &new_origin, Geom::Point const &new_vector) { setVector(new_vector); setOrigin(new_origin); }; void setVector(Geom::Point const &new_vector) { vector = new_vector; }; void setOrigin(Geom::Point const &new_origin) { origin = new_origin; }; - virtual void param_set_default(); + void param_set_default() override; void set_and_write_new_values(Geom::Point const &new_origin, Geom::Point const &new_vector); - virtual void param_transform_multiply(Geom::Affine const &postmul, bool set); + void param_transform_multiply(Geom::Affine const &postmul, bool set) override; void set_vector_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); void set_oncanvas_color(guint32 color); Geom::Point param_get_default() { return defvalue; } void param_update_default(Geom::Point default_point); - virtual void param_update_default(const gchar * default_point); - virtual bool providesKnotHolderEntities() const { return true; } + void param_update_default(const gchar * default_point) override; + bool providesKnotHolderEntities() const override { return true; } virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); private: diff --git a/src/live_effects/parameter/unit.h b/src/live_effects/parameter/unit.h index 8e3e3cb69..97514248e 100644 --- a/src/live_effects/parameter/unit.h +++ b/src/live_effects/parameter/unit.h @@ -27,16 +27,16 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, Glib::ustring default_unit = "px"); - virtual ~UnitParam(); + ~UnitParam() override; - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; - virtual void param_set_default(); + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; + void param_set_default() override; void param_set_value(Inkscape::Util::Unit const &val); - virtual void param_update_default(const gchar * default_unit); + void param_update_default(const gchar * default_unit) override; const gchar *get_abbreviation() const; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; operator Inkscape::Util::Unit const *() const { return unit; } diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp index 1207a05da..56895276c 100644 --- a/src/live_effects/parameter/vector.cpp +++ b/src/live_effects/parameter/vector.cpp @@ -172,17 +172,17 @@ VectorParam::set_oncanvas_color(guint32 color) class VectorParamKnotHolderEntity_Origin : public KnotHolderEntity { public: VectorParamKnotHolderEntity_Origin(VectorParam *p) : param(p) { } - virtual ~VectorParamKnotHolderEntity_Origin() {} + ~VectorParamKnotHolderEntity_Origin() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { + void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) override { Geom::Point const s = snap_knot_position(p, state); param->setOrigin(s); sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false); }; - virtual Geom::Point knot_get() const { + Geom::Point knot_get() const override { return param->origin; }; - virtual void knot_click(guint /*state*/){ + void knot_click(guint /*state*/) override{ g_print ("This is the origin handle associated to parameter '%s'\n", param->param_key.c_str()); }; @@ -193,18 +193,18 @@ private: class VectorParamKnotHolderEntity_Vector : public KnotHolderEntity { public: VectorParamKnotHolderEntity_Vector(VectorParam *p) : param(p) { } - virtual ~VectorParamKnotHolderEntity_Vector() {} + ~VectorParamKnotHolderEntity_Vector() override {} - virtual void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) { + void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override { Geom::Point const s = p - param->origin; /// @todo implement angle snapping when holding CTRL param->setVector(s); sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false); }; - virtual Geom::Point knot_get() const { + Geom::Point knot_get() const override { return param->origin + param->vector; }; - virtual void knot_click(guint /*state*/){ + void knot_click(guint /*state*/) override{ g_print ("This is the vector handle associated to parameter '%s'\n", param->param_key.c_str()); }; diff --git a/src/live_effects/parameter/vector.h b/src/live_effects/parameter/vector.h index 412d4f0bb..059f706e4 100644 --- a/src/live_effects/parameter/vector.h +++ b/src/live_effects/parameter/vector.h @@ -29,33 +29,33 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, Geom::Point default_vector = Geom::Point(1,0) ); - virtual ~VectorParam(); + ~VectorParam() override; - virtual Gtk::Widget * param_newWidget(); + Gtk::Widget * param_newWidget() override; inline const gchar *handleTip() const { return param_tooltip.c_str(); } - virtual bool param_readSVGValue(const gchar * strvalue); - virtual gchar * param_getSVGValue() const; - virtual gchar * param_getDefaultSVGValue() const; + bool param_readSVGValue(const gchar * strvalue) override; + gchar * param_getSVGValue() const override; + gchar * param_getDefaultSVGValue() const override; Geom::Point getVector() const { return vector; }; Geom::Point getOrigin() const { return origin; }; void setValues(Geom::Point const &new_origin, Geom::Point const &new_vector) { setVector(new_vector); setOrigin(new_origin); }; void setVector(Geom::Point const &new_vector) { vector = new_vector; }; void setOrigin(Geom::Point const &new_origin) { origin = new_origin; }; - virtual void param_set_default(); + void param_set_default() override; void set_and_write_new_values(Geom::Point const &new_origin, Geom::Point const &new_vector); - virtual void param_transform_multiply(Geom::Affine const &postmul, bool set); + void param_transform_multiply(Geom::Affine const &postmul, bool set) override; void set_vector_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); void set_origin_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); void set_oncanvas_color(guint32 color); void param_update_default(Geom::Point default_point); - virtual void param_update_default(const gchar * default_point); - virtual bool providesKnotHolderEntities() const { return true; } - virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); + void param_update_default(const gchar * default_point) override; + bool providesKnotHolderEntities() const override { return true; } + void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item) override; private: VectorParam(const VectorParam&) = delete; diff --git a/src/live_effects/spiro-converters.h b/src/live_effects/spiro-converters.h index b6b1c8da8..7def6d23d 100644 --- a/src/live_effects/spiro-converters.h +++ b/src/live_effects/spiro-converters.h @@ -27,10 +27,10 @@ public: : _curve(curve) {} - virtual void moveto(double x, double y); - virtual void lineto(double x, double y, bool close_last); - virtual void quadto(double x1, double y1, double x2, double y2, bool close_last); - virtual void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last); + void moveto(double x, double y) override; + void lineto(double x, double y, bool close_last) override; + void quadto(double x1, double y1, double x2, double y2, bool close_last) override; + void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) override; private: SPCurve &_curve; @@ -47,10 +47,10 @@ class ConverterPath : public ConverterBase { public: ConverterPath(Geom::Path &path); - virtual void moveto(double x, double y); - virtual void lineto(double x, double y, bool close_last); - virtual void quadto(double x1, double y1, double x2, double y2, bool close_last); - virtual void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last); + void moveto(double x, double y) override; + void lineto(double x, double y, bool close_last) override; + void quadto(double x1, double y1, double x2, double y2, bool close_last) override; + void curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) override; private: Geom::Path &_path; |
