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

app, devel-docs, libgimpbase: s/gimp_parasite_name/gimp_parasite_get_name/… 

… and s/gimp_parasite_flags/gimp_parasite_get_flags/

It is better to have a consistent API and the fact is that most
getter/setter functions use the _get|set_ naming, but these didn't.

I wondered if this was such a great idea to rename these anyway because
even though we are breaking API in GIMP 3, is it the best idea to rename
when no functional change happened? After discussing with Wormnest, we
still agreed it was still better to go for consistency rather than
regret later (and be stuck with these names for many more years).

Also this fixes these warnings:

> [649/1205] Generating gimp-3.0.vapi with a custom command
> Gimp-3.0.gir:24162.7-24162.56: warning: Field `Gimp.Parasite.flags' conflicts with method of the same name
> Gimp-3.0.gir:24318.7-24318.52: warning: Field `Gimp.Parasite.name' conflicts with method of the same name
This commit is contained in:
Jehan 2021-04-05 18:36:44 +02:00
parent b83988539b
commit 70a9576f27
14 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/gimpgrid.c
View File

@ -322,7 +322,7 @@ gimp_grid_from_parasite (const GimpParasite *parasite)
GError *error = NULL;
g_return_val_if_fail (parasite != NULL, NULL);
g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
g_return_val_if_fail (strcmp (gimp_parasite_get_name (parasite),
gimp_grid_parasite_name ()) == 0, NULL);
if (! gimp_parasite_get_data (parasite, NULL))

6
app/core/gimpimage-color-profile.c
View File

@ -191,7 +191,7 @@ gimp_image_validate_icc_parasite (GimpImage *image,
g_return_val_if_fail (icc_parasite != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (strcmp (gimp_parasite_name (icc_parasite),
if (strcmp (gimp_parasite_get_name (icc_parasite),
GIMP_ICC_PROFILE_PARASITE_NAME) != 0)
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
@ -200,8 +200,8 @@ gimp_image_validate_icc_parasite (GimpImage *image,
return FALSE;
}
if (gimp_parasite_flags (icc_parasite) != (GIMP_PARASITE_PERSISTENT |
GIMP_PARASITE_UNDOABLE))
if (gimp_parasite_get_flags (icc_parasite) != (GIMP_PARASITE_PERSISTENT |
GIMP_PARASITE_UNDOABLE))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("ICC profile validation failed: "

4
app/core/gimpimage-undo-push.c
View File

@ -184,7 +184,7 @@ gimp_image_undo_push_image_parasite (GimpImage *image,
return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
GIMP_UNDO_PARASITE_ATTACH, undo_desc,
GIMP_DIRTY_IMAGE_META,
"parasite-name", gimp_parasite_name (parasite),
"parasite-name", gimp_parasite_get_name (parasite),
NULL);
}
@ -497,7 +497,7 @@ gimp_image_undo_push_item_parasite (GimpImage *image,
GIMP_UNDO_PARASITE_ATTACH, undo_desc,
GIMP_DIRTY_ITEM_META,
"item", item,
"parasite-name", gimp_parasite_name (parasite),
"parasite-name", gimp_parasite_get_name (parasite),
NULL);
}

4
app/core/gimpimage.c
View File

@ -4024,7 +4024,7 @@ gimp_image_parasite_validate (GimpImage *image,
g_return_val_if_fail (parasite != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
name = gimp_parasite_name (parasite);
name = gimp_parasite_get_name (parasite);
if (strcmp (name, GIMP_ICC_PROFILE_PARASITE_NAME) == 0)
{
@ -4071,7 +4071,7 @@ gimp_image_parasite_attach (GimpImage *image,
private = GIMP_IMAGE_GET_PRIVATE (image);
name = gimp_parasite_name (parasite);
name = gimp_parasite_get_name (parasite);
/* this is so ugly and is only for the PDB */
if (strcmp (name, GIMP_ICC_PROFILE_PARASITE_NAME) == 0)

4
app/core/gimpitem.c
View File

@ -2163,7 +2163,7 @@ gimp_item_parasite_attach (GimpItem *item,
else if (gimp_parasite_is_persistent (&copy) &&
! gimp_parasite_compare (&copy,
gimp_item_parasite_find
(item, gimp_parasite_name (&copy))))
(item, gimp_parasite_get_name (&copy))))
{
gimp_image_undo_push_cantundo (private->image,
C_("undo-type", "Attach Parasite to Item"));
@ -2219,7 +2219,7 @@ gimp_item_parasite_detach (GimpItem *item,
gimp_image_undo_push_item_parasite_remove (private->image,
C_("undo-type", "Remove Parasite from Item"),
item,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
}
else if (gimp_parasite_is_persistent (parasite))
{

4
app/core/gimpparasitelist.c
View File

@ -415,8 +415,8 @@ parasite_serialize (const gchar *key,
parasite_contents = gimp_parasite_get_data (parasite, &parasite_size);
gimp_config_writer_printf (writer, "\"%s\" %lu %lu",
gimp_parasite_name (parasite),
gimp_parasite_flags (parasite),
gimp_parasite_get_name (parasite),
gimp_parasite_get_flags (parasite),
(long unsigned int) parasite_size);
gimp_config_writer_data (writer, parasite_size, parasite_contents);

2
app/core/gimpsymmetry.c
View File

@ -528,7 +528,7 @@ gimp_symmetry_from_parasite (const GimpParasite *parasite,
parasite_name = gimp_symmetry_parasite_name (type);
g_return_val_if_fail (parasite != NULL, NULL);
g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
g_return_val_if_fail (strcmp (gimp_parasite_get_name (parasite),
parasite_name) == 0,
NULL);

4
app/text/gimptext-parasite.c
View File

@ -72,7 +72,7 @@ gimp_text_from_parasite (const GimpParasite *parasite,
guint32 parasite_data_size;
g_return_val_if_fail (parasite != NULL, NULL);
g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
g_return_val_if_fail (strcmp (gimp_parasite_get_name (parasite),
gimp_text_parasite_name ()) == 0, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@ -138,7 +138,7 @@ gimp_text_from_gdyntext_parasite (const GimpParasite *parasite)
gint i;
g_return_val_if_fail (parasite != NULL, NULL);
g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
g_return_val_if_fail (strcmp (gimp_parasite_get_name (parasite),
gimp_text_gdyntext_parasite_name ()) == 0,
NULL);

12
app/xcf/xcf-load.c
View File

@ -267,7 +267,7 @@ xcf_load_image (Gimp *gimp,
GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
gimp_image_set_grid (GIMP_IMAGE (image), grid, FALSE);
g_object_unref (grid);
@ -301,7 +301,7 @@ xcf_load_image (Gimp *gimp,
}
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
}
/* check for symmetry parasites */
@ -325,7 +325,7 @@ xcf_load_image (Gimp *gimp,
GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
gimp_image_symmetry_add (image, sym);
@ -384,7 +384,7 @@ xcf_load_image (Gimp *gimp,
}
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
}
/* migrate the old "gimp-metadata" parasite */
@ -449,7 +449,7 @@ xcf_load_image (Gimp *gimp,
}
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
}
/* check for a gimp-xcf-compatibility-mode parasite */
@ -461,7 +461,7 @@ xcf_load_image (Gimp *gimp,
/* just ditch it, it's unused but shouldn't be re-saved */
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
}
xcf_progress_update (info);

10
app/xcf/xcf-save.c
View File

@ -466,14 +466,14 @@ xcf_save_image_props (XcfInfo *info,
if (grid_parasite)
{
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (grid_parasite));
gimp_parasite_get_name (grid_parasite));
gimp_parasite_free (grid_parasite);
}
if (meta_parasite)
{
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (meta_parasite));
gimp_parasite_get_name (meta_parasite));
gimp_parasite_free (meta_parasite);
}
@ -482,7 +482,7 @@ xcf_save_image_props (XcfInfo *info,
GimpParasite *parasite = iter->data;
gimp_parasite_list_remove (private->parasites,
gimp_parasite_name (parasite));
gimp_parasite_get_name (parasite));
}
g_list_free_full (symmetry_parasites,
(GDestroyNotify) gimp_parasite_free);
@ -1955,10 +1955,10 @@ xcf_save_parasite (XcfInfo *info,
GError *tmp_error = NULL;
gconstpointer parasite_data;
string = gimp_parasite_name (parasite);
string = gimp_parasite_get_name (parasite);
xcf_write_string_check_error (info, (gchar **) &string, 1);
value = gimp_parasite_flags (parasite);
value = gimp_parasite_get_flags (parasite);
xcf_write_int32_check_error (info, &value, 1);
parasite_data = gimp_parasite_get_data (parasite, &value);

4
devel-docs/libgimpbase/libgimpbase3-sections.txt
View File

@ -411,8 +411,8 @@ gimp_parasite_is_type
gimp_parasite_is_persistent
gimp_parasite_is_undoable
gimp_parasite_has_flag
gimp_parasite_flags
gimp_parasite_name
gimp_parasite_get_flags
gimp_parasite_get_name
gimp_parasite_data
gimp_parasite_data_size
GIMP_PARASITE_PERSISTENT

4
libgimpbase/gimpbase.def
View File

@ -129,15 +129,15 @@ EXPORTS
gimp_param_value_array_get_type
gimp_parasite_compare
gimp_parasite_copy
gimp_parasite_flags
gimp_parasite_free
gimp_parasite_get_data
gimp_parasite_get_flags
gimp_parasite_get_name
gimp_parasite_get_type
gimp_parasite_has_flag
gimp_parasite_is_persistent
gimp_parasite_is_type
gimp_parasite_is_undoable
gimp_parasite_name
gimp_parasite_new
gimp_path_free
gimp_path_get_user_writable_dir

8
libgimpbase/gimpparasite.c
View File

@ -333,13 +333,13 @@ gimp_parasite_compare (const GimpParasite *a,
}
/**
* gimp_parasite_flags:
* gimp_parasite_get_flags:
* @parasite: a #GimpParasite
*
* Returns: @parasite flags.
*/
gulong
gimp_parasite_flags (const GimpParasite *parasite)
gimp_parasite_get_flags (const GimpParasite *parasite)
{
if (parasite == NULL)
return 0;
@ -395,13 +395,13 @@ gimp_parasite_has_flag (const GimpParasite *parasite,
}
/**
* gimp_parasite_name:
* gimp_parasite_get_name:
* @parasite: a #GimpParasite
*
* Returns: @parasite's name.
*/
const gchar *
gimp_parasite_name (const GimpParasite *parasite)
gimp_parasite_get_name (const GimpParasite *parasite)
{
if (parasite)
return parasite->name;

4
libgimpbase/gimpparasite.h
View File

@ -104,8 +104,8 @@ gboolean gimp_parasite_is_persistent (const GimpParasite *parasite);
gboolean gimp_parasite_is_undoable (const GimpParasite *parasite);
gboolean gimp_parasite_has_flag (const GimpParasite *parasite,
gulong flag);
gulong gimp_parasite_flags (const GimpParasite *parasite);
const gchar * gimp_parasite_name (const GimpParasite *parasite);
gulong gimp_parasite_get_flags (const GimpParasite *parasite);
const gchar * gimp_parasite_get_name (const GimpParasite *parasite);
gconstpointer gimp_parasite_get_data (const GimpParasite *parasite,
guint32 *num_bytes);