From 1852f0e02848e14113ec7b1fcb005faadabf3b8e Mon Sep 17 00:00:00 2001 From: johanengelen Date: Sat, 3 Jan 2009 19:28:10 +0000 Subject: [PATCH] remove some of the lpe test define clauses. they are not needed. this in preparation for moving the define to config.h --- src/live_effects/effect-enum.h | 6 +----- src/live_effects/effect.cpp | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h index b6a091b0c..50001c841 100644 --- 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 LPETypeData[]; /// defined in effect.cpp diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 83e3ccb8d..d7613fb32 100644 --- 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 ( new LPELineSegment(lpeobj) ); break; -#ifdef LPE_ENABLE_TEST_EFFECTS case DOEFFECTSTACK_TEST: neweffect = static_cast ( new LPEdoEffectStackTest(lpeobj) ); break; case DYNASTROKE: neweffect = static_cast ( new LPEDynastroke(lpeobj) ); break; -#endif default: g_warning("LivePathEffect::Effect::New called with invalid patheffect type (%d)", lpenr); neweffect = NULL; -- 2.30.2