GNOME.org
 

[mutter/gbsneto/clutter-cleanups-part1: 8/19] clutter: Drop ClutterGroup

commit 7a56992d3840b00dcdd74e480011087e402cb676
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Jun 26 16:26:49 2020 -0300

    clutter: Drop ClutterGroup
    
    It is now unused.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1332

 clutter/clutter/cally/cally-group.c                | 147 ------
 clutter/clutter/cally/cally-group.h                |  87 ----
 clutter/clutter/cally/cally.c                      |   3 -
 clutter/clutter/cally/cally.h                      |   1 -
 clutter/clutter/clutter-deprecated.h               |   1 -
 clutter/clutter/clutter-group.h                    |  96 ----
 clutter/clutter/clutter.h                          |   1 -
 clutter/clutter/deprecated/clutter-group.c         | 530 ---------------------
 clutter/clutter/deprecated/clutter-group.h         |  62 ---
 clutter/clutter/meson.build                        |   5 -
 cogl/tests/conform/test-multitexture.c             |   2 +-
 cogl/tests/conform/test-texture-mipmaps.c          |   2 +-
 .../accessibility/cally-atkcomponent-example.c     |   2 +-
 .../accessibility/cally-atkeditabletext-example.c  |   2 +-
 .../clutter/accessibility/cally-atktext-example.c  |   2 +-
 .../clutter/accessibility/cally-clone-example.c    |   2 +-
 src/tests/clutter/conform/actor-paint-opacity.c    |   4 +-
 src/tests/clutter/conform/group.c                  |  62 ---
 src/tests/clutter/conform/meson.build              |   1 -
 src/tests/clutter/conform/texture-fbo.c            |   2 +-
 .../clutter/interactive/test-cogl-multitexture.c   |   2 +-
 .../clutter/interactive/test-cogl-tex-polygon.c    |   2 +-
 src/tests/clutter/interactive/test-events.c        |   2 +-
 src/tests/clutter/interactive/test-paint-wrapper.c |   2 +-
 src/tests/clutter/micro-bench/test-text.c          |   2 +-
 25 files changed, 14 insertions(+), 1010 deletions(-)
---
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
index 8b92682db5..681536ec6c 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-rectangle.h"
@@ -52,7 +51,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_RECTANGLE, cally_rectangle, cally_rectangle_new)
@@ -73,7 +71,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_RECTANGLE, cally_rectangle);
diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
index 440c30be36..771778d974 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-deprecated.h b/clutter/clutter/clutter-deprecated.h
index c2bb1cff26..a99964ade7 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -6,7 +6,6 @@
 #include "deprecated/clutter-actor.h"
 #include "deprecated/clutter-box.h"
 #include "deprecated/clutter-container.h"
-#include "deprecated/clutter-group.h"
 #include "deprecated/clutter-rectangle.h"
 #include "deprecated/clutter-stage.h"
 #include "deprecated/clutter-timeline.h"
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index d5ffdd04f0..efa52fa498 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -65,7 +65,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/meson.build b/clutter/clutter/meson.build
index 1796427401..5e7d25ac04 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -38,7 +38,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',
@@ -223,7 +222,6 @@ clutter_deprecated_headers = [
   'deprecated/clutter-actor.h',
   'deprecated/clutter-box.h',
   'deprecated/clutter-container.h',
-  'deprecated/clutter-group.h',
   'deprecated/clutter-rectangle.h',
   'deprecated/clutter-stage.h',
   'deprecated/clutter-timeline.h',
@@ -231,7 +229,6 @@ clutter_deprecated_headers = [
 
 clutter_deprecated_sources = [
   'deprecated/clutter-box.c',
-  'deprecated/clutter-group.c',
   'deprecated/clutter-rectangle.c',
 ]
 
@@ -288,7 +285,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',
@@ -302,7 +298,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/cogl/tests/conform/test-multitexture.c b/cogl/tests/conform/test-multitexture.c
index 391c4e703e..4f43c1c6ac 100644
--- a/cogl/tests/conform/test-multitexture.c
+++ b/cogl/tests/conform/test-multitexture.c
@@ -187,7 +187,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 5345453d2b..3093a19098 100644
--- a/cogl/tests/conform/test-texture-mipmaps.c
+++ b/cogl/tests/conform/test-texture-mipmaps.c
@@ -117,7 +117,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/src/tests/clutter/accessibility/cally-atkcomponent-example.c 
b/src/tests/clutter/accessibility/cally-atkcomponent-example.c
index cd46c2274f..09848dc89f 100644
--- a/src/tests/clutter/accessibility/cally-atkcomponent-example.c
+++ b/src/tests/clutter/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/src/tests/clutter/accessibility/cally-atkeditabletext-example.c 
b/src/tests/clutter/accessibility/cally-atkeditabletext-example.c
index 2b31e006c0..4c4c16376a 100644
--- a/src/tests/clutter/accessibility/cally-atkeditabletext-example.c
+++ b/src/tests/clutter/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/src/tests/clutter/accessibility/cally-atktext-example.c 
b/src/tests/clutter/accessibility/cally-atktext-example.c
index aa540c7bf1..5127e179cf 100644
--- a/src/tests/clutter/accessibility/cally-atktext-example.c
+++ b/src/tests/clutter/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/src/tests/clutter/accessibility/cally-clone-example.c 
b/src/tests/clutter/accessibility/cally-clone-example.c
index e80a8f1d15..9f6c916a29 100644
--- a/src/tests/clutter/accessibility/cally-clone-example.c
+++ b/src/tests/clutter/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/src/tests/clutter/conform/actor-paint-opacity.c b/src/tests/clutter/conform/actor-paint-opacity.c
index d6e77fce8c..16d8d92315 100644
--- a/src/tests/clutter/conform/actor-paint-opacity.c
+++ b/src/tests/clutter/conform/actor-paint-opacity.c
@@ -84,7 +84,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);
@@ -111,7 +111,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/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build
index 4484380ee5..842cd6f84c 100644
--- a/src/tests/clutter/conform/meson.build
+++ b/src/tests/clutter/conform/meson.build
@@ -41,7 +41,6 @@ clutter_conform_tests_general_tests = [
 ]
 
 clutter_conform_tests_deprecated_tests = [
-  'group',
   'rectangle',
 ]
 
diff --git a/src/tests/clutter/conform/texture-fbo.c b/src/tests/clutter/conform/texture-fbo.c
index 5d3348f05a..d5ab1de42b 100644
--- a/src/tests/clutter/conform/texture-fbo.c
+++ b/src/tests/clutter/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/src/tests/clutter/interactive/test-cogl-multitexture.c 
b/src/tests/clutter/interactive/test-cogl-multitexture.c
index b640622254..cd26846642 100644
--- a/src/tests/clutter/interactive/test-cogl-multitexture.c
+++ b/src/tests/clutter/interactive/test-cogl-multitexture.c
@@ -138,7 +138,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/src/tests/clutter/interactive/test-cogl-tex-polygon.c 
b/src/tests/clutter/interactive/test-cogl-tex-polygon.c
index 5fbb6df54f..e6235bacc6 100644
--- a/src/tests/clutter/interactive/test-cogl-tex-polygon.c
+++ b/src/tests/clutter/interactive/test-cogl-tex-polygon.c
@@ -366,7 +366,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/src/tests/clutter/interactive/test-events.c b/src/tests/clutter/interactive/test-events.c
index 16fadfc353..4074b67eb9 100644
--- a/src/tests/clutter/interactive/test-events.c
+++ b/src/tests/clutter/interactive/test-events.c
@@ -463,7 +463,7 @@ test_events_main (int argc, char *argv[])
   g_signal_connect (actor, "event", G_CALLBACK (input_cb), (char *) "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/src/tests/clutter/interactive/test-paint-wrapper.c 
b/src/tests/clutter/interactive/test-paint-wrapper.c
index 162681581d..2a30fd55af 100644
--- a/src/tests/clutter/interactive/test-paint-wrapper.c
+++ b/src/tests/clutter/interactive/test-paint-wrapper.c
@@ -263,7 +263,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/src/tests/clutter/micro-bench/test-text.c b/src/tests/clutter/micro-bench/test-text.c
index c3fa64132f..fc7060565f 100644
--- a/src/tests/clutter/micro-bench/test-text.c
+++ b/src/tests/clutter/micro-bench/test-text.c
@@ -58,7 +58,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);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]