[gimp/gimp-2-8] app: remove "remove_locked" parameter from gimp_image_item_list_filter()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-8] app: remove "remove_locked" parameter from gimp_image_item_list_filter()
- Date: Sat, 20 Jun 2015 14:10:19 +0000 (UTC)
commit 5f41d750ec7a24698cda65f91c5f4870b27c7e48
Author: Michael Natterer <mitch gimp org>
Date: Sat Jun 20 16:03:40 2015 +0200
app: remove "remove_locked" parameter from gimp_image_item_list_filter()
This is just removal of unused code before fixing bug 735906.
(cherry picked from commit 64b24d169dfb76499e9db0f37d457498c558ac74)
app/core/gimpimage-item-list.c | 18 +-----------------
app/core/gimpimage-item-list.h | 3 +--
app/core/gimpimage-scale.c | 2 +-
app/core/gimpitem-linked.c | 10 +++++-----
app/tools/gimpeditselectiontool.c | 18 ++++++------------
5 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/app/core/gimpimage-item-list.c b/app/core/gimpimage-item-list.c
index 0083954..f26599e 100644
--- a/app/core/gimpimage-item-list.c
+++ b/app/core/gimpimage-item-list.c
@@ -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;
}
diff --git a/app/core/gimpimage-item-list.h b/app/core/gimpimage-item-list.h
index 7053bd4..4823057 100644
--- a/app/core/gimpimage-item-list.h
+++ b/app/core/gimpimage-item-list.h
@@ -54,8 +54,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__ */
diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c
index dd3d274..12ba40c 100644
--- a/app/core/gimpimage-scale.c
+++ b/app/core/gimpimage-scale.c
@@ -286,7 +286,7 @@ gimp_image_scale_check (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));
diff --git a/app/core/gimpitem-linked.c b/app/core/gimpitem-linked.c
index aa41723..af90f9f 100644
--- a/app/core/gimpitem-linked.c
+++ b/app/core/gimpitem-linked.c
@@ -48,7 +48,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);
@@ -74,7 +74,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);
@@ -102,7 +102,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);
@@ -113,7 +113,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);
@@ -143,7 +143,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,
diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c
index 6454bd5..0d61f13 100644
--- a/app/tools/gimpeditselectiontool.c
+++ b/app/tools/gimpeditselectiontool.c
@@ -360,8 +360,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))
@@ -404,8 +403,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))
{
@@ -537,8 +535,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,
@@ -670,8 +667,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,
@@ -884,8 +880,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))
{
@@ -934,8 +929,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))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
