From fbcb078513dcd861182649fd1507715a0616376b Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 15 Sep 2021 22:55:48 -0300 Subject: [PATCH] clutter/container: Remove clutter_container_get_children This one is a trivial wrapper around clutter_actor_get_children(), so just use that in the two places where clutter_container_get_children() is used, and remove clutter_container_get_children(). Part-of: --- clutter/clutter/clutter-container.c | 24 +------------------ .../clutter/deprecated/clutter-container.h | 3 --- .../clutter/micro-bench/test-random-text.c | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/clutter/clutter/clutter-container.c b/clutter/clutter/clutter-container.c index bd18af3e7..7d129fcfb 100644 --- a/clutter/clutter/clutter-container.c +++ b/clutter/clutter/clutter-container.c @@ -420,28 +420,6 @@ clutter_container_remove_actor (ClutterContainer *container, container_remove_actor (container, actor); } -/** - * clutter_container_get_children: - * @container: a #ClutterContainer - * - * Retrieves all the children of @container. - * - * Return value: (element-type Clutter.Actor) (transfer container): a list - * of #ClutterActors. Use g_list_free() on the returned - * list when done. - * - * Since: 0.4 - * - * Deprecated: 1.10: Use clutter_actor_get_children() instead. - */ -GList * -clutter_container_get_children (ClutterContainer *container) -{ - g_return_val_if_fail (CLUTTER_IS_CONTAINER (container), NULL); - - return clutter_actor_get_children (CLUTTER_ACTOR (container)); -} - /** * clutter_container_find_child_by_name: * @container: a #ClutterContainer @@ -466,7 +444,7 @@ clutter_container_find_child_by_name (ClutterContainer *container, g_return_val_if_fail (CLUTTER_IS_CONTAINER (container), NULL); g_return_val_if_fail (child_name != NULL, NULL); - children = clutter_container_get_children (container); + children = clutter_actor_get_children (CLUTTER_ACTOR (container)); for (iter = children; iter; iter = g_list_next (iter)) { diff --git a/clutter/clutter/deprecated/clutter-container.h b/clutter/clutter/deprecated/clutter-container.h index d8da9e026..10cd9d0c0 100644 --- a/clutter/clutter/deprecated/clutter-container.h +++ b/clutter/clutter/deprecated/clutter-container.h @@ -52,9 +52,6 @@ CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child) void clutter_container_remove_actor (ClutterContainer *container, ClutterActor *actor); -CLUTTER_DEPRECATED_FOR(clutter_actor_get_children) -GList * clutter_container_get_children (ClutterContainer *container); - G_END_DECLS #endif /* __CLUTTER_CONTAINER_DEPRECATED_H__ */ diff --git a/src/tests/clutter/micro-bench/test-random-text.c b/src/tests/clutter/micro-bench/test-random-text.c index c5612924f..6843ef80b 100644 --- a/src/tests/clutter/micro-bench/test-random-text.c +++ b/src/tests/clutter/micro-bench/test-random-text.c @@ -29,7 +29,7 @@ on_idle (gpointer data) static int frame_count = 0; /* Remove all of the children of the stage */ - children = clutter_container_get_children (CLUTTER_CONTAINER (stage)); + children = clutter_actor_get_children (stage); for (node = children; node; node = node->next) clutter_container_remove_actor (CLUTTER_CONTAINER (stage), CLUTTER_ACTOR (node->data));