[gimp/warp-wip-rebased: 52/56] remove the warp operator, since it moved to GEGL

[Michael Natterer <mitch src gnome org>]

commit aee92dd9b0465353b6285d65481b6bb6606a179f
Author: Michael Muré <batolettre gmail com>
Date:   Mon Aug 1 20:48:30 2011 +0200

    remove the warp operator, since it moved to GEGL

 app/gegl/gimp-gegl-enums.c        |   39 ---
 app/gegl/gimp-gegl-enums.h        |   14 -
 app/gegl/gimpoperationwarp.c      |  483 -------------------------------------
 app/gegl/gimpoperationwarp.h      |   69 ------
 app/operations/Makefile.am        |    2 -
 app/operations/gimp-operations.c  |    1 -
 app/operations/operations-types.h |    1 -
 app/tools/tools-enums.c           |   39 +++
 app/tools/tools-enums.h           |   16 ++
 9 files changed, 55 insertions(+), 609 deletions(-)
---
diff --git a/app/gegl/gimp-gegl-enums.c b/app/gegl/gimp-gegl-enums.c
index b4062be..1b7f76d 100644
--- a/app/gegl/gimp-gegl-enums.c
+++ b/app/gegl/gimp-gegl-enums.c
@@ -38,45 +38,6 @@ gimp_cage_mode_get_type (void)
   return type;
 }
 
-GType
-gimp_warp_behavior_get_type (void)
-{
-  static const GEnumValue values[] =
-  {
-    { GIMP_WARP_BEHAVIOR_MOVE, "GIMP_WARP_BEHAVIOR_MOVE", "move" },
-    { GIMP_WARP_BEHAVIOR_GROW, "GIMP_WARP_BEHAVIOR_GROW", "grow" },
-    { GIMP_WARP_BEHAVIOR_SHRINK, "GIMP_WARP_BEHAVIOR_SHRINK", "shrink" },
-    { GIMP_WARP_BEHAVIOR_SWIRL_CW, "GIMP_WARP_BEHAVIOR_SWIRL_CW", "swirl-cw" },
-    { GIMP_WARP_BEHAVIOR_SWIRL_CCW, "GIMP_WARP_BEHAVIOR_SWIRL_CCW", "swirl-ccw" },
-    { GIMP_WARP_BEHAVIOR_ERASE, "GIMP_WARP_BEHAVIOR_ERASE", "erase" },
-    { GIMP_WARP_BEHAVIOR_SMOOTH, "GIMP_WARP_BEHAVIOR_SMOOTH", "smooth" },
-    { 0, NULL, NULL }
-  };
-
-  static const GimpEnumDesc descs[] =
-  {
-    { GIMP_WARP_BEHAVIOR_MOVE, NC_("warp-behavior", "Move pixels"), NULL },
-    { GIMP_WARP_BEHAVIOR_GROW, NC_("warp-behavior", "Grow area"), NULL },
-    { GIMP_WARP_BEHAVIOR_SHRINK, NC_("warp-behavior", "Shrink area"), NULL },
-    { GIMP_WARP_BEHAVIOR_SWIRL_CW, NC_("warp-behavior", "Swirl clockwise"), NULL },
-    { GIMP_WARP_BEHAVIOR_SWIRL_CCW, NC_("warp-behavior", "Swirl counter-clockwise"), NULL },
-    { GIMP_WARP_BEHAVIOR_ERASE, NC_("warp-behavior", "Erase warping"), NULL },
-    { GIMP_WARP_BEHAVIOR_SMOOTH, NC_("warp-behavior", "Smooth warping"), NULL },
-    { 0, NULL, NULL }
-  };
-
-  static GType type = 0;
-
-  if (G_UNLIKELY (! type))
-    {
-      type = g_enum_register_static ("GimpWarpBehavior", values);
-      gimp_type_set_translation_context (type, "warp-behavior");
-      gimp_enum_set_value_descriptions (type, descs);
-    }
-
-  return type;
-}
-
 
 /* Generated data ends here */
 
diff --git a/app/gegl/gimp-gegl-enums.h b/app/gegl/gimp-gegl-enums.h
index 4fd8699..cd7dcbd 100644
--- a/app/gegl/gimp-gegl-enums.h
+++ b/app/gegl/gimp-gegl-enums.h
@@ -31,19 +31,5 @@ typedef enum
   GIMP_CAGE_MODE_DEFORM       /*< desc="Deform the cage\nto deform the image" >*/
 } GimpCageMode;
 
-#define GIMP_TYPE_WARP_BEHAVIOR (gimp_warp_behavior_get_type ())
-
-GType gimp_warp_behavior_get_type (void) G_GNUC_CONST;
-
-typedef enum
-{
-  GIMP_WARP_BEHAVIOR_MOVE,        /*< desc="Move pixels"                         >*/
-  GIMP_WARP_BEHAVIOR_GROW,        /*< desc="Grow area"                           >*/
-  GIMP_WARP_BEHAVIOR_SHRINK,      /*< desc="Shrink area"                         >*/
-  GIMP_WARP_BEHAVIOR_SWIRL_CW,    /*< desc="Swirl clockwise"                     >*/
-  GIMP_WARP_BEHAVIOR_SWIRL_CCW,   /*< desc="Swirl counter-clockwise"             >*/
-  GIMP_WARP_BEHAVIOR_ERASE,       /*< desc="Erase warping"                       >*/
-  GIMP_WARP_BEHAVIOR_SMOOTH       /*< desc="Smooth warping"                      >*/
-} GimpWarpBehavior;
 
 #endif /* __GIMP_GEGL_ENUMS_H__ */
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
index 6ef761a..59b8b3a 100644
--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -66,8 +66,6 @@ libappoperations_a_sources = \
        gimpoperationshrink.h                   \
        gimpoperationthresholdalpha.c           \
        gimpoperationthresholdalpha.h           \
-       gimpoperationwarp.c                     \
-       gimpoperationwarp.h                     \
        \
        gimpoperationpointfilter.c              \
        gimpoperationpointfilter.h              \
diff --git a/app/operations/gimp-operations.c b/app/operations/gimp-operations.c
index cb1d930..6b35ec9 100644
--- a/app/operations/gimp-operations.c
+++ b/app/operations/gimp-operations.c
@@ -39,7 +39,6 @@
 #include "gimpoperationshapeburst.h"
 #include "gimpoperationshrink.h"
 #include "gimpoperationthresholdalpha.h"
-#include "gimpoperationwarp.h"
 
 #include "gimpoperationbrightnesscontrast.h"
 #include "gimpoperationcolorbalance.h"
diff --git a/app/operations/operations-types.h b/app/operations/operations-types.h
index 487e8a1..89f9045 100644
--- a/app/operations/operations-types.h
+++ b/app/operations/operations-types.h
@@ -28,7 +28,6 @@
 
 typedef struct _GimpOperationPointFilter        GimpOperationPointFilter;
 typedef struct _GimpOperationPointLayerMode     GimpOperationPointLayerMode;
-typedef struct _GimpOperationWarp               GimpOperationWarp;
 
 
 /*  operation config objects  */
diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c
index 86a3c3e..3985eee 100644
--- a/app/tools/tools-enums.c
+++ b/app/tools/tools-enums.c
@@ -350,6 +350,45 @@ gimp_matting_engine_get_type (void)
   return type;
 }
 
+GType
+gimp_warp_behavior_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_WARP_BEHAVIOR_MOVE, "GIMP_WARP_BEHAVIOR_MOVE", "imp-warp-behavior-move" },
+    { GEGL_WARP_BEHAVIOR_GROW, "GEGL_WARP_BEHAVIOR_GROW", "egl-warp-behavior-grow" },
+    { GEGL_WARP_BEHAVIOR_SHRINK, "GEGL_WARP_BEHAVIOR_SHRINK", "egl-warp-behavior-shrink" },
+    { GEGL_WARP_BEHAVIOR_SWIRL_CW, "GEGL_WARP_BEHAVIOR_SWIRL_CW", "egl-warp-behavior-swirl-cw" },
+    { GEGL_WARP_BEHAVIOR_SWIRL_CCW, "GEGL_WARP_BEHAVIOR_SWIRL_CCW", "egl-warp-behavior-swirl-ccw" },
+    { GEGL_WARP_BEHAVIOR_ERASE, "GEGL_WARP_BEHAVIOR_ERASE", "egl-warp-behavior-erase" },
+    { GEGL_WARP_BEHAVIOR_SMOOTH, "GEGL_WARP_BEHAVIOR_SMOOTH", "egl-warp-behavior-smooth" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_WARP_BEHAVIOR_MOVE, NC_("warp-behavior", "Move pixels"), NULL },
+    { GEGL_WARP_BEHAVIOR_GROW, NC_("warp-behavior", "Grow area"), NULL },
+    { GEGL_WARP_BEHAVIOR_SHRINK, NC_("warp-behavior", "Shrink area"), NULL },
+    { GEGL_WARP_BEHAVIOR_SWIRL_CW, NC_("warp-behavior", "Swirl clockwise"), NULL },
+    { GEGL_WARP_BEHAVIOR_SWIRL_CCW, NC_("warp-behavior", "Swirl counter-clockwise"), NULL },
+    { GEGL_WARP_BEHAVIOR_ERASE, NC_("warp-behavior", "Erase warping"), NULL },
+    { GEGL_WARP_BEHAVIOR_SMOOTH, NC_("warp-behavior", "Smooth warping"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpWarpBehavior", values);
+      gimp_type_set_translation_context (type, "warp-behavior");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
 
 /* Generated data ends here */
 
diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h
index c56f7d1..a8c38e2 100644
--- a/app/tools/tools-enums.h
+++ b/app/tools/tools-enums.h
@@ -154,6 +154,22 @@ typedef enum
 } GimpMattingEngine;
 
 
+#define GIMP_TYPE_WARP_BEHAVIOR (gimp_warp_behavior_get_type ())
+
+GType gimp_warp_behavior_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_WARP_BEHAVIOR_MOVE,      /*< desc="Move pixels" >*/
+  GEGL_WARP_BEHAVIOR_GROW,      /*< desc="Grow area" >*/
+  GEGL_WARP_BEHAVIOR_SHRINK,    /*< desc="Shrink area" >*/
+  GEGL_WARP_BEHAVIOR_SWIRL_CW,  /*< desc="Swirl clockwise" >*/
+  GEGL_WARP_BEHAVIOR_SWIRL_CCW, /*< desc="Swirl counter-clockwise" >*/
+  GEGL_WARP_BEHAVIOR_ERASE,     /*< desc="Erase warping" >*/
+  GEGL_WARP_BEHAVIOR_SMOOTH     /*< desc="Smooth warping" >*/
+} GimpWarpBehavior;
+
+
 /*
  * non-registered enums; register them if needed
  */