From a66945342d3bd65a734c702946e8ca09058bf9c0 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 30 Aug 2019 18:58:16 +0200 Subject: [PATCH] libgimp: remove some old API that is no longer needed --- libgimp/gimp.def | 1 - libgimp/gimpdrawable.c | 23 ----------------------- libgimp/gimpdrawable.h | 6 ------ libgimp/gimpitemcombobox.c | 22 ---------------------- libgimp/gimpitemcombobox.h | 4 ---- libgimp/gimpui.def | 1 - 6 files changed, 57 deletions(-) diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 12f90ed20e..94f6d3966c 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -215,7 +215,6 @@ EXPORTS gimp_drawable_get_sub_thumbnail_data gimp_drawable_get_thumbnail gimp_drawable_get_thumbnail_data - gimp_drawable_get_thumbnail_data_deprecated gimp_drawable_get_thumbnail_format gimp_drawable_get_type gimp_drawable_has_alpha diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c index c5146c14fa..ae1dbb7283 100644 --- a/libgimp/gimpdrawable.c +++ b/libgimp/gimpdrawable.c @@ -402,29 +402,6 @@ gimp_drawable_get_thumbnail_format (GimpDrawable *drawable) /* Deprecated API. */ -/** - * gimp_drawable_get_thumbnail_data_deprecated: (skip) - * @drawable_ID: the drawable ID - * @width: the requested thumbnail width (<= 1024 pixels) - * @height: the requested thumbnail height (<= 1024 pixels) - * @bpp: - * - * Retrieves thumbnail data for the drawable identified by @drawable_ID. - * The thumbnail will be not larger than the requested size. - * - * Returns: (transfer full) (nullable): thumbnail data or %NULL if - * @drawable_ID is invalid. - **/ -guchar * -gimp_drawable_get_thumbnail_data_deprecated (gint32 drawable_ID, - gint *width, - gint *height, - gint *bpp) -{ - return gimp_drawable_get_thumbnail_data (GIMP_DRAWABLE (gimp_item_get_by_id (drawable_ID)), - width, height, bpp); -} - /** * gimp_drawable_get_buffer_deprecated: (skip) * @drawable_ID: the ID of the #GimpDrawable to get the buffer for. diff --git a/libgimp/gimpdrawable.h b/libgimp/gimpdrawable.h index 8359394595..8af39b851f 100644 --- a/libgimp/gimpdrawable.h +++ b/libgimp/gimpdrawable.h @@ -108,7 +108,6 @@ 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_data gimp_drawable_get_thumbnail_data_deprecated #endif /* GIMP_DEPRECATED_REPLACE_NEW_API */ @@ -118,11 +117,6 @@ GeglBuffer * gimp_drawable_get_shadow_buffer_deprecated (gint32 dra const Babl * gimp_drawable_get_format_deprecated (gint32 drawable_ID); -guchar * gimp_drawable_get_thumbnail_data_deprecated (gint32 drawable_ID, - gint *width, - gint *height, - gint *bpp); - G_END_DECLS diff --git a/libgimp/gimpitemcombobox.c b/libgimp/gimpitemcombobox.c index d9d4fbd59b..d7b8a80a66 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_layer_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 - * layers. See gimp_drawable_combo_box_new() for more information. - * - * Returns: a new #GimpIntComboBox. - * - * Since: 2.2 - **/ -GtkWidget * -gimp_layer_combo_box_new_deprecated (GimpItemConstraintDeprecatedFunc constraint, - gpointer data, - GDestroyNotify data_destroy) -{ - return gimp_item_combo_box_new_deprecated (GIMP_TYPE_LAYER_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 5552f763db..83e9685fd5 100644 --- a/libgimp/gimpitemcombobox.h +++ b/libgimp/gimpitemcombobox.h @@ -78,7 +78,6 @@ 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_layer_combo_box_new gimp_layer_combo_box_new_deprecated #endif /* GIMP_DEPRECATED_REPLACE_NEW_API */ @@ -91,9 +90,6 @@ typedef gboolean (* GimpItemConstraintDeprecatedFunc) (gint image_id, GtkWidget * gimp_drawable_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); G_END_DECLS diff --git a/libgimp/gimpui.def b/libgimp/gimpui.def index 030aee9617..56e4654116 100644 --- a/libgimp/gimpui.def +++ b/libgimp/gimpui.def @@ -33,7 +33,6 @@ EXPORTS gimp_image_metadata_save_prepare gimp_layer_combo_box_get_type gimp_layer_combo_box_new - gimp_layer_combo_box_new_deprecated gimp_palette_select_button_get_palette gimp_palette_select_button_get_type gimp_palette_select_button_new