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/parameter | |
| 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/parameter')
30 files changed, 204 insertions, 204 deletions
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; |
