From cb3999744f3bd879bbf0739489b479e23364d35c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 16 Jun 2011 17:07:32 +0100 Subject: [PATCH] Remove usage of clutter_group_add() The macro is there for mallum eyes only. --- tests/conform/test-actor-invariants.c | 8 ++++---- tests/interactive/test-fbo.c | 10 +++++----- tests/interactive/test-scale.c | 6 +++--- tests/interactive/test-unproject.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/conform/test-actor-invariants.c b/tests/conform/test-actor-invariants.c index 00476842b..5c3e2d034 100644 --- a/tests/conform/test-actor-invariants.c +++ b/tests/conform/test-actor-invariants.c @@ -199,15 +199,15 @@ test_show_on_set_parent (TestConformSimpleFixture *fixture, group); actor = clutter_rectangle_new (); - g_object_get (G_OBJECT (actor), + g_object_get (actor, "show-on-set-parent", &show_on_set_parent, NULL); g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor))); g_assert (show_on_set_parent == TRUE); - clutter_group_add (group, actor); - g_object_get (G_OBJECT (actor), + clutter_container_add_actor (CLUTTER_CONTAINER (group), actor); + g_object_get (actor, "show-on-set-parent", &show_on_set_parent, NULL); @@ -216,7 +216,7 @@ test_show_on_set_parent (TestConformSimpleFixture *fixture, g_object_ref (actor); clutter_actor_unparent (actor); - g_object_get (G_OBJECT (actor), + g_object_get (actor, "show-on-set-parent", &show_on_set_parent, NULL); diff --git a/tests/interactive/test-fbo.c b/tests/interactive/test-fbo.c index 9d496f918..41bffa8b6 100644 --- a/tests/interactive/test-fbo.c +++ b/tests/interactive/test-fbo.c @@ -27,13 +27,13 @@ make_source (void) g_free (file); - clutter_group_add (source, actor); + clutter_container_add_actor (CLUTTER_CONTAINER (source), actor); actor = clutter_text_new_with_text ("Sans Bold 50px", "Clutter"); clutter_text_set_color (CLUTTER_TEXT (actor), &yellow); clutter_actor_set_y (actor, clutter_actor_get_height(source) + 5); - clutter_group_add (source, actor); + clutter_container_add_actor (CLUTTER_CONTAINER (source), actor); return source; } @@ -63,7 +63,7 @@ test_fbo_main (int argc, char *argv[]) /* Create the first source */ onscreen_source = make_source(); clutter_actor_show_all (onscreen_source); - clutter_group_add (stage, onscreen_source); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), onscreen_source); y_pos = (STAGE_HEIGHT/2.0) - (clutter_actor_get_height (onscreen_source)/2.0); @@ -83,7 +83,7 @@ test_fbo_main (int argc, char *argv[]) clutter_actor_set_position (fbo, x_pos, y_pos); x_pos += clutter_actor_get_width (fbo); - clutter_group_add (stage, fbo); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), fbo); /* Third hand = actor from Second hand */ if ((fbo = clutter_texture_new_from_actor (fbo)) == NULL) @@ -91,7 +91,7 @@ test_fbo_main (int argc, char *argv[]) clutter_actor_set_position (fbo, x_pos, y_pos); x_pos += clutter_actor_get_width (fbo); - clutter_group_add (stage, fbo); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), fbo); clutter_actor_show_all (stage); clutter_main (); diff --git a/tests/interactive/test-scale.c b/tests/interactive/test-scale.c index af8203407..23a63542d 100644 --- a/tests/interactive/test-scale.c +++ b/tests/interactive/test-scale.c @@ -70,7 +70,7 @@ test_scale_main (int argc, char *argv[]) clutter_actor_set_size (rect, 100, 100); clutter_actor_set_position (rect, 100, 100); - clutter_group_add (CLUTTER_GROUP (stage), rect); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect); label = clutter_text_new_with_text ("Sans 20px", ""); clutter_text_set_color (CLUTTER_TEXT (label), @@ -80,7 +80,7 @@ test_scale_main (int argc, char *argv[]) clutter_actor_get_y (rect) + clutter_actor_get_height (rect)); - clutter_group_add (CLUTTER_GROUP (stage), label); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), label); rect_color.alpha = 0xff; rect = clutter_rectangle_new_with_color (&rect_color); @@ -88,7 +88,7 @@ test_scale_main (int argc, char *argv[]) clutter_actor_set_size (rect, 100, 100); set_next_gravity (rect); - clutter_group_add (CLUTTER_GROUP (stage), rect); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect); timeline = clutter_timeline_new (750); alpha = clutter_alpha_new_with_func (timeline, diff --git a/tests/interactive/test-unproject.c b/tests/interactive/test-unproject.c index 5b5f481f9..680b667c3 100644 --- a/tests/interactive/test-unproject.c +++ b/tests/interactive/test-unproject.c @@ -115,7 +115,7 @@ test_unproject_main (int argc, char *argv[]) clutter_actor_set_rotation (rect, CLUTTER_X_AXIS, rotate_x, 0, 0, 0); clutter_actor_set_rotation (rect, CLUTTER_Y_AXIS, rotate_y, 0, 0, 0); clutter_actor_set_rotation (rect, CLUTTER_Z_AXIS, rotate_z, 0, 0, 0); - clutter_group_add (CLUTTER_GROUP (stage), rect); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect); test_rectangle = rect; txt = g_strdup_printf ("Rectangle: L %d, R %d, T %d, B %d\n" @@ -128,7 +128,7 @@ test_unproject_main (int argc, char *argv[]) clutter_text_set_color (CLUTTER_TEXT (label0), &white); clutter_actor_set_position (label0, 10, 10); - clutter_group_add (CLUTTER_GROUP (stage), label0); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), label0); g_free (txt); @@ -138,7 +138,7 @@ test_unproject_main (int argc, char *argv[]) clutter_text_set_color (CLUTTER_TEXT (label), &blue); clutter_actor_set_position (label, 10, 50); - clutter_group_add (CLUTTER_GROUP (stage), label); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), label); clutter_actor_show_all (stage);