[gimp] libgimp: remove a ton of deprecated API that is unused
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimp: remove a ton of deprecated API that is unused
- Date: Tue, 27 Aug 2019 14:32:56 +0000 (UTC)
commit 96c1f754ba0a8c70ef83caea042becfeb0ccd47b
Author: Michael Natterer <mitch gimp org>
Date: Tue Aug 27 16:32:25 2019 +0200
libgimp: remove a ton of deprecated API that is unused
libgimp/gimp.def | 16 -----
libgimp/gimpchannel.c | 45 -------------
libgimp/gimpchannel.h | 21 +-----
libgimp/gimpdrawable.c | 107 ++++--------------------------
libgimp/gimpdrawable.h | 26 --------
libgimp/gimpexport.c | 57 ----------------
libgimp/gimpexport.h | 15 -----
libgimp/gimpimage.c | 117 ---------------------------------
libgimp/gimpimage.h | 20 ------
libgimp/gimpimagecolorprofile.c | 88 -------------------------
libgimp/gimpimagecolorprofile.h | 23 -------
libgimp/gimpimagecombobox.c | 60 +----------------
libgimp/gimpimagecombobox.h | 31 ++-------
libgimp/gimpimagemetadata.c | 140 +---------------------------------------
libgimp/gimpimagemetadata.h | 79 ++++++-----------------
libgimp/gimpitemcombobox.c | 51 ---------------
libgimp/gimpitemcombobox.h | 8 ---
libgimp/gimplayer.c | 46 +------------
libgimp/gimplayer.h | 11 +---
libgimp/gimpselection.c | 41 ------------
libgimp/gimpselection.h | 23 ++-----
libgimp/gimpui.c | 49 --------------
libgimp/gimpui.def | 11 ----
libgimp/gimpui.h | 15 -----
libgimp/gimpvectors.h | 3 +-
25 files changed, 55 insertions(+), 1048 deletions(-)
---
diff --git a/libgimp/gimp.def b/libgimp/gimp.def
index 947e97bef4..378547a9fb 100644
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@ -47,7 +47,6 @@ EXPORTS
gimp_channel_get_type
gimp_channel_id_get_type
gimp_channel_new
- gimp_channel_new_deprecated
gimp_channel_new_from_component
gimp_channel_set_color
gimp_channel_set_opacity
@@ -215,14 +214,10 @@ EXPORTS
gimp_drawable_get_shadow_buffer_deprecated
gimp_drawable_get_sub_thumbnail
gimp_drawable_get_sub_thumbnail_data
- gimp_drawable_get_sub_thumbnail_data_deprecated
- gimp_drawable_get_sub_thumbnail_deprecated
gimp_drawable_get_thumbnail
gimp_drawable_get_thumbnail_data
gimp_drawable_get_thumbnail_data_deprecated
- gimp_drawable_get_thumbnail_deprecated
gimp_drawable_get_thumbnail_format
- gimp_drawable_get_thumbnail_format_deprecated
gimp_drawable_get_type
gimp_drawable_has_alpha
gimp_drawable_height
@@ -360,7 +355,6 @@ EXPORTS
gimp_image_base_type
gimp_image_clean_all
gimp_image_convert_color_profile
- gimp_image_convert_color_profile_deprecated
gimp_image_convert_color_profile_from_file
gimp_image_convert_grayscale
gimp_image_convert_indexed
@@ -389,16 +383,13 @@ EXPORTS
gimp_image_get_channel_by_name
gimp_image_get_channel_by_tattoo
gimp_image_get_channels
- gimp_image_get_channels_deprecated
gimp_image_get_color_profile
- gimp_image_get_color_profile_deprecated
gimp_image_get_colormap
gimp_image_get_colormap_deprecated
gimp_image_get_component_active
gimp_image_get_component_visible
gimp_image_get_default_new_layer_mode
gimp_image_get_effective_color_profile
- gimp_image_get_effective_color_profile_deprecated
gimp_image_get_exported_uri
gimp_image_get_filename
gimp_image_get_floating_sel
@@ -423,15 +414,12 @@ EXPORTS
gimp_image_get_tattoo_state
gimp_image_get_thumbnail
gimp_image_get_thumbnail_data
- gimp_image_get_thumbnail_data_deprecated
- gimp_image_get_thumbnail_deprecated
gimp_image_get_type
gimp_image_get_unit
gimp_image_get_uri
gimp_image_get_vectors
gimp_image_get_vectors_by_name
gimp_image_get_vectors_by_tattoo
- gimp_image_get_vectors_deprecated
gimp_image_get_xcf_uri
gimp_image_grid_get_background_color
gimp_image_grid_get_foreground_color
@@ -451,7 +439,6 @@ EXPORTS
gimp_image_is_dirty
gimp_image_is_valid
gimp_image_list_channels
- gimp_image_list_deprecated
gimp_image_list_layers
gimp_image_list_vectors
gimp_image_lower_item
@@ -485,7 +472,6 @@ EXPORTS
gimp_image_set_active_layer
gimp_image_set_active_vectors
gimp_image_set_color_profile
- gimp_image_set_color_profile_deprecated
gimp_image_set_color_profile_from_file
gimp_image_set_colormap
gimp_image_set_colormap_deprecated
@@ -589,7 +575,6 @@ EXPORTS
gimp_layer_new_deprecated
gimp_layer_new_from_drawable
gimp_layer_new_from_pixbuf
- gimp_layer_new_from_pixbuf_deprecated
gimp_layer_new_from_surface
gimp_layer_new_from_surface_deprecated
gimp_layer_new_from_visible
@@ -756,7 +741,6 @@ EXPORTS
gimp_selection_bounds
gimp_selection_feather
gimp_selection_float
- gimp_selection_float_deprecated
gimp_selection_flood
gimp_selection_get_type
gimp_selection_grow
diff --git a/libgimp/gimpchannel.c b/libgimp/gimpchannel.c
index 561f22eb4c..dd865a1ecc 100644
--- a/libgimp/gimpchannel.c
+++ b/libgimp/gimpchannel.c
@@ -37,10 +37,6 @@ gimp_channel_init (GimpChannel *channel)
{
}
-
-/* Public API. */
-
-
/**
* gimp_channel_new:
* @image: The image to which to add the channel.
@@ -78,44 +74,3 @@ gimp_channel_new (GimpImage *image,
opacity,
color);
}
-
-
-/* Deprecated API. */
-
-
-/**
- * gimp_channel_new_deprecated: (skip)
- * @image_ID: The image to which to add the channel.
- * @name: The channel name.
- * @width: The channel width.
- * @height: The channel height.
- * @opacity: The channel opacity.
- * @color: The channel compositing color.
- *
- * Create a new channel.
- *
- * This procedure creates a new channel with the specified width and
- * height. Name, opacity, and color are also supplied parameters. The
- * new channel still needs to be added to the image, as this is not
- * automatic. Add the new channel with the gimp_image_insert_channel()
- * command. Other attributes such as channel show masked, should be
- * set with explicit procedure calls. The channel's contents are
- * undefined initially.
- *
- * Returns: The newly created channel.
- */
-gint32
-gimp_channel_new_deprecated (gint32 image_id,
- const gchar *name,
- guint width,
- guint height,
- gdouble opacity,
- const GimpRGB *color)
-{
- GimpChannel *channel;
-
- channel = gimp_channel_new (gimp_image_get_by_id (image_id),
- name, width, height,
- opacity, color);
- return gimp_item_get_id (GIMP_ITEM (channel));
-}
diff --git a/libgimp/gimpchannel.h b/libgimp/gimpchannel.h
index d77bca7938..d286cffd24 100644
--- a/libgimp/gimpchannel.h
+++ b/libgimp/gimpchannel.h
@@ -62,33 +62,16 @@ struct _GimpChannelClass
void (*_gimp_reserved9) (void);
};
-GType gimp_channel_get_type (void) G_GNUC_CONST;
+GType gimp_channel_get_type (void) G_GNUC_CONST;
-#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
-
-GimpChannel * gimp_channel_new (GimpImage *image,
- const gchar *name,
- guint width,
- guint height,
- gdouble opacity,
- const GimpRGB *color);
-
-#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-#define gimp_channel_new gimp_channel_new_deprecated
-
-#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-
-gint32 gimp_channel_new_deprecated (gint32 image_ID,
+GimpChannel * gimp_channel_new (GimpImage *image,
const gchar *name,
guint width,
guint height,
gdouble opacity,
const GimpRGB *color);
-
G_END_DECLS
#endif /* __GIMP_CHANNEL_H__ */
diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c
index 8c797e4f01..54c744bbbf 100644
--- a/libgimp/gimpdrawable.c
+++ b/libgimp/gimpdrawable.c
@@ -44,6 +44,19 @@ gimp_drawable_init (GimpDrawable *drawable)
/* Public API. */
+/**
+ * gimp_drawable_get_thumbnail_data:
+ * @drawable: the drawable
+ * @width: (inout): the requested thumbnail width (<= 1024 pixels)
+ * @height: (inout): the requested thumbnail height (<= 1024 pixels)
+ * @bpp: (out): the bytes per pixel of the returned thubmnail data
+ *
+ * Retrieves thumbnail data for the drawable identified by @drawable.
+ * The thumbnail will be not larger than the requested size.
+ *
+ * Returns: (transfer full) (nullable): thumbnail data or %NULL if
+ * @drawable is invalid.
+ **/
guchar *
gimp_drawable_get_thumbnail_data (GimpDrawable *drawable,
gint *width,
@@ -72,7 +85,7 @@ gimp_drawable_get_thumbnail_data (GimpDrawable *drawable,
/**
* gimp_drawable_get_thumbnail:
- * @drawable: the drawable ID
+ * @drawable: the drawable
* @width: the requested thumbnail width (<= 1024 pixels)
* @height: the requested thumbnail height (<= 1024 pixels)
* @alpha: how to handle an alpha channel
@@ -404,83 +417,6 @@ gimp_drawable_get_thumbnail_data_deprecated (gint32 drawable_ID,
width, height, bpp);
}
-/**
- * gimp_drawable_get_thumbnail_deprecated: (skip)
- * @drawable_ID: the drawable ID
- * @width: the requested thumbnail width (<= 1024 pixels)
- * @height: the requested thumbnail height (<= 1024 pixels)
- * @alpha: how to handle an alpha channel
- *
- * Retrieves a thumbnail pixbuf for the drawable identified by
- * @drawable_ID. The thumbnail will be not larger than the requested
- * size.
- *
- * Returns: (transfer full) (nullable): a new #GdkPixbuf or %NULL if
- * @drawable_ID is invalid.
- *
- * Since: 2.2
- **/
-GdkPixbuf *
-gimp_drawable_get_thumbnail_deprecated (gint32 drawable_ID,
- gint width,
- gint height,
- GimpPixbufTransparency alpha)
-{
- return gimp_drawable_get_thumbnail (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID)),
- width, height, alpha);
-}
-
-guchar *
-gimp_drawable_get_sub_thumbnail_data_deprecated (gint32 drawable_ID,
- gint src_x,
- gint src_y,
- gint src_width,
- gint src_height,
- gint *dest_width,
- gint *dest_height,
- gint *bpp)
-{
- return gimp_drawable_get_sub_thumbnail_data (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID)),
- src_x, src_y,
- src_width, src_height,
- dest_width, dest_height, bpp);
-}
-
-/**
- * gimp_drawable_get_sub_thumbnail_deprecated: (skip)
- * @drawable_ID: the drawable ID
- * @src_x: the x coordinate of the area
- * @src_y: the y coordinate of the area
- * @src_width: the width of the area
- * @src_height: the height of the area
- * @dest_width: the requested thumbnail width (<= 1024 pixels)
- * @dest_height: the requested thumbnail height (<= 1024 pixels)
- * @alpha: how to handle an alpha channel
- *
- * Retrieves a thumbnail pixbuf for the drawable identified by
- * @drawable_ID. The thumbnail will be not larger than the requested
- * size.
- *
- * Returns: (transfer full): a new #GdkPixbuf
- *
- * Since: 2.2
- **/
-GdkPixbuf *
-gimp_drawable_get_sub_thumbnail_deprecated (gint32 drawable_ID,
- gint src_x,
- gint src_y,
- gint src_width,
- gint src_height,
- gint dest_width,
- gint dest_height,
- GimpPixbufTransparency alpha)
-{
- return gimp_drawable_get_sub_thumbnail (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID)),
- src_x, src_y,
- src_width, src_height,
- dest_width, dest_height, alpha);
-}
-
/**
* gimp_drawable_get_buffer_deprecated: (skip)
* @drawable_ID: the ID of the #GimpDrawable to get the buffer for.
@@ -538,18 +474,3 @@ gimp_drawable_get_format_deprecated (gint32 drawable_ID)
{
return gimp_drawable_get_format (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID)));
}
-/**
- * gimp_drawable_get_thumbnail_format_deprecated: (skip)
- * @drawable_ID: the ID of the #GimpDrawable to get the thumbnail format for.
- *
- * Returns the #Babl thumbnail format of the drawable.
- *
- * Returns: The #Babl thumbnail format.
- *
- * Since: 2.10.14
- */
-const Babl *
-gimp_drawable_get_thumbnail_format_deprecated (gint32 drawable_ID)
-{
- return gimp_drawable_get_thumbnail_format (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID)));
-}
diff --git a/libgimp/gimpdrawable.h b/libgimp/gimpdrawable.h
index fdb2d1069e..607eec47f9 100644
--- a/libgimp/gimpdrawable.h
+++ b/libgimp/gimpdrawable.h
@@ -103,11 +103,7 @@ GdkPixbuf * gimp_drawable_get_sub_thumbnail (GimpDrawable *drawable,
#define gimp_drawable_get_buffer gimp_drawable_get_buffer_deprecated
#define gimp_drawable_get_shadow_buffer gimp_drawable_get_shadow_buffer_deprecated
#define gimp_drawable_get_format gimp_drawable_get_format_deprecated
-#define gimp_drawable_get_thumbnail_format gimp_drawable_get_thumbnail_format_deprecated
#define gimp_drawable_get_thumbnail_data gimp_drawable_get_thumbnail_data_deprecated
-#define gimp_drawable_get_thumbnail gimp_drawable_get_thumbnail_deprecated
-#define gimp_drawable_get_sub_thumbnail_data gimp_drawable_get_sub_thumbnail_data_deprecated
-#define gimp_drawable_get_sub_thumbnail gimp_drawable_get_sub_thumbnail_deprecated
#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
@@ -116,33 +112,11 @@ GeglBuffer * gimp_drawable_get_buffer_deprecated (gint32 dra
GeglBuffer * gimp_drawable_get_shadow_buffer_deprecated (gint32 drawable_ID);
const Babl * gimp_drawable_get_format_deprecated (gint32 drawable_ID);
-const Babl * gimp_drawable_get_thumbnail_format_deprecated (gint32 drawable_ID);
guchar * gimp_drawable_get_thumbnail_data_deprecated (gint32 drawable_ID,
gint *width,
gint *height,
gint *bpp);
-GdkPixbuf * gimp_drawable_get_thumbnail_deprecated (gint32 drawable_ID,
- gint width,
- gint height,
- GimpPixbufTransparency alpha);
-
-guchar * gimp_drawable_get_sub_thumbnail_data_deprecated (gint32 drawable_ID,
- gint src_x,
- gint src_y,
- gint src_width,
- gint src_height,
- gint *dest_width,
- gint *dest_height,
- gint *bpp);
-GdkPixbuf * gimp_drawable_get_sub_thumbnail_deprecated (gint32 drawable_ID,
- gint src_x,
- gint src_y,
- gint src_width,
- gint src_height,
- gint dest_width,
- gint dest_height,
- GimpPixbufTransparency alpha);
G_END_DECLS
diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c
index bf909107cf..266b828133 100644
--- a/libgimp/gimpexport.c
+++ b/libgimp/gimpexport.c
@@ -1101,60 +1101,3 @@ gimp_export_dialog_get_content_area (GtkWidget *dialog)
{
return gtk_dialog_get_content_area (GTK_DIALOG (dialog));
}
-
-
-/* Deprecated API. */
-
-
-/**
- * gimp_export_image_deprecated: (skip)
- * @image_id: Pointer to the image ID.
- * @drawable_ID: Pointer to the drawable_ID.
- * @format_name: The (short) name of the image_format (e.g. JPEG or GIF).
- * @capabilities: What can the image_format do?
- *
- * Takes an image and a drawable to be saved together with a
- * description of the capabilities of the image_format. If the
- * type of image doesn't match the capabilities of the format
- * a dialog is opened that informs the user that the image has
- * to be exported and offers to do the necessary conversions.
- *
- * If the user chooses to export the image, a copy is created.
- * This copy is then converted, @image and @drawable_ID are changed to
- * point to the new image and the procedure returns GIMP_EXPORT_EXPORT.
- * The save_plugin has to take care of deleting the created image using
- * gimp_image_delete() when it has saved it.
- *
- * If the user chooses to Ignore the export problem, @image and
- * @drawable_ID are not altered, GIMP_EXPORT_IGNORE is returned and the
- * save_plugin should try to save the original image. If the user
- * chooses Cancel, GIMP_EXPORT_CANCEL is returned and the save_plugin
- * should quit itself with status %GIMP_PDB_CANCEL.
- *
- * If @format_name is NULL, no dialogs will be shown and this function
- * will behave as if the user clicked on the 'Export' button, if a
- * dialog would have been shown.
- *
- * Returns: An enum of #GimpExportReturn describing the user_action.
- **/
-GimpExportReturn
-gimp_export_image_deprecated (gint32 *image_ID,
- gint32 *drawable_ID,
- const gchar *format_name,
- GimpExportCapabilities capabilities)
-{
- GimpImage *image;
- GimpDrawable *drawable;
- GimpExportReturn retval;
-
- image = gimp_image_get_by_id (*image_ID);
- drawable = GIMP_DRAWABLE (gimp_item_get_by_id (*drawable_ID));
-
- retval = gimp_export_image (&image, &drawable,
- format_name, capabilities);
-
- *image_ID = gimp_image_get_id (image);
- *drawable_ID = gimp_item_get_id (GIMP_ITEM (drawable));
-
- return retval;
-}
diff --git a/libgimp/gimpexport.h b/libgimp/gimpexport.h
index f0ec72f698..347955cf31 100644
--- a/libgimp/gimpexport.h
+++ b/libgimp/gimpexport.h
@@ -80,26 +80,11 @@ GtkWidget * gimp_export_dialog_new (const gchar *
const gchar *help_id);
GtkWidget * gimp_export_dialog_get_content_area (GtkWidget *dialog);
-
-#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
-
GimpExportReturn gimp_export_image (GimpImage **image,
GimpDrawable **drawable,
const gchar *format_name,
GimpExportCapabilities capabilities);
-#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-#define gimp_export_image gimp_export_image_deprecated
-
-#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-
-GimpExportReturn gimp_export_image_deprecated (gint32 *image_id,
- gint32 *drawable_ID,
- const gchar *format_name,
- GimpExportCapabilities capabilities);
-
G_END_DECLS
diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c
index 353e7ec352..ca3986a285 100644
--- a/libgimp/gimpimage.c
+++ b/libgimp/gimpimage.c
@@ -648,24 +648,6 @@ gimp_image_set_metadata (GimpImage *image,
/* Deprecated API. */
-/**
- * gimp_image_list_deprecated: (skip)
- * @num_images: (out): The number of images currently open.
- *
- * Returns the list of images currently open.
- *
- * This procedure returns the list of images currently open in GIMP.
- *
- * Returns: (array length=num_images) (element-type gint32) (transfer full):
- * The list of images currently open.
- * The returned value must be freed with g_free().
- **/
-gint *
-gimp_image_list_deprecated (gint *num_images)
-{
- return _gimp_image_list (num_images);
-}
-
/**
* gimp_image_get_layers_deprecated: (skip)
* @image_id: The image id.
@@ -688,55 +670,6 @@ gimp_image_get_layers_deprecated (gint32 image_id,
num_layers);
}
-/**
- * gimp_image_get_channels_deprecated: (skip)
- * @image_id: The image.
- * @num_channels: (out): The number of channels contained in the image.
- *
- * Returns the list of channels contained in the specified image.
- *
- * This procedure returns the list of channels contained in the
- * specified image. This does not include the selection mask, or layer
- * masks. The order is from topmost to bottommost. Note that
- * "channels" are custom channels and do not include the image's
- * color components.
- *
- * Returns: (array length=num_channels):
- * The list of channels contained in the image.
- * The returned value must be freed with g_free().
- **/
-gint *
-gimp_image_get_channels_deprecated (gint32 image_id,
- gint *num_channels)
-{
- return _gimp_image_get_layers (gimp_image_get_by_id (image_id),
- num_channels);
-}
-
-/**
- * gimp_image_get_vectors_deprecated: (skip)
- * @image_id: The image.
- * @num_vectors: (out): The number of vectors contained in the image.
- *
- * Returns the list of vectors contained in the specified image.
- *
- * This procedure returns the list of vectors contained in the
- * specified image.
- *
- * Returns: (array length=num_vectors) (element-type gint32) (transfer full):
- * The list of vectors contained in the image.
- * The returned value must be freed with g_free().
- *
- * Since: 2.4
- **/
-gint *
-gimp_image_get_vectors_deprecated (gint32 image_id,
- gint *num_vectors)
-{
- return _gimp_image_get_vectors (gimp_image_get_by_id (image_id),
- num_vectors);
-}
-
/**
* gimp_image_get_colormap_deprecated: (skip)
* @image_id: The image.
@@ -782,56 +715,6 @@ gimp_image_set_colormap_deprecated (gint32 image_id,
colormap, num_colors);
}
-/**
- * gimp_image_get_thumbnail_data_deprecated: (skip)
- * @image_id: The image.
- * @width: (inout): The requested thumbnail width.
- * @height: (inout): The requested thumbnail height.
- * @bpp: (out): The previews bpp.
- *
- * Get a thumbnail of an image.
- *
- * This function gets data from which a thumbnail of an image preview
- * can be created. Maximum x or y dimension is 1024 pixels. The pixels
- * are returned in RGB[A] or GRAY[A] format. The bpp return value
- * gives the number of bytes per pixel in the image.
- *
- * Returns: (transfer full): the thumbnail data.
- **/
-guchar *
-gimp_image_get_thumbnail_data_deprecated (gint32 image_id,
- gint *width,
- gint *height,
- gint *bpp)
-{
- return gimp_image_get_thumbnail_data (gimp_image_get_by_id (image_id),
- width, height, bpp);
-}
-
-/**
- * gimp_image_get_thumbnail_deprecated: (skip)
- * @image_id: the image ID
- * @width: the requested thumbnail width (<= 1024 pixels)
- * @height: the requested thumbnail height (<= 1024 pixels)
- * @alpha: how to handle an alpha channel
- *
- * Retrieves a thumbnail pixbuf for the image identified by @image->priv->id.
- * The thumbnail will be not larger than the requested size.
- *
- * Returns: (transfer full): a new #GdkPixbuf
- *
- * Since: 2.2
- **/
-GdkPixbuf *
-gimp_image_get_thumbnail_deprecated (gint32 image_id,
- gint width,
- gint height,
- GimpPixbufTransparency alpha)
-{
- return gimp_image_get_thumbnail (gimp_image_get_by_id (image_id),
- width, height, alpha);
-}
-
/**
* gimp_image_get_metadata_deprecated: (skip)
* @image_id: The image.
diff --git a/libgimp/gimpimage.h b/libgimp/gimpimage.h
index 849f9021da..4f6cbee389 100644
--- a/libgimp/gimpimage.h
+++ b/libgimp/gimpimage.h
@@ -105,43 +105,23 @@ gboolean gimp_image_set_metadata (GimpImage *image,
#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-#define gimp_image_list gimp_image_list_deprecated
#define gimp_image_get_layers gimp_image_get_layers_deprecated
-#define gimp_image_get_channel gimp_image_get_channels_deprecated
-#define gimp_image_get_vectors gimp_image_get_vectors_deprecated
#define gimp_image_get_colormap gimp_image_get_colormap_deprecated
#define gimp_image_set_colormap gimp_image_set_colormap_deprecated
-#define gimp_image_get_thumbnail_data gimp_image_get_thumbnail_data_deprecated
-#define gimp_image_get_thumbnail gimp_image_get_thumbnail_deprecated
#define gimp_image_get_metadata gimp_image_get_metadata_deprecated
#define gimp_image_set_metadata gimp_image_set_metadata_deprecated
#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
-gint * gimp_image_list_deprecated (gint *num_images);
-
gint * gimp_image_get_layers_deprecated (gint32 image_id,
gint *num_layers);
-gint * gimp_image_get_channels_deprecated (gint32 image_id,
- gint *num_channels);
-gint * gimp_image_get_vectors_deprecated (gint32 image_id,
- gint *num_vectors);
guchar * gimp_image_get_colormap_deprecated (gint32 image_id,
gint *num_colors);
gboolean gimp_image_set_colormap_deprecated (gint32 image_id,
const guchar *colormap,
gint num_colors);
-guchar * gimp_image_get_thumbnail_data_deprecated (gint32 image_id,
- gint *width,
- gint *height,
- gint *bpp);
-GdkPixbuf * gimp_image_get_thumbnail_deprecated (gint32 image_id,
- gint width,
- gint height,
- GimpPixbufTransparency alpha);
-
GimpMetadata * gimp_image_get_metadata_deprecated (gint32 image_id);
gboolean gimp_image_set_metadata_deprecated (gint32 image_id,
GimpMetadata *metadata);
diff --git a/libgimp/gimpimagecolorprofile.c b/libgimp/gimpimagecolorprofile.c
index 5a54b46c34..bb22bd5ce8 100644
--- a/libgimp/gimpimagecolorprofile.c
+++ b/libgimp/gimpimagecolorprofile.c
@@ -171,91 +171,3 @@ gimp_image_convert_color_profile (GimpImage *image,
return _gimp_image_convert_color_profile (image, length, data,
intent, bpc);
}
-
-
-/* Deprecated API. */
-
-
-/**
- * gimp_image_get_color_profile_deprecated: (skip)
- * @image_id: The image.
- *
- * Returns the image's color profile
- *
- * This procedure returns the image's color profile, or NULL if the
- * image has no color profile assigned.
- *
- * Returns: (transfer full): The image's color profile. The returned
- * value must be freed with g_object_unref().
- **/
-GimpColorProfile *
-gimp_image_get_color_profile_deprecated (gint32 image_id)
-{
- return gimp_image_get_color_profile (gimp_image_get_by_id (image_id));
-}
-
-/**
- * gimp_image_set_color_profile_deprecated: (skip)
- * @image_id: The image.
- * @profile: A #GimpColorProfile, or %NULL.
- *
- * Sets the image's color profile
- *
- * This procedure sets the image's color profile.
- *
- * Returns: %TRUE on success.
- **/
-gboolean
-gimp_image_set_color_profile_deprecated (gint32 image_id,
- GimpColorProfile *profile)
-{
- return gimp_image_set_color_profile (gimp_image_get_by_id (image_id),
- profile);
-}
-
-/**
- * gimp_image_get_effective_color_profile_deprecated: (skip)
- * @image_id: The image.
- *
- * Returns the color profile that is used for the image.
- *
- * This procedure returns the color profile that is actually used for
- * this image, which is the profile returned by
- * gimp_image_get_color_profile()_deprecated if the image has a profile assigned,
- * or the default RGB profile from preferences if no profile is
- * assigned to the image. If there is no default RGB profile configured
- * in preferences either, a generated default RGB profile is returned.
- *
- * Returns: (transfer full): The color profile. The returned value must
- * be freed with g_object_unref().
- **/
-GimpColorProfile *
-gimp_image_get_effective_color_profile_deprecated (gint32 image_id)
-{
- return gimp_image_get_effective_color_profile (gimp_image_get_by_id (image_id));
-}
-
-/**
- * gimp_image_convert_color_profile_deprecated: (skip)
- * @image_id: The image.
- * @profile: The color profile to convert to.
- * @intent: Rendering intent.
- * @bpc: Black point compensation.
- *
- * Convert the image's layers to a color profile
- *
- * This procedure converts from the image's color profile (or the
- * default RGB profile if none is set) to the given color profile. Only
- * RGB color profiles are accepted.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_convert_color_profile_deprecated (gint32 image_id,
- GimpColorProfile *profile,
- GimpColorRenderingIntent intent,
- gboolean bpc)
-{
- return gimp_image_convert_color_profile (gimp_image_get_by_id (image_id),
- profile, intent, bpc);
-}
diff --git a/libgimp/gimpimagecolorprofile.h b/libgimp/gimpimagecolorprofile.h
index 803a9ce129..63ae015f04 100644
--- a/libgimp/gimpimagecolorprofile.h
+++ b/libgimp/gimpimagecolorprofile.h
@@ -30,8 +30,6 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
-#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
-
GimpColorProfile * gimp_image_get_color_profile (GimpImage *image);
gboolean gimp_image_set_color_profile (GimpImage *image,
GimpColorProfile *profile);
@@ -43,27 +41,6 @@ gboolean gimp_image_convert_color_profile (GimpImage
GimpColorRenderingIntent intent,
gboolean bpc);
-#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-#define gimp_image_get_color_profile gimp_image_get_color_profile_deprecated
-#define gimp_image_set_color_profile gimp_image_set_color_profile_deprecated
-#define gimp_image_get_effective_color_profile gimp_image_get_effective_color_profile_deprecated
-#define gimp_image_convert_color_profile gimp_image_convert_color_profile_deprecated
-
-#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-
-GimpColorProfile * gimp_image_get_color_profile_deprecated (gint32 image_id);
-gboolean gimp_image_set_color_profile_deprecated (gint32 image_id,
- GimpColorProfile *profile);
-
-GimpColorProfile * gimp_image_get_effective_color_profile_deprecated (gint32 image_id);
-
-gboolean gimp_image_convert_color_profile_deprecated (gint32 image_id,
- GimpColorProfile *profile,
- GimpColorRenderingIntent intent,
- gboolean bpc);
-
G_END_DECLS
diff --git a/libgimp/gimpimagecombobox.c b/libgimp/gimpimagecombobox.c
index fce1698ae1..65ebcbd497 100644
--- a/libgimp/gimpimagecombobox.c
+++ b/libgimp/gimpimagecombobox.c
@@ -57,8 +57,6 @@ struct _GimpImageComboBox
GimpImageConstraintFunc constraint;
gpointer data;
GDestroyNotify data_destroy;
-
- GimpImageConstraintDeprecatedFunc constraint_d;
};
struct _GimpImageComboBoxClass
@@ -73,8 +71,6 @@ static void gimp_image_combo_box_populate (GimpImageComboBox *combo_box)
static void gimp_image_combo_box_model_add (GtkListStore *store,
GList *images,
GimpImageConstraintFunc constraint,
- GimpImageConstraintDeprecatedFunc
- constraint_d,
gpointer data);
static void gimp_image_combo_box_drag_data_received (GtkWidget *widget,
@@ -188,7 +184,6 @@ gimp_image_combo_box_populate (GimpImageComboBox *combo_box)
gimp_image_combo_box_model_add (GTK_LIST_STORE (model), images,
combo_box->constraint,
- combo_box->constraint_d,
combo_box->data);
g_list_free (images);
@@ -201,8 +196,6 @@ static void
gimp_image_combo_box_model_add (GtkListStore *store,
GList *images,
GimpImageConstraintFunc constraint,
- GimpImageConstraintDeprecatedFunc
- constraint_d,
gpointer data)
{
GtkTreeIter iter;
@@ -213,9 +206,7 @@ gimp_image_combo_box_model_add (GtkListStore *store,
GimpImage *image = list->data;
gint32 image_id = gimp_image_get_id (image);
- if ((! constraint && ! constraint_d) ||
- (constraint && (* constraint) (image, data)) ||
- (constraint_d && (* constraint_d) (image_id, data)))
+ if (! constraint || constraint (image, data))
{
gchar *image_name = gimp_image_get_name (image);
gchar *label;
@@ -301,52 +292,3 @@ gimp_image_combo_box_changed (GimpImageComboBox *combo_box)
}
}
}
-
-
-/* Deprecated API. */
-
-
-/**
- * gimp_image_combo_box_new_deprecated: (skip)
- * @constraint: a #GimpImageConstraintDeprecatedFunc or %NULL
- * @data: a pointer that is passed to @constraint
- * @data_destroy: Destroy function for @data.
- *
- * Creates a new #GimpIntComboBox filled with all currently opened
- * images. If a @constraint function is specified, it is called for
- * each image and only if the function returns %TRUE, the image is
- * added to the combobox.
- *
- * You should use gimp_int_combo_box_connect() to initialize and
- * connect the combo. Use gimp_int_combo_box_set_active() to get the
- * active image ID and gimp_int_combo_box_get_active() to retrieve the
- * ID of the selected image.
- *
- * Returns: a new #GimpIntComboBox.
- *
- * Since: 2.2
- **/
-GtkWidget *
-gimp_image_combo_box_new_deprecated (GimpImageConstraintDeprecatedFunc constraint,
- gpointer data,
- GDestroyNotify data_destroy)
-{
- GimpImageComboBox *combo_box;
-
- combo_box = g_object_new (GIMP_TYPE_IMAGE_COMBO_BOX,
- "width-request", WIDTH_REQUEST,
- "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
- NULL);
-
- combo_box->constraint_d = constraint;
- combo_box->data = data;
- combo_box->data_destroy = data_destroy;
-
- gimp_image_combo_box_populate (combo_box);
-
- g_signal_connect (combo_box, "changed",
- G_CALLBACK (gimp_image_combo_box_changed),
- NULL);
-
- return GTK_WIDGET (combo_box);
-}
diff --git a/libgimp/gimpimagecombobox.h b/libgimp/gimpimagecombobox.h
index ce5de0734e..44a9db37e7 100644
--- a/libgimp/gimpimagecombobox.h
+++ b/libgimp/gimpimagecombobox.h
@@ -31,37 +31,20 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
-#define GIMP_TYPE_IMAGE_COMBO_BOX (gimp_image_combo_box_get_type ())
-#define GIMP_IMAGE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_COMBO_BOX,
GimpImageComboBox))
-#define GIMP_IS_IMAGE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_COMBO_BOX)
-
-
-GType gimp_image_combo_box_get_type (void) G_GNUC_CONST;
-
-
-#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
-
typedef gboolean (* GimpImageConstraintFunc) (GimpImage *image,
gpointer data);
-GtkWidget * gimp_image_combo_box_new (GimpImageConstraintFunc constraint,
- gpointer data,
- GDestroyNotify data_destroy);
-
-#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-#define GimpImageConstraintFunc GimpImageConstraintDeprecatedFunc
-#define gimp_image_combo_box_new gimp_image_combo_box_new_deprecated
-
-#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
+#define GIMP_TYPE_IMAGE_COMBO_BOX (gimp_image_combo_box_get_type ())
+#define GIMP_IMAGE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_COMBO_BOX,
GimpImageComboBox))
+#define GIMP_IS_IMAGE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_COMBO_BOX)
-typedef gboolean (* GimpImageConstraintDeprecatedFunc) (gint32 image_id,
- gpointer data);
+GType gimp_image_combo_box_get_type (void) G_GNUC_CONST;
-GtkWidget * gimp_image_combo_box_new_deprecated (GimpImageConstraintDeprecatedFunc constraint,
- gpointer data,
- GDestroyNotify data_destroy);
+GtkWidget * gimp_image_combo_box_new (GimpImageConstraintFunc constraint,
+ gpointer data,
+ GDestroyNotify data_destroy);
G_END_DECLS
diff --git a/libgimp/gimpimagemetadata.c b/libgimp/gimpimagemetadata.c
index edceb2a52c..8a0b40b88d 100644
--- a/libgimp/gimpimagemetadata.c
+++ b/libgimp/gimpimagemetadata.c
@@ -667,6 +667,8 @@ gimp_image_metadata_save_finish (GimpImage *image,
* Retrieves a thumbnail from metadata if present.
*
* Returns: (transfer none) (nullable): a #GimpImage of the @file thumbnail.
+ *
+ * Since: 2.10
*/
GimpImage *
gimp_image_metadata_load_thumbnail (GFile *file,
@@ -1033,141 +1035,3 @@ gimp_image_metadata_rotate_dialog (GimpImage *image,
return (response == GTK_RESPONSE_OK);
}
-
-
-/* Deprecated API. */
-
-
-/**
- * gimp_image_metadata_load_prepare_deprecated: (skip)
- * @image_id: The image
- * @mime_type: The loaded file's mime-type
- * @file: The file to load the metadata from
- * @error: Return location for error
- *
- * Loads and returns metadata from @file to be passed into
- * gimp_image_metadata_load_finish().
- *
- * Returns: (transfer full): The file's metadata.
- *
- * Since: 2.10
- */
-GimpMetadata *
-gimp_image_metadata_load_prepare_deprecated (gint32 image_id,
- const gchar *mime_type,
- GFile *file,
- GError **error)
-{
- return gimp_image_metadata_load_prepare (gimp_image_get_by_id (image_id),
- mime_type, file, error);
-}
-
-/**
- * gimp_image_metadata_load_finish_deprecated: (skip)
- * @image_id: The image
- * @mime_type: The loaded file's mime-type
- * @metadata: The metadata to set on the image
- * @flags: Flags to specify what of the metadata to apply to the image
- * @interactive: Whether this function is allowed to query info with dialogs
- *
- * Applies the @metadata previously loaded with
- * gimp_image_metadata_load_prepare()_deprecated to the image, taking into account
- * the passed @flags.
- *
- * Since: 2.10
- */
-void
-gimp_image_metadata_load_finish_deprecated (gint32 image_id,
- const gchar *mime_type,
- GimpMetadata *metadata,
- GimpMetadataLoadFlags flags,
- gboolean interactive)
-{
- gimp_image_metadata_load_finish (gimp_image_get_by_id (image_id),
- mime_type, metadata, flags, interactive);
-}
-
-/**
- * gimp_image_metadata_save_prepare_deprecated: (skip)
- * @image_id: The image
- * @mime_type: The saved file's mime-type
- * @suggested_flags: Suggested default values for the @flags passed to
- * gimp_image_metadata_save_finish()
- *
- * Gets the image metadata for saving it using
- * gimp_image_metadata_save_finish().
- *
- * The @suggested_flags are determined from what kind of metadata
- * (Exif, XMP, ...) is actually present in the image and the preferences
- * for metadata exporting.
- * The calling application may still update @available_flags, for
- * instance to follow the settings from a previous export in the same
- * session, or a previous export of the same image. But it should not
- * override the preferences without a good reason since it is a data
- * leak.
- *
- * The suggested value for GIMP_METADATA_SAVE_THUMBNAIL is determined by
- * whether there was a thumbnail in the previously imported image.
- *
- * Returns: (transfer full): The image's metadata, prepared for saving.
- *
- * Since: 2.10
- */
-GimpMetadata *
-gimp_image_metadata_save_prepare_deprecated (gint32 image_id,
- const gchar *mime_type,
- GimpMetadataSaveFlags *suggested_flags)
-{
- return gimp_image_metadata_save_prepare (gimp_image_get_by_id (image_id),
- mime_type, suggested_flags);
-}
-
-/**
- * gimp_image_metadata_save_finish_deprecated: (skip)
- * @image_id: The image
- * @mime_type: The saved file's mime-type
- * @metadata: The metadata to set on the image
- * @flags: Flags to specify what of the metadata to save
- * @file: The file to load the metadata from
- * @error: Return location for error message
- *
- * Saves the @metadata retrieved from the image with
- * gimp_image_metadata_save_prepare()_deprecated to @file, taking into account
- * the passed @flags.
- *
- * Returns: Whether the save was successful.
- *
- * Since: 2.10
- */
-gboolean
-gimp_image_metadata_save_finish_deprecated (gint32 image_id,
- const gchar *mime_type,
- GimpMetadata *metadata,
- GimpMetadataSaveFlags flags,
- GFile *file,
- GError **error)
-{
- return gimp_image_metadata_save_finish (gimp_image_get_by_id (image_id),
- mime_type, metadata,
- flags, file, error);
-}
-
-/**
- * gimp_image_metadata_load_thumbnail_deprecated: (skip)
- * @file: A #GFile image
- * @error: Return location for error message
- *
- * Retrieves a thumbnail from metadata if present.
- *
- * Returns: an image id of the @file thumbnail.
- */
-gint32
-gimp_image_metadata_load_thumbnail_deprecated (GFile *file,
- GError **error)
-{
- GimpImage *image;
-
- image = gimp_image_metadata_load_thumbnail (file, error);
-
- return gimp_image_get_id (image);
-}
diff --git a/libgimp/gimpimagemetadata.h b/libgimp/gimpimagemetadata.h
index 4cba41c19e..2f1cec6ddb 100644
--- a/libgimp/gimpimagemetadata.h
+++ b/libgimp/gimpimagemetadata.h
@@ -30,70 +30,29 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
-#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
-
-GimpMetadata * gimp_image_metadata_load_prepare (GimpImage *image,
- const gchar *mime_type,
- GFile *file,
- GError **error);
-void gimp_image_metadata_load_finish (GimpImage *image,
- const gchar *mime_type,
- GimpMetadata *metadata,
- GimpMetadataLoadFlags flags,
- gboolean interactive);
-
-GimpMetadata * gimp_image_metadata_save_prepare (GimpImage *image,
- const gchar *mime_type,
- GimpMetadataSaveFlags *suggested_flags);
-gboolean gimp_image_metadata_save_finish (GimpImage *image,
- const gchar *mime_type,
- GimpMetadata *metadata,
- GimpMetadataSaveFlags flags,
- GFile *file,
- GError **error);
-
-
-/* this is experimental API, to be finished for 2.10 */
+GimpMetadata * gimp_image_metadata_load_prepare (GimpImage *image,
+ const gchar *mime_type,
+ GFile *file,
+ GError **error);
+void gimp_image_metadata_load_finish (GimpImage *image,
+ const gchar *mime_type,
+ GimpMetadata *metadata,
+ GimpMetadataLoadFlags flags,
+ gboolean interactive);
+
+GimpMetadata * gimp_image_metadata_save_prepare (GimpImage *image,
+ const gchar *mime_type,
+ GimpMetadataSaveFlags *suggested_flags);
+gboolean gimp_image_metadata_save_finish (GimpImage *image,
+ const gchar *mime_type,
+ GimpMetadata *metadata,
+ GimpMetadataSaveFlags flags,
+ GFile *file,
+ GError **error);
GimpImage * gimp_image_metadata_load_thumbnail (GFile *file,
GError **error);
-#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-#define gimp_image_metadata_load_prepare gimp_image_metadata_load_prepare_deprecated
-#define gimp_image_metadata_load_finish gimp_image_metadata_load_finish_deprecated
-#define gimp_image_metadata_save_prepare gimp_image_metadata_save_prepare_deprecated
-#define gimp_image_metadata_save_finish gimp_image_metadata_save_finish_deprecated
-#define gimp_image_metadata_load_thumbnail gimp_image_metadata_load_thumbnail_deprecated
-
-#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-
-GimpMetadata * gimp_image_metadata_load_prepare_deprecated (gint32 image_id,
- const gchar *mime_type,
- GFile *file,
- GError **error);
-void gimp_image_metadata_load_finish_deprecated (gint32 image_id,
- const gchar *mime_type,
- GimpMetadata *metadata,
- GimpMetadataLoadFlags flags,
- gboolean interactive);
-
-GimpMetadata * gimp_image_metadata_save_prepare_deprecated (gint32 image_id,
- const gchar *mime_type,
- GimpMetadataSaveFlags *suggested_flags);
-gboolean gimp_image_metadata_save_finish_deprecated (gint32 image_id,
- const gchar *mime_type,
- GimpMetadata *metadata,
- GimpMetadataSaveFlags flags,
- GFile *file,
- GError **error);
-
-/* this is experimental API, to be finished for 2.10 */
-
-gint32 gimp_image_metadata_load_thumbnail_deprecated (GFile *file,
- GError **error);
-
G_END_DECLS
diff --git a/libgimp/gimpitemcombobox.c b/libgimp/gimpitemcombobox.c
index 7cca43cad4..6cf6132d0f 100644
--- a/libgimp/gimpitemcombobox.c
+++ b/libgimp/gimpitemcombobox.c
@@ -638,28 +638,6 @@ gimp_drawable_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constra
constraint, data, data_destroy);
}
-/**
- * gimp_channel_combo_box_new_deprecated: (skip)
- * @constraint: a #GimpItemConstraintDeprecatedFunc or %NULL
- * @data: a pointer that is passed to @constraint
- * @data_destroy: Destroy function for @data
- *
- * Creates a new #GimpIntComboBox filled with all currently opened
- * channels. See gimp_drawable_combo_box_new() for more information.
- *
- * Returns: a new #GimpIntComboBox.
- *
- * Since: 2.2
- **/
-GtkWidget *
-gimp_channel_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint,
- gpointer data,
- GDestroyNotify data_destroy)
-{
- return gimp_item_combo_box_new_deprecated (GIMP_TYPE_CHANNEL_COMBO_BOX,
- constraint, data, data_destroy);
-}
-
/**
* gimp_layer_combo_box_new_deprecated: (skip)
* @constraint: a #GimpItemConstraintDeprecatedFunc or %NULL
@@ -682,35 +660,6 @@ gimp_layer_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint
constraint, data, data_destroy);
}
-/**
- * gimp_vectors_combo_box_new_deprecated: (skip)
- * @constraint: a #GimpItemConstraintDeprecatedFunc or %NULL
- * @data: a pointer that is passed to @constraint
- * @data_destroy: Destroy function for @data
- *
- * Creates a new #GimpIntComboBox filled with all currently opened
- * vectors objects. If a @constraint function is specified, it is called for
- * each vectors object and only if the function returns %TRUE, the vectors
- * object is added to the combobox.
- *
- * You should use gimp_int_combo_box_connect() to initialize and connect
- * the combo. Use gimp_int_combo_box_set_active() to set the active
- * vectors ID and gimp_int_combo_box_get_active() to retrieve the ID
- * of the selected vectors object.
- *
- * Returns: a new #GimpIntComboBox.
- *
- * Since: 2.4
- **/
-GtkWidget *
-gimp_vectors_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint,
- gpointer data,
- GDestroyNotify data_destroy)
-{
- return gimp_item_combo_box_new_deprecated (GIMP_TYPE_VECTORS_COMBO_BOX,
- constraint, data, data_destroy);
-}
-
static GtkWidget *
gimp_item_combo_box_new_deprecated (GType type,
GimpItemConstraintDeprecatedFunc constraint,
diff --git a/libgimp/gimpitemcombobox.h b/libgimp/gimpitemcombobox.h
index 907ab5ccfd..5552f763db 100644
--- a/libgimp/gimpitemcombobox.h
+++ b/libgimp/gimpitemcombobox.h
@@ -78,9 +78,7 @@ GtkWidget * gimp_vectors_combo_box_new (GimpItemConstraintFunc constraint,
#define GimpItemConstraintFunc GimpItemConstraintDeprecatedFunc
#define gimp_drawable_combo_box_new gimp_drawable_combo_box_new_deprecated
-#define gimp_channel_combo_box_new gimp_channel_combo_box_new_deprecated
#define gimp_layer_combo_box_new gimp_layer_combo_box_new_deprecated
-#define gimp_vectors_combo_box_new gimp_vectors_combo_box_new_deprecated
#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
@@ -93,15 +91,9 @@ typedef gboolean (* GimpItemConstraintDeprecatedFunc) (gint image_id,
GtkWidget * gimp_drawable_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint,
gpointer data,
GDestroyNotify data_destroy);
-GtkWidget * gimp_channel_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint,
- gpointer data,
- GDestroyNotify data_destroy);
GtkWidget * gimp_layer_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint,
gpointer data,
GDestroyNotify data_destroy);
-GtkWidget * gimp_vectors_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint,
- gpointer data,
- GDestroyNotify data_destroy);
G_END_DECLS
diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c
index ae59b9a0e6..56bb4497b8 100644
--- a/libgimp/gimplayer.c
+++ b/libgimp/gimplayer.c
@@ -130,7 +130,7 @@ gimp_layer_copy (GimpLayer *layer)
* Returns: (transfer none): The newly created layer.
* The object belongs to libgimp and you should not free it.
*
- * Since: 3.0
+ * Since: 2.2
*/
GimpLayer *
gimp_layer_new_from_pixbuf (GimpImage *image,
@@ -209,7 +209,7 @@ gimp_layer_new_from_pixbuf (GimpImage *image,
* Returns: (transfer none): The newly created layer.
* The object belongs to libgimp and you should not free it.
*
- * Since: 3.0
+ * Since: 2.8
*/
GimpLayer *
gimp_layer_new_from_surface (GimpImage *image,
@@ -314,48 +314,6 @@ gimp_layer_new_deprecated (gint32 image_id,
return gimp_item_get_id (GIMP_ITEM (layer));
}
-/**
- * gimp_layer_new_from_pixbuf_deprecated: (skip)
- * @image_id: The RGB image to which to add the layer.
- * @name: The layer name.
- * @pixbuf: A GdkPixbuf.
- * @opacity: The layer opacity.
- * @mode: The layer combination mode.
- * @progress_start: start of progress
- * @progress_end: end of progress
- *
- * Create a new layer from a %GdkPixbuf.
- *
- * This procedure creates a new layer from the given %GdkPixbuf. The
- * image has to be an RGB image and just like with gimp_layer_new()
- * you will still need to add the layer to it.
- *
- * If you pass @progress_end > @progress_start to this function,
- * gimp_progress_update() will be called for. You have to call
- * gimp_progress_init() beforehand then.
- *
- * Returns: The newly created layer ID.
- *
- * Since: 2.4
- */
-gint32
-gimp_layer_new_from_pixbuf_deprecated (gint32 image_id,
- const gchar *name,
- GdkPixbuf *pixbuf,
- gdouble opacity,
- GimpLayerMode mode,
- gdouble progress_start,
- gdouble progress_end)
-{
- GimpLayer *layer;
-
- layer = gimp_layer_new_from_pixbuf (gimp_image_get_by_id (image_id),
- name, pixbuf, opacity, mode,
- progress_start, progress_end);
-
- return gimp_item_get_id (GIMP_ITEM (layer));
-}
-
/**
* gimp_layer_new_from_surface_deprecated: (skip)
* @image_id: The RGB image to which to add the layer.
diff --git a/libgimp/gimplayer.h b/libgimp/gimplayer.h
index aa36e85422..ccf95a42ca 100644
--- a/libgimp/gimplayer.h
+++ b/libgimp/gimplayer.h
@@ -61,8 +61,8 @@ struct _GimpLayerClass
void (*_gimp_reserved9) (void);
};
-GType gimp_layer_get_type (void) G_GNUC_CONST;
+GType gimp_layer_get_type (void) G_GNUC_CONST;
#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
@@ -92,7 +92,6 @@ GimpLayer * gimp_layer_copy (GimpLayer *layer);
#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
#define gimp_layer_new gimp_layer_new_deprecated
-#define gimp_layer_new_from_pixbuf gimp_layer_new_from_pixbuf_deprecated
#define gimp_layer_new_from_surface gimp_layer_new_from_surface_deprecated
#define gimp_layer_copy gimp_layer_copy_deprecated
@@ -107,13 +106,6 @@ gint32 gimp_layer_new_deprecated (gint32 image_id,
gdouble opacity,
GimpLayerMode mode);
-gint32 gimp_layer_new_from_pixbuf_deprecated (gint32 image_id,
- const gchar *name,
- GdkPixbuf *pixbuf,
- gdouble opacity,
- GimpLayerMode mode,
- gdouble progress_start,
- gdouble progress_end);
gint32 gimp_layer_new_from_surface_deprecated (gint32 image_id,
const gchar *name,
cairo_surface_t *surface,
@@ -122,6 +114,7 @@ gint32 gimp_layer_new_from_surface_deprecated (gint32 image_id,
gint32 gimp_layer_copy_deprecated (gint32 layer_ID);
+
G_END_DECLS
#endif /* __GIMP_LAYER_H__ */
diff --git a/libgimp/gimpselection.c b/libgimp/gimpselection.c
index 9f11777c39..fb9737b286 100644
--- a/libgimp/gimpselection.c
+++ b/libgimp/gimpselection.c
@@ -65,44 +65,3 @@ gimp_selection_float (GimpImage *image,
offx,
offy);
}
-
-
-/* Deprecated API. */
-
-
-/**
- * gimp_selection_float_deprecated: (skip)
- * @image_ID: ignored
- * @drawable_ID: The drawable from which to float selection.
- * @offx: x offset for translation.
- * @offy: y offset for translation.
- *
- * Float the selection from the specified drawable with initial offsets
- * as specified.
- *
- * This procedure determines the region of the specified drawable that
- * lies beneath the current selection. The region is then cut from the
- * drawable and the resulting data is made into a new layer which is
- * instantiated as a floating selection. The offsets allow initial
- * positioning of the new floating selection.
- *
- * Returns: The floated layer.
- */
-gint32
-gimp_selection_float_deprecated (gint32 image_ID,
- gint32 drawable_ID,
- gint offx,
- gint offy)
-{
- GimpLayer *selection;
- gint32 selection_id = -1;
-
- selection = gimp_selection_float (gimp_image_get_by_id (image_ID),
- GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID)),
- offx,
- offy);
- if (selection)
- selection_id = gimp_item_get_id (GIMP_ITEM (selection));
-
- return selection_id;
-}
diff --git a/libgimp/gimpselection.h b/libgimp/gimpselection.h
index 6911e424ee..93b03b3190 100644
--- a/libgimp/gimpselection.h
+++ b/libgimp/gimpselection.h
@@ -61,26 +61,13 @@ struct _GimpSelectionClass
void (*_gimp_reserved9) (void);
};
-GType gimp_selection_get_type (void) G_GNUC_CONST;
-#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
+GType gimp_selection_get_type (void) G_GNUC_CONST;
-GimpLayer * gimp_selection_float (GimpImage *image,
- GimpDrawable *drawable,
- gint offx,
- gint offy);
-
-#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-#define gimp_selection_float gimp_selection_float_deprecated
-
-#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-
-gint32 gimp_selection_float_deprecated (gint32 image_ID,
- gint32 drawable_ID,
- gint offx,
- gint offy);
+GimpLayer * gimp_selection_float (GimpImage *image,
+ GimpDrawable *drawable,
+ gint offx,
+ gint offy);
G_END_DECLS
diff --git a/libgimp/gimpui.c b/libgimp/gimpui.c
index 19c036eeeb..35cad82084 100644
--- a/libgimp/gimpui.c
+++ b/libgimp/gimpui.c
@@ -448,52 +448,3 @@ gimp_osx_focus_window (void)
[NSApp activateIgnoringOtherApps:YES];
}
#endif
-
-
-/* Deprecated API. */
-
-
-/**
- * gimp_ui_get_display_window_deprecated: (skip)
- * @gdisp_ID: a GimpDisplay ID.
- *
- * Returns the #GdkWindow of a display window. The purpose is to allow
- * to make plug-in dialogs transient to the image display as explained
- * with gdk_window_set_transient_for().
- *
- * You shouldn't have to call this function directly. Use
- * gimp_window_set_transient_for_display() instead.
- *
- * Returns: (nullable) (transfer full): A reference to a #GdkWindow or %NULL.
- * You should unref the window using g_object_unref() as
- * soon as you don't need it any longer.
- *
- * Since: 2.4
- */
-GdkWindow *
-gimp_ui_get_display_window_deprecated (guint32 gdisp_ID)
-{
- return gimp_ui_get_display_window (gimp_display_get_by_id (gdisp_ID));
-}
-
-/**
- * gimp_window_set_transient_for_display_deprecated: (skip)
- * @window: the #GtkWindow that should become transient
- * @gdisp_ID: display ID of the image window that should become the parent
- *
- * Indicates to the window manager that @window is a transient dialog
- * associated with the GIMP image window that is identified by it's
- * display ID. See gdk_window_set_transient_for () for more information.
- *
- * Most of the time you will want to use the convenience function
- * gimp_window_set_transient().
- *
- * Since: 2.4
- */
-void
-gimp_window_set_transient_for_display_deprecated (GtkWindow *window,
- guint32 gdisp_ID)
-{
- gimp_window_set_transient_for_display (window,
- gimp_display_get_by_id (gdisp_ID));
-}
diff --git a/libgimp/gimpui.def b/libgimp/gimpui.def
index 4edb64899c..030aee9617 100644
--- a/libgimp/gimpui.def
+++ b/libgimp/gimpui.def
@@ -7,7 +7,6 @@ EXPORTS
gimp_brush_select_button_set_brush
gimp_channel_combo_box_get_type
gimp_channel_combo_box_new
- gimp_channel_combo_box_new_deprecated
gimp_drawable_combo_box_get_type
gimp_drawable_combo_box_new
gimp_drawable_combo_box_new_deprecated
@@ -17,7 +16,6 @@ EXPORTS
gimp_export_dialog_get_content_area
gimp_export_dialog_new
gimp_export_image
- gimp_export_image_deprecated
gimp_font_select_button_get_font
gimp_font_select_button_get_type
gimp_font_select_button_new
@@ -28,17 +26,11 @@ EXPORTS
gimp_gradient_select_button_set_gradient
gimp_image_combo_box_get_type
gimp_image_combo_box_new
- gimp_image_combo_box_new_deprecated
gimp_image_metadata_load_finish
- gimp_image_metadata_load_finish_deprecated
gimp_image_metadata_load_prepare
- gimp_image_metadata_load_prepare_deprecated
gimp_image_metadata_load_thumbnail
- gimp_image_metadata_load_thumbnail_deprecated
gimp_image_metadata_save_finish
- gimp_image_metadata_save_finish_deprecated
gimp_image_metadata_save_prepare
- gimp_image_metadata_save_prepare_deprecated
gimp_layer_combo_box_get_type
gimp_layer_combo_box_new
gimp_layer_combo_box_new_deprecated
@@ -59,15 +51,12 @@ EXPORTS
gimp_select_button_close_popup
gimp_select_button_get_type
gimp_ui_get_display_window
- gimp_ui_get_display_window_deprecated
gimp_ui_get_progress_window
gimp_ui_init
gimp_vectors_combo_box_get_type
gimp_vectors_combo_box_new
- gimp_vectors_combo_box_new_deprecated
gimp_window_set_transient
gimp_window_set_transient_for_display
- gimp_window_set_transient_for_display_deprecated
gimp_zoom_preview_get_drawable
gimp_zoom_preview_get_factor
gimp_zoom_preview_get_model
diff --git a/libgimp/gimpui.h b/libgimp/gimpui.h
index c3302bf569..334329c7a7 100644
--- a/libgimp/gimpui.h
+++ b/libgimp/gimpui.h
@@ -58,25 +58,10 @@ GdkWindow * gimp_ui_get_progress_window (void);
void gimp_window_set_transient (GtkWindow *window);
-
-#ifndef GIMP_DEPRECATED_REPLACE_NEW_API
-
GdkWindow * gimp_ui_get_display_window (GimpDisplay *display);
void gimp_window_set_transient_for_display (GtkWindow *window,
GimpDisplay *display);
-#else /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-#define gimp_ui_get_display_window gimp_ui_get_display_window_deprecated
-#define gimp_window_set_transient_for_display gimp_window_set_transient_for_display_deprecated
-
-#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */
-
-
-GdkWindow * gimp_ui_get_display_window_deprecated (guint32 gdisp_ID);
-void gimp_window_set_transient_for_display_deprecated (GtkWindow *window,
- guint32 gdisp_ID);
-
G_END_DECLS
diff --git a/libgimp/gimpvectors.h b/libgimp/gimpvectors.h
index bb26d5b457..5b9702542c 100644
--- a/libgimp/gimpvectors.h
+++ b/libgimp/gimpvectors.h
@@ -62,8 +62,7 @@ struct _GimpVectorsClass
void (*_gimp_reserved9) (void);
};
-GType gimp_vectors_get_type (void) G_GNUC_CONST;
-
+GType gimp_vectors_get_type (void) G_GNUC_CONST;
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
