[mutter/gbsneto/clutter-cleanups-part1: 15/22] Drop ClutterBox

[Robert Mader <rmader src gnome org>]

commit 2802d359e5b2ba10c24ffd8260d375f42d226d24
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Jun 26 17:15:04 2020 -0300

    Drop ClutterBox
    
    Nobody was subclassing or using it, except for the tests. Replace
    it by ClutterActor in the tests.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1332

 clutter/clutter/clutter-deprecated.h               |   1 -
 clutter/clutter/clutter-layout-manager.c           |   5 +-
 clutter/clutter/deprecated/clutter-box.c           | 745 ---------------------
 clutter/clutter/deprecated/clutter-box.h           | 143 ----
 clutter/clutter/meson.build                        |   2 -
 src/tests/clutter/conform/script-parser.c          |   8 +-
 .../conform/scripts/test-script-named-object.json  |   2 +-
 .../scripts/test-script-object-property.json       |   2 +-
 8 files changed, 8 insertions(+), 900 deletions(-)
---
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 8d26bf087c..5dc0135c93 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -4,7 +4,6 @@
 #define __CLUTTER_DEPRECATED_H_INSIDE__
 
 #include "deprecated/clutter-actor.h"
-#include "deprecated/clutter-box.h"
 #include "deprecated/clutter-container.h"
 #include "deprecated/clutter-rectangle.h"
 
diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c
index ad642d8b6a..9c4f7228be 100644
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -32,8 +32,7 @@
  * it has been paired, and it controls the allocation of its children.
  *
  * Any composite or container #ClutterActor subclass can delegate the
- * layouting of its children to a #ClutterLayoutManager. Clutter provides
- * a generic container using #ClutterLayoutManager called #ClutterBox.
+ * layouting of its children to a #ClutterLayoutManager.
  *
  * Clutter provides some simple #ClutterLayoutManager sub-classes, like
  * #ClutterFlowLayout and #ClutterBinLayout.
@@ -97,7 +96,7 @@
  *
  * |[
  * {
- *   "type" : "ClutterBox",
+ *   "type" : "ClutterActor",
  *   "layout-manager" : { "type" : "ClutterGridLayout" },
  *   "children" : [
  *     {
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index eed943896a..ced37073e7 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -220,13 +220,11 @@ clutter_nonintrospected_sources = [
 
 clutter_deprecated_headers = [
   'deprecated/clutter-actor.h',
-  'deprecated/clutter-box.h',
   'deprecated/clutter-container.h',
   'deprecated/clutter-rectangle.h',
 ]
 
 clutter_deprecated_sources = [
-  'deprecated/clutter-box.c',
   'deprecated/clutter-rectangle.c',
 ]
 
diff --git a/src/tests/clutter/conform/script-parser.c b/src/tests/clutter/conform/script-parser.c
index 30ce229396..5f4d8b600d 100644
--- a/src/tests/clutter/conform/script-parser.c
+++ b/src/tests/clutter/conform/script-parser.c
@@ -215,9 +215,9 @@ script_object_property (void)
   g_assert_no_error (error);
 
   actor = clutter_script_get_object (script, "test");
-  g_assert (CLUTTER_IS_BOX (actor));
+  g_assert (CLUTTER_IS_ACTOR (actor));
 
-  manager = clutter_box_get_layout_manager (CLUTTER_BOX (actor));
+  manager = clutter_actor_get_layout_manager (CLUTTER_ACTOR (actor));
   g_assert (CLUTTER_IS_BIN_LAYOUT (manager));
 
   g_object_unref (script);
@@ -241,9 +241,9 @@ script_named_object (void)
   g_assert_no_error (error);
 
   actor = clutter_script_get_object (script, "test");
-  g_assert (CLUTTER_IS_BOX (actor));
+  g_assert (CLUTTER_IS_ACTOR (actor));
 
-  manager = clutter_box_get_layout_manager (CLUTTER_BOX (actor));
+  manager = clutter_actor_get_layout_manager (CLUTTER_ACTOR (actor));
   g_assert (CLUTTER_IS_BOX_LAYOUT (manager));
   g_assert (clutter_box_layout_get_orientation (CLUTTER_BOX_LAYOUT (manager)) == 
CLUTTER_ORIENTATION_VERTICAL);
 
diff --git a/src/tests/clutter/conform/scripts/test-script-named-object.json 
b/src/tests/clutter/conform/scripts/test-script-named-object.json
index 6611b62a40..956d2b4fd6 100644
--- a/src/tests/clutter/conform/scripts/test-script-named-object.json
+++ b/src/tests/clutter/conform/scripts/test-script-named-object.json
@@ -12,7 +12,7 @@
     "children" : [
       {
         "id" : "test",
-        "type" : "ClutterBox",
+        "type" : "ClutterActor",
         "layout-manager" : "layout",
         "children" : [
           {
diff --git a/src/tests/clutter/conform/scripts/test-script-object-property.json 
b/src/tests/clutter/conform/scripts/test-script-object-property.json
index 18a02fb8b1..d41a5f12ce 100644
--- a/src/tests/clutter/conform/scripts/test-script-object-property.json
+++ b/src/tests/clutter/conform/scripts/test-script-object-property.json
@@ -1,6 +1,6 @@
 {
   "id" : "test",
-  "type" : "ClutterBox",
+  "type" : "ClutterActor",
   "layout-manager" : { "id" : "layout", "type" : "ClutterBinLayout" },
   "children" : [
     {