From fd3852af314499653d89ca0dff1992e067438ac0 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 5 Jul 2025 14:15:17 +0200 Subject: [PATCH] pdb: remove -private suffixes from gimp-drawable-append-filter and -merge-filters. They are not needed any longer, and it's not an API change because they are private. --- app/pdb/drawable-cmds.c | 36 ++++----- libgimp/gimpdrawable.c | 4 +- libgimp/gimpdrawable_pdb.c | 16 ++-- libgimp/gimpdrawable_pdb.h | 148 ++++++++++++++++++------------------- pdb/groups/drawable.pdb | 8 +- 5 files changed, 106 insertions(+), 106 deletions(-) diff --git a/app/pdb/drawable-cmds.c b/app/pdb/drawable-cmds.c index 818d9717fc..03eb157112 100644 --- a/app/pdb/drawable-cmds.c +++ b/app/pdb/drawable-cmds.c @@ -605,12 +605,12 @@ drawable_mask_intersect_invoker (GimpProcedure *procedure, } static GimpValueArray * -drawable_append_filter_private_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GimpValueArray *args, - GError **error) +drawable_append_filter_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) { gboolean success = TRUE; GimpDrawable *drawable; @@ -666,12 +666,12 @@ drawable_append_filter_private_invoker (GimpProcedure *procedure, } static GimpValueArray * -drawable_merge_filter_private_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GimpValueArray *args, - GError **error) +drawable_merge_filter_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) { gboolean success = TRUE; GimpDrawable *drawable; @@ -1711,11 +1711,11 @@ register_drawable_procs (GimpPDB *pdb) g_object_unref (procedure); /* - * gimp-drawable-append-filter-private + * gimp-drawable-append-filter */ - procedure = gimp_procedure_new (drawable_append_filter_private_invoker, TRUE); + procedure = gimp_procedure_new (drawable_append_filter_invoker, TRUE); gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-drawable-append-filter-private"); + "gimp-drawable-append-filter"); gimp_procedure_set_static_help (procedure, "Append the specified effect to the top of the list of drawable effects.", "This procedure adds the specified drawable effect at the top of the effect list of @drawable.\n" @@ -1743,11 +1743,11 @@ register_drawable_procs (GimpPDB *pdb) g_object_unref (procedure); /* - * gimp-drawable-merge-filter-private + * gimp-drawable-merge-filter */ - procedure = gimp_procedure_new (drawable_merge_filter_private_invoker, TRUE); + procedure = gimp_procedure_new (drawable_merge_filter_invoker, TRUE); gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-drawable-merge-filter-private"); + "gimp-drawable-merge-filter"); gimp_procedure_set_static_help (procedure, "Apply the specified effect directly to the drawable.", "This procedure applies the specified drawable effect on @drawable and merge it (therefore before non-destructive effects are computed).\n" diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c index ee266afa5f..2cc7df0c9c 100644 --- a/libgimp/gimpdrawable.c +++ b/libgimp/gimpdrawable.c @@ -461,7 +461,7 @@ gimp_drawable_append_filter (GimpDrawable *drawable, g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter)); gimp_drawable_filter_update (filter); - _gimp_drawable_append_filter_private (drawable, filter); + _gimp_drawable_append_filter (drawable, filter); } /** @@ -491,7 +491,7 @@ gimp_drawable_merge_filter (GimpDrawable *drawable, g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter)); gimp_drawable_filter_update (filter); - _gimp_drawable_merge_filter_private (drawable, filter); + _gimp_drawable_merge_filter (drawable, filter); } /** diff --git a/libgimp/gimpdrawable_pdb.c b/libgimp/gimpdrawable_pdb.c index 81268ab626..b9eb69e3f5 100644 --- a/libgimp/gimpdrawable_pdb.c +++ b/libgimp/gimpdrawable_pdb.c @@ -677,7 +677,7 @@ gimp_drawable_mask_intersect (GimpDrawable *drawable, } /** - * _gimp_drawable_append_filter_private: + * _gimp_drawable_append_filter: * @drawable: The drawable. * @filter: The drawable filter to append. * @@ -702,8 +702,8 @@ gimp_drawable_mask_intersect (GimpDrawable *drawable, * Since: 3.0 **/ gboolean -_gimp_drawable_append_filter_private (GimpDrawable *drawable, - GimpDrawableFilter *filter) +_gimp_drawable_append_filter (GimpDrawable *drawable, + GimpDrawableFilter *filter) { GimpValueArray *args; GimpValueArray *return_vals; @@ -715,7 +715,7 @@ _gimp_drawable_append_filter_private (GimpDrawable *drawable, G_TYPE_NONE); return_vals = _gimp_pdb_run_procedure_array (gimp_get_pdb (), - "gimp-drawable-append-filter-private", + "gimp-drawable-append-filter", args); gimp_value_array_unref (args); @@ -727,7 +727,7 @@ _gimp_drawable_append_filter_private (GimpDrawable *drawable, } /** - * _gimp_drawable_merge_filter_private: + * _gimp_drawable_merge_filter: * @drawable: The drawable. * @filter: The drawable filter to merge. * @@ -752,8 +752,8 @@ _gimp_drawable_append_filter_private (GimpDrawable *drawable, * Since: 3.0 **/ gboolean -_gimp_drawable_merge_filter_private (GimpDrawable *drawable, - GimpDrawableFilter *filter) +_gimp_drawable_merge_filter (GimpDrawable *drawable, + GimpDrawableFilter *filter) { GimpValueArray *args; GimpValueArray *return_vals; @@ -765,7 +765,7 @@ _gimp_drawable_merge_filter_private (GimpDrawable *drawable, G_TYPE_NONE); return_vals = _gimp_pdb_run_procedure_array (gimp_get_pdb (), - "gimp-drawable-merge-filter-private", + "gimp-drawable-merge-filter", args); gimp_value_array_unref (args); diff --git a/libgimp/gimpdrawable_pdb.h b/libgimp/gimpdrawable_pdb.h index 37cabd6ff1..396fbe82b5 100644 --- a/libgimp/gimpdrawable_pdb.h +++ b/libgimp/gimpdrawable_pdb.h @@ -32,80 +32,80 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -G_GNUC_INTERNAL gchar* _gimp_drawable_get_format (GimpDrawable *drawable); -G_GNUC_INTERNAL gchar* _gimp_drawable_get_thumbnail_format (GimpDrawable *drawable); -GeglColor* gimp_drawable_get_pixel (GimpDrawable *drawable, - gint x_coord, - gint y_coord); -gboolean gimp_drawable_set_pixel (GimpDrawable *drawable, - gint x_coord, - gint y_coord, - GeglColor *color); -GimpImageType gimp_drawable_type (GimpDrawable *drawable); -GimpImageType gimp_drawable_type_with_alpha (GimpDrawable *drawable); -gboolean gimp_drawable_has_alpha (GimpDrawable *drawable); -gboolean gimp_drawable_is_rgb (GimpDrawable *drawable); -gboolean gimp_drawable_is_gray (GimpDrawable *drawable); -gboolean gimp_drawable_is_indexed (GimpDrawable *drawable); -gint gimp_drawable_get_bpp (GimpDrawable *drawable); -gint gimp_drawable_get_width (GimpDrawable *drawable); -gint gimp_drawable_get_height (GimpDrawable *drawable); -gboolean gimp_drawable_get_offsets (GimpDrawable *drawable, - gint *offset_x, - gint *offset_y); -gboolean gimp_drawable_mask_bounds (GimpDrawable *drawable, - gint *x1, - gint *y1, - gint *x2, - gint *y2); -gboolean gimp_drawable_mask_intersect (GimpDrawable *drawable, - gint *x, - gint *y, - gint *width, - gint *height); -G_GNUC_INTERNAL gboolean _gimp_drawable_append_filter_private (GimpDrawable *drawable, - GimpDrawableFilter *filter); -G_GNUC_INTERNAL gboolean _gimp_drawable_merge_filter_private (GimpDrawable *drawable, - GimpDrawableFilter *filter); -GimpDrawableFilter** gimp_drawable_get_filters (GimpDrawable *drawable); -gboolean gimp_drawable_merge_filters (GimpDrawable *drawable); -gboolean gimp_drawable_merge_shadow (GimpDrawable *drawable, - gboolean undo); -gboolean gimp_drawable_free_shadow (GimpDrawable *drawable); -gboolean gimp_drawable_update (GimpDrawable *drawable, - gint x, - gint y, - gint width, - gint height); -gboolean gimp_drawable_fill (GimpDrawable *drawable, - GimpFillType fill_type); -gboolean gimp_drawable_offset (GimpDrawable *drawable, - gboolean wrap_around, - GimpOffsetType fill_type, - GeglColor *color, - gint offset_x, - gint offset_y); -G_GNUC_INTERNAL gboolean _gimp_drawable_thumbnail (GimpDrawable *drawable, - gint width, - gint height, - gint *actual_width, - gint *actual_height, - gint *bpp, - GBytes **thumbnail_data); -G_GNUC_INTERNAL gboolean _gimp_drawable_sub_thumbnail (GimpDrawable *drawable, - gint src_x, - gint src_y, - gint src_width, - gint src_height, - gint dest_width, - gint dest_height, - gint *width, - gint *height, - gint *bpp, - GBytes **thumbnail_data); -gboolean gimp_drawable_foreground_extract (GimpDrawable *drawable, - GimpForegroundExtractMode mode, - GimpDrawable *mask); +G_GNUC_INTERNAL gchar* _gimp_drawable_get_format (GimpDrawable *drawable); +G_GNUC_INTERNAL gchar* _gimp_drawable_get_thumbnail_format (GimpDrawable *drawable); +GeglColor* gimp_drawable_get_pixel (GimpDrawable *drawable, + gint x_coord, + gint y_coord); +gboolean gimp_drawable_set_pixel (GimpDrawable *drawable, + gint x_coord, + gint y_coord, + GeglColor *color); +GimpImageType gimp_drawable_type (GimpDrawable *drawable); +GimpImageType gimp_drawable_type_with_alpha (GimpDrawable *drawable); +gboolean gimp_drawable_has_alpha (GimpDrawable *drawable); +gboolean gimp_drawable_is_rgb (GimpDrawable *drawable); +gboolean gimp_drawable_is_gray (GimpDrawable *drawable); +gboolean gimp_drawable_is_indexed (GimpDrawable *drawable); +gint gimp_drawable_get_bpp (GimpDrawable *drawable); +gint gimp_drawable_get_width (GimpDrawable *drawable); +gint gimp_drawable_get_height (GimpDrawable *drawable); +gboolean gimp_drawable_get_offsets (GimpDrawable *drawable, + gint *offset_x, + gint *offset_y); +gboolean gimp_drawable_mask_bounds (GimpDrawable *drawable, + gint *x1, + gint *y1, + gint *x2, + gint *y2); +gboolean gimp_drawable_mask_intersect (GimpDrawable *drawable, + gint *x, + gint *y, + gint *width, + gint *height); +G_GNUC_INTERNAL gboolean _gimp_drawable_append_filter (GimpDrawable *drawable, + GimpDrawableFilter *filter); +G_GNUC_INTERNAL gboolean _gimp_drawable_merge_filter (GimpDrawable *drawable, + GimpDrawableFilter *filter); +GimpDrawableFilter** gimp_drawable_get_filters (GimpDrawable *drawable); +gboolean gimp_drawable_merge_filters (GimpDrawable *drawable); +gboolean gimp_drawable_merge_shadow (GimpDrawable *drawable, + gboolean undo); +gboolean gimp_drawable_free_shadow (GimpDrawable *drawable); +gboolean gimp_drawable_update (GimpDrawable *drawable, + gint x, + gint y, + gint width, + gint height); +gboolean gimp_drawable_fill (GimpDrawable *drawable, + GimpFillType fill_type); +gboolean gimp_drawable_offset (GimpDrawable *drawable, + gboolean wrap_around, + GimpOffsetType fill_type, + GeglColor *color, + gint offset_x, + gint offset_y); +G_GNUC_INTERNAL gboolean _gimp_drawable_thumbnail (GimpDrawable *drawable, + gint width, + gint height, + gint *actual_width, + gint *actual_height, + gint *bpp, + GBytes **thumbnail_data); +G_GNUC_INTERNAL gboolean _gimp_drawable_sub_thumbnail (GimpDrawable *drawable, + gint src_x, + gint src_y, + gint src_width, + gint src_height, + gint dest_width, + gint dest_height, + gint *width, + gint *height, + gint *bpp, + GBytes **thumbnail_data); +gboolean gimp_drawable_foreground_extract (GimpDrawable *drawable, + GimpForegroundExtractMode mode, + GimpDrawable *mask); G_END_DECLS diff --git a/pdb/groups/drawable.pdb b/pdb/groups/drawable.pdb index b781111c9c..d5bc08e3db 100644 --- a/pdb/groups/drawable.pdb +++ b/pdb/groups/drawable.pdb @@ -111,7 +111,7 @@ CODE ); } -sub drawable_append_filter_private { +sub drawable_append_filter { $blurb = 'Append the specified effect to the top of the list of drawable effects.'; $help = <<'HELP'; @@ -185,7 +185,7 @@ HELP CODE } -sub drawable_merge_filter_private { +sub drawable_merge_filter { $blurb = 'Apply the specified effect directly to the drawable.'; $help = <<'HELP'; @@ -1231,8 +1231,8 @@ CODE drawable_get_offsets drawable_mask_bounds drawable_mask_intersect - drawable_append_filter_private - drawable_merge_filter_private + drawable_append_filter + drawable_merge_filter drawable_get_filters drawable_merge_filters drawable_merge_shadow