[gimp/gtk3-port: 238/444] libgimp: remove tons of deprecated cruft



commit 380baf19547842c71cd7945d798d899f46c1a8ac
Author: Michael Natterer <mitch gimp org>
Date:   Sat Apr 28 18:54:40 2018 +0200

    libgimp: remove tons of deprecated cruft

 libgimp/Makefile.am        |   39 ----
 libgimp/gimp.c             |  131 ------------
 libgimp/gimp.def           |   79 -------
 libgimp/gimp.h             |   27 ---
 libgimp/gimpbrushes.c      |   94 --------
 libgimp/gimpbrushes.h      |   45 ----
 libgimp/gimpbrushmenu.c    |  168 ---------------
 libgimp/gimpbrushmenu.h    |   55 -----
 libgimp/gimpchannel.h      |    1 -
 libgimp/gimpdrawable.c     |  325 ----------------------------
 libgimp/gimpdrawable.h     |   53 -----
 libgimp/gimpedit.c         |   67 ------
 libgimp/gimpedit.h         |   41 ----
 libgimp/gimpfontmenu.c     |  142 ------------
 libgimp/gimpfontmenu.h     |   49 -----
 libgimp/gimpgradientmenu.c |  148 -------------
 libgimp/gimpgradientmenu.h |   49 -----
 libgimp/gimpgradients.c    |   53 -----
 libgimp/gimpgradients.h    |   39 ----
 libgimp/gimpimage.c        |  359 -------------------------------
 libgimp/gimpimage.h        |   89 +-------
 libgimp/gimplayer.c        |   30 ---
 libgimp/gimplayer.h        |    5 -
 libgimp/gimpmenu.c         |  509 --------------------------------------------
 libgimp/gimpmenu.h         |   68 ------
 libgimp/gimppalette.c      |  130 -----------
 libgimp/gimppalette.h      |   47 ----
 libgimp/gimppalettemenu.c  |  148 -------------
 libgimp/gimppalettemenu.h  |   49 -----
 libgimp/gimppalettes.c     |   38 ----
 libgimp/gimppalettes.h     |   37 ----
 libgimp/gimppatternmenu.c  |  151 -------------
 libgimp/gimppatternmenu.h  |   49 -----
 libgimp/gimppatterns.c     |   40 ----
 libgimp/gimppatterns.h     |   37 ----
 libgimp/gimpselection.c    |   14 --
 libgimp/gimpselection.h    |    3 -
 libgimp/gimptypes.h        |   39 ----
 libgimp/gimpui.def         |   19 --
 libgimp/gimpui.h           |    6 -
 libgimp/gimpvectors.c      |  271 -----------------------
 libgimp/gimpvectors.h      |   73 -------
 42 files changed, 12 insertions(+), 3804 deletions(-)
---
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 1c2cdd3..83cb357 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -214,22 +214,16 @@ libgimp_sources = \
        gimpenums.h             \
        ${PDB_WRAPPERS_C}       \
        ${PDB_WRAPPERS_H}       \
-       gimpbrushes.c           \
-       gimpbrushes.h           \
        gimpbrushselect.c       \
        gimpbrushselect.h       \
        gimpchannel.c           \
        gimpchannel.h           \
        gimpdrawable.c          \
        gimpdrawable.h          \
-       gimpedit.c              \
-       gimpedit.h              \
        gimpfontselect.c        \
        gimpfontselect.h        \
        gimpgimprc.c            \
        gimpgimprc.h            \
-       gimpgradients.c         \
-       gimpgradients.h         \
        gimpgradientselect.c    \
        gimpgradientselect.h    \
        gimpimage.c             \
@@ -238,14 +232,8 @@ libgimp_sources = \
        gimpimagecolorprofile.h \
        gimplayer.c             \
        gimplayer.h             \
-       gimppalette.c           \
-       gimppalette.h           \
-       gimppalettes.c          \
-       gimppalettes.h          \
        gimppaletteselect.c     \
        gimppaletteselect.h     \
-       gimppatterns.c          \
-       gimppatterns.h          \
        gimppatternselect.c     \
        gimppatternselect.h     \
        gimppixbuf.c            \
@@ -270,8 +258,6 @@ libgimp_sources = \
        gimptilebackendplugin.h \
        gimpunitcache.c         \
        gimpunitcache.h         \
-       gimpvectors.c           \
-       gimpvectors.h           \
        stdplugins-intl.h       \
        libgimp-intl.h
 
@@ -290,20 +276,14 @@ libgimpui_sources = \
        gimpuitypes.h                   \
        gimpaspectpreview.c             \
        gimpaspectpreview.h             \
-       gimpbrushmenu.c                 \
-       gimpbrushmenu.h                 \
        gimpbrushselectbutton.c         \
        gimpbrushselectbutton.h         \
        gimpdrawablepreview.c           \
        gimpdrawablepreview.h           \
        gimpexport.c                    \
        gimpexport.h                    \
-       gimpfontmenu.c                  \
-       gimpfontmenu.h                  \
        gimpfontselectbutton.c          \
        gimpfontselectbutton.h          \
-       gimpgradientmenu.c              \
-       gimpgradientmenu.h              \
        gimpgradientselectbutton.c      \
        gimpgradientselectbutton.h      \
        gimpimagecombobox.c             \
@@ -312,14 +292,8 @@ libgimpui_sources = \
        gimpimagemetadata.h             \
        gimpitemcombobox.c              \
        gimpitemcombobox.h              \
-       gimpmenu.c                      \
-       gimpmenu.h                      \
-       gimppalettemenu.c               \
-       gimppalettemenu.h               \
        gimppaletteselectbutton.c       \
        gimppaletteselectbutton.h       \
-       gimppatternmenu.c               \
-       gimppatternmenu.h               \
        gimppatternselectbutton.c       \
        gimppatternselectbutton.h       \
        gimpprocbrowserdialog.c         \
@@ -348,22 +322,16 @@ gimpinclude_HEADERS = \
        gimptypes.h                     \
        gimpenums.h                     \
        ${PDB_WRAPPERS_H}               \
-       gimpbrushes.h                   \
        gimpbrushselect.h               \
        gimpchannel.h                   \
        gimpdrawable.h                  \
-       gimpedit.h                      \
        gimpfontselect.h                \
        gimpgimprc.h                    \
-       gimpgradients.h                 \
        gimpgradientselect.h            \
        gimpimage.h                     \
        gimpimagecolorprofile.h         \
        gimplayer.h                     \
-       gimppalette.h                   \
-       gimppalettes.h                  \
        gimppaletteselect.h             \
-       gimppatterns.h                  \
        gimppatternselect.h             \
        gimppixelfetcher.h              \
        gimppixelrgn.h                  \
@@ -373,26 +341,19 @@ gimpinclude_HEADERS = \
        gimpregioniterator.h            \
        gimpselection.h                 \
        gimptile.h                      \
-       gimpvectors.h                   \
        \
        gimpui.h                        \
        gimpuitypes.h                   \
        gimpaspectpreview.h             \
-       gimpbrushmenu.h                 \
        gimpbrushselectbutton.h         \
        gimpdrawablepreview.h           \
        gimpexport.h                    \
-       gimpfontmenu.h                  \
        gimpfontselectbutton.h          \
-       gimpgradientmenu.h              \
        gimpgradientselectbutton.h      \
        gimpimagecombobox.h             \
        gimpimagemetadata.h             \
        gimpitemcombobox.h              \
-       gimpmenu.h                      \
-       gimppalettemenu.h               \
        gimppaletteselectbutton.h       \
-       gimppatternmenu.h               \
        gimppatternselectbutton.h       \
        gimppixbuf.h                    \
        gimpprocbrowserdialog.h         \
diff --git a/libgimp/gimp.c b/libgimp/gimp.c
index 1c61ae6..722d8d5 100644
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@@ -1378,44 +1378,6 @@ gimp_gamma (void)
 }
 
 /**
- * gimp_install_cmap:
- *
- * Returns whether or not the plug-in should allocate an own colormap
- * when running on an 8 bit display. See also: gimp_min_colors().
- *
- * This is a constant value given at plug-in configuration time.
- *
- * @Deprecated: 2.8
- *
- * Return value: the install_cmap boolean
- **/
-gboolean
-gimp_install_cmap (void)
-{
-  return _install_cmap;
-}
-
-/**
- * gimp_min_colors:
- *
- * Returns the minimum number of colors to use when allocating an own
- * colormap on 8 bit displays.
- *
- * This is a constant value given at plug-in configuration time.
- *
- * See also: gimp_install_cmap()
- *
- * @Deprecated: 2.8
- *
- * Return value: the minimum number of colors to allocate
- **/
-gint
-gimp_min_colors (void)
-{
-  return _min_colors;
-}
-
-/**
  * gimp_show_tool_tips:
  *
  * Returns whether or not the plug-in should show tool-tips.
@@ -1756,99 +1718,6 @@ gimp_extension_process (guint timeout)
 #endif
 }
 
-/**
- * gimp_parasite_find:
- * @name: The name of the parasite to find.
- *
- * Deprecated: Use gimp_get_parasite() instead.
- *
- * Returns: The found parasite.
- **/
-GimpParasite *
-gimp_parasite_find (const gchar *name)
-{
-  return gimp_get_parasite (name);
-}
-
-/**
- * gimp_parasite_attach:
- * @parasite: The parasite to attach.
- *
- * Deprecated: Use gimp_attach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_parasite_attach (const GimpParasite *parasite)
-{
-  return gimp_attach_parasite (parasite);
-}
-
-/**
- * gimp_parasite_detach:
- * @name: The name of the parasite to detach.
- *
- * Deprecated: Use gimp_detach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_parasite_detach (const gchar *name)
-{
-  return gimp_detach_parasite (name);
-}
-
-/**
- * gimp_parasite_list:
- * @num_parasites: The number of attached parasites.
- * @parasites: The names of currently attached parasites.
- *
- * Deprecated: Use gimp_get_parasite_list() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_parasite_list (gint    *num_parasites,
-                    gchar ***parasites)
-{
-  *parasites = gimp_get_parasite_list (num_parasites);
-
-  return *parasites != NULL;
-}
-
-/**
- * gimp_attach_new_parasite:
- * @name: the name of the #GimpParasite to create and attach.
- * @flags: the flags set on the #GimpParasite.
- * @size: the size of the parasite data in bytes.
- * @data: a pointer to the data attached with the #GimpParasite.
- *
- * Convenience function that creates a parasite and attaches it
- * to GIMP.
- *
- * Deprecated: Use gimp_attach_parasite() instead.
- *
- * Return value: TRUE on successful creation and attachment of
- * the new parasite.
- *
- * See Also: gimp_attach_parasite()
- */
-gboolean
-gimp_attach_new_parasite (const gchar   *name,
-                          gint           flags,
-                          gint           size,
-                          gconstpointer  data)
-{
-  GimpParasite *parasite = gimp_parasite_new (name, flags, size, data);
-  gboolean      success;
-
-  success = gimp_attach_parasite (parasite);
-
-  gimp_parasite_free (parasite);
-
-  return success;
-}
-
 
 /*  private functions  */
 
diff --git a/libgimp/gimp.def b/libgimp/gimp.def
index ac71cb0..cd858bf 100644
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@ -1,7 +1,6 @@
 EXPORTS
        gimp_airbrush
        gimp_airbrush_default
-       gimp_attach_new_parasite
        gimp_attach_parasite
        gimp_brightness_contrast
        gimp_brush_application_mode_get_type
@@ -33,14 +32,9 @@ EXPORTS
        gimp_brushes_get_brush
        gimp_brushes_get_brush_data
        gimp_brushes_get_list
-       gimp_brushes_get_opacity
-       gimp_brushes_get_paint_mode
        gimp_brushes_get_spacing
        gimp_brushes_popup
        gimp_brushes_refresh
-       gimp_brushes_set_brush
-       gimp_brushes_set_opacity
-       gimp_brushes_set_paint_mode
        gimp_brushes_set_popup
        gimp_brushes_set_spacing
        gimp_buffer_delete
@@ -205,14 +199,12 @@ EXPORTS
        gimp_displays_reconnect
        gimp_dodgeburn
        gimp_dodgeburn_default
-       gimp_drawable_attach_new_parasite
        gimp_drawable_bpp
        gimp_drawable_brightness_contrast
        gimp_drawable_color_balance
        gimp_drawable_colorize_hsl
        gimp_drawable_curves_explicit
        gimp_drawable_curves_spline
-       gimp_drawable_delete
        gimp_drawable_desaturate
        gimp_drawable_detach
        gimp_drawable_edit_bucket_fill
@@ -230,32 +222,22 @@ EXPORTS
        gimp_drawable_get_buffer
        gimp_drawable_get_color_uchar
        gimp_drawable_get_format
-       gimp_drawable_get_image
-       gimp_drawable_get_linked
-       gimp_drawable_get_name
        gimp_drawable_get_pixel
        gimp_drawable_get_shadow_buffer
        gimp_drawable_get_sub_thumbnail
        gimp_drawable_get_sub_thumbnail_data
-       gimp_drawable_get_tattoo
        gimp_drawable_get_thumbnail
        gimp_drawable_get_thumbnail_data
        gimp_drawable_get_tile
        gimp_drawable_get_tile2
-       gimp_drawable_get_visible
        gimp_drawable_has_alpha
        gimp_drawable_height
        gimp_drawable_histogram
        gimp_drawable_hue_saturation
        gimp_drawable_invert
-       gimp_drawable_is_channel
        gimp_drawable_is_gray
        gimp_drawable_is_indexed
-       gimp_drawable_is_layer
-       gimp_drawable_is_layer_mask
        gimp_drawable_is_rgb
-       gimp_drawable_is_text_layer
-       gimp_drawable_is_valid
        gimp_drawable_levels
        gimp_drawable_levels_stretch
        gimp_drawable_mask_bounds
@@ -263,17 +245,9 @@ EXPORTS
        gimp_drawable_merge_shadow
        gimp_drawable_offset
        gimp_drawable_offsets
-       gimp_drawable_parasite_attach
-       gimp_drawable_parasite_detach
-       gimp_drawable_parasite_find
-       gimp_drawable_parasite_list
        gimp_drawable_posterize
        gimp_drawable_set_image
-       gimp_drawable_set_linked
-       gimp_drawable_set_name
        gimp_drawable_set_pixel
-       gimp_drawable_set_tattoo
-       gimp_drawable_set_visible
        gimp_drawable_threshold
        gimp_drawable_transform_2d
        gimp_drawable_transform_2d_default
@@ -309,10 +283,8 @@ EXPORTS
        gimp_edit_named_copy_visible
        gimp_edit_named_cut
        gimp_edit_named_paste
-       gimp_edit_named_paste_as_new
        gimp_edit_named_paste_as_new_image
        gimp_edit_paste
-       gimp_edit_paste_as_new
        gimp_edit_paste_as_new_image
        gimp_edit_stroke
        gimp_edit_stroke_vectors
@@ -401,14 +373,12 @@ EXPORTS
        gimp_gradient_select_destroy
        gimp_gradient_select_new
        gimp_gradients_close_popup
-       gimp_gradients_get_gradient
        gimp_gradients_get_gradient_data
        gimp_gradients_get_list
        gimp_gradients_popup
        gimp_gradients_refresh
        gimp_gradients_sample_custom
        gimp_gradients_sample_uniform
-       gimp_gradients_set_gradient
        gimp_gradients_set_popup
        gimp_heal
        gimp_heal_default
@@ -422,7 +392,6 @@ EXPORTS
        gimp_image_add_sample_point
        gimp_image_add_vectors
        gimp_image_add_vguide
-       gimp_image_attach_new_parasite
        gimp_image_attach_parasite
        gimp_image_base_type
        gimp_image_clean_all
@@ -456,7 +425,6 @@ EXPORTS
        gimp_image_get_channel_by_tattoo
        gimp_image_get_channel_position
        gimp_image_get_channels
-       gimp_image_get_cmap
        gimp_image_get_color_profile
        gimp_image_get_colormap
        gimp_image_get_component_active
@@ -472,7 +440,6 @@ EXPORTS
        gimp_image_get_item_position
        gimp_image_get_layer_by_name
        gimp_image_get_layer_by_tattoo
-       gimp_image_get_layer_position
        gimp_image_get_layers
        gimp_image_get_metadata
        gimp_image_get_name
@@ -509,30 +476,16 @@ EXPORTS
        gimp_image_is_dirty
        gimp_image_is_valid
        gimp_image_list
-       gimp_image_lower_channel
        gimp_image_lower_item
        gimp_image_lower_item_to_bottom
-       gimp_image_lower_layer
-       gimp_image_lower_layer_to_bottom
-       gimp_image_lower_vectors
-       gimp_image_lower_vectors_to_bottom
        gimp_image_merge_down
        gimp_image_merge_visible_layers
        gimp_image_new
        gimp_image_new_with_precision
-       gimp_image_parasite_attach
-       gimp_image_parasite_detach
-       gimp_image_parasite_find
-       gimp_image_parasite_list
        gimp_image_pick_color
        gimp_image_pick_correlate_layer
-       gimp_image_raise_channel
        gimp_image_raise_item
        gimp_image_raise_item_to_top
-       gimp_image_raise_layer
-       gimp_image_raise_layer_to_top
-       gimp_image_raise_vectors
-       gimp_image_raise_vectors_to_top
        gimp_image_remove_channel
        gimp_image_remove_layer
        gimp_image_remove_vectors
@@ -552,7 +505,6 @@ EXPORTS
        gimp_image_set_active_channel
        gimp_image_set_active_layer
        gimp_image_set_active_vectors
-       gimp_image_set_cmap
        gimp_image_set_color_profile
        gimp_image_set_color_profile_from_file
        gimp_image_set_colormap
@@ -575,7 +527,6 @@ EXPORTS
        gimp_image_undo_thaw
        gimp_image_unset_active_channel
        gimp_image_width
-       gimp_install_cmap
        gimp_install_procedure
        gimp_install_temp_proc
        gimp_invert
@@ -639,7 +590,6 @@ EXPORTS
        gimp_layer_get_mask
        gimp_layer_get_mode
        gimp_layer_get_opacity
-       gimp_layer_get_preserve_trans
        gimp_layer_get_show_mask
        gimp_layer_group_new
        gimp_layer_is_floating_sel
@@ -663,7 +613,6 @@ EXPORTS
        gimp_layer_set_mode
        gimp_layer_set_offsets
        gimp_layer_set_opacity
-       gimp_layer_set_preserve_trans
        gimp_layer_set_show_mask
        gimp_layer_translate
        gimp_levels
@@ -673,7 +622,6 @@ EXPORTS
        gimp_message
        gimp_message_get_handler
        gimp_message_set_handler
-       gimp_min_colors
        gimp_monitor_number
        gimp_paintbrush
        gimp_paintbrush_default
@@ -685,33 +633,22 @@ EXPORTS
        gimp_palette_entry_get_name
        gimp_palette_entry_set_color
        gimp_palette_entry_set_name
-       gimp_palette_get_background
        gimp_palette_get_colors
        gimp_palette_get_columns
-       gimp_palette_get_foreground
        gimp_palette_get_info
        gimp_palette_is_editable
        gimp_palette_new
        gimp_palette_rename
        gimp_palette_select_destroy
        gimp_palette_select_new
-       gimp_palette_set_background
        gimp_palette_set_columns
-       gimp_palette_set_default_colors
-       gimp_palette_set_foreground
-       gimp_palette_swap_colors
        gimp_palettes_close_popup
        gimp_palettes_get_list
        gimp_palettes_get_palette
        gimp_palettes_get_palette_entry
        gimp_palettes_popup
        gimp_palettes_refresh
-       gimp_palettes_set_palette
        gimp_palettes_set_popup
-       gimp_parasite_attach
-       gimp_parasite_detach
-       gimp_parasite_find
-       gimp_parasite_list
        gimp_path_delete
        gimp_path_get_current
        gimp_path_get_locked
@@ -736,7 +673,6 @@ EXPORTS
        gimp_patterns_get_pattern_data
        gimp_patterns_popup
        gimp_patterns_refresh
-       gimp_patterns_set_pattern
        gimp_patterns_set_popup
        gimp_pencil
        gimp_perspective
@@ -816,7 +752,6 @@ EXPORTS
        gimp_selection_all
        gimp_selection_border
        gimp_selection_bounds
-       gimp_selection_clear
        gimp_selection_combine
        gimp_selection_feather
        gimp_selection_float
@@ -895,26 +830,12 @@ EXPORTS
        gimp_vectors_copy
        gimp_vectors_export_to_file
        gimp_vectors_export_to_string
-       gimp_vectors_get_image
-       gimp_vectors_get_linked
-       gimp_vectors_get_name
        gimp_vectors_get_strokes
-       gimp_vectors_get_tattoo
-       gimp_vectors_get_visible
        gimp_vectors_import_from_file
        gimp_vectors_import_from_string
-       gimp_vectors_is_valid
        gimp_vectors_new
        gimp_vectors_new_from_text_layer
-       gimp_vectors_parasite_attach
-       gimp_vectors_parasite_detach
-       gimp_vectors_parasite_find
-       gimp_vectors_parasite_list
        gimp_vectors_remove_stroke
-       gimp_vectors_set_linked
-       gimp_vectors_set_name
-       gimp_vectors_set_tattoo
-       gimp_vectors_set_visible
        gimp_vectors_stroke_close
        gimp_vectors_stroke_flip
        gimp_vectors_stroke_flip_free
diff --git a/libgimp/gimp.h b/libgimp/gimp.h
index ba30338..78c39ff 100644
--- a/libgimp/gimp.h
+++ b/libgimp/gimp.h
@@ -35,22 +35,16 @@
 #include <libgimp/gimpenums.h>
 #include <libgimp/gimptypes.h>
 
-#include <libgimp/gimpbrushes.h>
 #include <libgimp/gimpbrushselect.h>
 #include <libgimp/gimpchannel.h>
 #include <libgimp/gimpdrawable.h>
-#include <libgimp/gimpedit.h>
 #include <libgimp/gimpfontselect.h>
 #include <libgimp/gimpgimprc.h>
-#include <libgimp/gimpgradients.h>
 #include <libgimp/gimpgradientselect.h>
 #include <libgimp/gimpimage.h>
 #include <libgimp/gimpimagecolorprofile.h>
 #include <libgimp/gimplayer.h>
-#include <libgimp/gimppalette.h>
-#include <libgimp/gimppalettes.h>
 #include <libgimp/gimppaletteselect.h>
-#include <libgimp/gimppatterns.h>
 #include <libgimp/gimppatternselect.h>
 #include <libgimp/gimppixbuf.h>
 #include <libgimp/gimppixelfetcher.h>
@@ -61,7 +55,6 @@
 #include <libgimp/gimpregioniterator.h>
 #include <libgimp/gimpselection.h>
 #include <libgimp/gimptile.h>
-#include <libgimp/gimpvectors.h>
 
 #include <libgimp/gimp_pdb_headers.h>
 
@@ -343,26 +336,6 @@ guint32        gimp_user_time           (void) G_GNUC_CONST;
 
 const gchar  * gimp_get_progname        (void) G_GNUC_CONST;
 
-GIMP_DEPRECATED
-gboolean       gimp_install_cmap        (void) G_GNUC_CONST;
-GIMP_DEPRECATED
-gint           gimp_min_colors          (void) G_GNUC_CONST;
-
-GIMP_DEPRECATED_FOR(gimp_get_parasite)
-GimpParasite * gimp_parasite_find       (const gchar        *name);
-GIMP_DEPRECATED_FOR(gimp_attach_parasite)
-gboolean       gimp_parasite_attach     (const GimpParasite *parasite);
-GIMP_DEPRECATED_FOR(gimp_detach_parasite)
-gboolean       gimp_parasite_detach     (const gchar        *name);
-GIMP_DEPRECATED_FOR(gimp_get_parasite_list)
-gboolean       gimp_parasite_list       (gint               *num_parasites,
-                                         gchar            ***parasites);
-GIMP_DEPRECATED_FOR(gimp_attach_parasite)
-gboolean       gimp_attach_new_parasite (const gchar        *name,
-                                         gint                flags,
-                                         gint                size,
-                                         gconstpointer       data);
-
 
 G_END_DECLS
 
diff --git a/libgimp/gimpchannel.h b/libgimp/gimpchannel.h
index 5730ad0..a51eaa1 100644
--- a/libgimp/gimpchannel.h
+++ b/libgimp/gimpchannel.h
@@ -41,4 +41,3 @@ gint32  gimp_channel_new (gint32         image_ID,
 G_END_DECLS
 
 #endif /* __GIMP_CHANNEL_H__ */
-
diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c
index e35c104..c8586bb 100644
--- a/libgimp/gimpdrawable.c
+++ b/libgimp/gimpdrawable.c
@@ -325,331 +325,6 @@ gimp_drawable_get_sub_thumbnail_data (gint32  drawable_ID,
 }
 
 /**
- * gimp_drawable_is_valid:
- * @drawable_ID: The drawable to check.
- *
- * Deprecated: Use gimp_item_is_valid() instead.
- *
- * Returns: Whether the drawable ID is valid.
- *
- * Since: 2.4
- */
-gboolean
-gimp_drawable_is_valid (gint32 drawable_ID)
-{
-  return gimp_item_is_valid (drawable_ID);
-}
-
-/**
- * gimp_drawable_is_layer:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_is_layer() instead.
- *
- * Returns: TRUE if the drawable is a layer, FALSE otherwise.
- */
-gboolean
-gimp_drawable_is_layer (gint32 drawable_ID)
-{
-  return gimp_item_is_layer (drawable_ID);
-}
-
-/**
- * gimp_drawable_is_text_layer:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_is_text_layer() instead.
- *
- * Returns: TRUE if the drawable is a text layer, FALSE otherwise.
- *
- * Since: 2.6
- */
-gboolean
-gimp_drawable_is_text_layer (gint32 drawable_ID)
-{
-  return gimp_item_is_text_layer (drawable_ID);
-}
-
-/**
- * gimp_drawable_is_layer_mask:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_is_layer_mask() instead.
- *
- * Returns: TRUE if the drawable is a layer mask, FALSE otherwise.
- */
-gboolean
-gimp_drawable_is_layer_mask (gint32 drawable_ID)
-{
-  return gimp_item_is_layer_mask (drawable_ID);
-}
-
-/**
- * gimp_drawable_is_channel:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_is_channel() instead.
- *
- * Returns: TRUE if the drawable is a channel, FALSE otherwise.
- */
-gboolean
-gimp_drawable_is_channel (gint32 drawable_ID)
-{
-  return gimp_item_is_channel (drawable_ID);
-}
-
-/**
- * gimp_drawable_delete:
- * @drawable_ID: The drawable to delete.
- *
- * Deprecated: Use gimp_item_delete() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_drawable_delete (gint32 drawable_ID)
-{
-  return gimp_item_delete (drawable_ID);
-}
-
-/**
- * gimp_drawable_get_image:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_get_image() instead.
- *
- * Returns: The drawable's image.
- */
-gint32
-gimp_drawable_get_image (gint32 drawable_ID)
-{
-  return gimp_item_get_image (drawable_ID);
-}
-
-/**
- * gimp_drawable_get_name:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_get_name() instead.
- *
- * Returns: The drawable name.
- */
-gchar *
-gimp_drawable_get_name (gint32 drawable_ID)
-{
-  return gimp_item_get_name (drawable_ID);
-}
-
-/**
- * gimp_drawable_set_name:
- * @drawable_ID: The drawable.
- * @name: The new drawable name.
- *
- * Deprecated: Use gimp_item_set_name() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_drawable_set_name (gint32       drawable_ID,
-                        const gchar *name)
-{
-  return gimp_item_set_name (drawable_ID, name);
-}
-
-/**
- * gimp_drawable_get_visible:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_get_visible() instead.
- *
- * Returns: The drawable visibility.
- */
-gboolean
-gimp_drawable_get_visible (gint32 drawable_ID)
-{
-  return gimp_item_get_visible (drawable_ID);
-}
-
-/**
- * gimp_drawable_set_visible:
- * @drawable_ID: The drawable.
- * @visible: The new drawable visibility.
- *
- * Deprecated: Use gimp_item_set_visible() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_drawable_set_visible (gint32   drawable_ID,
-                           gboolean visible)
-{
-  return gimp_item_set_visible (drawable_ID, visible);
-}
-
-/**
- * gimp_drawable_get_linked:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_get_linked() instead.
- *
- * Returns: The drawable linked state (for moves).
- */
-gboolean
-gimp_drawable_get_linked (gint32 drawable_ID)
-{
-  return gimp_item_get_linked (drawable_ID);
-}
-
-/**
- * gimp_drawable_set_linked:
- * @drawable_ID: The drawable.
- * @linked: The new drawable linked state.
- *
- * Deprecated: Use gimp_item_set_linked() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_drawable_set_linked (gint32   drawable_ID,
-                          gboolean linked)
-{
-  return gimp_item_set_linked (drawable_ID, linked);
-}
-
-/**
- * gimp_drawable_get_tattoo:
- * @drawable_ID: The drawable.
- *
- * Deprecated: Use gimp_item_get_tattoo() instead.
- *
- * Returns: The drawable tattoo.
- */
-gint
-gimp_drawable_get_tattoo (gint32 drawable_ID)
-{
-  return gimp_item_get_tattoo (drawable_ID);
-}
-
-/**
- * gimp_drawable_set_tattoo:
- * @drawable_ID: The drawable.
- * @tattoo: The new drawable tattoo.
- *
- * Deprecated: Use gimp_item_set_tattoo() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_drawable_set_tattoo (gint32 drawable_ID,
-                          gint   tattoo)
-{
-  return gimp_item_set_tattoo (drawable_ID, tattoo);
-}
-
-/**
- * gimp_drawable_parasite_find:
- * @drawable_ID: The drawable.
- * @name: The name of the parasite to find.
- *
- * Deprecated: Use gimp_item_get_parasite() instead.
- *
- * Returns: The found parasite.
- **/
-GimpParasite *
-gimp_drawable_parasite_find (gint32       drawable_ID,
-                             const gchar *name)
-{
-  return gimp_item_get_parasite (drawable_ID, name);
-}
-
-/**
- * gimp_drawable_parasite_attach:
- * @drawable_ID: The drawable.
- * @parasite: The parasite to attach to a drawable.
- *
- * Deprecated: Use gimp_item_attach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_drawable_parasite_attach (gint32              drawable_ID,
-                               const GimpParasite *parasite)
-{
-  return gimp_item_attach_parasite (drawable_ID, parasite);
-}
-
-/**
- * gimp_drawable_parasite_detach:
- * @drawable_ID: The drawable.
- * @name: The name of the parasite to detach from a drawable.
- *
- * Deprecated: Use gimp_item_detach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_drawable_parasite_detach (gint32       drawable_ID,
-                               const gchar *name)
-{
-  return gimp_item_detach_parasite (drawable_ID, name);
-}
-
-/**
- * gimp_drawable_parasite_list:
- * @drawable_ID: The drawable.
- * @num_parasites: The number of attached parasites.
- * @parasites: The names of currently attached parasites.
- *
- * Deprecated: Use gimp_item_get_parasite_list() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_drawable_parasite_list (gint32    drawable_ID,
-                             gint     *num_parasites,
-                             gchar  ***parasites)
-{
-  *parasites = gimp_item_get_parasite_list (drawable_ID, num_parasites);
-
-  return *parasites != NULL;
-}
-
-/**
- * gimp_drawable_attach_new_parasite:
- * @drawable_ID: the ID of the #GimpDrawable to attach the #GimpParasite to.
- * @name: the name of the #GimpParasite to create and attach.
- * @flags: the flags set on the #GimpParasite.
- * @size: the size of the parasite data in bytes.
- * @data: a pointer to the data attached with the #GimpParasite.
- *
- * Convenience function that creates a parasite and attaches it
- * to GIMP.
- *
- * Deprecated: use gimp_item_attach_parasite() instead.
- *
- * Return value: TRUE on successful creation and attachment of
- * the new parasite.
- *
- * See Also: gimp_drawable_parasite_attach()
- */
-gboolean
-gimp_drawable_attach_new_parasite (gint32          drawable_ID,
-                                   const gchar    *name,
-                                   gint            flags,
-                                   gint            size,
-                                   gconstpointer   data)
-{
-  GimpParasite *parasite = gimp_parasite_new (name, flags, size, data);
-  gboolean      success;
-
-  success = gimp_item_attach_parasite (drawable_ID, parasite);
-
-  gimp_parasite_free (parasite);
-
-  return success;
-}
-
-/**
  * gimp_drawable_get_buffer:
  * @drawable_ID: the ID of the #GimpDrawable to get the buffer for.
  *
diff --git a/libgimp/gimpdrawable.h b/libgimp/gimpdrawable.h
index 0ee2889..5ebffeb 100644
--- a/libgimp/gimpdrawable.h
+++ b/libgimp/gimpdrawable.h
@@ -82,59 +82,6 @@ guchar       * gimp_drawable_get_sub_thumbnail_data (gint32         drawable_ID,
                                                      gint          *dest_height,
                                                      gint          *bpp);
 
-GIMP_DEPRECATED_FOR(gimp_item_is_valid)
-gboolean       gimp_drawable_is_valid               (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_is_layer)
-gboolean       gimp_drawable_is_layer               (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_is_text_layer)
-gboolean       gimp_drawable_is_text_layer          (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_is_layer_mask)
-gboolean       gimp_drawable_is_layer_mask          (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_is_channel)
-gboolean       gimp_drawable_is_channel             (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_delete)
-gboolean       gimp_drawable_delete                 (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_get_image)
-gint32         gimp_drawable_get_image              (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_get_name)
-gchar*         gimp_drawable_get_name               (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_set_name)
-gboolean       gimp_drawable_set_name               (gint32              drawable_ID,
-                                                     const gchar        *name);
-GIMP_DEPRECATED_FOR(gimp_item_get_visible)
-gboolean       gimp_drawable_get_visible            (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_get_visible)
-gboolean       gimp_drawable_set_visible            (gint32              drawable_ID,
-                                                     gboolean            visible);
-GIMP_DEPRECATED_FOR(gimp_item_get_linked)
-gboolean       gimp_drawable_get_linked             (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_set_linked)
-gboolean       gimp_drawable_set_linked             (gint32              drawable_ID,
-                                                     gboolean            linked);
-GIMP_DEPRECATED_FOR(gimp_item_get_tattoo)
-gint           gimp_drawable_get_tattoo             (gint32              drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_item_set_tattoo)
-gboolean       gimp_drawable_set_tattoo             (gint32              drawable_ID,
-                                                     gint                tattoo);
-GIMP_DEPRECATED_FOR(gimp_item_get_parasite)
-GimpParasite * gimp_drawable_parasite_find          (gint32              drawable_ID,
-                                                     const gchar        *name);
-GIMP_DEPRECATED_FOR(gimp_item_attach_parasite)
-gboolean       gimp_drawable_parasite_attach        (gint32              drawable_ID,
-                                                     const GimpParasite *parasite);
-GIMP_DEPRECATED_FOR(gimp_item_detach_parasite)
-gboolean       gimp_drawable_parasite_detach        (gint32              drawable_ID,
-                                                     const gchar        *name);
-GIMP_DEPRECATED_FOR(gimp_item_get_parasite_list)
-gboolean       gimp_drawable_parasite_list          (gint32              drawable_ID,
-                                                     gint               *num_parasites,
-                                                     gchar            ***parasites);
-GIMP_DEPRECATED_FOR(gimp_item_attach_parasite)
-gboolean       gimp_drawable_attach_new_parasite    (gint32              drawable_ID,
-                                                     const gchar        *name,
-                                                     gint                flags,
-                                                     gint                size,
-                                                     gconstpointer       data);
 
 G_END_DECLS
 
diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c
index e284a24..85c3951 100644
--- a/libgimp/gimpimage.c
+++ b/libgimp/gimpimage.c
@@ -159,362 +159,3 @@ gimp_image_set_metadata (gint32        image_ID,
 
   return success;
 }
-
-/**
- * gimp_image_get_cmap:
- * @image_ID:   The image.
- * @num_colors: Number of colors in the colormap array.
- *
- * Deprecated: Use gimp_image_get_colormap() instead.
- *
- * Returns: The image's colormap.
- */
-guchar *
-gimp_image_get_cmap (gint32  image_ID,
-                     gint   *num_colors)
-{
-  return gimp_image_get_colormap (image_ID, num_colors);
-}
-
-/**
- * gimp_image_set_cmap:
- * @image_ID:   The image.
- * @cmap:       The new colormap values.
- * @num_colors: Number of colors in the colormap array.
- *
- * Deprecated: Use gimp_image_set_colormap() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_image_set_cmap (gint32        image_ID,
-                     const guchar *cmap,
-                     gint          num_colors)
-{
-  return gimp_image_set_colormap (image_ID, cmap, num_colors);
-}
-
-/**
- * gimp_image_get_layer_position:
- * @image_ID: The image.
- * @layer_ID: The layer.
- *
- * Deprecated: Use gimp_image_get_item_position() instead.
- *
- * Returns: The position of the layer in the layer stack.
- *
- * Since: 2.4
- **/
-gint
-gimp_image_get_layer_position (gint32 image_ID,
-                               gint32 layer_ID)
-{
-  return gimp_image_get_item_position (image_ID, layer_ID);
-}
-
-/**
- * gimp_image_raise_layer:
- * @image_ID: The image.
- * @layer_ID: The layer to raise.
- *
- * Deprecated: Use gimp_image_raise_item() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_raise_layer (gint32 image_ID,
-                        gint32 layer_ID)
-{
-  return gimp_image_raise_item (image_ID, layer_ID);
-}
-
-/**
- * gimp_image_lower_layer:
- * @image_ID: The image.
- * @layer_ID: The layer to lower.
- *
- * Deprecated: Use gimp_image_lower_item() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_lower_layer (gint32 image_ID,
-                        gint32 layer_ID)
-{
-  return gimp_image_lower_item (image_ID, layer_ID);
-}
-
-/**
- * gimp_image_raise_layer_to_top:
- * @image_ID: The image.
- * @layer_ID: The layer to raise to top.
- *
- * Deprecated: Use gimp_image_raise_item_to_top() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_raise_layer_to_top (gint32 image_ID,
-                               gint32 layer_ID)
-{
-  return gimp_image_raise_item_to_top (image_ID, layer_ID);
-}
-
-/**
- * gimp_image_lower_layer_to_bottom:
- * @image_ID: The image.
- * @layer_ID: The layer to lower to bottom.
- *
- * Deprecated: Use gimp_image_lower_item_to_bottom() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_lower_layer_to_bottom (gint32 image_ID,
-                                  gint32 layer_ID)
-{
-  return gimp_image_lower_item_to_bottom (image_ID, layer_ID);
-}
-
-/**
- * gimp_image_get_channel_position:
- * @image_ID: The image.
- * @channel_ID: The channel.
- *
- * Deprecated: Use gimp_image_get_item_position() instead.
- *
- * Returns: The position of the channel in the channel stack.
- *
- * Since: 2.4
- **/
-gint
-gimp_image_get_channel_position (gint32 image_ID,
-                                 gint32 channel_ID)
-{
-  return gimp_image_get_item_position (image_ID, channel_ID);
-}
-
-/**
- * gimp_image_raise_channel:
- * @image_ID: The image.
- * @channel_ID: The channel to raise.
- *
- * Deprecated: Use gimp_image_raise_item() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_raise_channel (gint32 image_ID,
-                          gint32 channel_ID)
-{
-  return gimp_image_raise_item (image_ID, channel_ID);
-}
-
-/**
- * gimp_image_lower_channel:
- * @image_ID: The image.
- * @channel_ID: The channel to lower.
- *
- * Deprecated: Use gimp_image_lower_item() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_lower_channel (gint32 image_ID,
-                          gint32 channel_ID)
-{
-  return gimp_image_lower_item (image_ID, channel_ID);
-}
-
-/**
- * gimp_image_get_vectors_position:
- * @image_ID: The image.
- * @vectors_ID: The vectors object.
- *
- * Deprecated: Use gimp_image_get_item_position() instead.
- *
- * Returns: The position of the vectors object in the vectors stack.
- *
- * Since: 2.4
- **/
-gint
-gimp_image_get_vectors_position (gint32 image_ID,
-                                 gint32 vectors_ID)
-{
-  return gimp_image_get_item_position (image_ID, vectors_ID);
-}
-
-/**
- * gimp_image_raise_vectors:
- * @image_ID: The image.
- * @vectors_ID: The vectors object to raise.
- *
- * Deprecated: Use gimp_image_raise_item() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.4
- **/
-gboolean
-gimp_image_raise_vectors (gint32 image_ID,
-                          gint32 vectors_ID)
-{
-  return gimp_image_raise_item (image_ID, vectors_ID);
-}
-
-/**
- * gimp_image_lower_vectors:
- * @image_ID: The image.
- * @vectors_ID: The vectors object to lower.
- *
- * Deprecated: Use gimp_image_lower_item() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.4
- **/
-gboolean
-gimp_image_lower_vectors (gint32 image_ID,
-                          gint32 vectors_ID)
-{
-  return gimp_image_lower_item (image_ID, vectors_ID);
-}
-
-/**
- * gimp_image_raise_vectors_to_top:
- * @image_ID: The image.
- * @vectors_ID: The vectors object to raise to top.
- *
- * Deprecated: Use gimp_image_raise_item_to_top() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.4
- **/
-gboolean
-gimp_image_raise_vectors_to_top (gint32 image_ID,
-                                 gint32 vectors_ID)
-{
-  return gimp_image_raise_item_to_top (image_ID, vectors_ID);
-}
-
-/**
- * gimp_image_lower_vectors_to_bottom:
- * @image_ID: The image.
- * @vectors_ID: The vectors object to lower to bottom.
- *
- * Deprecated: Use gimp_image_lower_item_to_bottom() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.4
- **/
-gboolean
-gimp_image_lower_vectors_to_bottom (gint32 image_ID,
-                                    gint32 vectors_ID)
-{
-  return gimp_image_lower_item_to_bottom (image_ID, vectors_ID);
-}
-
-/**
- * gimp_image_parasite_find:
- * @image_ID: The image.
- * @name: The name of the parasite to find.
- *
- * Deprecated: Use gimp_image_get_parasite() instead.
- *
- * Returns: The found parasite.
- **/
-GimpParasite *
-gimp_image_parasite_find (gint32       image_ID,
-                          const gchar *name)
-{
-  return gimp_image_get_parasite (image_ID, name);
-}
-
-/**
- * gimp_image_parasite_attach:
- * @image_ID: The image.
- * @parasite: The parasite to attach to an image.
- *
- * Deprecated: Use gimp_image_attach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_parasite_attach (gint32              image_ID,
-                            const GimpParasite *parasite)
-{
-  return gimp_image_attach_parasite (image_ID, parasite);
-}
-
-/**
- * gimp_image_parasite_detach:
- * @image_ID: The image.
- * @name: The name of the parasite to detach from an image.
- *
- * Deprecated: Use gimp_image_detach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_parasite_detach (gint32       image_ID,
-                            const gchar *name)
-{
-  return gimp_image_detach_parasite (image_ID, name);
-}
-
-/**
- * gimp_image_parasite_list:
- * @image_ID: The image.
- * @num_parasites: The number of attached parasites.
- * @parasites: The names of currently attached parasites.
- *
- * Deprecated: Use gimp_image_get_parasite_list() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_parasite_list (gint32    image_ID,
-                          gint     *num_parasites,
-                          gchar  ***parasites)
-{
-  *parasites = gimp_image_get_parasite_list (image_ID, num_parasites);
-
-  return *parasites != NULL;
-}
-
-/**
- * gimp_image_attach_new_parasite:
- * @image_ID: the ID of the image to attach the #GimpParasite to.
- * @name: the name of the #GimpParasite to create and attach.
- * @flags: the flags set on the #GimpParasite.
- * @size: the size of the parasite data in bytes.
- * @data: a pointer to the data attached with the #GimpParasite.
- *
- * Convenience function that creates a parasite and attaches it
- * to GIMP.
- *
- * Deprecated: Use gimp_image_attach_parasite() instead.
- *
- * Return value: TRUE on successful creation and attachment of
- * the new parasite.
- *
- * See Also: gimp_image_parasite_attach()
- */
-gboolean
-gimp_image_attach_new_parasite (gint32         image_ID,
-                                const gchar   *name,
-                                gint           flags,
-                                gint           size,
-                                gconstpointer  data)
-{
-  GimpParasite *parasite = gimp_parasite_new (name, flags, size, data);
-  gboolean      success;
-
-  success = gimp_image_attach_parasite (image_ID, parasite);
-
-  gimp_parasite_free (parasite);
-
-  return success;
-}
diff --git a/libgimp/gimpimage.h b/libgimp/gimpimage.h
index 376b033..0e0fd94 100644
--- a/libgimp/gimpimage.h
+++ b/libgimp/gimpimage.h
@@ -30,86 +30,21 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-guchar       * gimp_image_get_colormap            (gint32              image_ID,
-                                                   gint               *num_colors);
-gboolean       gimp_image_set_colormap            (gint32              image_ID,
-                                                   const guchar       *colormap,
-                                                   gint                num_colors);
+guchar       * gimp_image_get_colormap       (gint32        image_ID,
+                                              gint         *num_colors);
+gboolean       gimp_image_set_colormap       (gint32        image_ID,
+                                              const guchar *colormap,
+                                              gint          num_colors);
 
-guchar       * gimp_image_get_thumbnail_data      (gint32              image_ID,
-                                                   gint               *width,
-                                                   gint               *height,
-                                                   gint               *bpp);
+guchar       * gimp_image_get_thumbnail_data (gint32        image_ID,
+                                              gint         *width,
+                                              gint         *height,
+                                              gint         *bpp);
 
-GimpMetadata * gimp_image_get_metadata            (gint32              image_ID);
-gboolean       gimp_image_set_metadata            (gint32              image_ID,
-                                                   GimpMetadata       *metadata);
+GimpMetadata * gimp_image_get_metadata       (gint32        image_ID);
+gboolean       gimp_image_set_metadata       (gint32        image_ID,
+                                              GimpMetadata *metadata);
 
-GIMP_DEPRECATED_FOR(gimp_image_get_colormap)
-guchar       * gimp_image_get_cmap                (gint32              image_ID,
-                                                   gint               *num_colors);
-GIMP_DEPRECATED_FOR(gimp_image_set_colormap)
-gboolean       gimp_image_set_cmap                (gint32              image_ID,
-                                                   const guchar       *cmap,
-                                                   gint                num_colors);
-GIMP_DEPRECATED_FOR(gimp_image_get_item_position)
-gint           gimp_image_get_layer_position      (gint32              image_ID,
-                                                   gint32              layer_ID);
-GIMP_DEPRECATED_FOR(gimp_image_raise_item)
-gboolean       gimp_image_raise_layer             (gint32              image_ID,
-                                                   gint32              layer_ID);
-GIMP_DEPRECATED_FOR(gimp_image_lower_item)
-gboolean       gimp_image_lower_layer             (gint32              image_ID,
-                                                   gint32              layer_ID);
-GIMP_DEPRECATED_FOR(gimp_image_raise_item_to_top)
-gboolean       gimp_image_raise_layer_to_top      (gint32              image_ID,
-                                                   gint32              layer_ID);
-GIMP_DEPRECATED_FOR(gimp_image_lower_item_to_bottom)
-gboolean       gimp_image_lower_layer_to_bottom   (gint32              image_ID,
-                                                   gint32              layer_ID);
-GIMP_DEPRECATED_FOR(gimp_image_get_item_position)
-gint           gimp_image_get_channel_position    (gint32              image_ID,
-                                                   gint32              channel_ID);
-GIMP_DEPRECATED_FOR(gimp_image_raise_item)
-gboolean       gimp_image_raise_channel           (gint32              image_ID,
-                                                   gint32              channel_ID);
-GIMP_DEPRECATED_FOR(gimp_image_lower_item)
-gboolean       gimp_image_lower_channel           (gint32              image_ID,
-                                                   gint32              channel_ID);
-GIMP_DEPRECATED_FOR(gimp_image_get_item_position)
-gint           gimp_image_get_vectors_position    (gint32              image_ID,
-                                                   gint32              vectors_ID);
-GIMP_DEPRECATED_FOR(gimp_image_raise_item)
-gboolean       gimp_image_raise_vectors           (gint32              image_ID,
-                                                   gint32              vectors_ID);
-GIMP_DEPRECATED_FOR(gimp_image_lower_item)
-gboolean       gimp_image_lower_vectors           (gint32              image_ID,
-                                                   gint32              vectors_ID);
-GIMP_DEPRECATED_FOR(gimp_image_raise_item_to_top)
-gboolean       gimp_image_raise_vectors_to_top    (gint32              image_ID,
-                                                   gint32              vectors_ID);
-GIMP_DEPRECATED_FOR(gimp_image_lower_item_to_bottom)
-gboolean       gimp_image_lower_vectors_to_bottom (gint32              image_ID,
-                                                   gint32              vectors_ID);
-GIMP_DEPRECATED_FOR(gimp_image_get_parasite)
-GimpParasite * gimp_image_parasite_find           (gint32              image_ID,
-                                                   const gchar        *name);
-GIMP_DEPRECATED_FOR(gimp_image_attach_parasite)
-gboolean       gimp_image_parasite_attach         (gint32              image_ID,
-                                                   const GimpParasite *parasite);
-GIMP_DEPRECATED_FOR(gimp_image_detach_parasite)
-gboolean       gimp_image_parasite_detach         (gint32              image_ID,
-                                                   const gchar        *name);
-GIMP_DEPRECATED_FOR(gimp_image_get_parasite_list)
-gboolean       gimp_image_parasite_list           (gint32              image_ID,
-                                                   gint               *num_parasites,
-                                                   gchar            ***parasites);
-GIMP_DEPRECATED_FOR(gimp_image_attach_parasite)
-gboolean       gimp_image_attach_new_parasite     (gint32              image_ID,
-                                                   const gchar        *name,
-                                                   gint                flags,
-                                                   gint                size,
-                                                   gconstpointer       data);
 
 G_END_DECLS
 
diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c
index 9cb116e..31cb847 100644
--- a/libgimp/gimplayer.c
+++ b/libgimp/gimplayer.c
@@ -383,33 +383,3 @@ gimp_layer_new_from_surface (gint32                image_ID,
 
   return layer;
 }
-
-/**
- * gimp_layer_get_preserve_trans:
- * @layer_ID: The layer.
- *
- * This procedure is deprecated! Use gimp_layer_get_lock_alpha() instead.
- *
- * Returns: The layer's preserve transperancy setting.
- */
-gboolean
-gimp_layer_get_preserve_trans (gint32 layer_ID)
-{
-  return gimp_layer_get_lock_alpha (layer_ID);
-}
-
-/**
- * gimp_layer_set_preserve_trans:
- * @layer_ID: The layer.
- * @preserve_trans: The new layer's preserve transperancy setting.
- *
- * This procedure is deprecated! Use gimp_layer_set_lock_alpha() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_layer_set_preserve_trans (gint32   layer_ID,
-                               gboolean preserve_trans)
-{
-  return gimp_layer_set_lock_alpha (layer_ID, preserve_trans);
-}
diff --git a/libgimp/gimplayer.h b/libgimp/gimplayer.h
index f80b947..3ce8dc9 100644
--- a/libgimp/gimplayer.h
+++ b/libgimp/gimplayer.h
@@ -52,11 +52,6 @@ gint32   gimp_layer_new_from_surface   (gint32           image_ID,
                                         gdouble          progress_start,
                                         gdouble          progress_end);
 
-GIMP_DEPRECATED_FOR(gimp_layer_get_lock_alpha)
-gboolean gimp_layer_get_preserve_trans (gint32           layer_ID);
-GIMP_DEPRECATED_FOR(gimp_layer_set_lock_alpha)
-gboolean gimp_layer_set_preserve_trans (gint32           layer_ID,
-                                        gboolean         preserve_trans);
 
 G_END_DECLS
 
diff --git a/libgimp/gimpselection.c b/libgimp/gimpselection.c
index 87a8a66..f6e1b52 100644
--- a/libgimp/gimpselection.c
+++ b/libgimp/gimpselection.c
@@ -50,17 +50,3 @@ gimp_selection_float (gint32 image_ID,
                                 offx,
                                 offy);
 }
-
-/**
- * gimp_selection_clear:
- * @image_ID: The image.
- *
- * This procedure is deprecated! Use gimp_selection_none() instead.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_selection_clear (gint32 image_ID)
-{
-  return gimp_selection_none (image_ID);
-}
diff --git a/libgimp/gimpselection.h b/libgimp/gimpselection.h
index 14ff943..abbc7a8 100644
--- a/libgimp/gimpselection.h
+++ b/libgimp/gimpselection.h
@@ -35,9 +35,6 @@ gint32   gimp_selection_float (gint32 image_ID,
                                gint   offx,
                                gint   offy);
 
-GIMP_DEPRECATED_FOR(gimp_selection_none)
-gboolean gimp_selection_clear (gint32 image_ID);
-
 
 G_END_DECLS
 
diff --git a/libgimp/gimptypes.h b/libgimp/gimptypes.h
index 31295b3..97958f6 100644
--- a/libgimp/gimptypes.h
+++ b/libgimp/gimptypes.h
@@ -38,45 +38,6 @@ typedef union  _GimpParamData   GimpParamData;
 typedef struct _GimpParam       GimpParam;
 
 
-#ifndef GIMP_DISABLE_DEPRECATED
-
-/*  This is so ugly it hurts. C++ won't let us have enum GimpLayerMode
- *  in the API where we used to have enum GimpLayerModeEffects, so
- *  typedef and define around to make it happy:
- */
-typedef GimpLayerMode GimpLayerModeEffects;
-
-#define GIMP_NORMAL_MODE        GIMP_LAYER_MODE_NORMAL_LEGACY
-#define GIMP_DISSOLVE_MODE      GIMP_LAYER_MODE_DISSOLVE
-#define GIMP_BEHIND_MODE        GIMP_LAYER_MODE_BEHIND_LEGACY
-#define GIMP_MULTIPLY_MODE      GIMP_LAYER_MODE_MULTIPLY_LEGACY
-#define GIMP_SCREEN_MODE        GIMP_LAYER_MODE_SCREEN_LEGACY
-#define GIMP_OVERLAY_MODE       GIMP_LAYER_MODE_OVERLAY_LEGACY
-#define GIMP_DIFFERENCE_MODE    GIMP_LAYER_MODE_DIFFERENCE_LEGACY
-#define GIMP_ADDITION_MODE      GIMP_LAYER_MODE_ADDITION_LEGACY
-#define GIMP_SUBTRACT_MODE      GIMP_LAYER_MODE_SUBTRACT_LEGACY
-#define GIMP_DARKEN_ONLY_MODE   GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY
-#define GIMP_LIGHTEN_ONLY_MODE  GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY
-#define GIMP_HUE_MODE           GIMP_LAYER_MODE_HSV_HUE_LEGACY
-#define GIMP_SATURATION_MODE    GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
-#define GIMP_COLOR_MODE         GIMP_LAYER_MODE_HSL_COLOR_LEGACY
-#define GIMP_VALUE_MODE         GIMP_LAYER_MODE_HSV_VALUE_LEGACY
-#define GIMP_DIVIDE_MODE        GIMP_LAYER_MODE_DIVIDE_LEGACY
-#define GIMP_DODGE_MODE         GIMP_LAYER_MODE_DODGE_LEGACY
-#define GIMP_BURN_MODE          GIMP_LAYER_MODE_BURN_LEGACY
-#define GIMP_HARDLIGHT_MODE     GIMP_LAYER_MODE_HARDLIGHT_LEGACY
-#define GIMP_SOFTLIGHT_MODE     GIMP_LAYER_MODE_SOFTLIGHT_LEGACY
-#define GIMP_GRAIN_EXTRACT_MODE GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY
-#define GIMP_GRAIN_MERGE_MODE   GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY
-#define GIMP_COLOR_ERASE_MODE   GIMP_LAYER_MODE_COLOR_ERASE_LEGACY
-
-#define GIMP_NO_DITHER         GIMP_CONVERT_DITHER_NONE
-#define GIMP_FS_DITHER         GIMP_CONVERT_DITHER_FS
-#define GIMP_FSLOWBLEED_DITHER GIMP_CONVERT_DITHER_FS_LOWBLEED
-#define GIMP_FIXED_DITHER      GIMP_CONVERT_DITHER_FIXED
-
-#endif /* ! GIMP_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __GIMP_TYPES_H__ */
diff --git a/libgimp/gimpui.def b/libgimp/gimpui.def
index b0ba21a..f13852d 100644
--- a/libgimp/gimpui.def
+++ b/libgimp/gimpui.def
@@ -6,15 +6,10 @@ EXPORTS
        gimp_brush_select_button_get_type
        gimp_brush_select_button_new
        gimp_brush_select_button_set_brush
-       gimp_brush_select_widget_close
-       gimp_brush_select_widget_new
-       gimp_brush_select_widget_set
        gimp_channel_combo_box_get_type
        gimp_channel_combo_box_new
-       gimp_channel_menu_new
        gimp_drawable_combo_box_get_type
        gimp_drawable_combo_box_new
-       gimp_drawable_menu_new
        gimp_drawable_preview_draw_region
        gimp_drawable_preview_get_drawable
        gimp_drawable_preview_get_drawable_id
@@ -28,19 +23,12 @@ EXPORTS
        gimp_font_select_button_get_type
        gimp_font_select_button_new
        gimp_font_select_button_set_font
-       gimp_font_select_widget_close
-       gimp_font_select_widget_new
-       gimp_font_select_widget_set
        gimp_gradient_select_button_get_gradient
        gimp_gradient_select_button_get_type
        gimp_gradient_select_button_new
        gimp_gradient_select_button_set_gradient
-       gimp_gradient_select_widget_close
-       gimp_gradient_select_widget_new
-       gimp_gradient_select_widget_set
        gimp_image_combo_box_get_type
        gimp_image_combo_box_new
-       gimp_image_menu_new
        gimp_image_metadata_load_finish
        gimp_image_metadata_load_prepare
        gimp_image_metadata_load_thumbnail
@@ -48,21 +36,14 @@ EXPORTS
        gimp_image_metadata_save_prepare
        gimp_layer_combo_box_get_type
        gimp_layer_combo_box_new
-       gimp_layer_menu_new
        gimp_palette_select_button_get_palette
        gimp_palette_select_button_get_type
        gimp_palette_select_button_new
        gimp_palette_select_button_set_palette
-       gimp_palette_select_widget_close
-       gimp_palette_select_widget_new
-       gimp_palette_select_widget_set
        gimp_pattern_select_button_get_pattern
        gimp_pattern_select_button_get_type
        gimp_pattern_select_button_new
        gimp_pattern_select_button_set_pattern
-       gimp_pattern_select_widget_close
-       gimp_pattern_select_widget_new
-       gimp_pattern_select_widget_set
        gimp_proc_browser_dialog_get_selected
        gimp_proc_browser_dialog_get_type
        gimp_proc_browser_dialog_new
diff --git a/libgimp/gimpui.h b/libgimp/gimpui.h
index cdf89a6..f549fb4 100644
--- a/libgimp/gimpui.h
+++ b/libgimp/gimpui.h
@@ -28,21 +28,15 @@
 #include <libgimp/gimpuitypes.h>
 
 #include <libgimp/gimpaspectpreview.h>
-#include <libgimp/gimpbrushmenu.h>
 #include <libgimp/gimpbrushselectbutton.h>
 #include <libgimp/gimpdrawablepreview.h>
 #include <libgimp/gimpexport.h>
-#include <libgimp/gimpfontmenu.h>
 #include <libgimp/gimpfontselectbutton.h>
-#include <libgimp/gimpgradientmenu.h>
 #include <libgimp/gimpgradientselectbutton.h>
 #include <libgimp/gimpimagecombobox.h>
 #include <libgimp/gimpimagemetadata.h>
 #include <libgimp/gimpitemcombobox.h>
-#include <libgimp/gimpmenu.h>
-#include <libgimp/gimppalettemenu.h>
 #include <libgimp/gimppaletteselectbutton.h>
-#include <libgimp/gimppatternmenu.h>
 #include <libgimp/gimppatternselectbutton.h>
 #include <libgimp/gimpprocbrowserdialog.h>
 #include <libgimp/gimpprocview.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]