dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: remove "remove_locked" parameter from gimp_image_item_list_filter()

Browse source 
This is just removal of unused code before fixing bug 735906.
This commit is contained in:
Michael Natterer 2015-06-20 16:03:40 +02:00
parent 09cd5f6720
commit 64b24d169d
5 changed files with 15 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/core/gimpimage-item-list.c
View file

@ -242,8 +242,7 @@ gimp_image_item_list_remove_children (GList *list,
GList *
gimp_image_item_list_filter (const GimpItem *exclude,
GList *list,
gboolean remove_children,
gboolean remove_locked)
gboolean remove_children)
{
GList *l;
@ -270,20 +269,5 @@ gimp_image_item_list_filter (const GimpItem *exclude,
}
}
if (remove_locked)
{
l = list;
while (l)
{
GimpItem *item = l->data;
l = g_list_next (l);
if (gimp_item_is_content_locked (item))
list = g_list_remove (list, item);
}
}
return list;
}

3
app/core/gimpimage-item-list.h
View file

@ -53,8 +53,7 @@ GList * gimp_image_item_list_get_list (const GimpImage *image,
GList * gimp_image_item_list_filter (const GimpItem *exclude,
GList *list,
gboolean remove_children,
gboolean remove_locked);
gboolean remove_children);
#endif /* __GIMP_IMAGE_ITEM_LIST_H__ */

2
app/core/gimpimage.c
View file

@ -1711,7 +1711,7 @@ gimp_image_estimate_memsize (const GimpImage *image,
GIMP_ITEM_TYPE_CHANNELS,
GIMP_ITEM_SET_ALL);
gimp_image_item_list_filter (NULL, drawables, TRUE, FALSE);
gimp_image_item_list_filter (NULL, drawables, TRUE);
drawables = g_list_prepend (drawables, gimp_image_get_mask (image));

12
app/core/gimpitem-linked.c
View file

@ -48,7 +48,7 @@ gimp_item_linked_is_locked (const GimpItem *item)
GIMP_ITEM_TYPE_ALL,
GIMP_ITEM_SET_LINKED);
list = gimp_image_item_list_filter (item, list, TRUE, FALSE);
list = gimp_image_item_list_filter (item, list, TRUE);
for (l = list; l && ! locked; l = g_list_next (l))
{
@ -87,7 +87,7 @@ gimp_item_linked_translate (GimpItem *item,
GIMP_ITEM_TYPE_ALL,
GIMP_ITEM_SET_LINKED);
list = gimp_image_item_list_filter (item, list, TRUE, FALSE);
list = gimp_image_item_list_filter (item, list, TRUE);
gimp_image_item_list_translate (gimp_item_get_image (item), list,
offset_x, offset_y, push_undo);
@ -113,7 +113,7 @@ gimp_item_linked_flip (GimpItem *item,
GIMP_ITEM_TYPE_ALL,
GIMP_ITEM_SET_LINKED);
list = gimp_image_item_list_filter (item, list, TRUE, FALSE);
list = gimp_image_item_list_filter (item, list, TRUE);
gimp_image_item_list_flip (gimp_item_get_image (item), list, context,
flip_type, axis, clip_result);
@ -141,7 +141,7 @@ gimp_item_linked_rotate (GimpItem *item,
GIMP_ITEM_TYPE_VECTORS,
GIMP_ITEM_SET_LINKED);
list = gimp_image_item_list_filter (item, list, TRUE, FALSE);
list = gimp_image_item_list_filter (item, list, TRUE);
gimp_image_item_list_rotate (gimp_item_get_image (item), list, context,
rotate_type, center_x, center_y, clip_result);
@ -152,7 +152,7 @@ gimp_item_linked_rotate (GimpItem *item,
GIMP_ITEM_TYPE_CHANNELS,
GIMP_ITEM_SET_LINKED);
list = gimp_image_item_list_filter (item, list, TRUE, FALSE);
list = gimp_image_item_list_filter (item, list, TRUE);
gimp_image_item_list_rotate (gimp_item_get_image (item), list, context,
rotate_type, center_x, center_y, TRUE);
@ -181,7 +181,7 @@ gimp_item_linked_transform (GimpItem *item,
GIMP_ITEM_TYPE_ALL,
GIMP_ITEM_SET_LINKED);
list = gimp_image_item_list_filter (item, list, TRUE, FALSE);
list = gimp_image_item_list_filter (item, list, TRUE);
gimp_image_item_list_transform (gimp_item_get_image (item), list, context,
matrix, direction,

18
app/tools/gimpeditselectiontool.c
View file

@ -355,8 +355,7 @@ gimp_edit_selection_tool_start (GimpTool *parent_tool,
GIMP_ITEM_TYPE_LAYERS,
GIMP_ITEM_SET_LINKED);
linked = gimp_image_item_list_filter (active_item, linked,
TRUE, FALSE);
linked = gimp_image_item_list_filter (active_item, linked, TRUE);
/* Expand the rectangle to include all linked layers as well */
for (list = linked; list; list = g_list_next (list))
@ -399,8 +398,7 @@ gimp_edit_selection_tool_start (GimpTool *parent_tool,
GIMP_ITEM_TYPE_VECTORS,
GIMP_ITEM_SET_LINKED);
linked = gimp_image_item_list_filter (active_item, linked,
TRUE, FALSE);
linked = gimp_image_item_list_filter (active_item, linked, TRUE);
for (list = linked; list; list = g_list_next (list))
{
@ -532,8 +530,7 @@ gimp_edit_selection_tool_button_release (GimpTool *tool,
GIMP_ITEM_TYPE_CHANNELS,
GIMP_ITEM_SET_LINKED);
linked = gimp_image_item_list_filter (active_item, linked,
TRUE, FALSE);
linked = gimp_image_item_list_filter (active_item, linked, TRUE);
gimp_image_item_list_translate (image,
linked,
@ -665,8 +662,7 @@ gimp_edit_selection_tool_update_motion (GimpEditSelectionTool *edit_select,
GIMP_ITEM_TYPE_VECTORS,
GIMP_ITEM_SET_LINKED);
linked = gimp_image_item_list_filter (active_item, linked,
TRUE, FALSE);
linked = gimp_image_item_list_filter (active_item, linked, TRUE);
gimp_image_item_list_translate (image,
linked,
@ -879,8 +875,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
GIMP_ITEM_TYPE_LAYERS,
GIMP_ITEM_SET_LINKED);
linked = gimp_image_item_list_filter (active_item, linked,
TRUE, FALSE);
linked = gimp_image_item_list_filter (active_item, linked, TRUE);
for (list = linked; list; list = g_list_next (list))
{
@ -929,8 +924,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
GIMP_ITEM_TYPE_VECTORS,
GIMP_ITEM_SET_LINKED);
linked = gimp_image_item_list_filter (active_item, linked,
TRUE, FALSE);
linked = gimp_image_item_list_filter (active_item, linked, TRUE);
for (list = linked; list; list = g_list_next (list))
{