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/parameter | |
| 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/parameter')
20 files changed, 23 insertions, 38 deletions
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; |
