diff --git a/clutter/clutter/clutter-container.c b/clutter/clutter/clutter-container.c index 2f3139e49..587d891a7 100644 --- a/clutter/clutter/clutter-container.c +++ b/clutter/clutter/clutter-container.c @@ -384,33 +384,6 @@ clutter_container_add_actor (ClutterContainer *container, container_add_actor (container, actor); } -/** - * clutter_container_add_valist: (skip) - * @container: a #ClutterContainer - * @first_actor: the first #ClutterActor to add - * @var_args: list of actors to add, followed by %NULL - * - * Alternative va_list version of clutter_container_add(). - * - * This function will call #ClutterContainerIface.add(), which is a - * deprecated virtual function. The default implementation will - * call clutter_actor_add_child(). - * - * Since: 0.4 - * - * Deprecated: 1.10: Use clutter_actor_add_child() instead. - */ -void -clutter_container_add_valist (ClutterContainer *container, - ClutterActor *first_actor, - va_list var_args) -{ - g_return_if_fail (CLUTTER_IS_CONTAINER (container)); - g_return_if_fail (CLUTTER_IS_ACTOR (first_actor)); - - container_add_valist (container, first_actor, var_args); -} - /** * clutter_container_remove: (skip) * @container: a #ClutterContainer @@ -474,33 +447,6 @@ clutter_container_remove_actor (ClutterContainer *container, container_remove_actor (container, actor); } -/** - * clutter_container_remove_valist: (skip) - * @container: a #ClutterContainer - * @first_actor: the first #ClutterActor to add - * @var_args: list of actors to remove, followed by %NULL - * - * Alternative va_list version of clutter_container_remove(). - * - * This function will call #ClutterContainerIface.remove(), which is a - * deprecated virtual function. The default implementation will call - * clutter_actor_remove_child(). - * - * Since: 0.4 - * - * Deprecated: 1.10: Use clutter_actor_remove_child() instead. - */ -void -clutter_container_remove_valist (ClutterContainer *container, - ClutterActor *first_actor, - va_list var_args) -{ - g_return_if_fail (CLUTTER_IS_CONTAINER (container)); - g_return_if_fail (CLUTTER_IS_ACTOR (first_actor)); - - container_remove_valist (container, first_actor, var_args); -} - /** * clutter_container_get_children: * @container: a #ClutterContainer diff --git a/clutter/clutter/deprecated/clutter-container.h b/clutter/clutter/deprecated/clutter-container.h index 8bb6f640c..c1e256544 100644 --- a/clutter/clutter/deprecated/clutter-container.h +++ b/clutter/clutter/deprecated/clutter-container.h @@ -43,11 +43,6 @@ CLUTTER_DEPRECATED_FOR(clutter_actor_add_child) void clutter_container_add_actor (ClutterContainer *container, ClutterActor *actor); -CLUTTER_DEPRECATED_FOR(clutter_actor_add_child) -void clutter_container_add_valist (ClutterContainer *container, - ClutterActor *first_actor, - va_list var_args); - CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child) void clutter_container_remove (ClutterContainer *container, ClutterActor *first_actor, @@ -57,11 +52,6 @@ CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child) void clutter_container_remove_actor (ClutterContainer *container, ClutterActor *actor); -CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child) -void clutter_container_remove_valist (ClutterContainer *container, - ClutterActor *first_actor, - va_list var_args); - CLUTTER_DEPRECATED_FOR(clutter_actor_get_children) GList * clutter_container_get_children (ClutterContainer *container);