diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-15 17:02:56 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-06-18 12:27:01 +0000 |
| commit | 004e50d84773242a000f5cadb89466bbc793e1a8 (patch) | |
| tree | 019c32e65caa08fe7cf90b521787531a7b1d2225 /src/live_effects | |
| parent | Run clang-tidy’s modernize-use-nullptr pass. (diff) | |
| download | inkscape-004e50d84773242a000f5cadb89466bbc793e1a8.tar.gz inkscape-004e50d84773242a000f5cadb89466bbc793e1a8.zip | |
Run clang-tidy’s modernize-use-equals-default pass.
This replaces empty constructors and destructors with the default
keyword.
Diffstat (limited to 'src/live_effects')
79 files changed, 95 insertions, 190 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index bef7a1e3f..6251740d5 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -410,8 +410,7 @@ Effect::Effect(LivePathEffectObject *lpeobject) } Effect::~Effect() -{ -} += default; Glib::ustring Effect::getName() const diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp index 150bb4124..f7c7928c6 100644 --- a/src/live_effects/lpe-angle_bisector.cpp +++ b/src/live_effects/lpe-angle_bisector.cpp @@ -50,8 +50,7 @@ LPEAngleBisector::LPEAngleBisector(LivePathEffectObject *lpeobject) : } LPEAngleBisector::~LPEAngleBisector() -{ -} += default; Geom::PathVector LPEAngleBisector::doEffect_path (Geom::PathVector const & path_in) diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp index ea2965c6a..9ab832c5e 100644 --- a/src/live_effects/lpe-attach-path.cpp +++ b/src/live_effects/lpe-attach-path.cpp @@ -42,9 +42,7 @@ LPEAttachPath::LPEAttachPath(LivePathEffectObject *lpeobject) : } LPEAttachPath::~LPEAttachPath() -{ - -} += default; void LPEAttachPath::resetDefaults(SPItem const * /*item*/) { diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index 69415cf4e..6bf555156 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -78,9 +78,7 @@ LPEBendPath::LPEBendPath(LivePathEffectObject *lpeobject) : } LPEBendPath::~LPEBendPath() -{ - -} += default; void LPEBendPath::doBeforeEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp index 865968b30..eb8918555 100644 --- a/src/live_effects/lpe-bool.cpp +++ b/src/live_effects/lpe-bool.cpp @@ -86,9 +86,7 @@ LPEBool::LPEBool(LivePathEffectObject *lpeobject) : } LPEBool::~LPEBool() -{ - -} += default; void LPEBool::resetDefaults(SPItem const * /*item*/) { diff --git a/src/live_effects/lpe-bounding-box.cpp b/src/live_effects/lpe-bounding-box.cpp index ba519f1c6..b7b2e596d 100644 --- a/src/live_effects/lpe-bounding-box.cpp +++ b/src/live_effects/lpe-bounding-box.cpp @@ -25,9 +25,7 @@ LPEBoundingBox::LPEBoundingBox(LivePathEffectObject *lpeobject) : } LPEBoundingBox::~LPEBoundingBox() -{ - -} += default; void LPEBoundingBox::doEffect (SPCurve * curve) { diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp index 04182e84b..77c5ae66c 100644 --- a/src/live_effects/lpe-bspline.cpp +++ b/src/live_effects/lpe-bspline.cpp @@ -56,7 +56,7 @@ LPEBSpline::LPEBSpline(LivePathEffectObject *lpeobject) helper_size.param_set_digits(2); } -LPEBSpline::~LPEBSpline() {} +LPEBSpline::~LPEBSpline() = default; void LPEBSpline::doBeforeEffect (SPLPEItem const* /*lpeitem*/) { diff --git a/src/live_effects/lpe-circle_3pts.cpp b/src/live_effects/lpe-circle_3pts.cpp index c49d5ca4d..2f601fb00 100644 --- a/src/live_effects/lpe-circle_3pts.cpp +++ b/src/live_effects/lpe-circle_3pts.cpp @@ -29,8 +29,7 @@ LPECircle3Pts::LPECircle3Pts(LivePathEffectObject *lpeobject) : } LPECircle3Pts::~LPECircle3Pts() -{ -} += default; static void _circle3(Geom::Point const &A, Geom::Point const &B, Geom::Point const &C, Geom::PathVector &path_out) { using namespace Geom; diff --git a/src/live_effects/lpe-circle_with_radius.cpp b/src/live_effects/lpe-circle_with_radius.cpp index fcefc4ec6..99ade0da1 100644 --- a/src/live_effects/lpe-circle_with_radius.cpp +++ b/src/live_effects/lpe-circle_with_radius.cpp @@ -35,9 +35,7 @@ LPECircleWithRadius::LPECircleWithRadius(LivePathEffectObject *lpeobject) : } LPECircleWithRadius::~LPECircleWithRadius() -{ - -} += default; Geom::PathVector LPECircleWithRadius::doEffect_path (Geom::PathVector const & path_in) diff --git a/src/live_effects/lpe-constructgrid.cpp b/src/live_effects/lpe-constructgrid.cpp index db620fa95..4759dde5f 100644 --- a/src/live_effects/lpe-constructgrid.cpp +++ b/src/live_effects/lpe-constructgrid.cpp @@ -34,9 +34,7 @@ LPEConstructGrid::LPEConstructGrid(LivePathEffectObject *lpeobject) : } LPEConstructGrid::~LPEConstructGrid() -{ - -} += default; Geom::PathVector LPEConstructGrid::doEffect_path (Geom::PathVector const & path_in) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 909bd411e..f74e76211 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -104,9 +104,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : } LPECopyRotate::~LPECopyRotate() -{ - -} += default; void LPECopyRotate::doAfterEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp index 1ee29bbaf..d5947be4d 100644 --- a/src/live_effects/lpe-curvestitch.cpp +++ b/src/live_effects/lpe-curvestitch.cpp @@ -60,9 +60,7 @@ LPECurveStitch::LPECurveStitch(LivePathEffectObject *lpeobject) : } LPECurveStitch::~LPECurveStitch() -{ - -} += default; Geom::PathVector LPECurveStitch::doEffect_path (Geom::PathVector const & path_in) diff --git a/src/live_effects/lpe-dash-stroke.cpp b/src/live_effects/lpe-dash-stroke.cpp index 43aa04e11..dd30d05a4 100644 --- a/src/live_effects/lpe-dash-stroke.cpp +++ b/src/live_effects/lpe-dash-stroke.cpp @@ -36,7 +36,7 @@ LPEDashStroke::LPEDashStroke(LivePathEffectObject *lpeobject) message.param_set_min_height(30); } -LPEDashStroke::~LPEDashStroke() {} +LPEDashStroke::~LPEDashStroke() = default; void LPEDashStroke::doBeforeEffect (SPLPEItem const* lpeitem){ diff --git a/src/live_effects/lpe-dynastroke.cpp b/src/live_effects/lpe-dynastroke.cpp index d0655d9bd..276fd10df 100644 --- a/src/live_effects/lpe-dynastroke.cpp +++ b/src/live_effects/lpe-dynastroke.cpp @@ -77,9 +77,7 @@ LPEDynastroke::LPEDynastroke(LivePathEffectObject *lpeobject) : } LPEDynastroke::~LPEDynastroke() -{ - -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > LPEDynastroke::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) diff --git a/src/live_effects/lpe-ellipse_5pts.cpp b/src/live_effects/lpe-ellipse_5pts.cpp index 28e7058d7..5f89644f5 100644 --- a/src/live_effects/lpe-ellipse_5pts.cpp +++ b/src/live_effects/lpe-ellipse_5pts.cpp @@ -31,8 +31,7 @@ LPEEllipse5Pts::LPEEllipse5Pts(LivePathEffectObject *lpeobject) : } LPEEllipse5Pts::~LPEEllipse5Pts() -{ -} += default; static double _det3(double (*mat)[3]) { diff --git a/src/live_effects/lpe-embrodery-stitch.cpp b/src/live_effects/lpe-embrodery-stitch.cpp index 972d29b9c..00d1928d7 100644 --- a/src/live_effects/lpe-embrodery-stitch.cpp +++ b/src/live_effects/lpe-embrodery-stitch.cpp @@ -81,9 +81,7 @@ LPEEmbroderyStitch::LPEEmbroderyStitch(LivePathEffectObject *lpeobject) : } LPEEmbroderyStitch::~LPEEmbroderyStitch() -{ - -} += default; double LPEEmbroderyStitch::GetPatternInitialStep(int pattern, int line) { diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp index 0dcae51e4..6fc9084f8 100644 --- a/src/live_effects/lpe-envelope.cpp +++ b/src/live_effects/lpe-envelope.cpp @@ -34,9 +34,7 @@ LPEEnvelope::LPEEnvelope(LivePathEffectObject *lpeobject) : } LPEEnvelope::~LPEEnvelope() -{ - -} += default; void LPEEnvelope::doBeforeEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-extrude.cpp b/src/live_effects/lpe-extrude.cpp index 0b144053e..53ecc8dfd 100644 --- a/src/live_effects/lpe-extrude.cpp +++ b/src/live_effects/lpe-extrude.cpp @@ -31,9 +31,7 @@ LPEExtrude::LPEExtrude(LivePathEffectObject *lpeobject) : } LPEExtrude::~LPEExtrude() -{ - -} += default; static bool are_colinear(Geom::Point a, Geom::Point b) { return Geom::are_near(cross(a,b), 0., 0.5); diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp index 389ddf007..886b840e6 100644 --- a/src/live_effects/lpe-fill-between-many.cpp +++ b/src/live_effects/lpe-fill-between-many.cpp @@ -51,9 +51,7 @@ LPEFillBetweenMany::LPEFillBetweenMany(LivePathEffectObject *lpeobject) : } LPEFillBetweenMany::~LPEFillBetweenMany() -{ - -} += default; void LPEFillBetweenMany::doOnApply (SPLPEItem const* lpeitem) { diff --git a/src/live_effects/lpe-fill-between-strokes.cpp b/src/live_effects/lpe-fill-between-strokes.cpp index 5f327b6a4..22dfe7e54 100644 --- a/src/live_effects/lpe-fill-between-strokes.cpp +++ b/src/live_effects/lpe-fill-between-strokes.cpp @@ -34,9 +34,7 @@ LPEFillBetweenStrokes::LPEFillBetweenStrokes(LivePathEffectObject *lpeobject) : } LPEFillBetweenStrokes::~LPEFillBetweenStrokes() -{ - -} += default; void LPEFillBetweenStrokes::doEffect (SPCurve * curve) { diff --git a/src/live_effects/lpe-gears.cpp b/src/live_effects/lpe-gears.cpp index dad520041..4566869fe 100644 --- a/src/live_effects/lpe-gears.cpp +++ b/src/live_effects/lpe-gears.cpp @@ -225,9 +225,7 @@ LPEGears::LPEGears(LivePathEffectObject *lpeobject) : } LPEGears::~LPEGears() -{ - -} += default; Geom::PathVector LPEGears::doEffect_path (Geom::PathVector const &path_in) diff --git a/src/live_effects/lpe-interpolate.cpp b/src/live_effects/lpe-interpolate.cpp index 70bc92a27..dabad013f 100644 --- a/src/live_effects/lpe-interpolate.cpp +++ b/src/live_effects/lpe-interpolate.cpp @@ -41,9 +41,7 @@ LPEInterpolate::LPEInterpolate(LivePathEffectObject *lpeobject) : } LPEInterpolate::~LPEInterpolate() -{ - -} += default; /* * interpolate path_in[0] to path_in[1] diff --git a/src/live_effects/lpe-interpolate_points.cpp b/src/live_effects/lpe-interpolate_points.cpp index 7d4c88dc1..937b92837 100644 --- a/src/live_effects/lpe-interpolate_points.cpp +++ b/src/live_effects/lpe-interpolate_points.cpp @@ -43,8 +43,7 @@ LPEInterpolatePoints::LPEInterpolatePoints(LivePathEffectObject *lpeobject) } LPEInterpolatePoints::~LPEInterpolatePoints() -{ -} += default; Geom::PathVector diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp index b58fd01da..3b233fb51 100644 --- a/src/live_effects/lpe-jointype.cpp +++ b/src/live_effects/lpe-jointype.cpp @@ -80,8 +80,7 @@ LPEJoinType::LPEJoinType(LivePathEffectObject *lpeobject) : } LPEJoinType::~LPEJoinType() -{ -} += default; //from LPEPowerStroke -- sets fill if stroke color because we will //be converting to a fill to make the new join. diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp index 8522444c6..3640e8e43 100644 --- a/src/live_effects/lpe-knot.cpp +++ b/src/live_effects/lpe-knot.cpp @@ -368,9 +368,7 @@ LPEKnot::LPEKnot(LivePathEffectObject *lpeobject) : } LPEKnot::~LPEKnot() -{ - -} += default; void LPEKnot::updateSwitcher(){ diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp index df4da4590..223afa4cd 100644 --- a/src/live_effects/lpe-lattice.cpp +++ b/src/live_effects/lpe-lattice.cpp @@ -71,9 +71,7 @@ LPELattice::LPELattice(LivePathEffectObject *lpeobject) : } LPELattice::~LPELattice() -{ - -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp index ae9ec0361..79cb1e32a 100644 --- a/src/live_effects/lpe-lattice2.cpp +++ b/src/live_effects/lpe-lattice2.cpp @@ -98,8 +98,7 @@ LPELattice2::LPELattice2(LivePathEffectObject *lpeobject) : } LPELattice2::~LPELattice2() -{ -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp index fd23da804..535fc2f47 100644 --- a/src/live_effects/lpe-line_segment.cpp +++ b/src/live_effects/lpe-line_segment.cpp @@ -36,9 +36,7 @@ LPELineSegment::LPELineSegment(LivePathEffectObject *lpeobject) : } LPELineSegment::~LPELineSegment() -{ - -} += default; void LPELineSegment::doBeforeEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 66f00689a..ae205dfc0 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -84,8 +84,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : } LPEMirrorSymmetry::~LPEMirrorSymmetry() -{ -} += default; void LPEMirrorSymmetry::doAfterEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp index 91ea9df74..aa72ef195 100644 --- a/src/live_effects/lpe-offset.cpp +++ b/src/live_effects/lpe-offset.cpp @@ -96,8 +96,7 @@ LPEOffset::LPEOffset(LivePathEffectObject *lpeobject) : } LPEOffset::~LPEOffset() -{ -} += default; static void sp_flatten(Geom::PathVector &pathvector, bool evenodd) diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp index 7c6de10bb..e927d758f 100644 --- a/src/live_effects/lpe-parallel.cpp +++ b/src/live_effects/lpe-parallel.cpp @@ -57,9 +57,7 @@ LPEParallel::LPEParallel(LivePathEffectObject *lpeobject) : } LPEParallel::~LPEParallel() -{ - -} += default; void LPEParallel::doOnApply (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-path_length.cpp b/src/live_effects/lpe-path_length.cpp index 61818a73b..b9a5282b2 100644 --- a/src/live_effects/lpe-path_length.cpp +++ b/src/live_effects/lpe-path_length.cpp @@ -33,9 +33,7 @@ LPEPathLength::LPEPathLength(LivePathEffectObject *lpeobject) : } LPEPathLength::~LPEPathLength() -{ - -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > LPEPathLength::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index dd052c796..41b0b144a 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -112,9 +112,7 @@ LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) : } LPEPatternAlongPath::~LPEPatternAlongPath() -{ - -} += default; void LPEPatternAlongPath::doBeforeEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp index 6fa874a4d..48a7f5278 100644 --- a/src/live_effects/lpe-perp_bisector.cpp +++ b/src/live_effects/lpe-perp_bisector.cpp @@ -105,8 +105,7 @@ LPEPerpBisector::LPEPerpBisector(LivePathEffectObject *lpeobject) : } LPEPerpBisector::~LPEPerpBisector() -{ -} += default; void LPEPerpBisector::doOnApply (SPLPEItem const*/*lpeitem*/) diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp index dcbf3fee7..24b0e8b01 100644 --- a/src/live_effects/lpe-perspective-envelope.cpp +++ b/src/live_effects/lpe-perspective-envelope.cpp @@ -64,8 +64,7 @@ LPEPerspectiveEnvelope::LPEPerspectiveEnvelope(LivePathEffectObject *lpeobject) } LPEPerspectiveEnvelope::~LPEPerspectiveEnvelope() -{ -} += default; void LPEPerspectiveEnvelope::doEffect(SPCurve *curve) { diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp index 857bd2952..8699731f1 100644 --- a/src/live_effects/lpe-perspective_path.cpp +++ b/src/live_effects/lpe-perspective_path.cpp @@ -66,9 +66,7 @@ LPEPerspectivePath::LPEPerspectivePath(LivePathEffectObject *lpeobject) : } LPEPerspectivePath::~LPEPerspectivePath() -{ - -} += default; void LPEPerspectivePath::doOnApply(SPLPEItem const* lpeitem) { diff --git a/src/live_effects/lpe-powerclip.cpp b/src/live_effects/lpe-powerclip.cpp index 35da3bd26..9e5da13cd 100644 --- a/src/live_effects/lpe-powerclip.cpp +++ b/src/live_effects/lpe-powerclip.cpp @@ -42,7 +42,7 @@ LPEPowerClip::LPEPowerClip(LivePathEffectObject *lpeobject) convert_shapes = false; } -LPEPowerClip::~LPEPowerClip() {} +LPEPowerClip::~LPEPowerClip() = default; void LPEPowerClip::doBeforeEffect (SPLPEItem const* lpeitem){ diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp index ac3a1dd76..72cb75dab 100644 --- a/src/live_effects/lpe-powermask.cpp +++ b/src/live_effects/lpe-powermask.cpp @@ -46,7 +46,7 @@ LPEPowerMask::LPEPowerMask(LivePathEffectObject *lpeobject) previous_color = background_color.get_value(); } -LPEPowerMask::~LPEPowerMask() {} +LPEPowerMask::~LPEPowerMask() = default; void LPEPowerMask::doBeforeEffect (SPLPEItem const* lpeitem){ diff --git a/src/live_effects/lpe-powerstroke-interpolators.h b/src/live_effects/lpe-powerstroke-interpolators.h index ce792302f..33c587a53 100644 --- a/src/live_effects/lpe-powerstroke-interpolators.h +++ b/src/live_effects/lpe-powerstroke-interpolators.h @@ -34,8 +34,8 @@ enum InterpolatorType { class Interpolator { public: - Interpolator() {}; - virtual ~Interpolator() {}; + Interpolator() = default;; + virtual ~Interpolator() = default;; static Interpolator* create(InterpolatorType type); @@ -48,8 +48,8 @@ private: class Linear : public Interpolator { public: - Linear() {}; - ~Linear() override {}; + Linear() = default;; + ~Linear() override = default;; Path interpolateToPath(std::vector<Point> const &points) const override { Path path; @@ -68,8 +68,8 @@ private: // this class is terrible class CubicBezierFit : public Interpolator { public: - CubicBezierFit() {}; - ~CubicBezierFit() override {}; + CubicBezierFit() = default;; + ~CubicBezierFit() override = default;; Path interpolateToPath(std::vector<Point> const &points) const override { unsigned int n_points = points.size(); @@ -110,7 +110,7 @@ public: CubicBezierJohan(double beta = 0.2) { _beta = beta; }; - ~CubicBezierJohan() override {}; + ~CubicBezierJohan() override = default;; Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; @@ -141,7 +141,7 @@ public: CubicBezierSmooth(double beta = 0.2) { _beta = beta; }; - ~CubicBezierSmooth() override {}; + ~CubicBezierSmooth() override = default;; Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; @@ -175,8 +175,8 @@ private: class SpiroInterpolator : public Interpolator { public: - SpiroInterpolator() {}; - ~SpiroInterpolator() override {}; + SpiroInterpolator() = default;; + ~SpiroInterpolator() override = default;; Path interpolateToPath(std::vector<Point> const &points) const override { Path fit; @@ -209,8 +209,8 @@ private: // Quick mockup for testing the behavior for powerstroke controlpoint interpolation class CentripetalCatmullRomInterpolator : public Interpolator { public: - CentripetalCatmullRomInterpolator() {}; - ~CentripetalCatmullRomInterpolator() override {}; + CentripetalCatmullRomInterpolator() = default;; + ~CentripetalCatmullRomInterpolator() override = default;; Path interpolateToPath(std::vector<Point> const &points) const override { unsigned int n_points = points.size(); diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp index ce240ab1e..32f9a6b82 100644 --- a/src/live_effects/lpe-powerstroke.cpp +++ b/src/live_effects/lpe-powerstroke.cpp @@ -200,9 +200,7 @@ LPEPowerStroke::LPEPowerStroke(LivePathEffectObject *lpeobject) : } LPEPowerStroke::~LPEPowerStroke() -{ - -} += default; void LPEPowerStroke::doBeforeEffect(SPLPEItem const *lpeItem) { diff --git a/src/live_effects/lpe-pts2ellipse.cpp b/src/live_effects/lpe-pts2ellipse.cpp index 4fd145646..2df3b2001 100644 --- a/src/live_effects/lpe-pts2ellipse.cpp +++ b/src/live_effects/lpe-pts2ellipse.cpp @@ -69,8 +69,7 @@ LPEPts2Ellipse::LPEPts2Ellipse(LivePathEffectObject *lpeobject) : } LPEPts2Ellipse::~LPEPts2Ellipse() -{ -} += default; // helper function, transforms a given value into range [0, 2pi] inline double diff --git a/src/live_effects/lpe-recursiveskeleton.cpp b/src/live_effects/lpe-recursiveskeleton.cpp index 47613f58e..75a08c250 100644 --- a/src/live_effects/lpe-recursiveskeleton.cpp +++ b/src/live_effects/lpe-recursiveskeleton.cpp @@ -33,9 +33,7 @@ LPERecursiveSkeleton::LPERecursiveSkeleton(LivePathEffectObject *lpeobject) : } LPERecursiveSkeleton::~LPERecursiveSkeleton() -{ - -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp index 79ce89c9f..80dbbc54e 100644 --- a/src/live_effects/lpe-rough-hatches.cpp +++ b/src/live_effects/lpe-rough-hatches.cpp @@ -282,9 +282,7 @@ LPERoughHatches::LPERoughHatches(LivePathEffectObject *lpeobject) : } LPERoughHatches::~LPERoughHatches() -{ - -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > LPERoughHatches::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in){ diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp index 37a94343b..de3ccef25 100644 --- a/src/live_effects/lpe-roughen.cpp +++ b/src/live_effects/lpe-roughen.cpp @@ -88,7 +88,7 @@ LPERoughen::LPERoughen(LivePathEffectObject *lpeobject) apply_to_clippath_and_mask = true; } -LPERoughen::~LPERoughen() {} +LPERoughen::~LPERoughen() = default; void LPERoughen::doBeforeEffect(SPLPEItem const *lpeitem) { diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp index 0cda15b81..8d625f88e 100644 --- a/src/live_effects/lpe-ruler.cpp +++ b/src/live_effects/lpe-ruler.cpp @@ -65,9 +65,7 @@ LPERuler::LPERuler(LivePathEffectObject *lpeobject) : } LPERuler::~LPERuler() -{ - -} += default; Geom::Point LPERuler::n_major; Geom::Point LPERuler::n_minor; diff --git a/src/live_effects/lpe-show_handles.h b/src/live_effects/lpe-show_handles.h index a5256548c..0ea9c142f 100644 --- a/src/live_effects/lpe-show_handles.h +++ b/src/live_effects/lpe-show_handles.h @@ -20,7 +20,7 @@ class LPEShowHandles : public Effect , GroupBBoxEffect { public: LPEShowHandles(LivePathEffectObject *lpeobject); - ~LPEShowHandles() override {} + ~LPEShowHandles() override = default; void doOnApply(SPLPEItem const* lpeitem) override; diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index e640475dc..bcd0e1009 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -55,7 +55,7 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject) apply_to_clippath_and_mask = true; } -LPESimplify::~LPESimplify() {} +LPESimplify::~LPESimplify() = default; void LPESimplify::doBeforeEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-skeleton.cpp b/src/live_effects/lpe-skeleton.cpp index d3c94269a..266ba2204 100644 --- a/src/live_effects/lpe-skeleton.cpp +++ b/src/live_effects/lpe-skeleton.cpp @@ -41,9 +41,7 @@ LPESkeleton::LPESkeleton(LivePathEffectObject *lpeobject) : } LPESkeleton::~LPESkeleton() -{ - -} += default; /* ######################## diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp index 1d8f7703e..4ddc56803 100644 --- a/src/live_effects/lpe-sketch.cpp +++ b/src/live_effects/lpe-sketch.cpp @@ -113,9 +113,7 @@ LPESketch::LPESketch(LivePathEffectObject *lpeobject) : } LPESketch::~LPESketch() -{ - -} += default; /* Geom::Piecewise<Geom::D2<Geom::SBasis> > diff --git a/src/live_effects/lpe-spiro.cpp b/src/live_effects/lpe-spiro.cpp index 8ea57bee4..9d0c9476f 100644 --- a/src/live_effects/lpe-spiro.cpp +++ b/src/live_effects/lpe-spiro.cpp @@ -26,8 +26,7 @@ LPESpiro::LPESpiro(LivePathEffectObject *lpeobject) : } LPESpiro::~LPESpiro() -{ -} += default; void LPESpiro::doEffect(SPCurve * curve) diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp index 6c34fc9e6..38410d45e 100644 --- a/src/live_effects/lpe-tangent_to_curve.cpp +++ b/src/live_effects/lpe-tangent_to_curve.cpp @@ -69,8 +69,7 @@ LPETangentToCurve::LPETangentToCurve(LivePathEffectObject *lpeobject) : } LPETangentToCurve::~LPETangentToCurve() -{ -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > LPETangentToCurve::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) diff --git a/src/live_effects/lpe-taperstroke.h b/src/live_effects/lpe-taperstroke.h index 5e650b9ac..518f7a1d0 100644 --- a/src/live_effects/lpe-taperstroke.h +++ b/src/live_effects/lpe-taperstroke.h @@ -28,7 +28,7 @@ class KnotHolderEntityAttachEnd; class LPETaperStroke : public Effect { public: LPETaperStroke(LivePathEffectObject *lpeobject); - ~LPETaperStroke() override {} + ~LPETaperStroke() override = default; void doOnApply(SPLPEItem const* lpeitem) override; void doOnRemove(SPLPEItem const* lpeitem) override; diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp index c484c88a2..d02a26fe4 100644 --- a/src/live_effects/lpe-test-doEffect-stack.cpp +++ b/src/live_effects/lpe-test-doEffect-stack.cpp @@ -30,9 +30,7 @@ LPEdoEffectStackTest::LPEdoEffectStackTest(LivePathEffectObject *lpeobject) : } LPEdoEffectStackTest::~LPEdoEffectStackTest() -{ - -} += default; void LPEdoEffectStackTest::doEffect (SPCurve * curve) diff --git a/src/live_effects/lpe-text_label.cpp b/src/live_effects/lpe-text_label.cpp index 0c1db2f04..b2845930c 100644 --- a/src/live_effects/lpe-text_label.cpp +++ b/src/live_effects/lpe-text_label.cpp @@ -27,9 +27,7 @@ LPETextLabel::LPETextLabel(LivePathEffectObject *lpeobject) : } LPETextLabel::~LPETextLabel() -{ - -} += default; Geom::Piecewise<Geom::D2<Geom::SBasis> > LPETextLabel::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp index 47f8864ce..eac52943a 100644 --- a/src/live_effects/lpe-transform_2pts.cpp +++ b/src/live_effects/lpe-transform_2pts.cpp @@ -82,8 +82,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) : } LPETransform2Pts::~LPETransform2Pts() -{ -} += default; void LPETransform2Pts::doOnApply(SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp index 33460aa2d..33db7c14a 100644 --- a/src/live_effects/lpe-vonkoch.cpp +++ b/src/live_effects/lpe-vonkoch.cpp @@ -70,9 +70,7 @@ LPEVonKoch::LPEVonKoch(LivePathEffectObject *lpeobject) : } LPEVonKoch::~LPEVonKoch() -{ - -} += default; Geom::PathVector LPEVonKoch::doEffect_path (Geom::PathVector const & path_in) diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h index 1ee9acce0..6ff5b6ae3 100644 --- a/src/live_effects/lpe-vonkoch.h +++ b/src/live_effects/lpe-vonkoch.h @@ -26,7 +26,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){} - ~VonKochPathParam() override{} + ~VonKochPathParam() override= default; void param_setup_nodepath(Inkscape::NodePath::Path *np) override; }; @@ -39,7 +39,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){} - ~VonKochRefPathParam() override{} + ~VonKochRefPathParam() override= default; void param_setup_nodepath(Inkscape::NodePath::Path *np) override; bool param_readSVGValue(const gchar * strvalue) override; }; diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp index c05d00d60..561f4e79a 100644 --- a/src/live_effects/lpeobject.cpp +++ b/src/live_effects/lpeobject.cpp @@ -39,8 +39,7 @@ LivePathEffectObject::LivePathEffectObject() #endif } -LivePathEffectObject::~LivePathEffectObject() { -} +LivePathEffectObject::~LivePathEffectObject() = default; /** * Virtual build: set livepatheffect attributes from its associated XML node. diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h index 156de2f81..3f4baf8b4 100644 --- a/src/live_effects/parameter/array.h +++ b/src/live_effects/parameter/array.h @@ -37,9 +37,7 @@ public: } - ~ArrayParam() override { - - }; + ~ArrayParam() override = default;; std::vector<StorageType> const & data() const { return _vector; diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp index 2e8c4dbcc..9b8435941 100644 --- a/src/live_effects/parameter/bool.cpp +++ b/src/live_effects/parameter/bool.cpp @@ -26,8 +26,7 @@ BoolParam::BoolParam( const Glib::ustring& label, const Glib::ustring& tip, } BoolParam::~BoolParam() -{ -} += default; void BoolParam::param_set_default() diff --git a/src/live_effects/parameter/colorpicker.h b/src/live_effects/parameter/colorpicker.h index 965435fba..7fa1556a3 100644 --- a/src/live_effects/parameter/colorpicker.h +++ b/src/live_effects/parameter/colorpicker.h @@ -22,7 +22,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const guint32 default_color = 0x000000ff); - ~ColorPickerParam() override {} + ~ColorPickerParam() override = default; Gtk::Widget * param_newWidget() override; bool param_readSVGValue(const gchar * strvalue) override; diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h index 354eb74f6..0360a5f0a 100644 --- a/src/live_effects/parameter/enum.h +++ b/src/live_effects/parameter/enum.h @@ -37,7 +37,7 @@ public: sorted = sort; }; - ~EnumParam() override { }; + ~EnumParam() override = default;; Gtk::Widget * param_newWidget() override { Inkscape::UI::Widget::RegisteredEnum<E> *regenum = Gtk::manage ( diff --git a/src/live_effects/parameter/fontbutton.h b/src/live_effects/parameter/fontbutton.h index 466202ee1..27c982159 100644 --- a/src/live_effects/parameter/fontbutton.h +++ b/src/live_effects/parameter/fontbutton.h @@ -22,7 +22,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const Glib::ustring default_value = "Sans 10"); - ~FontButtonParam() override {} + ~FontButtonParam() override = default; Gtk::Widget * param_newWidget() override; bool param_readSVGValue(const gchar * strvalue) override; diff --git a/src/live_effects/parameter/hidden.h b/src/live_effects/parameter/hidden.h index df55bfb5a..ecc5039b2 100644 --- a/src/live_effects/parameter/hidden.h +++ b/src/live_effects/parameter/hidden.h @@ -31,7 +31,7 @@ public: Effect* effect, const Glib::ustring default_value = "", bool widget_is_visible = false); - ~HiddenParam() override {} + ~HiddenParam() override = default; Gtk::Widget * param_newWidget() override; diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h index bbee74998..3d9ddf62b 100644 --- a/src/live_effects/parameter/message.h +++ b/src/live_effects/parameter/message.h @@ -22,7 +22,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_message = "Default message"); - ~MessageParam() override {} + ~MessageParam() override = default; Gtk::Widget * param_newWidget() override; bool param_readSVGValue(const gchar * strvalue) override; diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp index 820c4d6b9..b415dd52a 100644 --- a/src/live_effects/parameter/originalitem.cpp +++ b/src/live_effects/parameter/originalitem.cpp @@ -38,9 +38,7 @@ OriginalItemParam::OriginalItemParam( const Glib::ustring& label, const Glib::us } OriginalItemParam::~OriginalItemParam() -{ - -} += default; Gtk::Widget * OriginalItemParam::param_newWidget() diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp index 3116b1f9c..23d9f96cd 100644 --- a/src/live_effects/parameter/originalitemarray.cpp +++ b/src/live_effects/parameter/originalitemarray.cpp @@ -46,7 +46,7 @@ public: add(_colLabel); add(_colActive); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<ItemAndActive*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp index 5ad5546da..e17ef74e4 100644 --- a/src/live_effects/parameter/originalpath.cpp +++ b/src/live_effects/parameter/originalpath.cpp @@ -41,9 +41,7 @@ OriginalPathParam::OriginalPathParam( const Glib::ustring& label, const Glib::us } OriginalPathParam::~OriginalPathParam() -{ - -} += default; Gtk::Widget * OriginalPathParam::param_newWidget() diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index f9e56c8f3..cc4408218 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -57,7 +57,7 @@ public: add(_colReverse); add(_colVisible); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<PathAndDirectionAndVisible*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp index acfe159ab..7ca3f04c8 100644 --- a/src/live_effects/parameter/parameter.cpp +++ b/src/live_effects/parameter/parameter.cpp @@ -71,8 +71,7 @@ ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip, } ScalarParam::~ScalarParam() -{ -} += default; bool ScalarParam::param_readSVGValue(const gchar * strvalue) diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h index a956a9ed4..7454558db 100644 --- a/src/live_effects/parameter/parameter.h +++ b/src/live_effects/parameter/parameter.h @@ -53,7 +53,7 @@ public: const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect); - virtual ~Parameter() {}; + virtual ~Parameter() = default;; virtual bool param_readSVGValue(const gchar * strvalue) = 0; // returns true if new value is valid / accepted. virtual gchar * param_getSVGValue() const = 0; diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp index 0857deab5..12f72a143 100644 --- a/src/live_effects/parameter/powerstrokepointarray.cpp +++ b/src/live_effects/parameter/powerstrokepointarray.cpp @@ -33,8 +33,7 @@ PowerStrokePointArrayParam::PowerStrokePointArrayParam( const Glib::ustring& lab } PowerStrokePointArrayParam::~PowerStrokePointArrayParam() -{ -} += default; Gtk::Widget * PowerStrokePointArrayParam::param_newWidget() diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h index a3712c2d2..e21945e7c 100644 --- a/src/live_effects/parameter/powerstrokepointarray.h +++ b/src/live_effects/parameter/powerstrokepointarray.h @@ -67,7 +67,7 @@ private: class PowerStrokePointArrayParamKnotHolderEntity : public KnotHolderEntity { public: PowerStrokePointArrayParamKnotHolderEntity(PowerStrokePointArrayParam *p, unsigned int index); - ~PowerStrokePointArrayParamKnotHolderEntity() override {} + ~PowerStrokePointArrayParamKnotHolderEntity() override = default; void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override; Geom::Point knot_get() const override; diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp index 23912bedb..fe99285a0 100644 --- a/src/live_effects/parameter/random.cpp +++ b/src/live_effects/parameter/random.cpp @@ -39,8 +39,7 @@ RandomParam::RandomParam( const Glib::ustring& label, const Glib::ustring& tip, } RandomParam::~RandomParam() -{ -} += default; bool RandomParam::param_readSVGValue(const gchar * strvalue) diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h index fda470638..6591c54c8 100644 --- a/src/live_effects/parameter/text.h +++ b/src/live_effects/parameter/text.h @@ -32,7 +32,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const Glib::ustring default_value = ""); - ~TextParam() override {} + ~TextParam() override = default; Gtk::Widget * param_newWidget() override; diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp index d94f8964c..e35cbc04d 100644 --- a/src/live_effects/parameter/transformedpoint.cpp +++ b/src/live_effects/parameter/transformedpoint.cpp @@ -37,9 +37,7 @@ TransformedPointParam::TransformedPointParam( const Glib::ustring& label, const } TransformedPointParam::~TransformedPointParam() -{ - -} += default; void TransformedPointParam::param_set_default() @@ -165,7 +163,7 @@ TransformedPointParam::set_oncanvas_color(guint32 color) class TransformedPointParamKnotHolderEntity_Vector : public KnotHolderEntity { public: TransformedPointParamKnotHolderEntity_Vector(TransformedPointParam *p) : param(p) { } - ~TransformedPointParamKnotHolderEntity_Vector() override {} + ~TransformedPointParamKnotHolderEntity_Vector() override = default; void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override { Geom::Point const s = p - param->origin; diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp index 9199e592d..9dbbaffac 100644 --- a/src/live_effects/parameter/unit.cpp +++ b/src/live_effects/parameter/unit.cpp @@ -29,8 +29,7 @@ UnitParam::UnitParam( const Glib::ustring& label, const Glib::ustring& tip, } UnitParam::~UnitParam() -{ -} += default; bool UnitParam::param_readSVGValue(const gchar * strvalue) diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp index 8018ed618..0e8948268 100644 --- a/src/live_effects/parameter/vector.cpp +++ b/src/live_effects/parameter/vector.cpp @@ -37,9 +37,7 @@ VectorParam::VectorParam( const Glib::ustring& label, const Glib::ustring& tip, } VectorParam::~VectorParam() -{ - -} += default; void VectorParam::param_set_default() @@ -172,7 +170,7 @@ VectorParam::set_oncanvas_color(guint32 color) class VectorParamKnotHolderEntity_Origin : public KnotHolderEntity { public: VectorParamKnotHolderEntity_Origin(VectorParam *p) : param(p) { } - ~VectorParamKnotHolderEntity_Origin() override {} + ~VectorParamKnotHolderEntity_Origin() override = default; void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) override { Geom::Point const s = snap_knot_position(p, state); @@ -193,7 +191,7 @@ private: class VectorParamKnotHolderEntity_Vector : public KnotHolderEntity { public: VectorParamKnotHolderEntity_Vector(VectorParam *p) : param(p) { } - ~VectorParamKnotHolderEntity_Vector() override {} + ~VectorParamKnotHolderEntity_Vector() override = default; void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override { Geom::Point const s = p - param->origin; diff --git a/src/live_effects/spiro-converters.h b/src/live_effects/spiro-converters.h index 7def6d23d..ec53e085b 100644 --- a/src/live_effects/spiro-converters.h +++ b/src/live_effects/spiro-converters.h @@ -8,8 +8,8 @@ namespace Spiro { class ConverterBase { public: - ConverterBase() {}; - virtual ~ConverterBase() {}; + ConverterBase() = default;; + virtual ~ConverterBase() = default;; virtual void moveto(double x, double y) = 0; virtual void lineto(double x, double y, bool close_last) = 0; |
