remove some of the lpe test define clauses. they are not needed. this in preparation...

diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h
index b6a091b0cfc71c82d957f3a0ca2d91e67e9b88dd..50001c841133f7afa6d5766f5aac98626cafdd40 100644 (file)
--- a/src/live_effects/effect-enum.h
+++ b/src/live_effects/effect-enum.h
@@ -11,8 +11,6 @@
 
 #include "util/enums.h"
 
-//#define LPE_ENABLE_TEST_EFFECTS
-
 namespace Inkscape {
 namespace LivePathEffect {
 
@@ -46,11 +44,9 @@ enum EffectType {
     TEXT_LABEL,
     PATH_LENGTH,
     LINE_SEGMENT,
-#ifdef LPE_ENABLE_TEST_EFFECTS
     DOEFFECTSTACK_TEST,
     DYNASTROKE,
-#endif
-    INVALID_LPE // This must be last
+    INVALID_LPE // This must be last (I made it such that it is not needed anymore I think..., Don't trust on it being last. - johan)
 };
 
 extern const Util::EnumData<EffectType> LPETypeData[];  /// defined in effect.cpp

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 83e3ccb8db7bf835187fd5c42d06c0bfaff7ace7..d7613fb326dadf6503e9f77101fba6e67879720f 100644 (file)
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -68,7 +68,7 @@
 #include "live_effects/lpe-path_length.h"
 #include "live_effects/lpe-line_segment.h"
 
-// end of includes
+//#define LPE_ENABLE_TEST_EFFECTS
 
 namespace Inkscape {
 
@@ -217,14 +217,12 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
         case LINE_SEGMENT:
             neweffect = static_cast<Effect*> ( new LPELineSegment(lpeobj) );
             break;
-#ifdef LPE_ENABLE_TEST_EFFECTS
         case DOEFFECTSTACK_TEST:
             neweffect = static_cast<Effect*> ( new LPEdoEffectStackTest(lpeobj) );
             break;
         case DYNASTROKE:
             neweffect = static_cast<Effect*> ( new LPEDynastroke(lpeobj) );
             break;
-#endif
         default:
             g_warning("LivePathEffect::Effect::New   called with invalid patheffect type (%d)", lpenr);
             neweffect = NULL;