dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp*: add GIMP_DEPRECATED macros using G_DEPRECATED 

and start using them instead of GIMP_DISABLE_DEPRECATED where possible.
This commit is contained in:
Michael Natterer 2012-05-03 00:54:21 +02:00
parent 6888304f4a
commit 0d481702c7
50 changed files with 148 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libgimp/gimp.c
View File

@ -97,7 +97,6 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimp.h"
#include "gimpunitcache.h"

9
libgimp/gimp.h
View File

@ -334,20 +334,25 @@ guint32 gimp_user_time (void) G_GNUC_CONST;
const gchar * gimp_get_progname (void) G_GNUC_CONST;
#ifndef GIMP_DISABLE_DEPRECATED
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_parasite_attach)
gboolean gimp_parasite_attach (const GimpParasite *parasite);
GIMP_DEPRECATED_FOR(gimp_parasite_detach)
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_parasite_attach)
gboolean gimp_attach_new_parasite (const gchar *name,
gint flags,
gint size,
gconstpointer data);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS

2
libgimp/gimpbrushes.c
View File

@ -23,8 +23,6 @@
#include <string.h>
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_BRUSHES_H__
#include "gimpbrushes.h"
/**

9
libgimp/gimpbrushes.h
View File

@ -29,16 +29,17 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_context_get_opacity)
gdouble gimp_brushes_get_opacity (void);
GIMP_DEPRECATED_FOR(gimp_context_set_opacity)
gboolean gimp_brushes_set_opacity (gdouble opacity);
GIMP_DEPRECATED_FOR(gimp_context_get_paint_mode)
GimpLayerModeEffects gimp_brushes_get_paint_mode (void);
GIMP_DEPRECATED_FOR(gimp_context_set_paint_mode)
gboolean gimp_brushes_set_paint_mode (GimpLayerModeEffects paint_mode);
GIMP_DEPRECATED_FOR(gimp_context_set_brush)
gboolean gimp_brushes_set_brush (const gchar *name);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GIMP_BRUSHES_H__ */

4
libgimp/gimpbrushmenu.c
View File

@ -26,10 +26,8 @@
#include "gimp.h"
#include "gimpuitypes.h"
#include "gimpbrushselectbutton.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimpbrushmenu.h"
#include "gimpbrushselectbutton.h"
/**

8
libgimp/gimpbrushmenu.h
View File

@ -29,11 +29,9 @@
* written code.
*/
#ifndef GIMP_DISABLE_DEPRECATED
G_BEGIN_DECLS
GIMP_DEPRECATED_FOR(gimp_brush_select_button_new)
GtkWidget * gimp_brush_select_widget_new (const gchar *title,
const gchar *brush_name,
gdouble opacity,
@ -42,7 +40,9 @@ GtkWidget * gimp_brush_select_widget_new (const gchar *title,
GimpRunBrushCallback callback,
gpointer data);
GIMP_DEPRECATED_FOR(gimp_select_button_close_popup)
void gimp_brush_select_widget_close (GtkWidget *widget);
GIMP_DEPRECATED_FOR(gimp_brush_select_button_set_brush)
void gimp_brush_select_widget_set (GtkWidget *widget,
const gchar *brush_name,
gdouble opacity,
@ -52,6 +52,4 @@ void gimp_brush_select_widget_set (GtkWidget *widget,
G_END_DECLS
#endif /* GIMP_DISABLE_DEPRECATED */
#endif /* __GIMP_BRUSH_MENU_H__ */

1
libgimp/gimpdrawable.c
View File

@ -20,7 +20,6 @@
#include "config.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimp.h"
#include "gimptilebackendplugin.h"

22
libgimp/gimpdrawable.h
View File

@ -76,41 +76,59 @@ guchar * gimp_drawable_get_sub_thumbnail_data (gint32 drawable_ID,
gint *dest_height,
gint *bpp);
#ifndef GIMP_DISABLE_DEPRECATED
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);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS

4
libgimp/gimpfontmenu.c
View File

@ -26,10 +26,8 @@
#include "gimp.h"
#include "gimpuitypes.h"
#include "gimpfontselectbutton.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimpfontmenu.h"
#include "gimpfontselectbutton.h"
/**

8
libgimp/gimpfontmenu.h
View File

@ -29,23 +29,21 @@
* written code.
*/
#ifndef GIMP_DISABLE_DEPRECATED
G_BEGIN_DECLS
GIMP_DEPRECATED_FOR(gimp_font_select_button_new)
GtkWidget * gimp_font_select_widget_new (const gchar *title,
const gchar *font_name,
GimpRunFontCallback callback,
gpointer data);
GIMP_DEPRECATED_FOR(gimp_select_button_close_popup)
void gimp_font_select_widget_close (GtkWidget *widget);
GIMP_DEPRECATED_FOR(gimp_font_select_button_set_font)
void gimp_font_select_widget_set (GtkWidget *widget,
const gchar *font_name);
G_END_DECLS
#endif /* GIMP_DISABLE_DEPRECATED */
#endif /* __GIMP_FONT_MENU_H__ */

4
libgimp/gimpgradientmenu.c
View File

@ -26,10 +26,8 @@
#include "gimp.h"
#include "gimpuitypes.h"
#include "gimpgradientselectbutton.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimpgradientmenu.h"
#include "gimpgradientselectbutton.h"
/**

8
libgimp/gimpgradientmenu.h
View File

@ -29,23 +29,21 @@
* written code.
*/
#ifndef GIMP_DISABLE_DEPRECATED
G_BEGIN_DECLS
GIMP_DEPRECATED_FOR(gimp_gradient_select_button_new)
GtkWidget * gimp_gradient_select_widget_new (const gchar *title,
const gchar *gradient_name,
GimpRunGradientCallback callback,
gpointer data);
GIMP_DEPRECATED_FOR(gimp_select_button_close_popup)
void gimp_gradient_select_widget_close (GtkWidget *widget);
GIMP_DEPRECATED_FOR(gimp_gradient_select_button_set_gradient)
void gimp_gradient_select_widget_set (GtkWidget *widget,
const gchar *gradient_name);
G_END_DECLS
#endif /* GIMP_DISABLE_DEPRECATED */
#endif /* __GIMP_GRADIENT_MENU_H__ */

2
libgimp/gimpgradients.c
View File

@ -23,8 +23,6 @@
#include <string.h>
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_GRADIENTS_H__
#include "gimpgradients.h"
/**

6
libgimp/gimpgradients.h
View File

@ -29,13 +29,11 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_context_get_gradient)
gchar * gimp_gradients_get_gradient (void);
GIMP_DEPRECATED_FOR(gimp_context_set_gradient)
gboolean gimp_gradients_set_gradient (const gchar *name);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GIMP_GRADIENTS_H__ */

2
libgimp/gimpimage.c
View File

@ -21,8 +21,6 @@
#include "config.h"
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_IMAGE_H__
#include "gimpimage.h"
/**

23
libgimp/gimpimage.h
View File

@ -41,54 +41,71 @@ guchar * gimp_image_get_thumbnail_data (gint32 image_ID,
gint *height,
gint *bpp);
#ifndef GIMP_DISABLE_DEPRECATED
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);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS

2
libgimp/gimplayer.c
View File

@ -23,8 +23,6 @@
#include <string.h>
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_LAYER_H__
#include "gimplayer.h"

5
libgimp/gimplayer.h
View File

@ -52,12 +52,11 @@ gint32 gimp_layer_new_from_surface (gint32 image_ID,
gdouble progress_start,
gdouble progress_end);
#ifndef GIMP_DISABLE_DEPRECATED
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);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS

12
libgimp/gimpmenu.h
View File

@ -29,11 +29,9 @@
* written code.
*/
#ifndef GIMP_DISABLE_DEPRECATED
G_BEGIN_DECLS
#ifndef GIMP_DISABLE_DEPRECATED
typedef gboolean (* GimpConstraintFunc) (gint32 image_id,
gint32 drawable_id,
@ -42,27 +40,29 @@ typedef void (* GimpMenuCallback) (gint32 any_id,
gpointer data);
GIMP_DEPRECATED_FOR(gimp_image_combo_box_new)
GtkWidget * gimp_image_menu_new (GimpConstraintFunc constraint,
GimpMenuCallback callback,
gpointer data,
gint32 active_image);
GIMP_DEPRECATED_FOR(gimp_layer_combo_box_new)
GtkWidget * gimp_layer_menu_new (GimpConstraintFunc constraint,
GimpMenuCallback callback,
gpointer data,
gint32 active_layer);
GIMP_DEPRECATED_FOR(gimp_channel_combo_box_new)
GtkWidget * gimp_channel_menu_new (GimpConstraintFunc constraint,
GimpMenuCallback callback,
gpointer data,
gint32 active_channel);
GIMP_DEPRECATED_FOR(gimp_drawable_combo_box_new)
GtkWidget * gimp_drawable_menu_new (GimpConstraintFunc constraint,
GimpMenuCallback callback,
gpointer data,
gint32 active_drawable);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* GIMP_DISABLE_DEPRECATED */
#endif /* __GIMP_MENU_H__ */

3
libgimp/gimppalette.c
View File

@ -21,9 +21,6 @@
#include "config.h"
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_PALETTE_H__
#include "gimppalette.h"
/**
* gimp_palette_get_foreground:

11
libgimp/gimppalette.h
View File

@ -29,18 +29,19 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_context_get_foreground)
gboolean gimp_palette_get_foreground (GimpRGB *foreground);
GIMP_DEPRECATED_FOR(gimp_context_get_background)
gboolean gimp_palette_get_background (GimpRGB *background);
GIMP_DEPRECATED_FOR(gimp_context_set_foreground)
gboolean gimp_palette_set_foreground (const GimpRGB *foreground);
GIMP_DEPRECATED_FOR(gimp_context_set_background)
gboolean gimp_palette_set_background (const GimpRGB *background);
GIMP_DEPRECATED_FOR(gimp_context_set_default_colors)
gboolean gimp_palette_set_default_colors (void);
GIMP_DEPRECATED_FOR(gimp_context_swap_colors)
gboolean gimp_palette_swap_colors (void);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GIMP_PALETTE_H__ */

4
libgimp/gimppalettemenu.c
View File

@ -26,10 +26,8 @@
#include "gimp.h"
#include "gimpuitypes.h"
#include "gimppaletteselectbutton.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimppalettemenu.h"
#include "gimppaletteselectbutton.h"
/**

8
libgimp/gimppalettemenu.h
View File

@ -29,23 +29,21 @@
* written code.
*/
#ifndef GIMP_DISABLE_DEPRECATED
G_BEGIN_DECLS
GIMP_DEPRECATED_FOR(gimp_gradient_select_button_new)
GtkWidget * gimp_palette_select_widget_new (const gchar *title,
const gchar *palette_name,
GimpRunPaletteCallback callback,
gpointer data);
GIMP_DEPRECATED_FOR(gimp_select_button_close_popup)
void gimp_palette_select_widget_close (GtkWidget *widget);
GIMP_DEPRECATED_FOR(gimp_gradient_select_button_set_gradient)
void gimp_palette_select_widget_set (GtkWidget *widget,
const gchar *palette_name);
G_END_DECLS
#endif /* GIMP_DISABLE_DEPRECATED */
#endif /* __GIMP_PALETTE_MENU_H__ */

2
libgimp/gimppalettes.c
View File

@ -21,8 +21,6 @@
#include "config.h"
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_PALETTES_H__
#include "gimppalettes.h"
/**

5
libgimp/gimppalettes.h
View File

@ -29,12 +29,9 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_context_set_gradient)
gboolean gimp_palettes_set_palette (const gchar *name);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GIMP_PALETTES_H__ */

4
libgimp/gimppatternmenu.c
View File

@ -26,10 +26,8 @@
#include "gimp.h"
#include "gimpuitypes.h"
#include "gimppatternselectbutton.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimppatternmenu.h"
#include "gimppatternselectbutton.h"
/**

8
libgimp/gimppatternmenu.h
View File

@ -29,23 +29,21 @@
* written code.
*/
#ifndef GIMP_DISABLE_DEPRECATED
G_BEGIN_DECLS
GIMP_DEPRECATED_FOR(gimp_pattern_select_button_new)
GtkWidget * gimp_pattern_select_widget_new (const gchar *title,
const gchar *pattern_name,
GimpRunPatternCallback callback,
gpointer data);
GIMP_DEPRECATED_FOR(gimp_select_button_close_popup)
void gimp_pattern_select_widget_close (GtkWidget *widget);
GIMP_DEPRECATED_FOR(gimp_pattern_select_button_set_brush)
void gimp_pattern_select_widget_set (GtkWidget *widget,
const gchar *pattern_name);
G_END_DECLS
#endif /* GIMP_DISABLE_DEPRECATED */
#endif /* __GIMP_PATTERN_MENU_H__ */

2
libgimp/gimppatterns.c
View File

@ -23,8 +23,6 @@
#include <string.h>
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_PATTERNS_H__
#include "gimppatterns.h"
/**

5
libgimp/gimppatterns.h
View File

@ -29,12 +29,9 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_context_set_pattern)
gboolean gimp_patterns_set_pattern (const gchar *name);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GIMP_PATTERNS_H__ */

2
libgimp/gimpprogress.c
View File

@ -22,6 +22,8 @@
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimpprogress.h"
#define GIMP_DISABLE_DEPRECATED

2
libgimp/gimpprogress.h
View File

@ -80,7 +80,7 @@ typedef void (* GimpProgressTextCallback) (const gchar *message,
typedef void (* GimpProgressValueCallback) (gdouble percentage,
gpointer user_data);
GIMP_DEPRECATED_FOR(gimp_progress_install_vtable)
const gchar * gimp_progress_install (GimpProgressStartCallback start_callback,
GimpProgressEndCallback end_callback,
GimpProgressTextCallback text_callback,

3
libgimp/gimpselection.c
View File

@ -21,9 +21,6 @@
#include "config.h"
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_SELECTION_H__
#include "gimpselection.h"
/**
* gimp_selection_float:

5
libgimp/gimpselection.h
View File

@ -35,12 +35,9 @@ gint32 gimp_selection_float (gint32 image_ID,
gint offx,
gint offy);
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_selection_none)
gboolean gimp_selection_clear (gint32 image_ID);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS

4
libgimp/gimpui.c
View File

@ -28,11 +28,11 @@
#include <gdk/gdkx.h>
#endif
#include "libgimpmodule/gimpmodule.h"
#include "gimp.h"
#include "gimpui.h"
#include "libgimpmodule/gimpmodule.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "libgimpwidgets/gimpwidgets-private.h"

2
libgimp/gimpvectors.c
View File

@ -23,8 +23,6 @@
#include <string.h>
#include "gimp.h"
#undef GIMP_DISABLE_DEPRECATED
#undef __GIMP_VECTORS_H__
#include "gimpvectors.h"

16
libgimp/gimpvectors.h
View File

@ -30,31 +30,43 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_item_is_valid)
gboolean gimp_vectors_is_valid (gint32 vectors_ID);
GIMP_DEPRECATED_FOR(gimp_item_get_image)
gint32 gimp_vectors_get_image (gint32 vectors_ID);
GIMP_DEPRECATED_FOR(gimp_item_get_name)
gchar * gimp_vectors_get_name (gint32 vectors_ID);
GIMP_DEPRECATED_FOR(gimp_item_set_name)
gboolean gimp_vectors_set_name (gint32 vectors_ID,
const gchar *name);
GIMP_DEPRECATED_FOR(gimp_item_get_visible)
gboolean gimp_vectors_get_visible (gint32 vectors_ID);
GIMP_DEPRECATED_FOR(gimp_item_get_visible)
gboolean gimp_vectors_set_visible (gint32 vectors_ID,
gboolean visible);
GIMP_DEPRECATED_FOR(gimp_item_get_linked)
gboolean gimp_vectors_get_linked (gint32 vectors_ID);
GIMP_DEPRECATED_FOR(gimp_item_set_linked)
gboolean gimp_vectors_set_linked (gint32 vectors_ID,
gboolean linked);
GIMP_DEPRECATED_FOR(gimp_item_get_tattoo)
gint gimp_vectors_get_tattoo (gint32 vectors_ID);
GIMP_DEPRECATED_FOR(gimp_item_set_tattoo)
gboolean gimp_vectors_set_tattoo (gint32 vectors_ID,
gint tattoo);
GIMP_DEPRECATED_FOR(gimp_item_get_parasite)
GimpParasite * gimp_vectors_parasite_find (gint32 vectors_ID,
const gchar *name);
GIMP_DEPRECATED_FOR(gimp_item_attach_parasite)
gboolean gimp_vectors_parasite_attach (gint32 vectors_ID,
const GimpParasite *parasite);
GIMP_DEPRECATED_FOR(gimp_item_detach_parasite)
gboolean gimp_vectors_parasite_detach (gint32 vectors_ID,
const gchar *name);
GIMP_DEPRECATED_FOR(gimp_item_get_parasite_list)
gboolean gimp_vectors_parasite_list (gint32 vectors_ID,
gint *num_parasites,
gchar ***parasites);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS

13
libgimpbase/gimpbasetypes.h
View File

@ -32,6 +32,19 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
/* XXX FIXME move these to a separate file */
#ifdef GIMP_DISABLE_DEPRECATION_WARNINGS
#define GIMP_DEPRECATED
#define GIMP_DEPRECATED_FOR(f)
#define GIMP_UNAVAILABLE(maj,min)
#else
#define GIMP_DEPRECATED G_DEPRECATED
#define GIMP_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
#define GIMP_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min)
#endif
typedef struct _GimpParasite GimpParasite;
typedef struct _GimpDatafileData GimpDatafileData;
typedef struct _GimpEnumDesc GimpEnumDesc;

1
libgimpbase/gimpenv.h
View File

@ -54,6 +54,7 @@ const gchar * gimp_sysconf_directory (void) G_GNUC_CONST;
const gchar * gimp_plug_in_directory (void) G_GNUC_CONST;
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(g_get_user_special_dir)
const gchar * gimp_user_directory (GimpUserDirectory type) G_GNUC_CONST;
#endif /* !GIMP_DISABLE_DEPRECATED */

3
libgimpbase/gimpmemsize.c
View File

@ -22,7 +22,8 @@
#include <glib-object.h>
#undef GIMP_DISABLE_DEPRECATED
#include "gimpbasetypes.h"
#include "gimpmemsize.h"
#include "libgimp/libgimp-intl.h"

5
libgimpbase/gimpmemsize.h
View File

@ -41,12 +41,9 @@ gchar * gimp_memsize_serialize (guint64 memsize) G_GNUC_MALLOC;
gboolean gimp_memsize_deserialize (const gchar *string,
guint64 *memsize);
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(g_format_size)
gchar * gimp_memsize_to_string (guint64 memsize) G_GNUC_MALLOC;
#endif /* GIMP_DISABLE_DEPRECATED */
/*
* GIMP_TYPE_PARAM_MEMSIZE

2
libgimpbase/gimpwire.c
View File

@ -20,7 +20,7 @@
#include <string.h>
#include <glib.h>
#include <glib-object.h>
#include <libgimpcolor/gimpcolortypes.h>

4
libgimpcolor/gimpcolortypes.h
View File

@ -19,6 +19,10 @@
#ifndef __GIMP_COLOR_TYPES_H__
#define __GIMP_COLOR_TYPES_H__
#include <libgimpbase/gimpbasetypes.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */

1
libgimpcolor/gimprgb.c
View File

@ -21,6 +21,7 @@
#include <babl/babl.h>
#include <glib-object.h>
#define GIMP_DISABLE_DEPRECATION_WARNINGS /* for GIMP_RGB_INTENSITY() */
#include "libgimpmath/gimpmath.h"
#include "gimpcolortypes.h"

4
libgimpcolor/gimprgb.h
View File

@ -125,10 +125,10 @@ void gimp_rgb_gamma (GimpRGB *rgb,
gdouble gimp_rgb_luminance (const GimpRGB *rgb);
guchar gimp_rgb_luminance_uchar (const GimpRGB *rgb);
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_rgb_luminance)
gdouble gimp_rgb_intensity (const GimpRGB *rgb);
GIMP_DEPRECATED_FOR(gimp_rgb_luminance_uchar)
guchar gimp_rgb_intensity_uchar (const GimpRGB *rgb);
#endif
void gimp_rgb_composite (GimpRGB *color1,
const GimpRGB *color2,

4
libgimpmath/gimpmathtypes.h
View File

@ -21,6 +21,10 @@
#ifndef __GIMP_MATH_TYPES_H__
#define __GIMP_MATH_TYPES_H__
#include <libgimpbase/gimpbasetypes.h>
G_BEGIN_DECLS
typedef struct _GimpMatrix2 GimpMatrix2;

5
libgimpmath/gimpmd5.c
View File

@ -7,9 +7,10 @@
#include "config.h"
#include <glib.h>
#include <glib-object.h>
#include "gimpmathtypes.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimpmd5.h"

5
libgimpmath/gimpmd5.h
View File

@ -16,14 +16,11 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(GChecksum)
void gimp_md5_get_digest (const gchar *buffer,
gint buffer_size,
guchar digest[16]);
#endif /* GIMP_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GIMP_MD5_H__ */

1
libgimpmodule/gimpmodule.c
View File

@ -27,7 +27,6 @@
#include "libgimpbase/gimpbase.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimpmodule.h"
#include "libgimp/libgimp-intl.h"

4
libgimpmodule/gimpmodule.h
View File

@ -221,12 +221,10 @@ void gimp_module_set_load_inhibit (GimpModule *module,
const gchar * gimp_module_state_name (GimpModuleState state);
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(g_type_module_register_enum)
GType gimp_module_register_enum (GTypeModule *module,
const gchar *name,
const GEnumValue *const_static_values);
#endif /* GIMP_DISABLE_DEPRECATED */
/* GimpModuleInfo functions */

4
libgimpmodule/gimpmoduletypes.h
View File

@ -19,6 +19,10 @@
#ifndef __GIMP_MODULE_TYPES_H__
#define __GIMP_MODULE_TYPES_H__
#include <libgimpbase/gimpbasetypes.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */