[gimp/gimp-2-10] app: s/GEGL_WARP_BEHAVIOR/GIMP_WARP_BEHAVIOR/
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app: s/GEGL_WARP_BEHAVIOR/GIMP_WARP_BEHAVIOR/
- Date: Wed, 12 Dec 2018 16:24:16 +0000 (UTC)
commit a8ef7db6161e738e2f2cadbf95bb9429ff0d31ec
Author: Ell <ell_se yahoo com>
Date: Wed Dec 12 11:13:48 2018 -0500
app: s/GEGL_WARP_BEHAVIOR/GIMP_WARP_BEHAVIOR/
The enumerators of the GimpWarpBehavior enum, except for MOVE, had
a GEGL_ prefix, rather than a GIMP_ prefix, for some reason.
Change all of them to GIMP_.
(cherry picked from commit 2085cb4a378f8ceec7b65e30b244989f6a653bc8)
app/tools/gimpwarptool.c | 12 ++++++------
app/tools/tools-enums.c | 26 +++++++++++++-------------
app/tools/tools-enums.h | 12 ++++++------
3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c
index 74075bbd88..2e4db55aa6 100644
--- a/app/tools/gimpwarptool.c
+++ b/app/tools/gimpwarptool.c
@@ -448,12 +448,12 @@ gimp_warp_tool_cursor_update (GimpTool *tool,
switch (options->behavior)
{
case GIMP_WARP_BEHAVIOR_MOVE:
- case GEGL_WARP_BEHAVIOR_GROW:
- case GEGL_WARP_BEHAVIOR_SHRINK:
- case GEGL_WARP_BEHAVIOR_SWIRL_CW:
- case GEGL_WARP_BEHAVIOR_SWIRL_CCW:
- case GEGL_WARP_BEHAVIOR_ERASE:
- case GEGL_WARP_BEHAVIOR_SMOOTH:
+ case GIMP_WARP_BEHAVIOR_GROW:
+ case GIMP_WARP_BEHAVIOR_SHRINK:
+ case GIMP_WARP_BEHAVIOR_SWIRL_CW:
+ case GIMP_WARP_BEHAVIOR_SWIRL_CCW:
+ case GIMP_WARP_BEHAVIOR_ERASE:
+ case GIMP_WARP_BEHAVIOR_SMOOTH:
modifier = GIMP_CURSOR_MODIFIER_MOVE;
break;
}
diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c
index d869bd5f3a..9ac946711c 100644
--- a/app/tools/tools-enums.c
+++ b/app/tools/tools-enums.c
@@ -171,25 +171,25 @@ 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" },
+ { 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 },
- { 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 },
+ { 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 }
};
diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h
index 986466278f..acbe05915a 100644
--- a/app/tools/tools-enums.h
+++ b/app/tools/tools-enums.h
@@ -91,12 +91,12 @@ 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" >*/
+ 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]