summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2009-01-03 19:28:10 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2009-01-03 19:28:10 +0000
commit8286436900b09ef0efe5433bd553e1d6c67d7093 (patch)
treefab1aca68a36d4d8f33375b1ba1ee96ef8fd4586 /src
parentadded lpe-dynastroke, but hidden as experimental. (diff)
downloadinkscape-8286436900b09ef0efe5433bd553e1d6c67d7093.tar.gz
inkscape-8286436900b09ef0efe5433bd553e1d6c67d7093.zip
remove some of the lpe test define clauses. they are not needed. this in preparation for moving the define to config.h
(bzr r7066)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/effect-enum.h6
-rw-r--r--src/live_effects/effect.cpp4
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<EffectType> 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<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;