diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-07-27 21:58:25 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-07-27 21:58:25 +0000 |
| commit | 68e446be3419fef0640457816a072bbe2b2062bc (patch) | |
| tree | c0da80e4ed1de734ff183a56ea04d251fd50c751 /src/live_effects/effect.cpp | |
| parent | sort LPE effect list (diff) | |
| download | inkscape-68e446be3419fef0640457816a072bbe2b2062bc.tar.gz inkscape-68e446be3419fef0640457816a072bbe2b2062bc.zip | |
remove dependency on INVALID_LPE a bit
(bzr r6436)
Diffstat (limited to 'src/live_effects/effect.cpp')
| -rw-r--r-- | src/live_effects/effect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 8b690bc44..289d22172 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -70,7 +70,7 @@ namespace Inkscape { namespace LivePathEffect { -const Util::EnumData<EffectType> LPETypeData[INVALID_LPE] = { +const Util::EnumData<EffectType> LPETypeData[] = { // {constant defined in effect.h, N_("name of your effect"), "name of your effect in SVG"} {ANGLE_BISECTOR, N_("Angle bisector"), "angle_bisector"}, {BEND_PATH, N_("Bend"), "bend_path"}, @@ -101,7 +101,7 @@ const Util::EnumData<EffectType> LPETypeData[INVALID_LPE] = { {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, {VONKOCH, N_("VonKoch"), "vonkoch"}, }; -const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, INVALID_LPE); +const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); Effect* Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) @@ -243,7 +243,7 @@ Effect::~Effect() Glib::ustring Effect::getName() { - if (lpeobj->effecttype_set && lpeobj->effecttype < INVALID_LPE) + if (lpeobj->effecttype_set && LPETypeConverter.is_valid_id(lpeobj->effecttype) ) return Glib::ustring( _(LPETypeConverter.get_label(lpeobj->effecttype).c_str()) ); else return Glib::ustring( _("No effect") ); |