eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 01:12:40 +02:00
Code Issues Releases Activity

Get rid of capitalized "ID" in function and variable names

Browse Source 
and use "id" instead.
This commit is contained in:
Michael Natterer
2019-08-23 22:23:23 +02:00
parent 75bf3865b8
commit 7201d48231
55 changed files with 276 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/actions/windows-actions.c
View File

@@ -393,7 +393,7 @@ windows_actions_image_notify (GimpDisplay *display,
escaped = gimp_escape_uline (display_name);
title = g_strdup_printf ("%s-%d.%d", escaped,
gimp_image_get_ID (image),
gimp_image_get_id (image),
gimp_display_get_instance (display));
g_free (escaped);

12
app/core/gimp-gui.c
View File

@@ -239,7 +239,7 @@ gimp_get_program_class (Gimp *gimp)
gchar *
gimp_get_display_name (Gimp *gimp,
gint display_ID,
gint display_id,
GObject **monitor,
gint *monitor_number)
{
@@ -248,7 +248,7 @@ gimp_get_display_name (Gimp *gimp,
g_return_val_if_fail (monitor_number != NULL, NULL);
if (gimp->gui.get_display_name)
return gimp->gui.get_display_name (gimp, display_ID,
return gimp->gui.get_display_name (gimp, display_id,
monitor, monitor_number);
*monitor = NULL;
@@ -322,19 +322,19 @@ gimp_get_empty_display (Gimp *gimp)
}
GimpObject *
gimp_get_display_by_ID (Gimp *gimp,
gint ID)
gimp_get_display_by_id (Gimp *gimp,
gint id)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
if (gimp->gui.display_get_by_id)
return gimp->gui.display_get_by_id (gimp, ID);
return gimp->gui.display_get_by_id (gimp, id);
return NULL;
}
gint
gimp_get_display_ID (Gimp *gimp,
gimp_get_display_id (Gimp *gimp,
GimpObject *display)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), -1);

8
app/core/gimp-gui.h
View File

@@ -44,7 +44,7 @@ struct _GimpGui
const gchar * (* get_program_class) (Gimp *gimp);
gchar * (* get_display_name) (Gimp *gimp,
gint display_ID,
gint display_id,
GObject **monitor,
gint *monitor_number);
guint32 (* get_user_time) (Gimp *gimp);
@@ -115,9 +115,9 @@ void gimp_gui_ungrab (Gimp *gimp);
GimpObject * gimp_get_window_strategy (Gimp *gimp);
GimpObject * gimp_get_empty_display (Gimp *gimp);
GimpObject * gimp_get_display_by_ID (Gimp *gimp,
GimpObject * gimp_get_display_by_id (Gimp *gimp,
gint ID);
gint gimp_get_display_ID (Gimp *gimp,
gint gimp_get_display_id (Gimp *gimp,
GimpObject *display);
guint32 gimp_get_display_window_id (Gimp *gimp,
GimpObject *display);
@@ -158,7 +158,7 @@ void gimp_free_progress (Gimp *gimp,
const gchar * gimp_get_program_class (Gimp *gimp);
gchar * gimp_get_display_name (Gimp *gimp,
gint display_ID,
gint display_id,
GObject **monitor,
gint *monitor_number);
guint32 gimp_get_user_time (Gimp *gimp);

6
app/core/gimp.c
View File

@@ -243,8 +243,8 @@ gimp_init (Gimp *gimp)
gimp->images = gimp_list_new_weak (GIMP_TYPE_IMAGE, FALSE);
gimp_object_set_static_name (GIMP_OBJECT (gimp->images), "images");
gimp->next_guide_ID = 1;
gimp->next_sample_point_ID = 1;
gimp->next_guide_id = 1;
gimp->next_sample_point_id = 1;
gimp->image_table = gimp_id_table_new ();
gimp->item_table = gimp_id_table_new ();
@@ -254,7 +254,7 @@ gimp_init (Gimp *gimp)
"append", TRUE,
NULL);
gimp_object_set_static_name (GIMP_OBJECT (gimp->displays), "displays");
gimp->next_display_ID = 1;
gimp->next_display_id = 1;
gimp->named_buffers = gimp_list_new (GIMP_TYPE_BUFFER, TRUE);
gimp_object_set_static_name (GIMP_OBJECT (gimp->named_buffers),

6
app/core/gimp.h
View File

@@ -81,13 +81,13 @@ struct _Gimp
GList *filter_history;
GimpContainer *images;
guint32 next_guide_ID;
guint32 next_sample_point_ID;
guint32 next_guide_id;
guint32 next_sample_point_id;
GimpIdTable *image_table;
GimpIdTable *item_table;
GimpContainer *displays;
gint next_display_ID;
gint next_display_id;
GList *image_windows;

10
app/core/gimpauxitem.c
View File

@@ -41,7 +41,7 @@ enum
struct _GimpAuxItemPrivate
{
guint32 aux_item_ID;
guint32 aux_item_id;
};
@@ -103,7 +103,7 @@ gimp_aux_item_get_property (GObject *object,
switch (property_id)
{
case PROP_ID:
g_value_set_uint (value, aux_item->priv->aux_item_ID);
g_value_set_uint (value, aux_item->priv->aux_item_id);
break;
default:
@@ -123,7 +123,7 @@ gimp_aux_item_set_property (GObject *object,
switch (property_id)
{
case PROP_ID:
aux_item->priv->aux_item_ID = g_value_get_uint (value);
aux_item->priv->aux_item_id = g_value_get_uint (value);
break;
default:
@@ -133,11 +133,11 @@ gimp_aux_item_set_property (GObject *object,
}
guint32
gimp_aux_item_get_ID (GimpAuxItem *aux_item)
gimp_aux_item_get_id (GimpAuxItem *aux_item)
{
g_return_val_if_fail (GIMP_IS_AUX_ITEM (aux_item), 0);
return aux_item->priv->aux_item_ID;
return aux_item->priv->aux_item_id;
}
void

2
app/core/gimpauxitem.h
View File

@@ -48,7 +48,7 @@ struct _GimpAuxItemClass
GType gimp_aux_item_get_type (void) G_GNUC_CONST;
guint32 gimp_aux_item_get_ID (GimpAuxItem *aux_item);
guint32 gimp_aux_item_get_id (GimpAuxItem *aux_item);
void gimp_aux_item_removed (GimpAuxItem *aux_item);

6
app/core/gimpimage-colormap.c
View File

@@ -66,10 +66,10 @@ gimp_image_colormap_init (GimpImage *image)
g_return_if_fail (private->palette == NULL);
palette_name = g_strdup_printf (_("Colormap of Image #%d (%s)"),
gimp_image_get_ID (image),
gimp_image_get_id (image),
gimp_image_get_display_name (image));
palette_id = g_strdup_printf ("gimp-indexed-image-palette-%d",
gimp_image_get_ID (image));
gimp_image_get_id (image));
private->n_colors = 0;
private->colormap = g_new0 (guchar, GIMP_IMAGE_COLORMAP_SIZE);
@@ -142,7 +142,7 @@ gimp_image_colormap_update_formats (GimpImage *image)
space = gimp_image_get_layer_space (image);
format_name = g_strdup_printf ("-gimp-indexed-format-%d",
gimp_image_get_ID (image));
gimp_image_get_id (image));
babl_new_palette_with_space (format_name, space,
&private->babl_palette_rgb,

8
app/core/gimpimage-guides.c
View File

@@ -46,7 +46,7 @@ gimp_image_add_hguide (GimpImage *image,
position <= gimp_image_get_height (image), NULL);
guide = gimp_guide_new (GIMP_ORIENTATION_HORIZONTAL,
image->gimp->next_guide_ID++);
image->gimp->next_guide_id++);
if (push_undo)
gimp_image_undo_push_guide (image,
@@ -70,7 +70,7 @@ gimp_image_add_vguide (GimpImage *image,
position <= gimp_image_get_width (image), NULL);
guide = gimp_guide_new (GIMP_ORIENTATION_VERTICAL,
image->gimp->next_guide_ID++);
image->gimp->next_guide_id++);
if (push_undo)
gimp_image_undo_push_guide (image,
@@ -177,7 +177,7 @@ gimp_image_get_guide (GimpImage *image,
{
GimpGuide *guide = guides->data;
if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (guide)) == id)
if (gimp_aux_item_get_id (GIMP_AUX_ITEM (guide)) == id)
return guide;
}
@@ -208,7 +208,7 @@ gimp_image_get_next_guide (GimpImage *image,
if (*guide_found) /* this is the first guide after the found one */
return guide;
if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (guide)) == id) /* found it, next one will be returned */
if (gimp_aux_item_get_id (GIMP_AUX_ITEM (guide)) == id) /* found it, next one will be returned */
*guide_found = TRUE;
}

6
app/core/gimpimage-sample-points.c
View File

@@ -46,7 +46,7 @@ gimp_image_add_sample_point_at_pos (GimpImage *image,
g_return_val_if_fail (x >= 0 && x < gimp_image_get_width (image), NULL);
g_return_val_if_fail (y >= 0 && y < gimp_image_get_height (image), NULL);
sample_point = gimp_sample_point_new (image->gimp->next_sample_point_ID++);
sample_point = gimp_sample_point_new (image->gimp->next_sample_point_id++);
if (push_undo)
gimp_image_undo_push_sample_point (image, C_("undo-type", "Add Sample Point"),
@@ -174,7 +174,7 @@ gimp_image_get_sample_point (GimpImage *image,
{
GimpSamplePoint *sample_point = sample_points->data;
if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (sample_point)) == id)
if (gimp_aux_item_get_id (GIMP_AUX_ITEM (sample_point)) == id)
return sample_point;
}
@@ -205,7 +205,7 @@ gimp_image_get_next_sample_point (GimpImage *image,
if (*sample_point_found) /* this is the first guide after the found one */
return sample_point;
if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (sample_point)) == id) /* found it, next one will be returned */
if (gimp_aux_item_get_id (GIMP_AUX_ITEM (sample_point)) == id) /* found it, next one will be returned */
*sample_point_found = TRUE;
}

6
app/core/gimpimage.c
View File

@@ -1237,7 +1237,7 @@ gimp_image_get_description (GimpViewable *viewable,
return g_strdup_printf ("%s-%d",
gimp_image_get_display_name (image),
gimp_image_get_ID (image));
gimp_image_get_id (image));
}
static void
@@ -1894,7 +1894,7 @@ gimp_image_unset_default_new_layer_mode (GimpImage *image)
}
gint
gimp_image_get_ID (GimpImage *image)
gimp_image_get_id (GimpImage *image)
{
g_return_val_if_fail (GIMP_IS_IMAGE (image), -1);
@@ -1902,7 +1902,7 @@ gimp_image_get_ID (GimpImage *image)
}
GimpImage *
gimp_image_get_by_ID (Gimp *gimp,
gimp_image_get_by_id (Gimp *gimp,
gint image_id)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);

4
app/core/gimpimage.h
View File

@@ -140,8 +140,8 @@ GimpLayerMode gimp_image_get_default_new_layer_mode
void gimp_image_unset_default_new_layer_mode
(GimpImage *image);
gint gimp_image_get_ID (GimpImage *image);
GimpImage * gimp_image_get_by_ID (Gimp *gimp,
gint gimp_image_get_id (GimpImage *image);
GimpImage * gimp_image_get_by_id (Gimp *gimp,
gint id);
GFile * gimp_image_get_file (GimpImage *image);

10
app/core/gimpitem.c
View File

@@ -1890,7 +1890,7 @@ gimp_item_remove_offset_node (GimpItem *item,
}
gint
gimp_item_get_ID (GimpItem *item)
gimp_item_get_id (GimpItem *item)
{
g_return_val_if_fail (GIMP_IS_ITEM (item), -1);
@@ -1898,7 +1898,7 @@ gimp_item_get_ID (GimpItem *item)
}
GimpItem *
gimp_item_get_by_ID (Gimp *gimp,
gimp_item_get_by_id (Gimp *gimp,
gint item_id)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
@@ -2009,11 +2009,11 @@ gimp_item_replace_item (GimpItem *item,
if (private->ID)
gimp_id_table_remove (gimp_item_get_image (item)->gimp->item_table,
gimp_item_get_ID (item));
gimp_item_get_id (item));
private->ID = gimp_item_get_ID (replace);
private->ID = gimp_item_get_id (replace);
gimp_id_table_replace (gimp_item_get_image (item)->gimp->item_table,
gimp_item_get_ID (item),
gimp_item_get_id (item),
item);
/* Set image before tattoo so that the explicitly set tattoo overrides

4
app/core/gimpitem.h
View File

@@ -320,8 +320,8 @@ void gimp_item_add_offset_node (GimpItem *item,
void gimp_item_remove_offset_node (GimpItem *item,
GeglNode *node);
gint gimp_item_get_ID (GimpItem *item);
GimpItem * gimp_item_get_by_ID (Gimp *gimp,
gint gimp_item_get_id (GimpItem *item);
GimpItem * gimp_item_get_by_id (Gimp *gimp,
gint id);
GimpTattoo gimp_item_get_tattoo (GimpItem *item);

45
app/core/gimpparamspecs.c
View File

@@ -427,7 +427,7 @@ gimp_param_image_id_validate (GParamSpec *pspec,
if (ispec->none_ok && (image_id == 0 || image_id == -1))
return FALSE;
image = gimp_image_get_by_ID (ispec->gimp, image_id);
image = gimp_image_get_by_id (ispec->gimp, image_id);
if (! GIMP_IS_IMAGE (image))
{
@@ -484,7 +484,7 @@ gimp_value_get_image (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_IMAGE_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
return gimp_image_get_by_ID (gimp, value->data[0].v_int);
return gimp_image_get_by_id (gimp, value->data[0].v_int);
}
void
@@ -494,7 +494,7 @@ gimp_value_set_image (GValue *value,
g_return_if_fail (GIMP_VALUE_HOLDS_IMAGE_ID (value));
g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
value->data[0].v_int = image ? gimp_image_get_ID (image) : -1;
value->data[0].v_int = image ? gimp_image_get_id (image) : -1;
}
@@ -594,7 +594,7 @@ gimp_param_item_id_validate (GParamSpec *pspec,
if (ispec->none_ok && (item_id == 0 || item_id == -1))
return FALSE;
item = gimp_item_get_by_ID (ispec->gimp, item_id);
item = gimp_item_get_by_id (ispec->gimp, item_id);
if (! item || ! g_type_is_a (G_TYPE_FROM_INSTANCE (item), ispec->item_type))
{
@@ -658,7 +658,7 @@ gimp_value_get_item (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_ITEM_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
item = gimp_item_get_by_id (gimp, value->data[0].v_int);
if (item && ! GIMP_IS_ITEM (item))
return NULL;
@@ -678,7 +678,7 @@ gimp_value_set_item (GValue *value,
if (GIMP_VALUE_HOLDS_ITEM_ID (value))
{
value->data[0].v_int = item ? gimp_item_get_ID (item) : -1;
value->data[0].v_int = item ? gimp_item_get_id (item) : -1;
}
else if (GIMP_VALUE_HOLDS_DRAWABLE_ID (value) &&
(item == NULL || GIMP_IS_DRAWABLE (item)))
@@ -813,7 +813,7 @@ gimp_value_get_drawable (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_DRAWABLE_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
item = gimp_item_get_by_id (gimp, value->data[0].v_int);
if (item && ! GIMP_IS_DRAWABLE (item))
return NULL;
@@ -830,7 +830,8 @@ gimp_value_set_drawable (GValue *value,
if (GIMP_VALUE_HOLDS_DRAWABLE_ID (value))
{
value->data[0].v_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1;
value->data[0].v_int =
drawable ? gimp_item_get_id (GIMP_ITEM (drawable)) : -1;
}
else if (GIMP_VALUE_HOLDS_LAYER_ID (value) &&
(drawable == NULL || GIMP_IS_LAYER (drawable)))
@@ -955,7 +956,7 @@ gimp_value_get_layer (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_LAYER_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
item = gimp_item_get_by_id (gimp, value->data[0].v_int);
if (item && ! GIMP_IS_LAYER (item))
return NULL;
@@ -970,7 +971,7 @@ gimp_value_set_layer (GValue *value,
g_return_if_fail (GIMP_VALUE_HOLDS_LAYER_ID (value));
g_return_if_fail (layer == NULL || GIMP_IS_LAYER (layer));
value->data[0].v_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1;
value->data[0].v_int = layer ? gimp_item_get_id (GIMP_ITEM (layer)) : -1;
}
@@ -1070,7 +1071,7 @@ gimp_value_get_channel (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_CHANNEL_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
item = gimp_item_get_by_id (gimp, value->data[0].v_int);
if (item && ! GIMP_IS_CHANNEL (item))
return NULL;
@@ -1087,7 +1088,8 @@ gimp_value_set_channel (GValue *value,
if (GIMP_VALUE_HOLDS_CHANNEL_ID (value))
{
value->data[0].v_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1;
value->data[0].v_int =
channel ? gimp_item_get_id (GIMP_ITEM (channel)) : -1;
}
else if (GIMP_VALUE_HOLDS_LAYER_MASK_ID (value) &&
(channel == NULL || GIMP_IS_LAYER_MASK (channel)))
@@ -1202,7 +1204,7 @@ gimp_value_get_layer_mask (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_LAYER_MASK_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
item = gimp_item_get_by_id (gimp, value->data[0].v_int);
if (item && ! GIMP_IS_LAYER_MASK (item))
return NULL;
@@ -1217,7 +1219,8 @@ gimp_value_set_layer_mask (GValue *value,
g_return_if_fail (GIMP_VALUE_HOLDS_LAYER_MASK_ID (value));
g_return_if_fail (layer_mask == NULL || GIMP_IS_LAYER_MASK (layer_mask));
value->data[0].v_int = layer_mask ? gimp_item_get_ID (GIMP_ITEM (layer_mask)) : -1;
value->data[0].v_int =
layer_mask ? gimp_item_get_id (GIMP_ITEM (layer_mask)) : -1;
}
@@ -1317,7 +1320,7 @@ gimp_value_get_selection (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_SELECTION_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
item = gimp_item_get_by_id (gimp, value->data[0].v_int);
if (item && ! GIMP_IS_SELECTION (item))
return NULL;
@@ -1332,7 +1335,8 @@ gimp_value_set_selection (GValue *value,
g_return_if_fail (GIMP_VALUE_HOLDS_SELECTION_ID (value));
g_return_if_fail (selection == NULL || GIMP_IS_SELECTION (selection));
value->data[0].v_int = selection ? gimp_item_get_ID (GIMP_ITEM (selection)) : -1;
value->data[0].v_int =
selection ? gimp_item_get_id (GIMP_ITEM (selection)) : -1;
}
@@ -1432,7 +1436,7 @@ gimp_value_get_vectors (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_VECTORS_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
item = gimp_item_get_by_id (gimp, value->data[0].v_int);
if (item && ! GIMP_IS_VECTORS (item))
return NULL;
@@ -1447,7 +1451,8 @@ gimp_value_set_vectors (GValue *value,
g_return_if_fail (GIMP_VALUE_HOLDS_VECTORS_ID (value));
g_return_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors));
value->data[0].v_int = vectors ? gimp_item_get_ID (GIMP_ITEM (vectors)) : -1;
value->data[0].v_int =
vectors ? gimp_item_get_id (GIMP_ITEM (vectors)) : -1;
}
@@ -1546,7 +1551,7 @@ gimp_param_display_id_validate (GParamSpec *pspec,
if (ispec->none_ok && (display_id == 0 || display_id == -1))
return FALSE;
display = gimp_get_display_by_ID (ispec->gimp, display_id);
display = gimp_get_display_by_id (ispec->gimp, display_id);
if (! GIMP_IS_OBJECT (display))
{
@@ -1603,7 +1608,7 @@ gimp_value_get_display (const GValue *value,
g_return_val_if_fail (GIMP_VALUE_HOLDS_DISPLAY_ID (value), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
return gimp_get_display_by_ID (gimp, value->data[0].v_int);
return gimp_get_display_by_id (gimp, value->data[0].v_int);
}
void

2
app/core/gimpsymmetry-mandala.c
View File

@@ -315,7 +315,7 @@ gimp_mandala_add_guide (GimpMandala *mandala,
gimp = image->gimp;
guide = gimp_guide_custom_new (orientation,
gimp->next_guide_ID++,
gimp->next_guide_id++,
GIMP_GUIDE_STYLE_MANDALA);
if (orientation == GIMP_ORIENTATION_HORIZONTAL)

2
app/core/gimpsymmetry-mirror.c
View File

@@ -428,7 +428,7 @@ gimp_mirror_add_guide (GimpMirror *mirror,
gimp = image->gimp;
guide = gimp_guide_custom_new (orientation,
gimp->next_guide_ID++,
gimp->next_guide_id++,
GIMP_GUIDE_STYLE_MIRROR);
if (orientation == GIMP_ORIENTATION_HORIZONTAL)

2
app/dialogs/palette-import-dialog.c
View File

@@ -503,7 +503,7 @@ palette_import_image_changed (GimpContext *context,
label = g_strdup_printf ("%s-%d",
gimp_image_get_display_name (image),
gimp_image_get_ID (image));
gimp_image_get_id (image));
gtk_entry_set_text (GTK_ENTRY (private->entry), label);
g_free (label);

18
app/display/gimpdisplay.c
View File

@@ -206,12 +206,12 @@ gimp_display_set_property (GObject *object,
do
{
ID = display->gimp->next_display_ID++;
ID = display->gimp->next_display_id++;
if (display->gimp->next_display_ID == G_MAXINT)
display->gimp->next_display_ID = 1;
if (display->gimp->next_display_id == G_MAXINT)
display->gimp->next_display_id = 1;
}
while (gimp_display_get_by_ID (display->gimp, ID));
while (gimp_display_get_by_id (display->gimp, ID));
private->ID = ID;
}
@@ -549,7 +549,7 @@ gimp_display_close (GimpDisplay *display)
}
gint
gimp_display_get_ID (GimpDisplay *display)
gimp_display_get_id (GimpDisplay *display)
{
GimpDisplayPrivate *private;
@@ -561,8 +561,8 @@ gimp_display_get_ID (GimpDisplay *display)
}
GimpDisplay *
gimp_display_get_by_ID (Gimp *gimp,
gint ID)
gimp_display_get_by_id (Gimp *gimp,
gint id)
{
GList *list;
@@ -574,7 +574,7 @@ gimp_display_get_by_ID (Gimp *gimp,
{
GimpDisplay *display = list->data;
if (gimp_display_get_ID (display) == ID)
if (gimp_display_get_id (display) == id)
return display;
}
@@ -594,7 +594,7 @@ gimp_display_get_action_name (GimpDisplay *display)
g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
return g_strdup_printf ("windows-display-%04d",
gimp_display_get_ID (display));
gimp_display_get_id (display));
}
Gimp *

6
app/display/gimpdisplay.h
View File

@@ -59,9 +59,9 @@ GimpDisplay * gimp_display_new (Gimp *gimp,
void gimp_display_delete (GimpDisplay *display);
void gimp_display_close (GimpDisplay *display);
gint gimp_display_get_ID (GimpDisplay *display);
GimpDisplay * gimp_display_get_by_ID (Gimp *gimp,
gint ID);
gint gimp_display_get_id (GimpDisplay *display);
GimpDisplay * gimp_display_get_by_id (Gimp *gimp,
gint id);
gchar * gimp_display_get_action_name (GimpDisplay *display);

4
app/display/gimpdisplayshell-title.c
View File

@@ -220,7 +220,7 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
break;
case 'p': /* PDB id */
i += print (title, title_len, i, "%d", gimp_image_get_ID (image));
i += print (title, title_len, i, "%d", gimp_image_get_id (image));
break;
case 'i': /* instance */
@@ -369,7 +369,7 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
case 'P': /* active drawable PDB id */
if (drawable)
i += print (title, title_len, i, "%d",
gimp_item_get_ID (GIMP_ITEM (drawable)));
gimp_item_get_id (GIMP_ITEM (drawable)));
else
i += print (title, title_len, i, "%s", _("(none)"));
break;

4
app/errors.c
View File

@@ -489,8 +489,8 @@ gimp_eek (const gchar *reason,
NULL, NULL,
"gimp-xcf-save",
GIMP_TYPE_RUN_MODE, GIMP_RUN_NONINTERACTIVE,
GIMP_TYPE_IMAGE_ID, gimp_image_get_ID (image),
GIMP_TYPE_DRAWABLE_ID, gimp_item_get_ID (item),
GIMP_TYPE_IMAGE_ID, gimp_image_get_id (image),
GIMP_TYPE_DRAWABLE_ID, gimp_item_get_id (item),
G_TYPE_STRING, backup_path,
G_TYPE_STRING, backup_path,
G_TYPE_NONE);

12
app/file/file-save.c
View File

@@ -69,8 +69,8 @@ file_save (Gimp *gimp,
GFile *local_file = NULL;
gchar *uri = NULL;
gboolean mounted = TRUE;
gint32 image_ID;
gint32 drawable_ID;
gint32 image_id;
gint32 drawable_id;
GError *my_error = NULL;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_PDB_CALLING_ERROR);
@@ -188,8 +188,8 @@ file_save (Gimp *gimp,
if (! uri)
uri = g_file_get_uri (file);
image_ID = gimp_image_get_ID (image);
drawable_ID = gimp_item_get_ID (GIMP_ITEM (drawable));
image_id = gimp_image_get_id (image);
drawable_id = gimp_item_get_id (GIMP_ITEM (drawable));
return_vals =
gimp_pdb_execute_procedure_by_name (image->gimp->pdb,
@@ -197,8 +197,8 @@ file_save (Gimp *gimp,
progress, error,
gimp_object_get_name (file_proc),
GIMP_TYPE_RUN_MODE, run_mode,
GIMP_TYPE_IMAGE_ID, image_ID,
GIMP_TYPE_DRAWABLE_ID, drawable_ID,
GIMP_TYPE_IMAGE_ID, image_id,
GIMP_TYPE_DRAWABLE_ID, drawable_id,
G_TYPE_STRING, uri,
G_TYPE_STRING, uri,
G_TYPE_NONE);

26
app/gui/gui-vtable.c
View File

@@ -121,7 +121,7 @@ static void gui_help (Gimp *gimp,
const gchar *help_id);
static const gchar * gui_get_program_class (Gimp *gimp);
static gchar * gui_get_display_name (Gimp *gimp,
gint display_ID,
gint display_id,
GObject **monitor,
gint *monitor_number);
static guint32 gui_get_user_time (Gimp *gimp);
@@ -129,9 +129,9 @@ static GFile * gui_get_theme_dir (Gimp *gimp);
static GFile * gui_get_icon_theme_dir (Gimp *gimp);
static GimpObject * gui_get_window_strategy (Gimp *gimp);
static GimpObject * gui_get_empty_display (Gimp *gimp);
static GimpObject * gui_display_get_by_ID (Gimp *gimp,
static GimpObject * gui_display_get_by_id (Gimp *gimp,
gint ID);
static gint gui_display_get_ID (GimpObject *display);
static gint gui_display_get_id (GimpObject *display);
static guint32 gui_display_get_window_id (GimpObject *display);
static GimpObject * gui_display_create (Gimp *gimp,
GimpImage *image,
@@ -203,8 +203,8 @@ gui_vtable_init (Gimp *gimp)
gimp->gui.get_icon_theme_dir = gui_get_icon_theme_dir;
gimp->gui.get_window_strategy = gui_get_window_strategy;
gimp->gui.get_empty_display = gui_get_empty_display;
gimp->gui.display_get_by_id = gui_display_get_by_ID;
gimp->gui.display_get_id = gui_display_get_ID;
gimp->gui.display_get_by_id = gui_display_get_by_id;
gimp->gui.display_get_id = gui_display_get_id;
gimp->gui.display_get_window_id = gui_display_get_window_id;
gimp->gui.display_create = gui_display_create;
gimp->gui.display_delete = gui_display_delete;
@@ -282,15 +282,15 @@ get_monitor_number (GdkMonitor *monitor)
static gchar *
gui_get_display_name (Gimp *gimp,
gint display_ID,
gint display_id,
GObject **monitor,
gint *monitor_number)
{
GimpDisplay *display = NULL;
GdkDisplay *gdk_display;
if (display_ID > 0)
display = gimp_display_get_by_ID (gimp, display_ID);
if (display_id > 0)
display = gimp_display_get_by_id (gimp, display_id);
if (display)
{
@@ -365,16 +365,16 @@ gui_get_empty_display (Gimp *gimp)
}
static GimpObject *
gui_display_get_by_ID (Gimp *gimp,
gint ID)
gui_display_get_by_id (Gimp *gimp,
gint id)
{
return (GimpObject *) gimp_display_get_by_ID (gimp, ID);
return (GimpObject *) gimp_display_get_by_id (gimp, id);
}
static gint
gui_display_get_ID (GimpObject *display)
gui_display_get_id (GimpObject *display)
{
return gimp_display_get_ID (GIMP_DISPLAY (display));
return gimp_display_get_id (GIMP_DISPLAY (display));
}
static guint32

4
app/menus/windows-menu.c
View File

@@ -172,7 +172,7 @@ windows_menu_display_remove (GimpContainer *container,
GimpUIManager *manager)
{
gchar *merge_key = g_strdup_printf ("windows-display-%04d-merge-id",
gimp_display_get_ID (display));
gimp_display_get_id (display));
guint merge_id;
merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
@@ -224,7 +224,7 @@ windows_menu_image_notify (GimpDisplay *display,
if (gimp_display_get_image (display))
{
gchar *merge_key = g_strdup_printf ("windows-display-%04d-merge-id",
gimp_display_get_ID (display));
gimp_display_get_id (display));
guint merge_id;
merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),

2
app/pdb/fileops-cmds.c
View File

@@ -229,7 +229,7 @@ file_load_layers_invoker (GimpProcedure *procedure,
for (i = 0, list = layers;
i < num_layers;
i++, list = g_list_next (list))
layer_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
layer_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
g_list_free (layers);
}

58
app/pdb/gimppdb-utils.c
View File

@@ -442,7 +442,7 @@ gimp_pdb_item_is_attached (GimpItem *item,
_("Item '%s' (%d) cannot be used because it has not "
"been added to an image"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -452,7 +452,7 @@ gimp_pdb_item_is_attached (GimpItem *item,
_("Item '%s' (%d) cannot be used because it is "
"attached to another image"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -478,7 +478,7 @@ gimp_pdb_item_is_in_tree (GimpItem *item,
_("Item '%s' (%d) cannot be used because it is not "
"a direct child of an item tree"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -506,9 +506,9 @@ gimp_pdb_item_is_in_same_tree (GimpItem *item,
_("Items '%s' (%d) and '%s' (%d) cannot be used "
"because they are not part of the same item tree"),
gimp_object_get_name (item),
gimp_item_get_ID (item),
gimp_item_get_id (item),
gimp_object_get_name (item2),
gimp_item_get_ID (item2));
gimp_item_get_id (item2));
return FALSE;
}
@@ -531,9 +531,9 @@ gimp_pdb_item_is_not_ancestor (GimpItem *item,
_("Item '%s' (%d) must not be an ancestor of "
"'%s' (%d)"),
gimp_object_get_name (item),
gimp_item_get_ID (item),
gimp_item_get_id (item),
gimp_object_get_name (not_descendant),
gimp_item_get_ID (not_descendant));
gimp_item_get_id (not_descendant));
return FALSE;
}
@@ -554,7 +554,7 @@ gimp_pdb_item_is_floating (GimpItem *item,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Item '%s' (%d) has already been added to an image"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
else if (gimp_item_get_image (item) != dest_image)
@@ -562,7 +562,7 @@ gimp_pdb_item_is_floating (GimpItem *item,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Trying to add item '%s' (%d) to wrong image"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -590,7 +590,7 @@ gimp_pdb_item_is_modifiable (GimpItem *item,
_("Item '%s' (%d) cannot be modified because its "
"contents are locked"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -600,7 +600,7 @@ gimp_pdb_item_is_modifiable (GimpItem *item,
_("Item '%s' (%d) cannot be modified because its "
"position and size are locked"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -620,7 +620,7 @@ gimp_pdb_item_is_group (GimpItem *item,
_("Item '%s' (%d) cannot be used because it is "
"not a group item"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -640,7 +640,7 @@ gimp_pdb_item_is_not_group (GimpItem *item,
_("Item '%s' (%d) cannot be modified because it "
"is a group item"),
gimp_object_get_name (item),
gimp_item_get_ID (item));
gimp_item_get_id (item));
return FALSE;
}
@@ -661,7 +661,7 @@ gimp_pdb_layer_is_text_layer (GimpLayer *layer,
_("Layer '%s' (%d) cannot be used because it is not "
"a text layer"),
gimp_object_get_name (layer),
gimp_item_get_ID (GIMP_ITEM (layer)));
gimp_item_get_id (GIMP_ITEM (layer)));
return FALSE;
}
@@ -702,7 +702,7 @@ gimp_pdb_image_is_base_type (GimpImage *image,
_("Image '%s' (%d) is of type '%s', "
"but an image of type '%s' is expected"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
gimp_pdb_enum_value_get_nick (GIMP_TYPE_IMAGE_BASE_TYPE,
gimp_image_get_base_type (image)),
gimp_pdb_enum_value_get_nick (GIMP_TYPE_IMAGE_BASE_TYPE, type));
@@ -724,7 +724,7 @@ gimp_pdb_image_is_not_base_type (GimpImage *image,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) must not be of type '%s'"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
gimp_pdb_enum_value_get_nick (GIMP_TYPE_IMAGE_BASE_TYPE, type));
return FALSE;
@@ -745,7 +745,7 @@ gimp_pdb_image_is_precision (GimpImage *image,
_("Image '%s' (%d) has precision '%s', "
"but an image of precision '%s' is expected"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
gimp_pdb_enum_value_get_nick (GIMP_TYPE_PRECISION,
gimp_image_get_precision (image)),
gimp_pdb_enum_value_get_nick (GIMP_TYPE_PRECISION, precision));
@@ -767,7 +767,7 @@ gimp_pdb_image_is_not_precision (GimpImage *image,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) must not be of precision '%s'"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
gimp_pdb_enum_value_get_nick (GIMP_TYPE_PRECISION, precision));
return FALSE;
@@ -775,7 +775,7 @@ gimp_pdb_image_is_not_precision (GimpImage *image,
GimpGuide *
gimp_pdb_image_get_guide (GimpImage *image,
gint guide_ID,
gint guide_id,
GError **error)
{
GimpGuide *guide;
@@ -783,7 +783,7 @@ gimp_pdb_image_get_guide (GimpImage *image,
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
guide = gimp_image_get_guide (image, guide_ID);
guide = gimp_image_get_guide (image, guide_id);
if (guide)
return guide;
@@ -791,14 +791,14 @@ gimp_pdb_image_get_guide (GimpImage *image,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) does not contain guide with ID %d"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
guide_ID);
gimp_image_get_id (image),
guide_id);
return NULL;
}
GimpSamplePoint *
gimp_pdb_image_get_sample_point (GimpImage *image,
gint sample_point_ID,
gint sample_point_id,
GError **error)
{
GimpSamplePoint *sample_point;
@@ -806,7 +806,7 @@ gimp_pdb_image_get_sample_point (GimpImage *image,
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
sample_point = gimp_image_get_sample_point (image, sample_point_ID);
sample_point = gimp_image_get_sample_point (image, sample_point_id);
if (sample_point)
return sample_point;
@@ -814,14 +814,14 @@ gimp_pdb_image_get_sample_point (GimpImage *image,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) does not contain sample point with ID %d"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
sample_point_ID);
gimp_image_get_id (image),
sample_point_id);
return NULL;
}
GimpStroke *
gimp_pdb_get_vectors_stroke (GimpVectors *vectors,
gint stroke_ID,
gint stroke_id,
GimpPDBItemModify modify,
GError **error)
{
@@ -836,12 +836,12 @@ gimp_pdb_get_vectors_stroke (GimpVectors *vectors,
if (! modify || gimp_pdb_item_is_modifiable (GIMP_ITEM (vectors),
modify, error))
{
stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_ID);
stroke = gimp_vectors_stroke_get_by_id (vectors, stroke_id);
if (! stroke)
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Vectors object %d does not contain stroke with ID %d"),
gimp_item_get_ID (GIMP_ITEM (vectors)), stroke_ID);
gimp_item_get_id (GIMP_ITEM (vectors)), stroke_id);
}
return stroke;

6
app/pdb/gimppdb-utils.h
View File

@@ -101,15 +101,15 @@ gboolean gimp_pdb_image_is_not_precision (GimpImage *image,
GError **error);
GimpGuide * gimp_pdb_image_get_guide (GimpImage *image,
gint guide_ID,
gint guide_id,
GError **error);
GimpSamplePoint *
gimp_pdb_image_get_sample_point (GimpImage *image,
gint sample_point_ID,
gint sample_point_id,
GError **error);
GimpStroke * gimp_pdb_get_vectors_stroke (GimpVectors *vectors,
gint stroke_ID,
gint stroke_id,
GimpPDBItemModify modify,
GError **error);

8
app/pdb/image-cmds.c
View File

@@ -123,7 +123,7 @@ image_list_invoker (GimpProcedure *procedure,
image_ids = g_new (gint32, num_images);
for (i = 0; i < num_images; i++, list = g_list_next (list))
image_ids[i] = gimp_image_get_ID (GIMP_IMAGE (list->data));
image_ids[i] = gimp_image_get_id (GIMP_IMAGE (list->data));
}
return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
@@ -445,7 +445,7 @@ image_get_layers_invoker (GimpProcedure *procedure,
layer_ids = g_new (gint32, num_layers);
for (i = 0; i < num_layers; i++, list = g_list_next (list))
layer_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
layer_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}
@@ -490,7 +490,7 @@ image_get_channels_invoker (GimpProcedure *procedure,
channel_ids = g_new (gint32, num_channels);
for (i = 0; i < num_channels; i++, list = g_list_next (list))
channel_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
channel_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}
@@ -535,7 +535,7 @@ image_get_vectors_invoker (GimpProcedure *procedure,
vector_ids = g_new (gint32, num_vectors);
for (i = 0; i < num_vectors; i++, list = g_list_next (list))
vector_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
vector_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}

8
app/pdb/image-guides-cmds.c
View File

@@ -67,7 +67,7 @@ image_add_hguide_invoker (GimpProcedure *procedure,
GimpGuide *g;
g = gimp_image_add_hguide (image, yposition, TRUE);
guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
guide = gimp_aux_item_get_id (GIMP_AUX_ITEM (g));
}
else
success = FALSE;
@@ -106,7 +106,7 @@ image_add_vguide_invoker (GimpProcedure *procedure,
GimpGuide *g;
g = gimp_image_add_vguide (image, xposition, TRUE);
guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
guide = gimp_aux_item_get_id (GIMP_AUX_ITEM (g));
}
else
success = FALSE;
@@ -172,13 +172,13 @@ image_find_next_guide_invoker (GimpProcedure *procedure,
GimpGuide *g = gimp_image_get_next_guide (image, guide, &success);
if (g)
next_guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
next_guide = gimp_aux_item_get_id (GIMP_AUX_ITEM (g));
if (! success)
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) does not contain guide with ID %d"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
guide);
}

6
app/pdb/image-sample-points-cmds.c
View File

@@ -69,7 +69,7 @@ image_add_sample_point_invoker (GimpProcedure *procedure,
sp = gimp_image_add_sample_point_at_pos (image, position_x, position_y,
TRUE);
sample_point = gimp_aux_item_get_ID (GIMP_AUX_ITEM (sp));
sample_point = gimp_aux_item_get_id (GIMP_AUX_ITEM (sp));
}
else
success = FALSE;
@@ -137,13 +137,13 @@ image_find_next_sample_point_invoker (GimpProcedure *procedure,
&success);
if (sp)
next_sample_point = gimp_aux_item_get_ID (GIMP_AUX_ITEM (sp));
next_sample_point = gimp_aux_item_get_id (GIMP_AUX_ITEM (sp));
if (! success)
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) does not contain sample point with ID %d"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
sample_point);
}

2
app/pdb/item-cmds.c
View File

@@ -423,7 +423,7 @@ item_get_children_invoker (GimpProcedure *procedure,
list;
list = g_list_next (list), i++)
{
child_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
child_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}
}

12
app/pdb/vectors-cmds.c
View File

@@ -190,7 +190,7 @@ vectors_get_strokes_invoker (GimpProcedure *procedure,
cur_stroke;
cur_stroke = gimp_vectors_stroke_get_next (vectors, cur_stroke))
{
stroke_ids[i] = gimp_stroke_get_ID (cur_stroke);
stroke_ids[i] = gimp_stroke_get_id (cur_stroke);
i++;
}
}
@@ -730,7 +730,7 @@ vectors_stroke_new_from_points_invoker (GimpProcedure *procedure,
gimp_vectors_stroke_add (vectors, stroke);
g_object_unref (stroke);
stroke_id = gimp_stroke_get_ID (stroke);
stroke_id = gimp_stroke_get_id (stroke);
success = TRUE;
}
@@ -854,7 +854,7 @@ vectors_bezier_stroke_new_moveto_invoker (GimpProcedure *procedure,
gimp_vectors_stroke_add (vectors, stroke);
g_object_unref (stroke);
stroke_id = gimp_stroke_get_ID (stroke);
stroke_id = gimp_stroke_get_id (stroke);
}
else
success = FALSE;
@@ -1084,7 +1084,7 @@ vectors_bezier_stroke_new_ellipse_invoker (GimpProcedure *procedure,
gimp_vectors_stroke_add (vectors, stroke);
g_object_unref (stroke);
stroke_id = gimp_stroke_get_ID (stroke);
stroke_id = gimp_stroke_get_id (stroke);
}
else
success = FALSE;
@@ -1146,7 +1146,7 @@ vectors_import_from_file_invoker (GimpProcedure *procedure,
list = vectors_list;
for (i = 0; i < num_vectors; i++, list = g_list_next (list))
vectors_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
vectors_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
g_list_free (vectors_list);
}
@@ -1210,7 +1210,7 @@ vectors_import_from_string_invoker (GimpProcedure *procedure,
list = vectors_list;
for (i = 0; i < num_vectors; i++, list = g_list_next (list))
vectors_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
vectors_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
g_list_free (vectors_list);
}

16
app/plug-in/gimpplugin-cleanup.c
View File

@@ -45,7 +45,7 @@ typedef struct _GimpPlugInCleanupImage GimpPlugInCleanupImage;
struct _GimpPlugInCleanupImage
{
GimpImage *image;
gint image_ID;
gint image_id;
gint undo_group_count;
gint layers_freeze_count;
@@ -59,7 +59,7 @@ typedef struct _GimpPlugInCleanupItem GimpPlugInCleanupItem;
struct _GimpPlugInCleanupItem
{
GimpItem *item;
gint item_ID;
gint item_id;
gboolean shadow_buffer;
};
@@ -357,8 +357,8 @@ gimp_plug_in_cleanup (GimpPlugIn *plug_in,
{
GimpPlugInCleanupImage *cleanup = proc_frame->image_cleanups->data;
if (gimp_image_get_by_ID (plug_in->manager->gimp,
cleanup->image_ID) == cleanup->image)
if (gimp_image_get_by_id (plug_in->manager->gimp,
cleanup->image_id) == cleanup->image)
{
gimp_plug_in_cleanup_image (proc_frame, cleanup);
}
@@ -370,8 +370,8 @@ gimp_plug_in_cleanup (GimpPlugIn *plug_in,
{
GimpPlugInCleanupItem *cleanup = proc_frame->item_cleanups->data;
if (gimp_item_get_by_ID (plug_in->manager->gimp,
cleanup->item_ID) == cleanup->item)
if (gimp_item_get_by_id (plug_in->manager->gimp,
cleanup->item_id) == cleanup->item)
{
gimp_plug_in_cleanup_item (proc_frame, cleanup);
}
@@ -390,7 +390,7 @@ gimp_plug_in_cleanup_image_new (GimpPlugInProcFrame *proc_frame,
GimpPlugInCleanupImage *cleanup = g_slice_new0 (GimpPlugInCleanupImage);
cleanup->image = image;
cleanup->image_ID = gimp_image_get_ID (image);
cleanup->image_id = gimp_image_get_id (image);
proc_frame->image_cleanups = g_list_prepend (proc_frame->image_cleanups,
cleanup);
@@ -514,7 +514,7 @@ gimp_plug_in_cleanup_item_new (GimpPlugInProcFrame *proc_frame,
GimpPlugInCleanupItem *cleanup = g_slice_new0 (GimpPlugInCleanupItem);
cleanup->item = item;
cleanup->item_ID = gimp_item_get_ID (item);
cleanup->item_id = gimp_item_get_id (item);
proc_frame->item_cleanups = g_list_remove (proc_frame->item_cleanups,
cleanup);

26
app/plug-in/gimpplugin-message.c
View File

@@ -178,7 +178,7 @@ gimp_plug_in_handle_tile_request (GimpPlugIn *plug_in,
{
g_return_if_fail (request != NULL);
if (request->drawable_ID == -1)
if (request->drawable_id == -1)
gimp_plug_in_handle_tile_put (plug_in, request);
else
gimp_plug_in_handle_tile_get (plug_in, request);
@@ -196,7 +196,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
const Babl *format;
GeglRectangle tile_rect;
tile_data.drawable_ID = -1;
tile_data.drawable_id = -1;
tile_data.tile_num = 0;
tile_data.shadow = 0;
tile_data.bpp = 0;
@@ -231,8 +231,8 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
tile_info = msg.data;
drawable = (GimpDrawable *) gimp_item_get_by_ID (plug_in->manager->gimp,
tile_info->drawable_ID);
drawable = (GimpDrawable *) gimp_item_get_by_id (plug_in->manager->gimp,
tile_info->drawable_id);
if (! GIMP_IS_DRAWABLE (drawable))
{
@@ -241,7 +241,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
"tried writing to invalid drawable %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
tile_info->drawable_ID);
tile_info->drawable_id);
gimp_plug_in_close (plug_in, TRUE);
return;
}
@@ -253,7 +253,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
"from the image (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
tile_info->drawable_ID);
tile_info->drawable_id);
gimp_plug_in_close (plug_in, TRUE);
return;
}
@@ -279,7 +279,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
"tried writing to a locked drawable %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
tile_info->drawable_ID);
tile_info->drawable_id);
gimp_plug_in_close (plug_in, TRUE);
return;
}
@@ -290,7 +290,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
"tried writing to a group layer %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
tile_info->drawable_ID);
tile_info->drawable_id);
gimp_plug_in_close (plug_in, TRUE);
return;
}
@@ -351,8 +351,8 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
GeglRectangle tile_rect;
gint tile_size;
drawable = (GimpDrawable *) gimp_item_get_by_ID (plug_in->manager->gimp,
request->drawable_ID);
drawable = (GimpDrawable *) gimp_item_get_by_id (plug_in->manager->gimp,
request->drawable_id);
if (! GIMP_IS_DRAWABLE (drawable))
{
@@ -361,7 +361,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
"tried reading from invalid drawable %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
request->drawable_ID);
request->drawable_id);
gimp_plug_in_close (plug_in, TRUE);
return;
}
@@ -373,7 +373,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
"from the image (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
request->drawable_ID);
request->drawable_id);
gimp_plug_in_close (plug_in, TRUE);
return;
}
@@ -409,7 +409,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
tile_size = (babl_format_get_bytes_per_pixel (format) *
tile_rect.width * tile_rect.height);
tile_data.drawable_ID = request->drawable_ID;
tile_data.drawable_id = request->drawable_id;
tile_data.tile_num = request->tile_num;
tile_data.shadow = request->shadow;
tile_data.bpp = babl_format_get_bytes_per_pixel (format);

12
app/plug-in/gimppluginmanager-call.c
View File

@@ -173,7 +173,7 @@ gimp_plug_in_manager_call_run (GimpPlugInManager *manager,
GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (core_config);
GPConfig config;
GPProcRun proc_run;
gint display_ID;
gint display_id;
GObject *monitor;
GFile *icon_theme_dir;
@@ -194,14 +194,14 @@ gimp_plug_in_manager_call_run (GimpPlugInManager *manager,
return return_vals;
}
display_ID = display ? gimp_get_display_ID (manager->gimp, display) : -1;
display_id = display ? gimp_get_display_id (manager->gimp, display) : -1;
icon_theme_dir = gimp_get_icon_theme_dir (manager->gimp);
config.tile_width = GIMP_PLUG_IN_TILE_WIDTH;
config.tile_height = GIMP_PLUG_IN_TILE_HEIGHT;
config.shm_ID = (manager->shm ?
gimp_plug_in_shm_get_ID (manager->shm) : -1);
config.shm_id = (manager->shm ?
gimp_plug_in_shm_get_id (manager->shm) : -1);
config.check_size = display_config->transparency_size;
config.check_type = display_config->transparency_type;
config.show_help_button = (gui_config->use_help &&
@@ -212,11 +212,11 @@ gimp_plug_in_manager_call_run (GimpPlugInManager *manager,
config.export_exif = core_config->export_metadata_exif;
config.export_xmp = core_config->export_metadata_xmp;
config.export_iptc = core_config->export_metadata_iptc;
config.gdisp_ID = display_ID;
config.gdisp_id = display_id;
config.app_name = (gchar *) g_get_application_name ();
config.wm_class = (gchar *) gimp_get_program_class (manager->gimp);
config.display_name = gimp_get_display_name (manager->gimp,
display_ID,
display_id,
&monitor,
&config.monitor_number);
config.timestamp = gimp_get_user_time (manager->gimp);

36
app/plug-in/gimppluginshm.c
View File

@@ -78,7 +78,7 @@
struct _GimpPlugInShm
{
gint shm_ID;
gint shm_id;
guchar *shm_addr;
#if defined(USE_WIN32_SHM)
@@ -97,29 +97,29 @@ gimp_plug_in_shm_new (void)
GimpPlugInShm *shm = g_slice_new0 (GimpPlugInShm);
shm->shm_ID = -1;
shm->shm_id = -1;
#if defined(USE_SYSV_SHM)
/* Use SysV shared memory mechanisms for transferring tile data. */
{
shm->shm_ID = shmget (IPC_PRIVATE, TILE_MAP_SIZE, IPC_CREAT | 0600);
shm->shm_id = shmget (IPC_PRIVATE, TILE_MAP_SIZE, IPC_CREAT | 0600);
if (shm->shm_ID != -1)
if (shm->shm_id != -1)
{
shm->shm_addr = (guchar *) shmat (shm->shm_ID, NULL, 0);
shm->shm_addr = (guchar *) shmat (shm->shm_id, NULL, 0);
if (shm->shm_addr == (guchar *) -1)
{
g_printerr ("shmat() failed: %s\n" ERRMSG_SHM_DISABLE,
g_strerror (errno));
shmctl (shm->shm_ID, IPC_RMID, NULL);
shm->shm_ID = -1;
shmctl (shm->shm_id, IPC_RMID, NULL);
shm->shm_id = -1;
}
#ifdef IPC_RMID_DEFERRED_RELEASE
if (shm->shm_addr != (guchar *) -1)
shmctl (shm->shm_ID, IPC_RMID, NULL);
shmctl (shm->shm_id, IPC_RMID, NULL);
#endif
}
else
@@ -158,7 +158,7 @@ gimp_plug_in_shm_new (void)
/* Verify that we mapped our view */
if (shm->shm_addr)
{
shm->shm_ID = pid;
shm->shm_id = pid;
}
else
{
@@ -202,7 +202,7 @@ gimp_plug_in_shm_new (void)
/* Verify that we mapped our view */
if (shm->shm_addr != MAP_FAILED)
{
shm->shm_ID = pid;
shm->shm_id = pid;
}
else
{
@@ -231,14 +231,14 @@ gimp_plug_in_shm_new (void)
#endif
if (shm->shm_ID == -1)
if (shm->shm_id == -1)
{
g_slice_free (GimpPlugInShm, shm);
shm = NULL;
}
else
{
GIMP_LOG (SHM, "attached shared memory segment ID = %d", shm->shm_ID);
GIMP_LOG (SHM, "attached shared memory segment ID = %d", shm->shm_id);
}
return shm;
@@ -249,7 +249,7 @@ gimp_plug_in_shm_free (GimpPlugInShm *shm)
{
g_return_if_fail (shm != NULL);
if (shm->shm_ID != -1)
if (shm->shm_id != -1)
{
#if defined (USE_SYSV_SHM)
@@ -257,7 +257,7 @@ gimp_plug_in_shm_free (GimpPlugInShm *shm)
shmdt (shm->shm_addr);
#ifndef IPC_RMID_DEFERRED_RELEASE
shmctl (shm->shm_ID, IPC_RMID, NULL);
shmctl (shm->shm_id, IPC_RMID, NULL);
#endif
#elif defined(USE_WIN32_SHM)
@@ -272,24 +272,24 @@ gimp_plug_in_shm_free (GimpPlugInShm *shm)
munmap (shm->shm_addr, TILE_MAP_SIZE);
g_snprintf (shm_handle, sizeof (shm_handle), "/gimp-shm-%d",
shm->shm_ID);
shm->shm_id);
shm_unlink (shm_handle);
#endif
GIMP_LOG (SHM, "detached shared memory segment ID = %d", shm->shm_ID);
GIMP_LOG (SHM, "detached shared memory segment ID = %d", shm->shm_id);
}
g_slice_free (GimpPlugInShm, shm);
}
gint
gimp_plug_in_shm_get_ID (GimpPlugInShm *shm)
gimp_plug_in_shm_get_id (GimpPlugInShm *shm)
{
g_return_val_if_fail (shm != NULL, -1);
return shm->shm_ID;
return shm->shm_id;
}
guchar *

2
app/plug-in/gimppluginshm.h
View File

@@ -24,7 +24,7 @@
GimpPlugInShm * gimp_plug_in_shm_new (void);
void gimp_plug_in_shm_free (GimpPlugInShm *shm);
gint gimp_plug_in_shm_get_ID (GimpPlugInShm *shm);
gint gimp_plug_in_shm_get_id (GimpPlugInShm *shm);
guchar * gimp_plug_in_shm_get_addr (GimpPlugInShm *shm);

2
app/tools/gimpfiltertool.c
View File

@@ -1257,7 +1257,7 @@ gimp_filter_tool_add_guide (GimpFilterTool *filter_tool)
filter_tool->preview_guide =
gimp_guide_custom_new (orientation,
image->gimp->next_guide_ID++,
image->gimp->next_guide_id++,
GIMP_GUIDE_STYLE_SPLIT_VIEW);
gimp_image_add_guide (image, filter_tool->preview_guide, position);

12
app/vectors/gimpstroke.c
View File

@@ -357,21 +357,21 @@ gimp_stroke_get_memsize (GimpObject *object,
}
void
gimp_stroke_set_ID (GimpStroke *stroke,
gimp_stroke_set_id (GimpStroke *stroke,
gint id)
{
g_return_if_fail (GIMP_IS_STROKE (stroke));
g_return_if_fail (stroke->ID == 0 /* we don't want changing IDs... */);
g_return_if_fail (stroke->id == 0 /* we don't want changing IDs... */);
stroke->ID = id;
stroke->id = id;
}
gint
gimp_stroke_get_ID (GimpStroke *stroke)
gimp_stroke_get_id (GimpStroke *stroke)
{
g_return_val_if_fail (GIMP_IS_STROKE (stroke), -1);
return stroke->ID;
return stroke->id;
}
@@ -1193,7 +1193,7 @@ gimp_stroke_real_transform (GimpStroke *stroke,
if (ret_strokes)
{
stroke->ID = 0;
stroke->id = 0;
g_queue_push_tail (ret_strokes, g_object_ref (stroke));
}

6
app/vectors/gimpstroke.h
View File

@@ -37,7 +37,7 @@ typedef struct _GimpStrokeClass GimpStrokeClass;
struct _GimpStroke
{
GimpObject parent_instance;
gint ID;
gint id;
GQueue *anchors;
@@ -182,9 +182,9 @@ struct _GimpStrokeClass
GType gimp_stroke_get_type (void) G_GNUC_CONST;
void gimp_stroke_set_ID (GimpStroke *stroke,
void gimp_stroke_set_id (GimpStroke *stroke,
gint id);
gint gimp_stroke_get_ID (GimpStroke *stroke);
gint gimp_stroke_get_id (GimpStroke *stroke);
/* accessing / modifying the anchors */

20
app/vectors/gimpvectors.c
View File

@@ -269,7 +269,7 @@ gimp_vectors_init (GimpVectors *vectors)
vectors->strokes = g_queue_new ();
vectors->stroke_to_list = g_hash_table_new (g_direct_hash, g_direct_equal);
vectors->last_stroke_ID = 0;
vectors->last_stroke_id = 0;
vectors->freeze_count = 0;
vectors->precision = 0.2;
@@ -640,7 +640,7 @@ gimp_vectors_transform (GimpItem *item,
g_object_unref (stroke);
}
vectors->last_stroke_ID = 0;
vectors->last_stroke_id = 0;
for (list = strokes.head; list; list = g_list_next (list))
{
@@ -842,7 +842,7 @@ gimp_vectors_copy_strokes (GimpVectors *src_vectors,
dest_vectors->strokes = g_queue_new ();
g_hash_table_remove_all (dest_vectors->stroke_to_list);
dest_vectors->last_stroke_ID = 0;
dest_vectors->last_stroke_id = 0;
gimp_vectors_add_strokes (src_vectors, dest_vectors);
@@ -874,9 +874,9 @@ gimp_vectors_add_strokes (GimpVectors *src_vectors,
newstroke,
g_queue_peek_tail_link (dest_vectors->strokes));
dest_vectors->last_stroke_ID++;
gimp_stroke_set_ID (newstroke,
dest_vectors->last_stroke_ID);
dest_vectors->last_stroke_id++;
gimp_stroke_set_id (newstroke,
dest_vectors->last_stroke_id);
}
gimp_vectors_thaw (dest_vectors);
@@ -912,8 +912,8 @@ gimp_vectors_real_stroke_add (GimpVectors *vectors,
stroke,
g_queue_peek_tail_link (vectors->strokes));
vectors->last_stroke_ID++;
gimp_stroke_set_ID (stroke, vectors->last_stroke_ID);
vectors->last_stroke_id++;
gimp_stroke_set_id (stroke, vectors->last_stroke_id);
}
void
@@ -992,7 +992,7 @@ gimp_vectors_real_stroke_get (GimpVectors *vectors,
}
GimpStroke *
gimp_vectors_stroke_get_by_ID (GimpVectors *vectors,
gimp_vectors_stroke_get_by_id (GimpVectors *vectors,
gint id)
{
GList *list;
@@ -1001,7 +1001,7 @@ gimp_vectors_stroke_get_by_ID (GimpVectors *vectors,
for (list = vectors->strokes->head; list; list = g_list_next (list))
{
if (gimp_stroke_get_ID (list->data) == id)
if (gimp_stroke_get_id (list->data) == id)
return list->data;
}

4
app/vectors/gimpvectors.h
View File

@@ -39,7 +39,7 @@ struct _GimpVectors
GQueue *strokes; /* Queue of GimpStrokes */
GHashTable *stroke_to_list; /* Map from GimpStroke to strokes listnode */
gint last_stroke_ID;
gint last_stroke_id;
gint freeze_count;
gdouble precision;
@@ -151,7 +151,7 @@ void gimp_vectors_stroke_remove (GimpVectors *vectors,
gint gimp_vectors_get_n_strokes (GimpVectors *vectors);
GimpStroke * gimp_vectors_stroke_get (GimpVectors *vectors,
const GimpCoords *coord);
GimpStroke * gimp_vectors_stroke_get_by_ID (GimpVectors *vectors,
GimpStroke * gimp_vectors_stroke_get_by_id (GimpVectors *vectors,
gint id);
/* prev == NULL: "first" stroke */

12
app/widgets/gimpselectiondata.c
View File

@@ -491,7 +491,7 @@ gimp_selection_data_set_image (GtkSelectionData *selection,
g_return_if_fail (selection != NULL);
g_return_if_fail (GIMP_IS_IMAGE (image));
str = g_strdup_printf ("%d:%d", gimp_get_pid (), gimp_image_get_ID (image));
str = g_strdup_printf ("%d:%d", gimp_get_pid (), gimp_image_get_id (image));
gtk_selection_data_set (selection,
gtk_selection_data_get_target (selection),
@@ -519,7 +519,7 @@ gimp_selection_data_get_image (GtkSelectionData *selection,
if (sscanf (str, "%i:%i", &pid, &ID) == 2 &&
pid == gimp_get_pid ())
{
return gimp_image_get_by_ID (gimp, ID);
return gimp_image_get_by_id (gimp, ID);
}
}
@@ -536,7 +536,7 @@ gimp_selection_data_set_component (GtkSelectionData *selection,
g_return_if_fail (selection != NULL);
g_return_if_fail (GIMP_IS_IMAGE (image));
str = g_strdup_printf ("%d:%d:%d", gimp_get_pid (), gimp_image_get_ID (image),
str = g_strdup_printf ("%d:%d:%d", gimp_get_pid (), gimp_image_get_id (image),
(gint) channel);
gtk_selection_data_set (selection,
@@ -570,7 +570,7 @@ gimp_selection_data_get_component (GtkSelectionData *selection,
if (sscanf (str, "%i:%i:%i", &pid, &ID, &ch) == 3 &&
pid == gimp_get_pid ())
{
GimpImage *image = gimp_image_get_by_ID (gimp, ID);
GimpImage *image = gimp_image_get_by_id (gimp, ID);
if (image && channel)
*channel = ch;
@@ -591,7 +591,7 @@ gimp_selection_data_set_item (GtkSelectionData *selection,
g_return_if_fail (selection != NULL);
g_return_if_fail (GIMP_IS_ITEM (item));
str = g_strdup_printf ("%d:%d", gimp_get_pid (), gimp_item_get_ID (item));
str = g_strdup_printf ("%d:%d", gimp_get_pid (), gimp_item_get_id (item));
gtk_selection_data_set (selection,
gtk_selection_data_get_target (selection),
@@ -619,7 +619,7 @@ gimp_selection_data_get_item (GtkSelectionData *selection,
if (sscanf (str, "%i:%i", &pid, &ID) == 2 &&
pid == gimp_get_pid ())
{
return gimp_item_get_by_ID (gimp, ID);
return gimp_item_get_by_id (gimp, ID);
}
}

2
app/widgets/gimpviewabledialog.c
View File

@@ -368,7 +368,7 @@ gimp_viewable_dialog_name_changed (GimpObject *object,
tmp = name;
name = g_strdup_printf ("%s-%d (%s)",
tmp,
gimp_item_get_ID (GIMP_ITEM (object)),
gimp_item_get_id (GIMP_ITEM (object)),
gimp_image_get_display_name (image));
g_free (tmp);
}

8
libgimp/gimp.c
View File

@@ -150,7 +150,7 @@ static gboolean _export_xmp = FALSE;
static gboolean _export_iptc = FALSE;
static GimpCheckSize _check_size = GIMP_CHECK_SIZE_MEDIUM_CHECKS;
static GimpCheckType _check_type = GIMP_CHECK_TYPE_GRAY_CHECKS;
static gint _gdisp_ID = -1;
static gint _gdisp_id = -1;
static gchar *_wm_class = NULL;
static gchar *_display_name = NULL;
static gint _monitor_number = 0;
@@ -842,7 +842,7 @@ gimp_check_type (void)
GimpDisplay *
gimp_default_display (void)
{
return gimp_display_get_by_id (_gdisp_ID);
return gimp_display_get_by_id (_gdisp_id);
}
/**
@@ -1139,7 +1139,7 @@ _gimp_config (GPConfig *config)
_export_exif = config->export_exif ? TRUE : FALSE;
_export_xmp = config->export_xmp ? TRUE : FALSE;
_export_iptc = config->export_iptc ? TRUE : FALSE;
_gdisp_ID = config->gdisp_ID;
_gdisp_id = config->gdisp_id;
_wm_class = g_strdup (config->wm_class);
_display_name = g_strdup (config->display_name);
_monitor_number = config->monitor_number;
@@ -1165,5 +1165,5 @@ _gimp_config (GPConfig *config)
g_free (path);
g_object_unref (file);
_gimp_shm_open (config->shm_ID);
_gimp_shm_open (config->shm_id);
}

10
libgimp/gimptilebackendplugin.c
View File

@@ -333,7 +333,7 @@ gimp_tile_get (GimpTileBackendPlugin *backend_plugin,
GPTileData *tile_data;
GimpWireMessage msg;
tile_req.drawable_ID = priv->drawable_id;
tile_req.drawable_id = priv->drawable_id;
tile_req.tile_num = tile->tile_num;
tile_req.shadow = priv->shadow;
@@ -355,7 +355,7 @@ gimp_tile_get (GimpTileBackendPlugin *backend_plugin,
}
tile_data = msg.data;
if (tile_data->drawable_ID != priv->drawable_id ||
if (tile_data->drawable_id != priv->drawable_id ||
tile_data->tile_num != tile->tile_num ||
tile_data->shadow != priv->shadow ||
tile_data->width != tile->ewidth ||
@@ -365,7 +365,7 @@ gimp_tile_get (GimpTileBackendPlugin *backend_plugin,
#if 0
g_printerr ("tile_data: %d %d %d %d %d %d\n"
"tile: %d %d %d %d %d %d\n",
tile_data->drawable_ID,
tile_data->drawable_id,
tile_data->tile_num,
tile_data->shadow,
tile_data->width,
@@ -419,7 +419,7 @@ gimp_tile_put (GimpTileBackendPlugin *backend_plugin,
GPTileData *tile_info;
GimpWireMessage msg;
tile_req.drawable_ID = -1;
tile_req.drawable_id = -1;
tile_req.tile_num = 0;
tile_req.shadow = 0;
@@ -441,7 +441,7 @@ gimp_tile_put (GimpTileBackendPlugin *backend_plugin,
tile_info = msg.data;
tile_data.drawable_ID = priv->drawable_id;
tile_data.drawable_id = priv->drawable_id;
tile_data.tile_num = tile->tile_num;
tile_data.shadow = priv->shadow;
tile_data.bpp = priv->bpp;

16
libgimpbase/gimpprotocol.c
View File

@@ -485,7 +485,7 @@ _gp_config_read (GIOChannel *channel,
&config->tile_height, 1, user_data))
goto cleanup;
if (! _gimp_wire_read_int32 (channel,
(guint32 *) &config->shm_ID, 1, user_data))
(guint32 *) &config->shm_id, 1, user_data))
goto cleanup;
if (! _gimp_wire_read_int8 (channel,
(guint8 *) &config->check_size, 1, user_data))
@@ -522,7 +522,7 @@ _gp_config_read (GIOChannel *channel,
user_data))
goto cleanup;
if (! _gimp_wire_read_int32 (channel,
(guint32 *) &config->gdisp_ID, 1, user_data))
(guint32 *) &config->gdisp_id, 1, user_data))
goto cleanup;
if (! _gimp_wire_read_string (channel,
@@ -581,7 +581,7 @@ _gp_config_write (GIOChannel *channel,
&config->tile_height, 1, user_data))
return;
if (! _gimp_wire_write_int32 (channel,
(const guint32 *) &config->shm_ID, 1,
(const guint32 *) &config->shm_id, 1,
user_data))
return;
if (! _gimp_wire_write_int8 (channel,
@@ -621,7 +621,7 @@ _gp_config_write (GIOChannel *channel,
user_data))
return;
if (! _gimp_wire_write_int32 (channel,
(const guint32 *) &config->gdisp_ID, 1,
(const guint32 *) &config->gdisp_id, 1,
user_data))
return;
if (! _gimp_wire_write_string (channel,
@@ -682,7 +682,7 @@ _gp_tile_req_read (GIOChannel *channel,
GPTileReq *tile_req = g_slice_new0 (GPTileReq);
if (! _gimp_wire_read_int32 (channel,
(guint32 *) &tile_req->drawable_ID, 1,
(guint32 *) &tile_req->drawable_id, 1,
user_data))
goto cleanup;
if (! _gimp_wire_read_int32 (channel,
@@ -708,7 +708,7 @@ _gp_tile_req_write (GIOChannel *channel,
GPTileReq *tile_req = msg->data;
if (! _gimp_wire_write_int32 (channel,
(const guint32 *) &tile_req->drawable_ID, 1,
(const guint32 *) &tile_req->drawable_id, 1,
user_data))
return;
if (! _gimp_wire_write_int32 (channel,
@@ -759,7 +759,7 @@ _gp_tile_data_read (GIOChannel *channel,
GPTileData *tile_data = g_slice_new0 (GPTileData);
if (! _gimp_wire_read_int32 (channel,
(guint32 *) &tile_data->drawable_ID, 1,
(guint32 *) &tile_data->drawable_id, 1,
user_data))
goto cleanup;
if (! _gimp_wire_read_int32 (channel,
@@ -810,7 +810,7 @@ _gp_tile_data_write (GIOChannel *channel,
GPTileData *tile_data = msg->data;
if (! _gimp_wire_write_int32 (channel,
(const guint32 *) &tile_data->drawable_ID, 1,
(const guint32 *) &tile_data->drawable_id, 1,
user_data))
return;
if (! _gimp_wire_write_int32 (channel,

8
libgimpbase/gimpprotocol.h
View File

@@ -100,7 +100,7 @@ struct _GPConfig
{
guint32 tile_width;
guint32 tile_height;
gint32 shm_ID;
gint32 shm_id;
gint8 check_size;
gint8 check_type;
gint8 show_help_button;
@@ -110,7 +110,7 @@ struct _GPConfig
gint8 export_exif;
gint8 export_xmp;
gint8 export_iptc;
gint32 gdisp_ID;
gint32 gdisp_id;
gchar *app_name;
gchar *wm_class;
gchar *display_name;
@@ -124,14 +124,14 @@ struct _GPConfig
struct _GPTileReq
{
gint32 drawable_ID;
gint32 drawable_id;
guint32 tile_num;
guint32 shadow;
};
struct _GPTileData
{
gint32 drawable_ID;
gint32 drawable_id;
guint32 tile_num;
guint32 shadow;
guint32 bpp;

2
pdb/groups/fileops.pdb
View File

@@ -237,7 +237,7 @@ HELP
for (i = 0, list = layers;
i < num_layers;
i++, list = g_list_next (list))
layer_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
layer_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
g_list_free (layers);
}

8
pdb/groups/image.pdb
View File

@@ -76,7 +76,7 @@ HELP
image_ids = g_new (gint32, num_images);
for (i = 0; i < num_images; i++, list = g_list_next (list))
image_ids[i] = gimp_image_get_ID (GIMP_IMAGE (list->data));
image_ids[i] = gimp_image_get_id (GIMP_IMAGE (list->data));
}
}
CODE
@@ -275,7 +275,7 @@ HELP
layer_ids = g_new (gint32, num_layers);
for (i = 0; i < num_layers; i++, list = g_list_next (list))
layer_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
layer_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}
CODE
@@ -321,7 +321,7 @@ HELP
channel_ids = g_new (gint32, num_channels);
for (i = 0; i < num_channels; i++, list = g_list_next (list))
channel_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
channel_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}
CODE
@@ -364,7 +364,7 @@ HELP
vector_ids = g_new (gint32, num_vectors);
for (i = 0; i < num_vectors; i++, list = g_list_next (list))
vector_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
vector_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}
CODE

8
pdb/groups/image_guides.pdb
View File

@@ -47,7 +47,7 @@ HELP
GimpGuide *g;
g = gimp_image_add_hguide (image, yposition, TRUE);
guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
guide = gimp_aux_item_get_id (GIMP_AUX_ITEM (g));
}
else
success = FALSE;
@@ -87,7 +87,7 @@ HELP
GimpGuide *g;
g = gimp_image_add_vguide (image, xposition, TRUE);
guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
guide = gimp_aux_item_get_id (GIMP_AUX_ITEM (g));
}
else
success = FALSE;
@@ -157,13 +157,13 @@ HELP
GimpGuide *g = gimp_image_get_next_guide (image, guide, &success);
if (g)
next_guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
next_guide = gimp_aux_item_get_id (GIMP_AUX_ITEM (g));
if (! success)
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) does not contain guide with ID %d"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
guide);
}
CODE

6
pdb/groups/image_sample_points.pdb
View File

@@ -51,7 +51,7 @@ HELP
sp = gimp_image_add_sample_point_at_pos (image, position_x, position_y,
TRUE);
sample_point = gimp_aux_item_get_ID (GIMP_AUX_ITEM (sp));
sample_point = gimp_aux_item_get_id (GIMP_AUX_ITEM (sp));
}
else
success = FALSE;
@@ -125,13 +125,13 @@ HELP
&success);
if (sp)
next_sample_point = gimp_aux_item_get_ID (GIMP_AUX_ITEM (sp));
next_sample_point = gimp_aux_item_get_id (GIMP_AUX_ITEM (sp));
if (! success)
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Image '%s' (%d) does not contain sample point with ID %d"),
gimp_image_get_display_name (image),
gimp_image_get_ID (image),
gimp_image_get_id (image),
sample_point);
}
CODE

2
pdb/groups/item.pdb
View File

@@ -409,7 +409,7 @@ HELP
list;
list = g_list_next (list), i++)
{
child_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
child_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
}
}
}

12
pdb/groups/vectors.pdb
View File

@@ -159,7 +159,7 @@ HELP
cur_stroke;
cur_stroke = gimp_vectors_stroke_get_next (vectors, cur_stroke))
{
stroke_ids[i] = gimp_stroke_get_ID (cur_stroke);
stroke_ids[i] = gimp_stroke_get_id (cur_stroke);
i++;
}
}
@@ -772,7 +772,7 @@ HELP
gimp_vectors_stroke_add (vectors, stroke);
g_object_unref (stroke);
stroke_id = gimp_stroke_get_ID (stroke);
stroke_id = gimp_stroke_get_id (stroke);
success = TRUE;
}
@@ -830,7 +830,7 @@ HELP
gimp_vectors_stroke_add (vectors, stroke);
g_object_unref (stroke);
stroke_id = gimp_stroke_get_ID (stroke);
stroke_id = gimp_stroke_get_id (stroke);
}
else
success = FALSE;
@@ -1065,7 +1065,7 @@ HELP
gimp_vectors_stroke_add (vectors, stroke);
g_object_unref (stroke);
stroke_id = gimp_stroke_get_ID (stroke);
stroke_id = gimp_stroke_get_id (stroke);
}
else
success = FALSE;
@@ -1130,7 +1130,7 @@ HELP
list = vectors_list;
for (i = 0; i < num_vectors; i++, list = g_list_next (list))
vectors_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
vectors_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
g_list_free (vectors_list);
}
@@ -1195,7 +1195,7 @@ HELP
list = vectors_list;
for (i = 0; i < num_vectors; i++, list = g_list_next (list))
vectors_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
vectors_ids[i] = gimp_item_get_id (GIMP_ITEM (list->data));
g_list_free (vectors_list);
}