remove dependency on INVALID_LPE a bit

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 8b690bc444214fbea71cc9ee0ed3d3f9be3b1076..289d22172b22544c180cd0390e99da1d585c539f 100644 (file)
--- 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") );

diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 4b609965696db533f5f2ec9d9bab7d0ee430f885..b6386169c77a1e977f86fc901204713cd4868467 100644 (file)
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -82,7 +82,7 @@ enum EffectType {
     INVALID_LPE // This must be last
 };
 
-extern const Util::EnumData<EffectType> LPETypeData[INVALID_LPE];
+extern const Util::EnumData<EffectType> LPETypeData[];
 extern const Util::EnumDataConverter<EffectType> LPETypeConverter;
 
 enum LPEPathFlashType {