GNOME.org
 

[mutter/wip/nielsdg/clutter-remove-deprecated: 3/6] clutter: Remove deprecated ClutterGroup

commit a8ee0d8b80f059fa3644ef90e61fedf1c61c6a44
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Nov 17 13:50:51 2018 +0100

    clutter: Remove deprecated ClutterGroup

 clutter/clutter/Makefile.am                        |   3 -
 clutter/clutter/cally/cally-group.c                | 147 ------
 clutter/clutter/cally/cally-group.h                |  87 ----
 clutter/clutter/cally/cally-stage.c                |   2 +-
 clutter/clutter/cally/cally-stage.h                |   6 +-
 clutter/clutter/cally/cally.c                      |   3 -
 clutter/clutter/cally/cally.h                      |   1 -
 clutter/clutter/clutter-constraint.c               |   2 +-
 clutter/clutter/clutter-deprecated.h               |   1 -
 clutter/clutter/clutter-group.h                    |  96 ----
 clutter/clutter/clutter-stage.c                    |  18 +-
 clutter/clutter/clutter-stage.h                    |   7 +-
 clutter/clutter/clutter.h                          |   1 -
 clutter/clutter/deprecated/clutter-group.c         | 562 ---------------------
 clutter/clutter/deprecated/clutter-group.h         |  62 ---
 clutter/clutter/egl/clutter-backend-eglnative.h    |   1 +
 clutter/clutter/meson.build                        |   5 -
 clutter/clutter/x11/clutter-stage-x11.h            |   1 -
 .../accessibility/cally-atkcomponent-example.c     |   2 +-
 .../accessibility/cally-atkeditabletext-example.c  |   2 +-
 .../tests/accessibility/cally-atktext-example.c    |   2 +-
 clutter/tests/accessibility/cally-clone-example.c  |   2 +-
 clutter/tests/conform/actor-paint-opacity.c        |   4 +-
 clutter/tests/conform/group.c                      |  60 ---
 clutter/tests/conform/meson.build                  |   1 -
 clutter/tests/conform/texture-fbo.c                |   2 +-
 clutter/tests/interactive/test-cogl-multitexture.c |   2 +-
 clutter/tests/interactive/test-cogl-tex-polygon.c  |   2 +-
 .../tests/interactive/test-cogl-vertex-buffer.c    |   2 +-
 clutter/tests/interactive/test-events.c            |   2 +-
 clutter/tests/interactive/test-fbo.c               |   2 +-
 clutter/tests/interactive/test-paint-wrapper.c     |   2 +-
 clutter/tests/interactive/test-pixmap.c            |   4 +-
 clutter/tests/micro-bench/test-text.c              |   2 +-
 clutter/tests/performance/test-state-hidden.c      |   4 +-
 clutter/tests/performance/test-state-interactive.c |   2 +-
 clutter/tests/performance/test-state-mini.c        |   2 +-
 clutter/tests/performance/test-state-pick.c        |   2 +-
 clutter/tests/performance/test-state.c             |   2 +-
 cogl/tests/conform/test-materials.c                |   2 +-
 cogl/tests/conform/test-multitexture.c             |   2 +-
 cogl/tests/conform/test-texture-mipmaps.c          |   2 +-
 cogl/tests/conform/test-vertex-buffer-contiguous.c |   2 +-
 cogl/tests/conform/test-vertex-buffer-interleved.c |   2 +-
 cogl/tests/conform/test-vertex-buffer-mutability.c |   2 +-
 src/meta/meta-window-actor.h                       |   2 +-
 46 files changed, 43 insertions(+), 1081 deletions(-)
---
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index b9a84804c..27f8ec134 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -78,7 +78,6 @@ source_h =                                    \
        clutter-flow-layout.h           \
        clutter-gesture-action.h        \
        clutter-grid-layout.h   \
-       clutter-group.h                 \
        clutter-image.h         \
        clutter-input-device.h  \
        clutter-input-device-tool.h     \
@@ -271,7 +270,6 @@ deprecated_h = \
        deprecated/clutter-box.h                        \
        deprecated/clutter-cairo-texture.h              \
        deprecated/clutter-container.h          \
-       deprecated/clutter-group.h                      \
        deprecated/clutter-input-device.h               \
        deprecated/clutter-keysyms.h                    \
        deprecated/clutter-main.h                       \
@@ -300,7 +298,6 @@ deprecated_c = \
        deprecated/clutter-behaviour-scale.c            \
        deprecated/clutter-box.c                        \
        deprecated/clutter-cairo-texture.c              \
-       deprecated/clutter-group.c                      \
        deprecated/clutter-input-device-deprecated.c    \
        deprecated/clutter-layout-manager-deprecated.c \
        deprecated/clutter-rectangle.c          \
diff --git a/clutter/clutter/cally/cally-stage.c b/clutter/clutter/cally/cally-stage.c
index 7c100aabf..b32249211 100644
--- a/clutter/clutter/cally/cally-stage.c
+++ b/clutter/clutter/cally/cally-stage.c
@@ -63,7 +63,7 @@ struct _CallyStagePrivate
 
 G_DEFINE_TYPE_WITH_CODE (CallyStage,
                          cally_stage,
-                         CALLY_TYPE_GROUP,
+                         CALLY_TYPE_ACTOR,
                          G_ADD_PRIVATE (CallyStage)
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW,
                                                 cally_stage_window_interface_init));
diff --git a/clutter/clutter/cally/cally-stage.h b/clutter/clutter/cally/cally-stage.h
index e8f676de5..576ba6b81 100644
--- a/clutter/clutter/cally/cally-stage.h
+++ b/clutter/clutter/cally/cally-stage.h
@@ -25,7 +25,7 @@
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#include <cally/cally-group.h>
+#include <cally/cally-actor.h>
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
@@ -52,7 +52,7 @@ typedef struct _CallyStagePrivate CallyStagePrivate;
 struct _CallyStage
 {
   /*< private >*/
-  CallyGroup parent;
+  CallyActor parent;
 
   CallyStagePrivate *priv;
 };
@@ -68,7 +68,7 @@ struct _CallyStage
 struct _CallyStageClass
 {
   /*< private >*/
-  CallyGroupClass parent_class;
+  CallyActorClass parent_class;
 
   /* padding for future expansion */
   gpointer _padding_dummy[16];
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
index 4e1b79ada..350af90fd 100644
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -36,7 +36,6 @@
 #include "cally.h"
 
 #include "cally-actor.h"
-#include "cally-group.h"
 #include "cally-stage.h"
 #include "cally-text.h"
 #include "cally-texture.h"
@@ -53,7 +52,6 @@
 
 /* factories initialization*/
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new)
-CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_GROUP, cally_group, cally_group_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_STAGE, cally_stage, cally_stage_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXT, cally_text, cally_text_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXTURE, cally_texture, cally_texture_new)
@@ -75,7 +73,6 @@ cally_accessibility_init (void)
 {
   /* setting the factories */
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_ACTOR, cally_actor);
-  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_GROUP, cally_group);
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_STAGE, cally_stage);
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXT, cally_text);
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXTURE, cally_texture);
diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
index 11fa9fc6c..7c7a41df5 100644
--- a/clutter/clutter/cally/cally.h
+++ b/clutter/clutter/cally/cally.h
@@ -26,7 +26,6 @@
 #include "cally-actor.h"
 #include "cally-clone.h"
 #include "cally-factory.h"
-#include "cally-group.h"
 #include "cally-main.h"
 #include "cally-rectangle.h"
 #include "cally-root.h"
diff --git a/clutter/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c
index bd44dab9b..148e797a3 100644
--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@@ -43,7 +43,7 @@
  *
  * Constraints can be used with fixed layout managers, like
  * #ClutterFixedLayout, or with actors implicitly using a fixed layout
- * manager, like #ClutterGroup and #ClutterStage.
+ * manager, like #ClutterStage.
  *
  * Constraints provide a way to build user interfaces by using
  * relations between #ClutterActors, without explicit fixed
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 31ae126fe..a3d129092 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -20,7 +20,6 @@
 #include "deprecated/clutter-box.h"
 #include "deprecated/clutter-cairo-texture.h"
 #include "deprecated/clutter-container.h"
-#include "deprecated/clutter-group.h"
 #include "deprecated/clutter-input-device.h"
 #include "deprecated/clutter-keysyms.h"
 #include "deprecated/clutter-main.h"
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 533663f09..9a908f4bf 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -204,7 +204,7 @@ static void free_queue_redraw_entry (ClutterStageQueueRedrawEntry *entry);
 
 static void clutter_container_iface_init (ClutterContainerIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (ClutterStage, clutter_stage, CLUTTER_TYPE_GROUP,
+G_DEFINE_TYPE_WITH_CODE (ClutterStage, clutter_stage, CLUTTER_TYPE_ACTOR,
                          G_ADD_PRIVATE (ClutterStage)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
                                                 clutter_container_iface_init))
@@ -685,10 +685,6 @@ _clutter_stage_paint_view (ClutterStage                *stage,
   g_signal_emit (stage, stage_signals[AFTER_PAINT], 0);
 }
 
-/* If we don't implement this here, we get the paint function
- * from the deprecated clutter-group class, which doesn't
- * respect the Z order as it uses our empty sort_depth_order.
- */
 static void
 clutter_stage_paint (ClutterActor *self)
 {
@@ -707,9 +703,9 @@ clutter_stage_pick (ClutterActor       *self,
   ClutterActorIter iter;
   ClutterActor *child;
 
-  /* Note: we don't chain up to our parent as we don't want any geometry
-   * emitted for the stage itself. The stage's pick id is effectively handled
-   * by the call to cogl_clear done in clutter-main.c:_clutter_do_pick_async()
+  /* Note: we don't want any geometry emitted for the stage itself. The stage's
+   * pick id is effectively handled by the call to cogl_clear done in
+   * clutter-main.c:_clutter_do_pick_async()
    */
   clutter_actor_iter_init (&iter, self);
   while (clutter_actor_iter_next (&iter, &child))
@@ -756,9 +752,6 @@ clutter_stage_show_all (ClutterActor *self)
   ClutterActorIter iter;
   ClutterActor *child;
 
-  /* we don't do a recursive show_all(), to maintain the old
-   * invariants from ClutterGroup
-   */
   clutter_actor_iter_init (&iter, self);
   while (clutter_actor_iter_next (&iter, &child))
     clutter_actor_show (child);
@@ -789,9 +782,6 @@ clutter_stage_hide_all (ClutterActor *self)
 
   clutter_actor_hide (self);
 
-  /* we don't do a recursive hide_all(), to maintain the old invariants
-   * from ClutterGroup
-   */
   clutter_actor_iter_init (&iter, self);
   while (clutter_actor_iter_next (&iter, &child))
     clutter_actor_hide (child);
diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h
index 643f8d7b3..115011e70 100644
--- a/clutter/clutter/clutter-stage.h
+++ b/clutter/clutter/clutter-stage.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
+#include <clutter/clutter-actor-private.h>
 #include <clutter/clutter-types.h>
-#include <clutter/clutter-group.h>
 
 G_BEGIN_DECLS
 
@@ -55,10 +55,11 @@ typedef struct _ClutterStagePrivate ClutterStagePrivate;
 struct _ClutterStage
 {
   /*< private >*/
-  ClutterGroup parent_instance;
+  ClutterActor parent_instance;
 
   ClutterStagePrivate *priv;
 };
+
 /**
  * ClutterStageClass:
  * @fullscreen: handler for the #ClutterStage::fullscreen signal
@@ -75,7 +76,7 @@ struct _ClutterStage
 struct _ClutterStageClass
 {
   /*< private >*/
-  ClutterGroupClass parent_class;
+  ClutterActorClass parent_class;
 
   /*< public >*/
   /* signals */
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index cd6b53798..b30d4514e 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -68,7 +68,6 @@
 #include "clutter-flow-layout.h"
 #include "clutter-gesture-action.h"
 #include "clutter-grid-layout.h"
-#include "clutter-group.h"
 #include "clutter-image.h"
 #include "clutter-input-device.h"
 #include "clutter-input-device-tool.h"
diff --git a/clutter/clutter/egl/clutter-backend-eglnative.h b/clutter/clutter/egl/clutter-backend-eglnative.h
index 3a87ddb3d..b022eca58 100644
--- a/clutter/clutter/egl/clutter-backend-eglnative.h
+++ b/clutter/clutter/egl/clutter-backend-eglnative.h
@@ -27,6 +27,7 @@
 #define __CLUTTER_BACKEND_EGL_NATIVE_H__
 
 #include <glib-object.h>
+#include <gio/gio.h>
 #include <cogl/cogl.h>
 #include <cogl/cogl-egl.h>
 #include <clutter/clutter-event.h>
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 7d4b3bf20..2174201f1 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -40,7 +40,6 @@ clutter_headers = [
   'clutter-flow-layout.h',
   'clutter-gesture-action.h',
   'clutter-grid-layout.h',
-  'clutter-group.h',
   'clutter-image.h',
   'clutter-input-device.h',
   'clutter-input-device-tool.h',
@@ -231,7 +230,6 @@ clutter_deprecated_headers = [
   'deprecated/clutter-box.h',
   'deprecated/clutter-cairo-texture.h',
   'deprecated/clutter-container.h',
-  'deprecated/clutter-group.h',
   'deprecated/clutter-input-device.h',
   'deprecated/clutter-keysyms.h',
   'deprecated/clutter-main.h',
@@ -259,7 +257,6 @@ clutter_deprecated_sources = [
   'deprecated/clutter-behaviour-scale.c',
   'deprecated/clutter-box.c',
   'deprecated/clutter-cairo-texture.c',
-  'deprecated/clutter-group.c',
   'deprecated/clutter-input-device-deprecated.c',
   'deprecated/clutter-layout-manager-deprecated.c',
   'deprecated/clutter-rectangle.c',
@@ -370,7 +367,6 @@ cally_headers = [
     'cally/cally-actor.h',
     'cally/cally-clone.h',
     'cally/cally-factory.h',
-    'cally/cally-group.h',
     'cally/cally.h',
     'cally/cally-main.h',
     'cally/cally-rectangle.h',
@@ -385,7 +381,6 @@ cally_sources = [
     'cally/cally-actor.c',
     'cally/cally.c',
     'cally/cally-clone.c',
-    'cally/cally-group.c',
     'cally/cally-rectangle.c',
     'cally/cally-root.c',
     'cally/cally-stage.c',
diff --git a/clutter/clutter/x11/clutter-stage-x11.h b/clutter/clutter/x11/clutter-stage-x11.h
index e2be10bec..b6ed96f1a 100644
--- a/clutter/clutter/x11/clutter-stage-x11.h
+++ b/clutter/clutter/x11/clutter-stage-x11.h
@@ -22,7 +22,6 @@
 #ifndef __CLUTTER_STAGE_X11_H__
 #define __CLUTTER_STAGE_X11_H__
 
-#include <clutter/clutter-group.h>
 #include <clutter/clutter-stage.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
diff --git a/clutter/tests/accessibility/cally-atkcomponent-example.c 
b/clutter/tests/accessibility/cally-atkcomponent-example.c
index 79a816bde..d88bbf186 100644
--- a/clutter/tests/accessibility/cally-atkcomponent-example.c
+++ b/clutter/tests/accessibility/cally-atkcomponent-example.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
   clutter_actor_set_size (button4, SIZE, SIZE);
 
   for (i = 0; i < 4; i++) {
-    group[i] = clutter_group_new ();
+    group[i] = clutter_actor_new ();
     clutter_actor_set_position (group[i], SIZE / 2, SIZE / 2);
     clutter_actor_set_size (group[i], SIZE, SIZE);
 
diff --git a/clutter/tests/accessibility/cally-atkeditabletext-example.c 
b/clutter/tests/accessibility/cally-atkeditabletext-example.c
index 433ee9270..85ad66f7d 100644
--- a/clutter/tests/accessibility/cally-atkeditabletext-example.c
+++ b/clutter/tests/accessibility/cally-atkeditabletext-example.c
@@ -149,7 +149,7 @@ _create_button (const gchar *text)
   ClutterActor *rectangle  = NULL;
   ClutterActor *label      = NULL;
 
-  button = clutter_group_new ();
+  button = clutter_actor_new ();
   rectangle = clutter_rectangle_new_with_color (CLUTTER_COLOR_Magenta);
   clutter_actor_set_size (rectangle, 375, 35);
 
diff --git a/clutter/tests/accessibility/cally-atktext-example.c 
b/clutter/tests/accessibility/cally-atktext-example.c
index 634a9a74f..d66b1a560 100644
--- a/clutter/tests/accessibility/cally-atktext-example.c
+++ b/clutter/tests/accessibility/cally-atktext-example.c
@@ -209,7 +209,7 @@ make_ui (ClutterActor *stage)
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_editable_actor);
 
   /* test button */
-  button = clutter_group_new ();
+  button = clutter_actor_new ();
   rectangle = clutter_rectangle_new_with_color (&color_rect);
   clutter_actor_set_size (rectangle, 75, 35);
 
diff --git a/clutter/tests/accessibility/cally-clone-example.c 
b/clutter/tests/accessibility/cally-clone-example.c
index 9cc2d6856..a43134310 100644
--- a/clutter/tests/accessibility/cally-clone-example.c
+++ b/clutter/tests/accessibility/cally-clone-example.c
@@ -70,7 +70,7 @@ make_ui (ClutterActor *stage)
   clutter_actor_set_position (rectangle, 150, 50);
   clutter_actor_add_constraint (rectangle, clutter_bind_constraint_new (editable, CLUTTER_BIND_SIZE, 0));
 
-  full_entry = clutter_group_new ();
+  full_entry = clutter_actor_new ();
   clutter_actor_set_position (full_entry, 0, 50);
   clutter_actor_set_size (full_entry, 100, 75);
   clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), label);
diff --git a/clutter/tests/conform/actor-paint-opacity.c b/clutter/tests/conform/actor-paint-opacity.c
index 6df240872..ab0ff8bd7 100644
--- a/clutter/tests/conform/actor-paint-opacity.c
+++ b/clutter/tests/conform/actor-paint-opacity.c
@@ -82,7 +82,7 @@ opacity_paint (void)
 
   stage = clutter_test_get_stage ();
 
-  group1 = clutter_group_new ();
+  group1 = clutter_actor_new ();
   clutter_actor_set_opacity (group1, 128);
   clutter_container_add (CLUTTER_CONTAINER (stage), group1, NULL);
   clutter_actor_set_position (group1, 10, 30);
@@ -109,7 +109,7 @@ opacity_paint (void)
 
   clutter_actor_destroy (label);
 
-  group2 = clutter_group_new ();
+  group2 = clutter_actor_new ();
   clutter_container_add (CLUTTER_CONTAINER (group1), group2, NULL);
   clutter_actor_set_position (group2, 10, 60);
 
diff --git a/clutter/tests/conform/meson.build b/clutter/tests/conform/meson.build
index 1768c401c..87b316318 100644
--- a/clutter/tests/conform/meson.build
+++ b/clutter/tests/conform/meson.build
@@ -42,7 +42,6 @@ clutter_conform_tests_general_tests = [
 clutter_conform_tests_deprecated_tests = [
   'animator',
   'behaviours',
-  'group',
   'rectangle',
   'texture',
 ]
diff --git a/clutter/tests/conform/texture-fbo.c b/clutter/tests/conform/texture-fbo.c
index 4a30b383c..0cc1542fb 100644
--- a/clutter/tests/conform/texture-fbo.c
+++ b/clutter/tests/conform/texture-fbo.c
@@ -31,7 +31,7 @@ static ClutterActor *
 create_source (void)
 {
   int x, y;
-  ClutterActor *group = clutter_group_new ();
+  ClutterActor *group = clutter_actor_new ();
 
   /* Create a group with a different coloured rectangle at each
      corner */
diff --git a/clutter/tests/interactive/test-cogl-multitexture.c 
b/clutter/tests/interactive/test-cogl-multitexture.c
index b815831b5..820be6c08 100644
--- a/clutter/tests/interactive/test-cogl-multitexture.c
+++ b/clutter/tests/interactive/test-cogl-multitexture.c
@@ -127,7 +127,7 @@ test_cogl_multitexture_main (int argc, char *argv[])
    * default paint handler, so that we can easily control
    * painting in a paint signal handler, without having to
    * sub-class anything etc. */
-  state->group = clutter_group_new ();
+  state->group = clutter_actor_new ();
   clutter_actor_set_position (state->group, stage_w / 2, stage_h / 2);
   g_signal_connect (state->group, "paint",
                    G_CALLBACK(material_rectangle_paint), state);
diff --git a/clutter/tests/interactive/test-cogl-tex-polygon.c 
b/clutter/tests/interactive/test-cogl-tex-polygon.c
index 44f13c731..c244acda8 100644
--- a/clutter/tests/interactive/test-cogl-tex-polygon.c
+++ b/clutter/tests/interactive/test-cogl-tex-polygon.c
@@ -331,7 +331,7 @@ on_toggle_click (ClutterActor *button, ClutterEvent *event,
 static ClutterActor *
 make_toggle (const char *label_text, gboolean *toggle_val)
 {
-  ClutterActor *group = clutter_group_new ();
+  ClutterActor *group = clutter_actor_new ();
   ClutterActor *label = clutter_text_new_with_text ("Sans 14", label_text);
   ClutterActor *button = clutter_text_new_with_text ("Sans 14", "");
 
diff --git a/clutter/tests/interactive/test-cogl-vertex-buffer.c 
b/clutter/tests/interactive/test-cogl-vertex-buffer.c
index e31dcd14c..895d8a4f7 100644
--- a/clutter/tests/interactive/test-cogl-vertex-buffer.c
+++ b/clutter/tests/interactive/test-cogl-vertex-buffer.c
@@ -317,7 +317,7 @@ create_dummy_actor (guint width, guint height)
   ClutterActor *group, *rect;
   ClutterColor clr = { 0xff, 0xff, 0xff, 0xff};
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   rect = clutter_rectangle_new_with_color (&clr);
   clutter_actor_set_size (rect, width, height);
   clutter_actor_hide (rect);
diff --git a/clutter/tests/interactive/test-events.c b/clutter/tests/interactive/test-events.c
index a41dd8fce..eeaefaf24 100644
--- a/clutter/tests/interactive/test-events.c
+++ b/clutter/tests/interactive/test-events.c
@@ -496,7 +496,7 @@ test_events_main (int argc, char *argv[])
   g_signal_connect (actor, "event", G_CALLBACK (input_cb), "yellow box");
 
   /* note group not reactive */
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_container_add (CLUTTER_CONTAINER (group), actor, NULL);
   clutter_container_add (CLUTTER_CONTAINER (stage), group, NULL);
   clutter_actor_set_position (group, 100, 350);
diff --git a/clutter/tests/interactive/test-fbo.c b/clutter/tests/interactive/test-fbo.c
index c659fe146..22953db9e 100644
--- a/clutter/tests/interactive/test-fbo.c
+++ b/clutter/tests/interactive/test-fbo.c
@@ -17,7 +17,7 @@ make_source (void)
 
   ClutterColor  yellow = {0xff, 0xff, 0x00, 0xff};
 
-  source  = clutter_group_new ();
+  source  = clutter_actor_new ();
 
   file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
   actor = clutter_texture_new_from_file (file, &error);
diff --git a/clutter/tests/interactive/test-paint-wrapper.c b/clutter/tests/interactive/test-paint-wrapper.c
index 103f9d01f..3d4363204 100644
--- a/clutter/tests/interactive/test-paint-wrapper.c
+++ b/clutter/tests/interactive/test-paint-wrapper.c
@@ -271,7 +271,7 @@ test_paint_wrapper_main (int argc, char *argv[])
     }
 
   /* create a new group to hold multiple actors in a group */
-  oh->group = clutter_group_new();
+  oh->group = clutter_actor_new();
 
   oh->hand = g_new (ClutterActor*, n_hands);
 
diff --git a/clutter/tests/interactive/test-pixmap.c b/clutter/tests/interactive/test-pixmap.c
index 759345721..d6f075efd 100644
--- a/clutter/tests/interactive/test-pixmap.c
+++ b/clutter/tests/interactive/test-pixmap.c
@@ -257,7 +257,7 @@ test_pixmap_main (int argc, char **argv)
 
   if (!disable_x11)
     {
-      group = clutter_group_new ();
+      group = clutter_actor_new ();
       clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
       label = clutter_text_new_with_text ("fixed",
                                           "ClutterX11Texture (Window)");
@@ -289,7 +289,7 @@ test_pixmap_main (int argc, char **argv)
     XDrawLine (xdpy, win_remote, gc, 0+i*20, 0, 10+i*20+i, 200);
 
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
   label = clutter_text_new_with_text ("fixed", "ClutterX11Texture (Pixmap)");
   clutter_container_add_actor (CLUTTER_CONTAINER (group), label);
diff --git a/clutter/tests/micro-bench/test-text.c b/clutter/tests/micro-bench/test-text.c
index d79bfd65a..0698ce74c 100644
--- a/clutter/tests/micro-bench/test-text.c
+++ b/clutter/tests/micro-bench/test-text.c
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black);
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Text");
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_actor_set_size (group, STAGE_WIDTH, STAGE_WIDTH);
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
 
diff --git a/clutter/tests/performance/test-state-hidden.c b/clutter/tests/performance/test-state-hidden.c
index 64911b4eb..1d0c188ec 100644
--- a/clutter/tests/performance/test-state-hidden.c
+++ b/clutter/tests/performance/test-state-hidden.c
@@ -37,7 +37,7 @@ static ClutterActor *new_rect (gint r,
                                gint a)
 {
   ClutterColor *color = clutter_color_new (r, g, b, a);
-  ClutterActor *group = clutter_group_new ();
+  ClutterActor *group = clutter_actor_new ();
   ClutterActor *rectangle = clutter_rectangle_new_with_color (color);
 
   gchar *file = g_build_filename (TESTS_DATA_DIR, "redhand.png", NULL);
@@ -63,7 +63,7 @@ main (gint    argc,
     g_error ("Failed to initialize Clutter");
 
   stage = clutter_stage_new ();
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   layout_state = clutter_state_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "State Performance [hidden]");
   clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black);
diff --git a/clutter/tests/performance/test-state-interactive.c 
b/clutter/tests/performance/test-state-interactive.c
index 375783541..555b73b59 100644
--- a/clutter/tests/performance/test-state-interactive.c
+++ b/clutter/tests/performance/test-state-interactive.c
@@ -71,7 +71,7 @@ static ClutterActor *new_rect (gint r,
 {
   GError *error = NULL;
   ClutterColor *color = clutter_color_new (r, g, b, a);
-  ClutterActor *group = clutter_group_new ();
+  ClutterActor *group = clutter_actor_new ();
   ClutterActor *rectangle = clutter_rectangle_new_with_color (color);
   ClutterActor *hand = NULL;
 
diff --git a/clutter/tests/performance/test-state-mini.c b/clutter/tests/performance/test-state-mini.c
index 773b9d061..3dfa505ed 100644
--- a/clutter/tests/performance/test-state-mini.c
+++ b/clutter/tests/performance/test-state-mini.c
@@ -38,7 +38,7 @@ static ClutterActor *new_rect (gint r,
 {
   GError *error = NULL;
   ClutterColor *color = clutter_color_new (r, g, b, a);
-  ClutterActor *group = clutter_group_new ();
+  ClutterActor *group = clutter_actor_new ();
   ClutterActor *rectangle = clutter_rectangle_new_with_color (color);
   ClutterActor *hand = NULL;
 
diff --git a/clutter/tests/performance/test-state-pick.c b/clutter/tests/performance/test-state-pick.c
index 0dc450a64..c0175aae1 100644
--- a/clutter/tests/performance/test-state-pick.c
+++ b/clutter/tests/performance/test-state-pick.c
@@ -43,7 +43,7 @@ static ClutterActor *new_rect (gint r,
 {
   GError *error = NULL;
   ClutterColor *color = clutter_color_new (r, g, b, a);
-  ClutterActor *group = clutter_group_new ();
+  ClutterActor *group = clutter_actor_new ();
   ClutterActor *rectangle = clutter_rectangle_new_with_color (color);
   ClutterActor *hand = NULL;
 
diff --git a/clutter/tests/performance/test-state.c b/clutter/tests/performance/test-state.c
index 7b0778cb4..d6b24697c 100644
--- a/clutter/tests/performance/test-state.c
+++ b/clutter/tests/performance/test-state.c
@@ -43,7 +43,7 @@ static ClutterActor *new_rect (gint r,
 {
   GError *error = NULL;
   ClutterColor *color = clutter_color_new (r, g, b, a);
-  ClutterActor *group = clutter_group_new ();
+  ClutterActor *group = clutter_actor_new ();
   ClutterActor *rectangle = clutter_rectangle_new_with_color (color);
   ClutterActor *hand = NULL;
 
diff --git a/cogl/tests/conform/test-materials.c b/cogl/tests/conform/test-materials.c
index e260683cb..b3bea16ae 100644
--- a/cogl/tests/conform/test-materials.c
+++ b/cogl/tests/conform/test-materials.c
@@ -231,7 +231,7 @@ test_materials (TestUtilsGTestFixture *fixture,
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   clutter_actor_get_geometry (stage, &state.stage_geom);
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
 
   /* We force continuous redrawing of the stage, since we need to skip
diff --git a/cogl/tests/conform/test-multitexture.c b/cogl/tests/conform/test-multitexture.c
index da38766aa..c6597977b 100644
--- a/cogl/tests/conform/test-multitexture.c
+++ b/cogl/tests/conform/test-multitexture.c
@@ -185,7 +185,7 @@ test_multitexture (TestUtilsGTestFixture *fixture,
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
 
   /* We force continuous redrawing incase someone comments out the
diff --git a/cogl/tests/conform/test-texture-mipmaps.c b/cogl/tests/conform/test-texture-mipmaps.c
index 3118ba86d..05655662e 100644
--- a/cogl/tests/conform/test-texture-mipmaps.c
+++ b/cogl/tests/conform/test-texture-mipmaps.c
@@ -115,7 +115,7 @@ test_texture_mipmaps (TestUtilsGTestFixture *fixture,
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
 
   /* We force continuous redrawing of the stage, since we need to skip
diff --git a/cogl/tests/conform/test-vertex-buffer-contiguous.c 
b/cogl/tests/conform/test-vertex-buffer-contiguous.c
index 1cd7b456b..10c5762fc 100644
--- a/cogl/tests/conform/test-vertex-buffer-contiguous.c
+++ b/cogl/tests/conform/test-vertex-buffer-contiguous.c
@@ -172,7 +172,7 @@ test_vertex_buffer_contiguous (TestUtilsGTestFixture *fixture,
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
   clutter_actor_get_geometry (stage, &state.stage_geom);
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_actor_set_size (group,
                          state.stage_geom.width,
                          state.stage_geom.height);
diff --git a/cogl/tests/conform/test-vertex-buffer-interleved.c 
b/cogl/tests/conform/test-vertex-buffer-interleved.c
index 2d31e364a..043f2020e 100644
--- a/cogl/tests/conform/test-vertex-buffer-interleved.c
+++ b/cogl/tests/conform/test-vertex-buffer-interleved.c
@@ -97,7 +97,7 @@ test_vertex_buffer_interleved (TestUtilsGTestFixture *fixture,
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
   clutter_actor_get_geometry (stage, &state.stage_geom);
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_actor_set_size (group,
                          state.stage_geom.width,
                          state.stage_geom.height);
diff --git a/cogl/tests/conform/test-vertex-buffer-mutability.c 
b/cogl/tests/conform/test-vertex-buffer-mutability.c
index 9c8d5da8c..b3fc648b0 100644
--- a/cogl/tests/conform/test-vertex-buffer-mutability.c
+++ b/cogl/tests/conform/test-vertex-buffer-mutability.c
@@ -140,7 +140,7 @@ test_vertex_buffer_mutability (TestUtilsGTestFixture *fixture,
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
   clutter_actor_get_geometry (stage, &state.stage_geom);
 
-  group = clutter_group_new ();
+  group = clutter_actor_new ();
   clutter_actor_set_size (group,
                          state.stage_geom.width,
                          state.stage_geom.height);
diff --git a/src/meta/meta-window-actor.h b/src/meta/meta-window-actor.h
index d5862e44b..7bbdf60f9 100644
--- a/src/meta/meta-window-actor.h
+++ b/src/meta/meta-window-actor.h
@@ -29,7 +29,7 @@
 #include "meta/compositor.h"
 
 /*
- * MetaWindowActor object (ClutterGroup sub-class)
+ * MetaWindowActor object (ClutterActor sub-class)
  */
 #define META_TYPE_WINDOW_ACTOR            (meta_window_actor_get_type ())
 #define META_WINDOW_ACTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WINDOW_ACTOR, 
MetaWindowActor))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]