diff options
Diffstat (limited to 'src/object')
155 files changed, 165 insertions, 163 deletions
diff --git a/src/object/box3d-side.cpp b/src/object/box3d-side.cpp index f90b3e9ff..bfd698eb3 100644 --- a/src/object/box3d-side.cpp +++ b/src/object/box3d-side.cpp @@ -71,7 +71,7 @@ Inkscape::XML::Node* Box3DSide::write(Inkscape::XML::Document *xml_doc, Inkscape return repr; } -void Box3DSide::set(unsigned int key, const gchar* value) { +void Box3DSide::set(SPAttributeEnum key, const gchar* value) { // TODO: In case the box was recreated (by undo, e.g.) we need to recreate the path // (along with other info?) from the parent box. diff --git a/src/object/box3d-side.h b/src/object/box3d-side.h index bd8b33e3a..36e2b75e0 100644 --- a/src/object/box3d-side.h +++ b/src/object/box3d-side.h @@ -34,7 +34,7 @@ public: static Box3DSide * createBox3DSide(SPBox3D *box); void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; void update(SPCtx *ctx, unsigned int flags) override; diff --git a/src/object/box3d.cpp b/src/object/box3d.cpp index 79779d713..98dfddbb4 100644 --- a/src/object/box3d.cpp +++ b/src/object/box3d.cpp @@ -114,7 +114,7 @@ void SPBox3D::release() { SPGroup::release(); } -void SPBox3D::set(unsigned int key, const gchar* value) { +void SPBox3D::set(SPAttributeEnum key, const gchar* value) { SPBox3D* object = this; SPBox3D *box = object; diff --git a/src/object/box3d.h b/src/object/box3d.h index ee68b415c..006571478 100644 --- a/src/object/box3d.h +++ b/src/object/box3d.h @@ -53,7 +53,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx *ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/color-profile.cpp b/src/object/color-profile.cpp index 1540b7fa6..2475181ec 100644 --- a/src/object/color-profile.cpp +++ b/src/object/color-profile.cpp @@ -315,7 +315,7 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) { /** * Callback: set attribute. */ -void ColorProfile::set(unsigned key, gchar const *value) { +void ColorProfile::set(SPAttributeEnum key, gchar const *value) { switch (key) { case SP_ATTR_XLINK_HREF: if ( this->href ) { diff --git a/src/object/color-profile.h b/src/object/color-profile.h index 4e687b9b6..1abc02a33 100644 --- a/src/object/color-profile.h +++ b/src/object/color-profile.h @@ -89,7 +89,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/filters/blend.cpp b/src/object/filters/blend.cpp index 33fa56506..e1f2b3c46 100644 --- a/src/object/filters/blend.cpp +++ b/src/object/filters/blend.cpp @@ -129,7 +129,7 @@ static Inkscape::Filters::FilterBlendMode sp_feBlend_readmode(gchar const *value /** * Sets a specific value in the SPFeBlend. */ -void SPFeBlend::set(unsigned int key, gchar const *value) { +void SPFeBlend::set(SPAttributeEnum key, gchar const *value) { Inkscape::Filters::FilterBlendMode mode; int input; diff --git a/src/object/filters/blend.h b/src/object/filters/blend.h index 689c53977..f8efa78a4 100644 --- a/src/object/filters/blend.h +++ b/src/object/filters/blend.h @@ -31,7 +31,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/colormatrix.cpp b/src/object/filters/colormatrix.cpp index 0017fa0b2..879d723cf 100644 --- a/src/object/filters/colormatrix.cpp +++ b/src/object/filters/colormatrix.cpp @@ -77,7 +77,7 @@ static Inkscape::Filters::FilterColorMatrixType sp_feColorMatrix_read_type(gchar /** * Sets a specific value in the SPFeColorMatrix. */ -void SPFeColorMatrix::set(unsigned int key, gchar const *str) { +void SPFeColorMatrix::set(SPAttributeEnum key, gchar const *str) { Inkscape::Filters::FilterColorMatrixType read_type; /*DEAL WITH SETTING ATTRIBUTES HERE*/ diff --git a/src/object/filters/colormatrix.h b/src/object/filters/colormatrix.h index fdc28c02e..cc2b6ef28 100644 --- a/src/object/filters/colormatrix.h +++ b/src/object/filters/colormatrix.h @@ -31,7 +31,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp index f45f96958..547d6eae6 100644 --- a/src/object/filters/componenttransfer-funcnode.cpp +++ b/src/object/filters/componenttransfer-funcnode.cpp @@ -103,7 +103,7 @@ static Inkscape::Filters::FilterComponentTransferType sp_feComponenttransfer_rea /** * Sets a specific value in the SPFeFuncNode. */ -void SPFeFuncNode::set(unsigned int key, gchar const *value) { +void SPFeFuncNode::set(SPAttributeEnum key, gchar const *value) { Inkscape::Filters::FilterComponentTransferType type; double read_num; diff --git a/src/object/filters/componenttransfer-funcnode.h b/src/object/filters/componenttransfer-funcnode.h index 3f303e663..3597fc82a 100644 --- a/src/object/filters/componenttransfer-funcnode.h +++ b/src/object/filters/componenttransfer-funcnode.h @@ -42,7 +42,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/componenttransfer.cpp b/src/object/filters/componenttransfer.cpp index b7a85fbae..f64d4b6f9 100644 --- a/src/object/filters/componenttransfer.cpp +++ b/src/object/filters/componenttransfer.cpp @@ -120,7 +120,7 @@ void SPFeComponentTransfer::release() { /** * Sets a specific value in the SPFeComponentTransfer. */ -void SPFeComponentTransfer::set(unsigned int key, gchar const *value) { +void SPFeComponentTransfer::set(SPAttributeEnum key, gchar const *value) { switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ default: diff --git a/src/object/filters/componenttransfer.h b/src/object/filters/componenttransfer.h index 46d337450..20d5c1983 100644 --- a/src/object/filters/componenttransfer.h +++ b/src/object/filters/componenttransfer.h @@ -35,7 +35,7 @@ protected: void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node* child) override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/composite.cpp b/src/object/filters/composite.cpp index 9954cd7a1..8a6dcb294 100644 --- a/src/object/filters/composite.cpp +++ b/src/object/filters/composite.cpp @@ -117,7 +117,7 @@ sp_feComposite_read_operator(gchar const *value) { /** * Sets a specific value in the SPFeComposite. */ -void SPFeComposite::set(unsigned int key, gchar const *value) { +void SPFeComposite::set(SPAttributeEnum key, gchar const *value) { int input; FeCompositeOperator op; double k_n; diff --git a/src/object/filters/composite.h b/src/object/filters/composite.h index f1c21ddf3..adfed4655 100644 --- a/src/object/filters/composite.h +++ b/src/object/filters/composite.h @@ -53,7 +53,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/convolvematrix.cpp b/src/object/filters/convolvematrix.cpp index 28fcb0ba1..a1c4d2e85 100644 --- a/src/object/filters/convolvematrix.cpp +++ b/src/object/filters/convolvematrix.cpp @@ -102,7 +102,7 @@ static Inkscape::Filters::FilterConvolveMatrixEdgeMode sp_feConvolveMatrix_read_ /** * Sets a specific value in the SPFeConvolveMatrix. */ -void SPFeConvolveMatrix::set(unsigned int key, gchar const *value) { +void SPFeConvolveMatrix::set(SPAttributeEnum key, gchar const *value) { double read_num; int read_int; bool read_bool; diff --git a/src/object/filters/convolvematrix.h b/src/object/filters/convolvematrix.h index 196f93ec5..c6a3edcab 100644 --- a/src/object/filters/convolvematrix.h +++ b/src/object/filters/convolvematrix.h @@ -43,7 +43,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/diffuselighting.cpp b/src/object/filters/diffuselighting.cpp index bad591a22..980c41e9e 100644 --- a/src/object/filters/diffuselighting.cpp +++ b/src/object/filters/diffuselighting.cpp @@ -76,7 +76,7 @@ void SPFeDiffuseLighting::release() { /** * Sets a specific value in the SPFeDiffuseLighting. */ -void SPFeDiffuseLighting::set(unsigned int key, gchar const *value) { +void SPFeDiffuseLighting::set(SPAttributeEnum key, gchar const *value) { gchar const *cend_ptr = nullptr; gchar *end_ptr = nullptr; diff --git a/src/object/filters/diffuselighting.h b/src/object/filters/diffuselighting.h index 68008af89..dc4ebd631 100644 --- a/src/object/filters/diffuselighting.h +++ b/src/object/filters/diffuselighting.h @@ -49,7 +49,7 @@ protected: void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr) override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/displacementmap.cpp b/src/object/filters/displacementmap.cpp index dccd78dcd..7dda2843d 100644 --- a/src/object/filters/displacementmap.cpp +++ b/src/object/filters/displacementmap.cpp @@ -96,7 +96,7 @@ static FilterDisplacementMapChannelSelector sp_feDisplacementMap_readChannelSele /** * Sets a specific value in the SPFeDisplacementMap. */ -void SPFeDisplacementMap::set(unsigned int key, gchar const *value) { +void SPFeDisplacementMap::set(SPAttributeEnum key, gchar const *value) { int input; double read_num; FilterDisplacementMapChannelSelector read_selector; diff --git a/src/object/filters/displacementmap.h b/src/object/filters/displacementmap.h index b3f6db1b1..2d88649be 100644 --- a/src/object/filters/displacementmap.h +++ b/src/object/filters/displacementmap.h @@ -39,7 +39,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/distantlight.cpp b/src/object/filters/distantlight.cpp index 32f50c754..7a2acf75f 100644 --- a/src/object/filters/distantlight.cpp +++ b/src/object/filters/distantlight.cpp @@ -62,7 +62,7 @@ void SPFeDistantLight::release() { /** * Sets a specific value in the SPFeDistantLight. */ -void SPFeDistantLight::set(unsigned int key, gchar const *value) { +void SPFeDistantLight::set(SPAttributeEnum key, gchar const *value) { gchar *end_ptr; switch (key) { diff --git a/src/object/filters/distantlight.h b/src/object/filters/distantlight.h index 15b257f31..1a5622624 100644 --- a/src/object/filters/distantlight.h +++ b/src/object/filters/distantlight.h @@ -37,7 +37,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/flood.cpp b/src/object/filters/flood.cpp index 6b7cac482..a87c0c78a 100644 --- a/src/object/filters/flood.cpp +++ b/src/object/filters/flood.cpp @@ -57,7 +57,7 @@ void SPFeFlood::release() { /** * Sets a specific value in the SPFeFlood. */ -void SPFeFlood::set(unsigned int key, gchar const *value) { +void SPFeFlood::set(SPAttributeEnum key, gchar const *value) { gchar const *cend_ptr = nullptr; gchar *end_ptr = nullptr; guint32 read_color; diff --git a/src/object/filters/flood.h b/src/object/filters/flood.h index 192643e36..c60c107d0 100644 --- a/src/object/filters/flood.h +++ b/src/object/filters/flood.h @@ -31,7 +31,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/gaussian-blur.cpp b/src/object/filters/gaussian-blur.cpp index d5a49e7ca..4725503b3 100644 --- a/src/object/filters/gaussian-blur.cpp +++ b/src/object/filters/gaussian-blur.cpp @@ -50,7 +50,7 @@ void SPGaussianBlur::release() { /** * Sets a specific value in the SPGaussianBlur. */ -void SPGaussianBlur::set(unsigned int key, gchar const *value) { +void SPGaussianBlur::set(SPAttributeEnum key, gchar const *value) { switch(key) { case SP_ATTR_STDDEVIATION: this->stdDeviation.set(value); diff --git a/src/object/filters/gaussian-blur.h b/src/object/filters/gaussian-blur.h index 57d9f28ce..abaf0d116 100644 --- a/src/object/filters/gaussian-blur.h +++ b/src/object/filters/gaussian-blur.h @@ -30,7 +30,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/image.cpp b/src/object/filters/image.cpp index 83a185cfb..c80bfcf2f 100644 --- a/src/object/filters/image.cpp +++ b/src/object/filters/image.cpp @@ -96,7 +96,7 @@ static void sp_feImage_href_modified(SPObject* /*old_elem*/, SPObject* new_elem, /** * Sets a specific value in the SPFeImage. */ -void SPFeImage::set(unsigned int key, gchar const *value) { +void SPFeImage::set(SPAttributeEnum key, gchar const *value) { switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ case SP_ATTR_XLINK_HREF: diff --git a/src/object/filters/image.h b/src/object/filters/image.h index 040b8543d..99a9446bf 100644 --- a/src/object/filters/image.h +++ b/src/object/filters/image.h @@ -45,7 +45,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/merge.cpp b/src/object/filters/merge.cpp index d96834d73..0eb1f06d0 100644 --- a/src/object/filters/merge.cpp +++ b/src/object/filters/merge.cpp @@ -44,7 +44,7 @@ void SPFeMerge::release() { /** * Sets a specific value in the SPFeMerge. */ -void SPFeMerge::set(unsigned int key, gchar const *value) { +void SPFeMerge::set(SPAttributeEnum key, gchar const *value) { switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ default: diff --git a/src/object/filters/merge.h b/src/object/filters/merge.h index b7eaafb29..03f0e9511 100644 --- a/src/object/filters/merge.h +++ b/src/object/filters/merge.h @@ -24,7 +24,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/mergenode.cpp b/src/object/filters/mergenode.cpp index a6824c061..0608f6e53 100644 --- a/src/object/filters/mergenode.cpp +++ b/src/object/filters/mergenode.cpp @@ -47,7 +47,7 @@ void SPFeMergeNode::release() { /** * Sets a specific value in the SPFeMergeNode. */ -void SPFeMergeNode::set(unsigned int key, gchar const *value) { +void SPFeMergeNode::set(SPAttributeEnum key, gchar const *value) { SPFeMerge *parent = SP_FEMERGE(this->parent); if (key == SP_ATTR_IN) { diff --git a/src/object/filters/mergenode.h b/src/object/filters/mergenode.h index b02fac29f..e084e9335 100644 --- a/src/object/filters/mergenode.h +++ b/src/object/filters/mergenode.h @@ -31,7 +31,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/morphology.cpp b/src/object/filters/morphology.cpp index 830240049..7345dbea9 100644 --- a/src/object/filters/morphology.cpp +++ b/src/object/filters/morphology.cpp @@ -74,7 +74,7 @@ static Inkscape::Filters::FilterMorphologyOperator sp_feMorphology_read_operator /** * Sets a specific value in the SPFeMorphology. */ -void SPFeMorphology::set(unsigned int key, gchar const *value) { +void SPFeMorphology::set(SPAttributeEnum key, gchar const *value) { Inkscape::Filters::FilterMorphologyOperator read_operator; switch(key) { diff --git a/src/object/filters/morphology.h b/src/object/filters/morphology.h index 8edab6967..cb154d152 100644 --- a/src/object/filters/morphology.h +++ b/src/object/filters/morphology.h @@ -31,7 +31,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/offset.cpp b/src/object/filters/offset.cpp index 699a0bfb9..7969a111c 100644 --- a/src/object/filters/offset.cpp +++ b/src/object/filters/offset.cpp @@ -54,7 +54,7 @@ void SPFeOffset::release() { /** * Sets a specific value in the SPFeOffset. */ -void SPFeOffset::set(unsigned int key, gchar const *value) { +void SPFeOffset::set(SPAttributeEnum key, gchar const *value) { double read_num; switch(key) { diff --git a/src/object/filters/offset.h b/src/object/filters/offset.h index fadcb3493..b48ecce6a 100644 --- a/src/object/filters/offset.h +++ b/src/object/filters/offset.h @@ -28,7 +28,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/pointlight.cpp b/src/object/filters/pointlight.cpp index 640db877e..490518413 100644 --- a/src/object/filters/pointlight.cpp +++ b/src/object/filters/pointlight.cpp @@ -66,7 +66,7 @@ void SPFePointLight::release() { /** * Sets a specific value in the SPFePointLight. */ -void SPFePointLight::set(unsigned int key, gchar const *value) { +void SPFePointLight::set(SPAttributeEnum key, gchar const *value) { gchar *end_ptr; switch (key) { diff --git a/src/object/filters/pointlight.h b/src/object/filters/pointlight.h index c04ef90f3..9d47d77ef 100644 --- a/src/object/filters/pointlight.h +++ b/src/object/filters/pointlight.h @@ -39,7 +39,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/sp-filter-primitive.cpp b/src/object/filters/sp-filter-primitive.cpp index e71b8929c..a0405b6f0 100644 --- a/src/object/filters/sp-filter-primitive.cpp +++ b/src/object/filters/sp-filter-primitive.cpp @@ -75,7 +75,7 @@ void SPFilterPrimitive::release() { /** * Sets a specific value in the SPFilterPrimitive. */ -void SPFilterPrimitive::set(unsigned int key, gchar const *value) { +void SPFilterPrimitive::set(SPAttributeEnum key, gchar const *value) { int image_nr; switch (key) { diff --git a/src/object/filters/sp-filter-primitive.h b/src/object/filters/sp-filter-primitive.h index d45ac590e..142fde99a 100644 --- a/src/object/filters/sp-filter-primitive.h +++ b/src/object/filters/sp-filter-primitive.h @@ -37,7 +37,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/specularlighting.cpp b/src/object/filters/specularlighting.cpp index 81b574fdd..58a221624 100644 --- a/src/object/filters/specularlighting.cpp +++ b/src/object/filters/specularlighting.cpp @@ -81,7 +81,7 @@ void SPFeSpecularLighting::release() { /** * Sets a specific value in the SPFeSpecularLighting. */ -void SPFeSpecularLighting::set(unsigned int key, gchar const *value) { +void SPFeSpecularLighting::set(SPAttributeEnum key, gchar const *value) { gchar const *cend_ptr = nullptr; gchar *end_ptr = nullptr; diff --git a/src/object/filters/specularlighting.h b/src/object/filters/specularlighting.h index 751858046..3f9c26883 100644 --- a/src/object/filters/specularlighting.h +++ b/src/object/filters/specularlighting.h @@ -55,7 +55,7 @@ protected: void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr) override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/spotlight.cpp b/src/object/filters/spotlight.cpp index 1df720722..fb8165469 100644 --- a/src/object/filters/spotlight.cpp +++ b/src/object/filters/spotlight.cpp @@ -71,7 +71,7 @@ void SPFeSpotLight::release() { /** * Sets a specific value in the SPFeSpotLight. */ -void SPFeSpotLight::set(unsigned int key, gchar const *value) { +void SPFeSpotLight::set(SPAttributeEnum key, gchar const *value) { gchar *end_ptr; switch (key) { diff --git a/src/object/filters/spotlight.h b/src/object/filters/spotlight.h index 7ffb11b57..0b522fa1e 100644 --- a/src/object/filters/spotlight.h +++ b/src/object/filters/spotlight.h @@ -55,7 +55,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/tile.cpp b/src/object/filters/tile.cpp index da17fa004..4ebc67b78 100644 --- a/src/object/filters/tile.cpp +++ b/src/object/filters/tile.cpp @@ -46,7 +46,7 @@ void SPFeTile::release() { /** * Sets a specific value in the SPFeTile. */ -void SPFeTile::set(unsigned int key, gchar const *value) { +void SPFeTile::set(SPAttributeEnum key, gchar const *value) { switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ default: diff --git a/src/object/filters/tile.h b/src/object/filters/tile.h index 94619abf6..63bb2eadf 100644 --- a/src/object/filters/tile.h +++ b/src/object/filters/tile.h @@ -27,7 +27,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/filters/turbulence.cpp b/src/object/filters/turbulence.cpp index 6ba3a3eee..9a1861f35 100644 --- a/src/object/filters/turbulence.cpp +++ b/src/object/filters/turbulence.cpp @@ -101,7 +101,7 @@ static Inkscape::Filters::FilterTurbulenceType sp_feTurbulence_read_type(gchar c /** * Sets a specific value in the SPFeTurbulence. */ -void SPFeTurbulence::set(unsigned int key, gchar const *value) { +void SPFeTurbulence::set(SPAttributeEnum key, gchar const *value) { int read_int; double read_num; bool read_bool; diff --git a/src/object/filters/turbulence.h b/src/object/filters/turbulence.h index a4b348807..c6430e282 100644 --- a/src/object/filters/turbulence.h +++ b/src/object/filters/turbulence.h @@ -40,7 +40,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/persp3d.cpp b/src/object/persp3d.cpp index 821f69521..7861a7565 100644 --- a/src/object/persp3d.cpp +++ b/src/object/persp3d.cpp @@ -133,7 +133,7 @@ static Proj::Pt2 legacy_transform_backward(Proj::Pt2 pt, SPDocument const *doc) */ // FIXME: Currently we only read the finite positions of vanishing points; // should we move VPs into their own repr (as it's done for SPStop, e.g.)? -void Persp3D::set(unsigned key, gchar const *value) { +void Persp3D::set(SPAttributeEnum key, gchar const *value) { switch (key) { case SP_ATTR_INKSCAPE_PERSP3D_VP_X: { diff --git a/src/object/persp3d.h b/src/object/persp3d.h index bcbc5c601..a86c10618 100644 --- a/src/object/persp3d.h +++ b/src/object/persp3d.h @@ -66,7 +66,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/sp-anchor.cpp b/src/object/sp-anchor.cpp index 4af737125..7a6274202 100644 --- a/src/object/sp-anchor.cpp +++ b/src/object/sp-anchor.cpp @@ -65,7 +65,7 @@ void SPAnchor::release() { SPGroup::release(); } -void SPAnchor::set(unsigned int key, const gchar* value) { +void SPAnchor::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: g_free(this->href); diff --git a/src/object/sp-anchor.h b/src/object/sp-anchor.h index 99c3b0ef9..67b203244 100644 --- a/src/object/sp-anchor.h +++ b/src/object/sp-anchor.h @@ -30,7 +30,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; virtual void updatePageAnchor(); Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-clippath.cpp b/src/object/sp-clippath.cpp index 724c715ed..91bd10b35 100644 --- a/src/object/sp-clippath.cpp +++ b/src/object/sp-clippath.cpp @@ -65,7 +65,7 @@ void SPClipPath::release() { SPObjectGroup::release(); } -void SPClipPath::set(unsigned int key, const gchar* value) { +void SPClipPath::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_CLIPPATHUNITS: this->clipPathUnits = SP_CONTENT_UNITS_USERSPACEONUSE; diff --git a/src/object/sp-clippath.h b/src/object/sp-clippath.h index 2c07fe5d1..d46fcb779 100644 --- a/src/object/sp-clippath.h +++ b/src/object/sp-clippath.h @@ -66,7 +66,7 @@ protected: void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; diff --git a/src/object/sp-ellipse.cpp b/src/object/sp-ellipse.cpp index aa8853ec6..daa3148ef 100644 --- a/src/object/sp-ellipse.cpp +++ b/src/object/sp-ellipse.cpp @@ -91,7 +91,7 @@ void SPGenericEllipse::build(SPDocument *document, Inkscape::XML::Node *repr) SPShape::build(document, repr); } -void SPGenericEllipse::set(unsigned int key, gchar const *value) +void SPGenericEllipse::set(SPAttributeEnum key, gchar const *value) { // There are multiple ways to set internal cx, cy, rx, and ry (via SVG attributes or Sodipodi // attributes) thus we don't want to unset them if a read fails (e.g., when we explicitly clear diff --git a/src/object/sp-ellipse.h b/src/object/sp-ellipse.h index 2721fc74f..19670049e 100644 --- a/src/object/sp-ellipse.h +++ b/src/object/sp-ellipse.h @@ -58,7 +58,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; - void set(unsigned int key, char const *value) override; + void set(SPAttributeEnum key, char const *value) override; void update(SPCtx *ctx, unsigned int flags) override; Inkscape::XML::Node *write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-filter.cpp b/src/object/sp-filter.cpp index fa39f5486..9b307cc9c 100644 --- a/src/object/sp-filter.cpp +++ b/src/object/sp-filter.cpp @@ -111,7 +111,7 @@ void SPFilter::release() { /** * Sets a specific value in the SPFilter. */ -void SPFilter::set(unsigned int key, gchar const *value) { +void SPFilter::set(SPAttributeEnum key, gchar const *value) { switch (key) { case SP_ATTR_FILTERUNITS: if (value) { diff --git a/src/object/sp-filter.h b/src/object/sp-filter.h index b82ae745d..da32bdd65 100644 --- a/src/object/sp-filter.h +++ b/src/object/sp-filter.h @@ -67,7 +67,7 @@ protected: void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node* child) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/sp-flowdiv.cpp b/src/object/sp-flowdiv.cpp index b4e32d295..8730c29dd 100644 --- a/src/object/sp-flowdiv.cpp +++ b/src/object/sp-flowdiv.cpp @@ -79,7 +79,7 @@ void SPFlowdiv::build(SPDocument *doc, Inkscape::XML::Node *repr) { SPItem::build(doc, repr); } -void SPFlowdiv::set(unsigned int key, const gchar* value) { +void SPFlowdiv::set(SPAttributeEnum key, const gchar* value) { SPItem::set(key, value); } @@ -202,7 +202,7 @@ void SPFlowtspan::build(SPDocument *doc, Inkscape::XML::Node *repr) { SPItem::build(doc, repr); } -void SPFlowtspan::set(unsigned int key, const gchar* value) { +void SPFlowtspan::set(SPAttributeEnum key, const gchar* value) { SPItem::set(key, value); } @@ -324,7 +324,7 @@ void SPFlowpara::build(SPDocument *doc, Inkscape::XML::Node *repr) { SPItem::build(doc, repr); } -void SPFlowpara::set(unsigned int key, const gchar* value) { +void SPFlowpara::set(SPAttributeEnum key, const gchar* value) { SPItem::set(key, value); } diff --git a/src/object/sp-flowdiv.h b/src/object/sp-flowdiv.h index 3875fc520..b4ccc8350 100644 --- a/src/object/sp-flowdiv.h +++ b/src/object/sp-flowdiv.h @@ -34,7 +34,7 @@ protected: void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; @@ -49,7 +49,7 @@ protected: void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; @@ -64,7 +64,7 @@ protected: void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; diff --git a/src/object/sp-flowtext.cpp b/src/object/sp-flowtext.cpp index c24b7689b..865e24253 100644 --- a/src/object/sp-flowtext.cpp +++ b/src/object/sp-flowtext.cpp @@ -145,7 +145,7 @@ void SPFlowtext::build(SPDocument* doc, Inkscape::XML::Node* repr) { this->readAttr( "inkscape:layoutOptions" ); // must happen after css has been read } -void SPFlowtext::set(unsigned int key, const gchar* value) { +void SPFlowtext::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_LAYOUT_OPTIONS: { // deprecated attribute, read for backward compatibility only diff --git a/src/object/sp-flowtext.h b/src/object/sp-flowtext.h index 321000d25..516049220 100644 --- a/src/object/sp-flowtext.h +++ b/src/object/sp-flowtext.h @@ -73,7 +73,7 @@ public: void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node* child) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; Geom::Affine set_transform(Geom::Affine const& xform) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/sp-font-face.cpp b/src/object/sp-font-face.cpp index 5fd7fd99d..0dec692e9 100644 --- a/src/object/sp-font-face.cpp +++ b/src/object/sp-font-face.cpp @@ -370,7 +370,7 @@ void SPFontFace::release() { SPObject::release(); } -void SPFontFace::set(unsigned int key, const gchar *value) { +void SPFontFace::set(SPAttributeEnum key, const gchar *value) { std::vector<FontFaceStyleType> style; std::vector<FontFaceVariantType> variant; std::vector<FontFaceWeightType> weight; diff --git a/src/object/sp-font-face.h b/src/object/sp-font-face.h index cbe43b4b6..5b8c6d1fa 100644 --- a/src/object/sp-font-face.h +++ b/src/object/sp-font-face.h @@ -113,7 +113,7 @@ protected: void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node* child) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/sp-font.cpp b/src/object/sp-font.cpp index 8caac2612..569c164b0 100644 --- a/src/object/sp-font.cpp +++ b/src/object/sp-font.cpp @@ -74,7 +74,7 @@ void SPFont::release() { SPObject::release(); } -void SPFont::set(unsigned int key, const gchar *value) { +void SPFont::set(SPAttributeEnum key, const gchar *value) { // TODO these are floating point, so some epsilon comparison would be good switch (key) { case SP_ATTR_HORIZ_ORIGIN_X: diff --git a/src/object/sp-font.h b/src/object/sp-font.h index 9e08507c5..9b0e593a8 100644 --- a/src/object/sp-font.h +++ b/src/object/sp-font.h @@ -36,7 +36,7 @@ protected: void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node* child) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; diff --git a/src/object/sp-glyph-kerning.cpp b/src/object/sp-glyph-kerning.cpp index 899bb71f6..c5eb8f16c 100644 --- a/src/object/sp-glyph-kerning.cpp +++ b/src/object/sp-glyph-kerning.cpp @@ -79,7 +79,7 @@ bool GlyphNames::contains(const char* name) return false; } -void SPGlyphKerning::set(unsigned int key, const gchar *value) +void SPGlyphKerning::set(SPAttributeEnum key, const gchar *value) { switch (key) { case SP_ATTR_U1: diff --git a/src/object/sp-glyph-kerning.h b/src/object/sp-glyph-kerning.h index 0fca561e2..1038b14f0 100644 --- a/src/object/sp-glyph-kerning.h +++ b/src/object/sp-glyph-kerning.h @@ -47,7 +47,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-glyph.cpp b/src/object/sp-glyph.cpp index 9f5f6403c..64e88130e 100644 --- a/src/object/sp-glyph.cpp +++ b/src/object/sp-glyph.cpp @@ -101,7 +101,7 @@ static glyphOrientation sp_glyph_read_orientation(gchar const *value) return GLYPH_ORIENTATION_BOTH; } -void SPGlyph::set(unsigned int key, const gchar *value) +void SPGlyph::set(SPAttributeEnum key, const gchar *value) { switch (key) { case SP_ATTR_UNICODE: diff --git a/src/object/sp-glyph.h b/src/object/sp-glyph.h index 17a34a664..1c91ab256 100644 --- a/src/object/sp-glyph.h +++ b/src/object/sp-glyph.h @@ -52,7 +52,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; diff --git a/src/object/sp-gradient.cpp b/src/object/sp-gradient.cpp index 7e31540b6..0fe7f1943 100644 --- a/src/object/sp-gradient.cpp +++ b/src/object/sp-gradient.cpp @@ -329,7 +329,7 @@ void SPGradient::release() /** * Set gradient attribute to value. */ -void SPGradient::set(unsigned key, gchar const *value) +void SPGradient::set(SPAttributeEnum key, gchar const *value) { #ifdef OBJECT_TRACE std::stringstream temp; diff --git a/src/object/sp-gradient.h b/src/object/sp-gradient.h index e03937c5b..a8d7ab87e 100644 --- a/src/object/sp-gradient.h +++ b/src/object/sp-gradient.h @@ -214,7 +214,7 @@ protected: void child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) override; void remove_child(Inkscape::XML::Node *child) override; - void set(unsigned key, char const *value) override; + void set(SPAttributeEnum key, char const *value) override; }; void diff --git a/src/object/sp-guide.cpp b/src/object/sp-guide.cpp index a9367192c..6cd3f1248 100644 --- a/src/object/sp-guide.cpp +++ b/src/object/sp-guide.cpp @@ -89,7 +89,7 @@ void SPGuide::release() SPObject::release(); } -void SPGuide::set(unsigned int key, const gchar *value) { +void SPGuide::set(SPAttributeEnum key, const gchar *value) { switch (key) { case SP_ATTR_INKSCAPE_COLOR: if (value) { diff --git a/src/object/sp-guide.h b/src/object/sp-guide.h index 3e8d8550d..353269e2b 100644 --- a/src/object/sp-guide.h +++ b/src/object/sp-guide.h @@ -76,7 +76,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; char* label; std::vector<SPGuideLine *> views; // contains an object of type SPGuideline (see display/guideline.cpp for definition) diff --git a/src/object/sp-hatch-path.cpp b/src/object/sp-hatch-path.cpp index 60f186212..5cacaa9be 100644 --- a/src/object/sp-hatch-path.cpp +++ b/src/object/sp-hatch-path.cpp @@ -79,7 +79,7 @@ void SPHatchPath::release() SPObject::release(); } -void SPHatchPath::set(unsigned int key, const gchar* value) +void SPHatchPath::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_D: diff --git a/src/object/sp-hatch-path.h b/src/object/sp-hatch-path.h index 228628f2e..2690cbc0f 100644 --- a/src/object/sp-hatch-path.h +++ b/src/object/sp-hatch-path.h @@ -51,7 +51,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; private: diff --git a/src/object/sp-hatch.cpp b/src/object/sp-hatch.cpp index 5786fc98d..2fbf4cc4c 100644 --- a/src/object/sp-hatch.cpp +++ b/src/object/sp-hatch.cpp @@ -125,7 +125,7 @@ void SPHatch::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) //FIXME: notify all hatches that refer to this child set } -void SPHatch::set(unsigned int key, const gchar* value) +void SPHatch::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_HATCHUNITS: diff --git a/src/object/sp-hatch.h b/src/object/sp-hatch.h index f8baf6bfb..8ff2064ce 100644 --- a/src/object/sp-hatch.h +++ b/src/object/sp-hatch.h @@ -95,7 +95,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; - void set(unsigned int key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; diff --git a/src/object/sp-image.cpp b/src/object/sp-image.cpp index 95b6ace11..81d02279e 100644 --- a/src/object/sp-image.cpp +++ b/src/object/sp-image.cpp @@ -176,7 +176,7 @@ void SPImage::release() { SPItem::release(); } -void SPImage::set(unsigned int key, const gchar* value) { +void SPImage::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: g_free (this->href); diff --git a/src/object/sp-image.h b/src/object/sp-image.h index cb61622ce..4ae9d7380 100644 --- a/src/object/sp-image.h +++ b/src/object/sp-image.h @@ -53,7 +53,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx *ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; void modified(unsigned int flags) override; diff --git a/src/object/sp-item-group.cpp b/src/object/sp-item-group.cpp index 8e78da04d..7852ea4fa 100644 --- a/src/object/sp-item-group.cpp +++ b/src/object/sp-item-group.cpp @@ -310,7 +310,7 @@ gchar *SPGroup::description() const { ngettext(_("of <b>%d</b> object"), _("of <b>%d</b> objects"), len), len); } -void SPGroup::set(unsigned int key, gchar const* value) { +void SPGroup::set(SPAttributeEnum key, gchar const* value) { switch (key) { case SP_ATTR_INKSCAPE_GROUPMODE: if ( value && !strcmp(value, "layer") ) { diff --git a/src/object/sp-item-group.h b/src/object/sp-item-group.h index 38cdf1bdd..f2e4a0fb5 100644 --- a/src/object/sp-item-group.h +++ b/src/object/sp-item-group.h @@ -78,7 +78,7 @@ public: void update(SPCtx *ctx, unsigned int flags) override; void modified(unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp index 14dd4c5f2..4c0538928 100644 --- a/src/object/sp-item.cpp +++ b/src/object/sp-item.cpp @@ -426,7 +426,7 @@ void SPItem::release() { //item->_transformed_signal.~signal(); } -void SPItem::set(unsigned int key, gchar const* value) { +void SPItem::set(SPAttributeEnum key, gchar const* value) { SPItem *item = this; SPItem* object = item; diff --git a/src/object/sp-item.h b/src/object/sp-item.h index acdde5d56..c041a2fa3 100644 --- a/src/object/sp-item.h +++ b/src/object/sp-item.h @@ -388,7 +388,7 @@ private: public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx *ctx, unsigned int flags) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-line.cpp b/src/object/sp-line.cpp index 2f06ddeef..37b8a1300 100644 --- a/src/object/sp-line.cpp +++ b/src/object/sp-line.cpp @@ -38,7 +38,7 @@ void SPLine::build(SPDocument * document, Inkscape::XML::Node * repr) { this->readAttr( "y2" ); } -void SPLine::set(unsigned int key, const gchar* value) { +void SPLine::set(SPAttributeEnum key, const gchar* value) { /* fixme: we should really collect updates */ switch (key) { diff --git a/src/object/sp-line.h b/src/object/sp-line.h index 4420b01c8..f27490c39 100644 --- a/src/object/sp-line.h +++ b/src/object/sp-line.h @@ -32,7 +32,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; const char* displayName() const override; Geom::Affine set_transform(Geom::Affine const &transform) override; diff --git a/src/object/sp-linear-gradient.cpp b/src/object/sp-linear-gradient.cpp index 5e0100251..47faaea1d 100644 --- a/src/object/sp-linear-gradient.cpp +++ b/src/object/sp-linear-gradient.cpp @@ -29,7 +29,7 @@ void SPLinearGradient::build(SPDocument *document, Inkscape::XML::Node *repr) { /** * Callback: set attribute. */ -void SPLinearGradient::set(unsigned int key, const gchar* value) { +void SPLinearGradient::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_X1: this->x1.readOrUnset(value, SVGLength::PERCENT, 0.0, 0.0); diff --git a/src/object/sp-linear-gradient.h b/src/object/sp-linear-gradient.h index c3ffe7610..48e3ae3d4 100644 --- a/src/object/sp-linear-gradient.h +++ b/src/object/sp-linear-gradient.h @@ -26,7 +26,7 @@ public: protected: void build(SPDocument *document, Inkscape::XML::Node *repr) override; - void set(unsigned key, char const *value) override; + void set(SPAttributeEnum key, char const *value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp index d11249d1f..417135e1e 100755 --- a/src/object/sp-lpe-item.cpp +++ b/src/object/sp-lpe-item.cpp @@ -92,7 +92,7 @@ void SPLPEItem::release() { SPItem::release(); } -void SPLPEItem::set(unsigned int key, gchar const* value) { +void SPLPEItem::set(SPAttributeEnum key, gchar const* value) { switch (key) { case SP_ATTR_INKSCAPE_PATH_EFFECT: { diff --git a/src/object/sp-lpe-item.h b/src/object/sp-lpe-item.h index b53b440a1..a29c228cb 100644 --- a/src/object/sp-lpe-item.h +++ b/src/object/sp-lpe-item.h @@ -58,7 +58,7 @@ public: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; diff --git a/src/object/sp-marker.cpp b/src/object/sp-marker.cpp index 3a504db90..7cf9cd708 100644 --- a/src/object/sp-marker.cpp +++ b/src/object/sp-marker.cpp @@ -113,7 +113,7 @@ void SPMarker::release() { } -void SPMarker::set(unsigned int key, const gchar* value) { +void SPMarker::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_MARKERUNITS: this->markerUnits_set = FALSE; diff --git a/src/object/sp-marker.h b/src/object/sp-marker.h index 5394d9376..04fcc3ac5 100644 --- a/src/object/sp-marker.h +++ b/src/object/sp-marker.h @@ -73,7 +73,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, gchar const* value) override; + void set(SPAttributeEnum key, gchar const* value) override; void update(SPCtx *ctx, guint flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) override; diff --git a/src/object/sp-mask.cpp b/src/object/sp-mask.cpp index 277e35140..217e8383c 100644 --- a/src/object/sp-mask.cpp +++ b/src/object/sp-mask.cpp @@ -69,7 +69,7 @@ void SPMask::release() { SPObjectGroup::release(); } -void SPMask::set(unsigned int key, const gchar* value) { +void SPMask::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_MASKUNITS: this->maskUnits = SP_CONTENT_UNITS_OBJECTBOUNDINGBOX; diff --git a/src/object/sp-mask.h b/src/object/sp-mask.h index b1a1d1d3c..f07c2ccd1 100644 --- a/src/object/sp-mask.h +++ b/src/object/sp-mask.h @@ -64,7 +64,7 @@ protected: void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; diff --git a/src/object/sp-mesh-gradient.cpp b/src/object/sp-mesh-gradient.cpp index d36a7fb73..4e1d78bee 100644 --- a/src/object/sp-mesh-gradient.cpp +++ b/src/object/sp-mesh-gradient.cpp @@ -51,7 +51,7 @@ void SPMeshGradient::build(SPDocument *document, Inkscape::XML::Node *repr) { } -void SPMeshGradient::set(unsigned key, gchar const *value) { +void SPMeshGradient::set(SPAttributeEnum key, gchar const *value) { #ifdef OBJECT_TRACE objectTrace( "SPMeshGradient::set" ); #endif diff --git a/src/object/sp-mesh-gradient.h b/src/object/sp-mesh-gradient.h index c542ea830..9888ba3a1 100644 --- a/src/object/sp-mesh-gradient.h +++ b/src/object/sp-mesh-gradient.h @@ -25,7 +25,7 @@ public: protected: void build(SPDocument *document, Inkscape::XML::Node *repr) override; - void set(unsigned key, char const *value) override; + void set(SPAttributeEnum key, char const *value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; diff --git a/src/object/sp-mesh-patch.cpp b/src/object/sp-mesh-patch.cpp index 15149b689..1331bf79b 100644 --- a/src/object/sp-mesh-patch.cpp +++ b/src/object/sp-mesh-patch.cpp @@ -72,7 +72,7 @@ void SPMeshpatch::build(SPDocument* doc, Inkscape::XML::Node* repr) { /** * Virtual build: set meshpatch attributes from its associated XML node. */ -void SPMeshpatch::set(unsigned int key, const gchar* value) { +void SPMeshpatch::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_TENSOR: { if (value) { diff --git a/src/object/sp-mesh-patch.h b/src/object/sp-mesh-patch.h index 5a7834ec7..c8f1feb41 100644 --- a/src/object/sp-mesh-patch.h +++ b/src/object/sp-mesh-patch.h @@ -32,7 +32,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-mesh-row.cpp b/src/object/sp-mesh-row.cpp index 52e3b326e..bd2274dbd 100644 --- a/src/object/sp-mesh-row.cpp +++ b/src/object/sp-mesh-row.cpp @@ -68,7 +68,7 @@ void SPMeshrow::build(SPDocument* doc, Inkscape::XML::Node* repr) { /** * Virtual build: set meshrow attributes from its associated XML node. */ -void SPMeshrow::set(unsigned int /*key*/, const gchar* /*value*/) { +void SPMeshrow::set(SPAttributeEnum /*key*/, const gchar* /*value*/) { } /** diff --git a/src/object/sp-mesh-row.h b/src/object/sp-mesh-row.h index 669c7f237..48f696253 100644 --- a/src/object/sp-mesh-row.h +++ b/src/object/sp-mesh-row.h @@ -27,7 +27,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-metadata.cpp b/src/object/sp-metadata.cpp index ad50295d0..223ab0f12 100644 --- a/src/object/sp-metadata.cpp +++ b/src/object/sp-metadata.cpp @@ -75,7 +75,7 @@ void SPMetadata::release() { SPObject::release(); } -void SPMetadata::set(unsigned int key, const gchar* value) { +void SPMetadata::set(SPAttributeEnum key, const gchar* value) { debug("0x%08x %s(%u): '%s'",(unsigned int)this, sp_attribute_name(key),key,value); diff --git a/src/object/sp-metadata.h b/src/object/sp-metadata.h index 2ca53c6a2..450b429b4 100644 --- a/src/object/sp-metadata.h +++ b/src/object/sp-metadata.h @@ -28,7 +28,7 @@ protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-missing-glyph.cpp b/src/object/sp-missing-glyph.cpp index 62102e292..d6c8a9288 100644 --- a/src/object/sp-missing-glyph.cpp +++ b/src/object/sp-missing-glyph.cpp @@ -41,7 +41,7 @@ void SPMissingGlyph::release() { } -void SPMissingGlyph::set(unsigned int key, const gchar* value) { +void SPMissingGlyph::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_D: { diff --git a/src/object/sp-missing-glyph.h b/src/object/sp-missing-glyph.h index 75652da02..883434e46 100644 --- a/src/object/sp-missing-glyph.h +++ b/src/object/sp-missing-glyph.h @@ -27,7 +27,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; private: diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp index 0618485d2..0a2cc4888 100644 --- a/src/object/sp-namedview.cpp +++ b/src/object/sp-namedview.cpp @@ -272,7 +272,7 @@ void SPNamedView::release() { SPObjectGroup::release(); } -void SPNamedView::set(unsigned int key, const gchar* value) { +void SPNamedView::set(SPAttributeEnum key, const gchar* value) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); bool global_snapping = prefs->getBool("/options/snapdefault/value", false); switch (key) { diff --git a/src/object/sp-namedview.h b/src/object/sp-namedview.h index 1dd2a5f5b..0d6ffa58e 100644 --- a/src/object/sp-namedview.h +++ b/src/object/sp-namedview.h @@ -107,7 +107,7 @@ private: protected: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node* child) override; diff --git a/src/object/sp-object.cpp b/src/object/sp-object.cpp index 588bdacd0..7c6b6c28d 100644 --- a/src/object/sp-object.cpp +++ b/src/object/sp-object.cpp @@ -879,7 +879,7 @@ void SPObject::repr_order_changed(Inkscape::XML::Node * /*repr*/, Inkscape::XML: object->order_changed(child, old, newer); } -void SPObject::set(unsigned int key, gchar const* value) { +void SPObject::set(SPAttributeEnum key, gchar const* value) { #ifdef OBJECT_TRACE std::stringstream temp; @@ -975,7 +975,7 @@ void SPObject::set(unsigned int key, gchar const* value) { #endif } -void SPObject::setKeyValue(unsigned int key, gchar const *value) +void SPObject::setKeyValue(SPAttributeEnum key, gchar const *value) { //g_assert(object != NULL); //g_assert(SP_IS_OBJECT(object)); @@ -992,7 +992,7 @@ void SPObject::readAttr(gchar const *key) //XML Tree being used here. g_assert(this->getRepr() != nullptr); - unsigned int keyid = sp_attribute_lookup(key); + auto keyid = sp_attribute_lookup(key); if (keyid != SP_ATTR_INVALID) { /* Retrieve the 'key' attribute from the object's XML representation */ gchar const *value = getRepr()->attribute(key); diff --git a/src/object/sp-object.h b/src/object/sp-object.h index ca3ddaec5..3e94f6484 100644 --- a/src/object/sp-object.h +++ b/src/object/sp-object.h @@ -61,6 +61,8 @@ class SPObject; #include "version.h" #include "util/forward-pointer-iterator.h" +enum SPAttributeEnum : unsigned; + class SPCSSAttr; class SPStyle; @@ -705,7 +707,7 @@ public: /** * Call virtual set() function of object. */ - void setKeyValue(unsigned int key, char const *value); + void setKeyValue(SPAttributeEnum key, char const *value); void setAttribute( char const *key, char const *value, SPException *ex=nullptr); void setAttribute( char const *key, Glib::ustring const &value, SPException *ex=nullptr); @@ -816,7 +818,7 @@ protected: virtual void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr); - virtual void set(unsigned int key, const char* value); + virtual void set(SPAttributeEnum key, const char* value); virtual void update(SPCtx* ctx, unsigned int flags); virtual void modified(unsigned int flags); diff --git a/src/object/sp-offset.cpp b/src/object/sp-offset.cpp index 1657c9edc..ee8bbab2f 100644 --- a/src/object/sp-offset.cpp +++ b/src/object/sp-offset.cpp @@ -216,7 +216,7 @@ void SPOffset::release() { SPShape::release(); } -void SPOffset::set(unsigned int key, const gchar* value) { +void SPOffset::set(SPAttributeEnum key, const gchar* value) { if ( this->sourceDirty ) { refresh_offset_source(this); } diff --git a/src/object/sp-offset.h b/src/object/sp-offset.h index f99124b88..018211d22 100644 --- a/src/object/sp-offset.h +++ b/src/object/sp-offset.h @@ -76,7 +76,7 @@ public: sigc::connection _transformed_connection; void build(SPDocument *document, Inkscape::XML::Node *repr) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx *ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned flags) override; void release() override; diff --git a/src/object/sp-path.cpp b/src/object/sp-path.cpp index 10f7930c0..81149b13e 100644 --- a/src/object/sp-path.cpp +++ b/src/object/sp-path.cpp @@ -211,7 +211,7 @@ void SPPath::release() { SPShape::release(); } -void SPPath::set(unsigned int key, const gchar* value) { +void SPPath::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_INKSCAPE_ORIGINAL_D: if (value) { diff --git a/src/object/sp-path.h b/src/object/sp-path.h index 3bd7f5a54..67beacb7e 100644 --- a/src/object/sp-path.h +++ b/src/object/sp-path.h @@ -41,7 +41,7 @@ public: void release() override; void update(SPCtx* ctx, unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update_patheffect(bool write) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-pattern.cpp b/src/object/sp-pattern.cpp index 6b1ffeb44..e25f48473 100644 --- a/src/object/sp-pattern.cpp +++ b/src/object/sp-pattern.cpp @@ -94,7 +94,7 @@ void SPPattern::release() SPPaintServer::release(); } -void SPPattern::set(unsigned int key, const gchar *value) +void SPPattern::set(SPAttributeEnum key, const gchar *value) { switch (key) { case SP_ATTR_PATTERNUNITS: diff --git a/src/object/sp-pattern.h b/src/object/sp-pattern.h index 4f37e9a2b..00e229d3d 100644 --- a/src/object/sp-pattern.h +++ b/src/object/sp-pattern.h @@ -74,7 +74,7 @@ public: protected: void build(SPDocument *doc, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, const gchar *value) override; + void set(SPAttributeEnum key, const gchar *value) override; void update(SPCtx *ctx, unsigned int flags) override; void modified(unsigned int flags) override; diff --git a/src/object/sp-polygon.cpp b/src/object/sp-polygon.cpp index 205120cfa..979005888 100644 --- a/src/object/sp-polygon.cpp +++ b/src/object/sp-polygon.cpp @@ -102,7 +102,7 @@ static gboolean polygon_get_value(gchar const **p, gdouble *v) return true; } -void SPPolygon::set(unsigned int key, const gchar* value) { +void SPPolygon::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_POINTS: { if (!value) { diff --git a/src/object/sp-polygon.h b/src/object/sp-polygon.h index ef853c6de..17bfad2e5 100644 --- a/src/object/sp-polygon.h +++ b/src/object/sp-polygon.h @@ -25,7 +25,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; char* description() const override; }; diff --git a/src/object/sp-polyline.cpp b/src/object/sp-polyline.cpp index 083cb3066..316078876 100644 --- a/src/object/sp-polyline.cpp +++ b/src/object/sp-polyline.cpp @@ -29,7 +29,7 @@ void SPPolyLine::build(SPDocument * document, Inkscape::XML::Node * repr) { this->readAttr("points"); } -void SPPolyLine::set(unsigned int key, const gchar* value) { +void SPPolyLine::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_POINTS: { SPCurve * curve; diff --git a/src/object/sp-polyline.h b/src/object/sp-polyline.h index 6a689a6f0..6edb056ec 100644 --- a/src/object/sp-polyline.h +++ b/src/object/sp-polyline.h @@ -12,7 +12,7 @@ public: ~SPPolyLine() override; void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; char* description() const override; diff --git a/src/object/sp-radial-gradient.cpp b/src/object/sp-radial-gradient.cpp index 4f776d334..e01aa1639 100644 --- a/src/object/sp-radial-gradient.cpp +++ b/src/object/sp-radial-gradient.cpp @@ -38,7 +38,7 @@ void SPRadialGradient::build(SPDocument *document, Inkscape::XML::Node *repr) { /** * Set radial gradient attribute. */ -void SPRadialGradient::set(unsigned key, gchar const *value) { +void SPRadialGradient::set(SPAttributeEnum key, gchar const *value) { switch (key) { case SP_ATTR_CX: if (!this->cx.read(value)) { diff --git a/src/object/sp-radial-gradient.h b/src/object/sp-radial-gradient.h index d31f63966..a89c56274 100644 --- a/src/object/sp-radial-gradient.h +++ b/src/object/sp-radial-gradient.h @@ -31,7 +31,7 @@ public: protected: void build(SPDocument *document, Inkscape::XML::Node *repr) override; - void set(unsigned key, char const *value) override; + void set(SPAttributeEnum key, char const *value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; }; diff --git a/src/object/sp-rect.cpp b/src/object/sp-rect.cpp index ac56577d7..26dd0147f 100644 --- a/src/object/sp-rect.cpp +++ b/src/object/sp-rect.cpp @@ -50,7 +50,7 @@ void SPRect::build(SPDocument* doc, Inkscape::XML::Node* repr) { #endif } -void SPRect::set(unsigned key, gchar const *value) { +void SPRect::set(SPAttributeEnum key, gchar const *value) { #ifdef OBJECT_TRACE std::stringstream temp; diff --git a/src/object/sp-rect.h b/src/object/sp-rect.h index 68d2507a4..5c587e89f 100644 --- a/src/object/sp-rect.h +++ b/src/object/sp-rect.h @@ -51,7 +51,7 @@ public: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned key, char const *value) override; + void set(SPAttributeEnum key, char const *value) override; void update(SPCtx* ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-root.cpp b/src/object/sp-root.cpp index 6ebccef3c..3325a1ef2 100644 --- a/src/object/sp-root.cpp +++ b/src/object/sp-root.cpp @@ -96,7 +96,7 @@ void SPRoot::release() } -void SPRoot::set(unsigned int key, const gchar *value) +void SPRoot::set(SPAttributeEnum key, const gchar *value) { switch (key) { case SP_ATTR_VERSION: diff --git a/src/object/sp-root.h b/src/object/sp-root.h index 9bf3fb0db..e821c8357 100644 --- a/src/object/sp-root.h +++ b/src/object/sp-root.h @@ -48,7 +48,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx *ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-script.cpp b/src/object/sp-script.cpp index e60789eb0..79b79fb01 100644 --- a/src/object/sp-script.cpp +++ b/src/object/sp-script.cpp @@ -52,7 +52,7 @@ void SPScript::modified(unsigned int /*flags*/) { } -void SPScript::set(unsigned int key, const gchar* value) { +void SPScript::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: if (this->xlinkhref) { diff --git a/src/object/sp-script.h b/src/object/sp-script.h index 794ba5e70..749eb727a 100644 --- a/src/object/sp-script.h +++ b/src/object/sp-script.h @@ -27,7 +27,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; diff --git a/src/object/sp-shape.cpp b/src/object/sp-shape.cpp index c5ecd5294..1049e29de 100644 --- a/src/object/sp-shape.cpp +++ b/src/object/sp-shape.cpp @@ -106,7 +106,7 @@ void SPShape::release() { SPLPEItem::release(); } -void SPShape::set(unsigned int key, const gchar* value) { +void SPShape::set(SPAttributeEnum key, const gchar* value) { SPLPEItem::set(key, value); } diff --git a/src/object/sp-shape.h b/src/object/sp-shape.h index 1fa8dbe4d..74e1135c1 100644 --- a/src/object/sp-shape.h +++ b/src/object/sp-shape.h @@ -63,7 +63,7 @@ public: void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const override; diff --git a/src/object/sp-solid-color.cpp b/src/object/sp-solid-color.cpp index f1d73835c..72f37d329 100644 --- a/src/object/sp-solid-color.cpp +++ b/src/object/sp-solid-color.cpp @@ -36,7 +36,7 @@ void SPSolidColor::build(SPDocument* doc, Inkscape::XML::Node* repr) { * Virtual build: set solidcolor attributes from its associated XML node. */ -void SPSolidColor::set(unsigned int key, const gchar* value) { +void SPSolidColor::set(SPAttributeEnum key, const gchar* value) { if (SP_ATTRIBUTE_IS_CSS(key)) { style->clear(key); diff --git a/src/object/sp-solid-color.h b/src/object/sp-solid-color.h index 6b20ab006..6e6b2bc2c 100644 --- a/src/object/sp-solid-color.h +++ b/src/object/sp-solid-color.h @@ -30,7 +30,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-spiral.cpp b/src/object/sp-spiral.cpp index b7a92e47e..8b4a6d223 100644 --- a/src/object/sp-spiral.cpp +++ b/src/object/sp-spiral.cpp @@ -89,7 +89,7 @@ Inkscape::XML::Node* SPSpiral::write(Inkscape::XML::Document *xml_doc, Inkscape: return repr; } -void SPSpiral::set(unsigned int key, gchar const* value) { +void SPSpiral::set(SPAttributeEnum key, gchar const* value) { /// \todo fixme: we should really collect updates switch (key) { case SP_ATTR_SODIPODI_CX: diff --git a/src/object/sp-spiral.h b/src/object/sp-spiral.h index 4b92c6156..f9ee5c00d 100644 --- a/src/object/sp-spiral.h +++ b/src/object/sp-spiral.h @@ -64,7 +64,7 @@ public: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; void update(SPCtx *ctx, unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override; const char* displayName() const override; diff --git a/src/object/sp-star.cpp b/src/object/sp-star.cpp index 20c9607b1..8b5b4e11d 100644 --- a/src/object/sp-star.cpp +++ b/src/object/sp-star.cpp @@ -90,7 +90,7 @@ Inkscape::XML::Node* SPStar::write(Inkscape::XML::Document *xml_doc, Inkscape::X return repr; } -void SPStar::set(unsigned int key, const gchar* value) { +void SPStar::set(SPAttributeEnum key, const gchar* value) { SVGLength::Unit unit; /* fixme: we should really collect updates */ diff --git a/src/object/sp-star.h b/src/object/sp-star.h index 6e767481d..d60881190 100644 --- a/src/object/sp-star.h +++ b/src/object/sp-star.h @@ -47,7 +47,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; const char* displayName() const override; diff --git a/src/object/sp-stop.cpp b/src/object/sp-stop.cpp index 41daeb4d4..7d9548955 100644 --- a/src/object/sp-stop.cpp +++ b/src/object/sp-stop.cpp @@ -43,7 +43,7 @@ void SPStop::build(SPDocument* doc, Inkscape::XML::Node* repr) { * Virtual build: set stop attributes from its associated XML node. */ -void SPStop::set(unsigned int key, const gchar* value) { +void SPStop::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_OFFSET: { this->offset = sp_svg_read_percentage(value, 0.0); diff --git a/src/object/sp-stop.h b/src/object/sp-stop.h index 7ee03259e..41d98de49 100644 --- a/src/object/sp-stop.h +++ b/src/object/sp-stop.h @@ -43,7 +43,7 @@ public: protected: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void modified(guint flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp index 7ccea3ea4..55f1f6cb8 100644 --- a/src/object/sp-style-elem.cpp +++ b/src/object/sp-style-elem.cpp @@ -24,7 +24,7 @@ SPStyleElem::SPStyleElem() : SPObject() { SPStyleElem::~SPStyleElem() = default; -void SPStyleElem::set(unsigned int key, const gchar* value) { +void SPStyleElem::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_TYPE: { if (!value) { diff --git a/src/object/sp-style-elem.h b/src/object/sp-style-elem.h index 3d0919a2f..65fede562 100644 --- a/src/object/sp-style-elem.h +++ b/src/object/sp-style-elem.h @@ -13,7 +13,7 @@ public: bool is_css; void build(SPDocument* doc, Inkscape::XML::Node* repr) override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void read_content() override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; diff --git a/src/object/sp-symbol.cpp b/src/object/sp-symbol.cpp index db18b5a70..1825bf763 100644 --- a/src/object/sp-symbol.cpp +++ b/src/object/sp-symbol.cpp @@ -37,7 +37,7 @@ void SPSymbol::release() { SPGroup::release(); } -void SPSymbol::set(unsigned int key, const gchar* value) { +void SPSymbol::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_VIEWBOX: set_viewBox( value ); diff --git a/src/object/sp-symbol.h b/src/object/sp-symbol.h index 761227255..d43fb3aff 100644 --- a/src/object/sp-symbol.h +++ b/src/object/sp-symbol.h @@ -32,7 +32,7 @@ public: void build(SPDocument *document, Inkscape::XML::Node *repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx *ctx, unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; diff --git a/src/object/sp-tag-use.cpp b/src/object/sp-tag-use.cpp index c3fbfee7e..e1dae8167 100644 --- a/src/object/sp-tag-use.cpp +++ b/src/object/sp-tag-use.cpp @@ -84,7 +84,7 @@ SPTagUse::release() } void -SPTagUse::set(unsigned key, gchar const *value) +SPTagUse::set(SPAttributeEnum key, gchar const *value) { switch (key) { diff --git a/src/object/sp-tag-use.h b/src/object/sp-tag-use.h index 4d354f4ce..e77624ab6 100644 --- a/src/object/sp-tag-use.h +++ b/src/object/sp-tag-use.h @@ -38,7 +38,7 @@ public: ~SPTagUse() override; void build(SPDocument *doc, Inkscape::XML::Node *repr) override; - void set(unsigned key, gchar const *value) override; + void set(SPAttributeEnum key, gchar const *value) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; void release() override; diff --git a/src/object/sp-tag.cpp b/src/object/sp-tag.cpp index b06a02fd1..6d9892e10 100644 --- a/src/object/sp-tag.cpp +++ b/src/object/sp-tag.cpp @@ -70,7 +70,7 @@ SPTag::build(SPDocument *document, Inkscape::XML::Node *repr) * Sets a specific value in the SPTag. */ void -SPTag::set(unsigned int key, gchar const *value) +SPTag::set(SPAttributeEnum key, gchar const *value) { switch (key) diff --git a/src/object/sp-tag.h b/src/object/sp-tag.h index 1a1c737d8..2f7f331e0 100644 --- a/src/object/sp-tag.h +++ b/src/object/sp-tag.h @@ -28,7 +28,7 @@ public: void build(SPDocument * doc, Inkscape::XML::Node *repr) override; //virtual void release(); - void set(unsigned key, const gchar* value) override; + void set(SPAttributeEnum key, const gchar* value) override; void update(SPCtx * ctx, unsigned flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; diff --git a/src/object/sp-text.cpp b/src/object/sp-text.cpp index 4739f6b12..5d17ffaaa 100644 --- a/src/object/sp-text.cpp +++ b/src/object/sp-text.cpp @@ -83,7 +83,7 @@ void SPText::release() { SPItem::release(); } -void SPText::set(unsigned int key, const gchar* value) { +void SPText::set(SPAttributeEnum key, const gchar* value) { //std::cout << "SPText::set: " << sp_attribute_name( key ) << ": " << (value?value:"Null") << std::endl; if (this->attributes.readSingleAttribute(key, value, style, &viewport)) { diff --git a/src/object/sp-text.h b/src/object/sp-text.h index 6abf33090..bc33f9534 100644 --- a/src/object/sp-text.h +++ b/src/object/sp-text.h @@ -83,7 +83,7 @@ public: void release() override; void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node* child) override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; diff --git a/src/object/sp-textpath.h b/src/object/sp-textpath.h index 4e71ff9c5..37c403156 100644 --- a/src/object/sp-textpath.h +++ b/src/object/sp-textpath.h @@ -31,7 +31,7 @@ public: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; diff --git a/src/object/sp-tref.cpp b/src/object/sp-tref.cpp index e7941145f..c3db8780f 100644 --- a/src/object/sp-tref.cpp +++ b/src/object/sp-tref.cpp @@ -85,7 +85,7 @@ void SPTRef::release() { SPItem::release(); } -void SPTRef::set(unsigned int key, const gchar* value) { +void SPTRef::set(SPAttributeEnum key, const gchar* value) { debug("0x%p %s(%u): '%s'",this, sp_attribute_name(key),key,value ? value : "<no value>"); diff --git a/src/object/sp-tref.h b/src/object/sp-tref.h index 9df993430..54553d689 100644 --- a/src/object/sp-tref.h +++ b/src/object/sp-tref.h @@ -53,7 +53,7 @@ public: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, char const* value) override; + void set(SPAttributeEnum key, char const* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) override; diff --git a/src/object/sp-tspan.cpp b/src/object/sp-tspan.cpp index 860c30c84..4b6a0733f 100644 --- a/src/object/sp-tspan.cpp +++ b/src/object/sp-tspan.cpp @@ -68,7 +68,7 @@ void SPTSpan::release() { SPItem::release(); } -void SPTSpan::set(unsigned int key, const gchar* value) { +void SPTSpan::set(SPAttributeEnum key, const gchar* value) { if (this->attributes.readSingleAttribute(key, value, style, &viewport)) { this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } else { @@ -277,7 +277,7 @@ void SPTextPath::release() { SPItem::release(); } -void SPTextPath::set(unsigned int key, const gchar* value) { +void SPTextPath::set(SPAttributeEnum key, const gchar* value) { if (this->attributes.readSingleAttribute(key, value, style, &viewport)) { this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); diff --git a/src/object/sp-tspan.h b/src/object/sp-tspan.h index 24a8a3bbf..becea8c4a 100644 --- a/src/object/sp-tspan.h +++ b/src/object/sp-tspan.h @@ -27,7 +27,7 @@ public: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned int key, const char* value) override; + void set(SPAttributeEnum key, const char* value) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; diff --git a/src/object/sp-use.cpp b/src/object/sp-use.cpp index a73a731f8..876c822e6 100644 --- a/src/object/sp-use.cpp +++ b/src/object/sp-use.cpp @@ -106,7 +106,7 @@ void SPUse::release() { SPItem::release(); } -void SPUse::set(unsigned int key, const gchar* value) { +void SPUse::set(SPAttributeEnum key, const gchar* value) { switch (key) { case SP_ATTR_X: this->x.readOrUnset(value); diff --git a/src/object/sp-use.h b/src/object/sp-use.h index 1c482bae7..54cefdcbd 100644 --- a/src/object/sp-use.h +++ b/src/object/sp-use.h @@ -49,7 +49,7 @@ public: void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void release() override; - void set(unsigned key, char const *value) override; + void set(SPAttributeEnum key, char const *value) override; Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override; void update(SPCtx* ctx, unsigned int flags) override; void modified(unsigned int flags) override; |