From 80340f2d47fcfcc446df9a65741abf7d67f671fa Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 3 Sep 2019 12:04:05 +0200 Subject: [PATCH] libgimp: remove the last manual compat wrappers --- libgimp/gimp.def | 4 --- libgimp/gimpdrawable.c | 46 ------------------------------ libgimp/gimpdrawable.h | 13 --------- libgimp/gimplayer.c | 65 ------------------------------------------ libgimp/gimplayer.h | 19 ------------ 5 files changed, 147 deletions(-) diff --git a/libgimp/gimp.def b/libgimp/gimp.def index e00b977ae6..7dbb28a2af 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -206,12 +206,10 @@ EXPORTS gimp_drawable_foreground_extract gimp_drawable_free_shadow gimp_drawable_get_buffer - gimp_drawable_get_buffer_deprecated gimp_drawable_get_by_id gimp_drawable_get_format gimp_drawable_get_pixel gimp_drawable_get_shadow_buffer - gimp_drawable_get_shadow_buffer_deprecated gimp_drawable_get_sub_thumbnail gimp_drawable_get_sub_thumbnail_data gimp_drawable_get_thumbnail @@ -549,7 +547,6 @@ EXPORTS gimp_layer_color_space_get_type gimp_layer_composite_mode_get_type gimp_layer_copy - gimp_layer_copy_deprecated gimp_layer_create_mask gimp_layer_flatten gimp_layer_from_mask @@ -571,7 +568,6 @@ EXPORTS gimp_layer_mask_get_type gimp_layer_mode_get_type gimp_layer_new - gimp_layer_new_deprecated gimp_layer_new_from_drawable gimp_layer_new_from_pixbuf gimp_layer_new_from_surface diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c index dff2381fd5..9adddc4fa2 100644 --- a/libgimp/gimpdrawable.c +++ b/libgimp/gimpdrawable.c @@ -439,49 +439,3 @@ gimp_drawable_get_thumbnail_format (GimpDrawable *drawable) return format; } - - -/* Deprecated API. */ - - -/** - * gimp_drawable_get_buffer_deprecated: (skip) - * @drawable_ID: the ID of the #GimpDrawable to get the buffer for. - * - * Returns a #GeglBuffer of a specified drawable. The buffer can be used - * like any other GEGL buffer. Its data will we synced back with the core - * drawable when the buffer gets destroyed, or when gegl_buffer_flush() - * is called. - * - * Returns: (transfer full): The #GeglBuffer. - * - * See Also: gimp_drawable_get_shadow_buffer() - * - * Since: 2.10 - */ -GeglBuffer * -gimp_drawable_get_buffer_deprecated (gint32 drawable_ID) -{ - return gimp_drawable_get_buffer (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID))); -} - -/** - * gimp_drawable_get_shadow_buffer_deprecated: (skip) - * @drawable_ID: the ID of the #GimpDrawable to get the buffer for. - * - * Returns a #GeglBuffer of a specified drawable's shadow tiles. The - * buffer can be used like any other GEGL buffer. Its data will we - * synced back with the core drawable's shadow tiles when the buffer - * gets destroyed, or when gegl_buffer_flush() is called. - * - * Returns: (transfer full): The #GeglBuffer. - * - * See Also: gimp_drawable_get_shadow_buffer() - * - * Since: 2.10 - */ -GeglBuffer * -gimp_drawable_get_shadow_buffer_deprecated (gint32 drawable_ID) -{ - return gimp_drawable_get_shadow_buffer (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID))); -} diff --git a/libgimp/gimpdrawable.h b/libgimp/gimpdrawable.h index 22c80a660b..876912069d 100644 --- a/libgimp/gimpdrawable.h +++ b/libgimp/gimpdrawable.h @@ -71,8 +71,6 @@ GType gimp_drawable_get_type (void) G_GNUC_CONST; GimpDrawable * gimp_drawable_get_by_id (gint32 drawable_id); -#ifndef GIMP_DEPRECATED_REPLACE_NEW_API - GeglBuffer * gimp_drawable_get_buffer (GimpDrawable *drawable); GeglBuffer * gimp_drawable_get_shadow_buffer (GimpDrawable *drawable); @@ -105,17 +103,6 @@ GdkPixbuf * gimp_drawable_get_sub_thumbnail (GimpDrawable *drawable, gint dest_height, GimpPixbufTransparency alpha); -#else /* GIMP_DEPRECATED_REPLACE_NEW_API */ - -#define gimp_drawable_get_buffer gimp_drawable_get_buffer_deprecated -#define gimp_drawable_get_shadow_buffer gimp_drawable_get_shadow_buffer_deprecated - -#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */ - - -GeglBuffer * gimp_drawable_get_buffer_deprecated (gint32 drawable_ID); -GeglBuffer * gimp_drawable_get_shadow_buffer_deprecated (gint32 drawable_ID); - G_END_DECLS diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c index 63a6f3026f..2e97187274 100644 --- a/libgimp/gimplayer.c +++ b/libgimp/gimplayer.c @@ -302,68 +302,3 @@ gimp_layer_new_from_surface (GimpImage *image, return layer; } - - -/* Deprecate API. */ - - -/** - * gimp_layer_new_deprecated: (skip) - * @image_id: The image to which to add the layer. - * @name: The layer name. - * @width: The layer width. - * @height: The layer height. - * @type: The layer type. - * @opacity: The layer opacity. - * @mode: The layer combination mode. - * - * Create a new layer. - * - * This procedure creates a new layer with the specified width, height, - * and type. Name, opacity, and mode are also supplied parameters. The - * new layer still needs to be added to the image, as this is not - * automatic. Add the new layer with the gimp_image_insert_layer() - * command. Other attributes such as layer mask modes, and offsets - * should be set with explicit procedure calls. - * - * Returns: The newly created layer ID. - */ -gint32 -gimp_layer_new_deprecated (gint32 image_id, - const gchar *name, - gint width, - gint height, - GimpImageType type, - gdouble opacity, - GimpLayerMode mode) -{ - GimpLayer *layer; - - layer = gimp_layer_new (gimp_image_get_by_id (image_id), - name, width, height, - type, opacity, mode); - - return gimp_item_get_id (GIMP_ITEM (layer)); -} - -/** - * gimp_layer_copy_deprecated: (skip) - * @layer_ID: The layer to copy. - * - * Copy a layer. - * - * This procedure copies the specified layer and returns the copy. The - * newly copied layer is for use within the original layer's image. It - * should not be subsequently added to any other image. - * - * Returns: The newly copied layer ID. - */ -gint32 -gimp_layer_copy_deprecated (gint32 layer_ID) -{ - GimpLayer *copy; - - copy = gimp_layer_copy (GIMP_LAYER (gimp_item_get_by_id (layer_ID))); - - return gimp_item_get_id (GIMP_ITEM (copy)); -} diff --git a/libgimp/gimplayer.h b/libgimp/gimplayer.h index b032a8eb9c..b3453e0ea9 100644 --- a/libgimp/gimplayer.h +++ b/libgimp/gimplayer.h @@ -68,8 +68,6 @@ GType gimp_layer_get_type (void) G_GNUC_CONST; GimpLayer * gimp_layer_get_by_id (gint32 layer_id); -#ifndef GIMP_DEPRECATED_REPLACE_NEW_API - GimpLayer * gimp_layer_new (GimpImage *image, const gchar *name, gint width, @@ -93,23 +91,6 @@ GimpLayer * gimp_layer_new_from_surface (GimpImage *image, GimpLayer * gimp_layer_copy (GimpLayer *layer); -#else /* GIMP_DEPRECATED_REPLACE_NEW_API */ - -#define gimp_layer_new gimp_layer_new_deprecated -#define gimp_layer_copy gimp_layer_copy_deprecated - -#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */ - -gint32 gimp_layer_new_deprecated (gint32 image_id, - const gchar *name, - gint width, - gint height, - GimpImageType type, - gdouble opacity, - GimpLayerMode mode); - -gint32 gimp_layer_copy_deprecated (gint32 layer_ID); - G_END_DECLS