[gegl/soc-2011-warp: 3/31] rename gegl_chant_interpolation to gegl_chant_sampler

[Michael Murà <mmure src gnome org>]

commit 41fac44f14db39233a4276b9faaccdd42fd09192
Author: Michael Murà <batolettre gmail com>
Date:   Tue Jul 5 17:26:04 2011 +0200

    rename gegl_chant_interpolation to gegl_chant_sampler

 gegl/gegl-chant.h                |   28 ++++++++++++++--------------
 operations/common/map-absolute.c |    4 ++--
 operations/common/map-relative.c |    4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gegl/gegl-chant.h b/gegl/gegl-chant.h
index c455ada..ff4706c 100644
--- a/gegl/gegl-chant.h
+++ b/gegl/gegl-chant.h
@@ -353,7 +353,7 @@ struct _GeglChantO
 #define gegl_chant_curve(name, nick, blurb)                  GeglCurve         *name;
 #define gegl_chant_path(name, nick, blurb)                   GeglPath          *name;\
                                                           guint path_changed_handler;
-#define gegl_chant_interpolation(name, nick, def, blurb)     GeglSamplerType    name;
+#define gegl_chant_sampler(name, nick, def, blurb)           GeglSamplerType    name;
 
 #include GEGL_CHANT_C_FILE
 
@@ -368,7 +368,7 @@ struct _GeglChantO
 #undef gegl_chant_color
 #undef gegl_chant_curve
 #undef gegl_chant_path
-#undef gegl_chant_interpolation
+#undef gegl_chant_sampler
 };
 
 #define GEGL_CHANT_OPERATION(obj) ((Operation*)(obj))
@@ -387,7 +387,7 @@ enum
 #define gegl_chant_color(name, nick, def, blurb)             PROP_##name,
 #define gegl_chant_curve(name, nick, blurb)                  PROP_##name,
 #define gegl_chant_path(name, nick, blurb)                   PROP_##name,
-#define gegl_chant_interpolation(name, nick, def, blurb)     PROP_##name,
+#define gegl_chant_sampler(name, nick, def, blurb)           PROP_##name,
 
 #include GEGL_CHANT_C_FILE
 
@@ -402,7 +402,7 @@ enum
 #undef gegl_chant_color
 #undef gegl_chant_curve
 #undef gegl_chant_path
-#undef gegl_chant_interpolation
+#undef gegl_chant_sampler
   PROP_LAST
 };
 
@@ -463,7 +463,7 @@ get_property (GObject      *gobject,
       if (!properties->name)properties->name = gegl_path_new (); /* this feels ugly */\
       g_value_set_object (value, properties->name);           \
       break;/*XXX*/
-#define gegl_chant_interpolation(name, nick, def, blurb)      \
+#define gegl_chant_sampler(name, nick, def, blurb)            \
     case PROP_##name:                                         \
       g_value_set_enum (value, properties->name);             \
       break;
@@ -481,7 +481,7 @@ get_property (GObject      *gobject,
 #undef gegl_chant_color
 #undef gegl_chant_curve
 #undef gegl_chant_path
-#undef gegl_chant_interpolation
+#undef gegl_chant_sampler
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, pspec);
       break;
@@ -569,7 +569,7 @@ set_property (GObject      *gobject,
           G_CALLBACK(path_changed), gobject);     \
          }\
       break; /*XXX*/
-#define gegl_chant_interpolation(name, nick, def, blurb)              \
+#define gegl_chant_sampler(name, nick, def, blurb)                    \
     case PROP_##name:                                                 \
       properties->name = g_value_get_enum (value);                    \
       break;
@@ -587,7 +587,7 @@ set_property (GObject      *gobject,
 #undef gegl_chant_color
 #undef gegl_chant_curve
 #undef gegl_chant_path
-#undef gegl_chant_interpolation
+#undef gegl_chant_sampler
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, pspec);
@@ -647,7 +647,7 @@ static void gegl_chant_destroy_notify (gpointer data)
       g_object_unref (properties->name);            \
       properties->name = NULL;                      \
     }
-#define gegl_chant_interpolation(name, nick, def, blurb)
+#define gegl_chant_sampler(name, nick, def, blurb)
 
 #include GEGL_CHANT_C_FILE
 
@@ -662,7 +662,7 @@ static void gegl_chant_destroy_notify (gpointer data)
 #undef gegl_chant_color
 #undef gegl_chant_curve
 #undef gegl_chant_path
-#undef gegl_chant_interpolation
+#undef gegl_chant_sampler
 
   g_slice_free (GeglChantO, properties);
 }
@@ -694,7 +694,7 @@ gegl_chant_constructor (GType                  type,
     {properties->name = gegl_color_new(def?def:"black");}
 #define gegl_chant_path(name, nick, blurb)
 #define gegl_chant_curve(name, nick, blurb)
-#define gegl_chant_interpolation(name, nick, def, blurb)
+#define gegl_chant_sampler(name, nick, def, blurb)
 
 #include GEGL_CHANT_C_FILE
 
@@ -709,7 +709,7 @@ gegl_chant_constructor (GType                  type,
 #undef gegl_chant_color
 #undef gegl_chant_curve
 #undef gegl_chant_path
-#undef gegl_chant_interpolation
+#undef gegl_chant_sampler
 
   g_object_set_data_full (obj, "chant-data", obj, gegl_chant_destroy_notify);
   properties ++; /* evil hack to silence gcc */
@@ -813,7 +813,7 @@ gegl_chant_class_intern_init (gpointer klass)
                                                           G_PARAM_READWRITE |\
                                                           G_PARAM_CONSTRUCT |\
                                                           GEGL_PARAM_PAD_INPUT)));
-#define gegl_chant_interpolation(name, nick, def, blurb)                     \
+#define gegl_chant_sampler(name, nick, def, blurb)                           \
   g_object_class_install_property (object_class, PROP_##name,                \
                                    g_param_spec_enum (#name, nick, blurb,    \
                                                       GEGL_TYPE_SAMPLER_TYPE,\
@@ -836,7 +836,7 @@ gegl_chant_class_intern_init (gpointer klass)
 #undef gegl_chant_color
 #undef gegl_chant_curve
 #undef gegl_chant_path
-#undef gegl_chant_interpolation
+#undef gegl_chant_sampler
 }
 
 
diff --git a/operations/common/map-absolute.c b/operations/common/map-absolute.c
index 389960d..1475885 100644
--- a/operations/common/map-absolute.c
+++ b/operations/common/map-absolute.c
@@ -19,8 +19,8 @@
 
 #ifdef GEGL_CHANT_PROPERTIES
 
-gegl_chant_interpolation (interpolation, _("Interpolation"),
-                          GEGL_INTERPOLATION_CUBIC, _("Sampler used internaly"))
+gegl_chant_sampler (interpolation, _("Interpolation"),
+                    GEGL_INTERPOLATION_CUBIC, _("Sampler used internaly"))
 
 #else
 
diff --git a/operations/common/map-relative.c b/operations/common/map-relative.c
index 15e4d04..99fd68f 100644
--- a/operations/common/map-relative.c
+++ b/operations/common/map-relative.c
@@ -23,8 +23,8 @@
 gegl_chant_double (scaling, _("Scaling"), 0.0, 5000.0, 1.0,
        _("scaling factor of displacement, indicates how large spatial"
          " displacement a relative mapping value of 1.0 corresponds to."))
-gegl_chant_interpolation (interpolation, _("Interpolation"),
-                          GEGL_INTERPOLATION_CUBIC, _("Sampler used internaly"))
+gegl_chant_sampler (interpolation, _("Interpolation"),
+                    GEGL_INTERPOLATION_CUBIC, _("Sampler used internaly"))
 
 #else