GSoC C++-ificiation merge and cleanup.

[inkscape.git] / src / live_effects / effect-enum.h

diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h
index 1e82954f8a4ca9295ae235d6963686aab640af02..535cc25646e28503509e9449b1c77fcaf861cee4 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 {
 
@@ -21,12 +19,9 @@ enum EffectType {
     PATTERN_ALONG_PATH,
     FREEHAND_SHAPE,
     SKETCH,
-    HATCHES,
+    ROUGH_HATCHES,
     VONKOCH,
     KNOT,
-#ifdef LPE_ENABLE_TEST_EFFECTS
-    DOEFFECTSTACK_TEST,
-#endif
     GEARS,
     CURVE_STITCH,
     CIRCLE_WITH_RADIUS,
@@ -49,7 +44,12 @@ enum EffectType {
     TEXT_LABEL,
     PATH_LENGTH,
     LINE_SEGMENT,
-    INVALID_LPE // This must be last
+    DOEFFECTSTACK_TEST,
+    DYNASTROKE,
+    RECURSIVE_SKELETON,
+    EXTRUDE,
+    POWERSTROKE,
+    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