[mutter/gbsneto/clutter-cleanups-part1: 14/19] Drop ClutterRectangle

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 5ce8067ca6c195c0c893543b796ef6fad91855a1
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Jun 26 17:54:09 2020 -0300

    Drop ClutterRectangle
    
    And the correcponding CallyRectangle class.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1332

 clutter/clutter/cally/cally-rectangle.c        |  98 ----
 clutter/clutter/cally/cally-rectangle.h        |  84 ----
 clutter/clutter/cally/cally.c                  |   3 -
 clutter/clutter/cally/cally.h                  |   1 -
 clutter/clutter/clutter-bind-constraint.c      |   9 +-
 clutter/clutter/clutter-deprecated.h           |   1 -
 clutter/clutter/clutter-script.c               |   6 +-
 clutter/clutter/deprecated/clutter-rectangle.c | 626 -------------------------
 clutter/clutter/deprecated/clutter-rectangle.h | 117 -----
 clutter/clutter/meson.build                    |   9 -
 src/tests/clutter/conform/meson.build          |   5 -
 src/tests/clutter/conform/rectangle.c          |  53 ---
 12 files changed, 9 insertions(+), 1003 deletions(-)
---
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
index 681536ec6c..223aa39e0d 100644
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -38,7 +38,6 @@
 #include "cally-actor.h"
 #include "cally-stage.h"
 #include "cally-text.h"
-#include "cally-rectangle.h"
 #include "cally-clone.h"
 
 #include "cally-factory.h"
@@ -53,7 +52,6 @@
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_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)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_CLONE, cally_clone, cally_clone_new)
 
 /**
@@ -73,7 +71,6 @@ cally_accessibility_init (void)
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_ACTOR, cally_actor);
   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);
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_CLONE, cally_clone);
 
   /* Initialize the CallyUtility class */
diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
index 771778d974..98c3a44992 100644
--- a/clutter/clutter/cally/cally.h
+++ b/clutter/clutter/cally/cally.h
@@ -27,7 +27,6 @@
 #include "cally-clone.h"
 #include "cally-factory.h"
 #include "cally-main.h"
-#include "cally-rectangle.h"
 #include "cally-root.h"
 #include "cally-stage.h"
 #include "cally-text.h"
diff --git a/clutter/clutter/clutter-bind-constraint.c b/clutter/clutter/clutter-bind-constraint.c
index 0f51600e07..6a5ab57d21 100644
--- a/clutter/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter/clutter-bind-constraint.c
@@ -38,12 +38,14 @@
  *
  * |[<!-- language="C" -->
  * // source
- * rect[0] = clutter_rectangle_new_with_color (&red_color);
+ * rect[0] = clutter_actor_new ();
+ * clutter_actor_set_background_color (rect[0], &red_color);
  * clutter_actor_set_position (rect[0], x_pos, y_pos);
  * clutter_actor_set_size (rect[0], 100, 100);
  *
  * // second rectangle
- * rect[1] = clutter_rectangle_new_with_color (&green_color);
+ * rect[1] = clutter_actor_new ();
+ * clutter_actor_set_background_color (rect[1], &green_color);
  * clutter_actor_set_size (rect[1], 100, 100);
  * clutter_actor_set_opacity (rect[1], 0);
  *
@@ -53,7 +55,8 @@
  * clutter_actor_add_constraint_with_name (rect[1], "green-y", constraint);
  *
  * // third rectangle
- * rect[2] = clutter_rectangle_new_with_color (&blue_color);
+ * rect[2] = clutter_actor_new ();
+ * clutter_actor_set_background_color (rect[2], &blue_color);
  * clutter_actor_set_size (rect[2], 100, 100);
  * clutter_actor_set_opacity (rect[2], 0);
  *
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 5dc0135c93..c8ba04c203 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -5,7 +5,6 @@
 
 #include "deprecated/clutter-actor.h"
 #include "deprecated/clutter-container.h"
-#include "deprecated/clutter-rectangle.h"
 
 #undef __CLUTTER_DEPRECATED_H_INSIDE__
 
diff --git a/clutter/clutter/clutter-script.c b/clutter/clutter/clutter-script.c
index 89dc166c9b..15bfdc5824 100644
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -50,14 +50,14 @@
  * <informalexample><programlisting><![CDATA[
  * {
  *   "id"     : "red-button",
- *   "type"   : "ClutterRectangle",
+ *   "type"   : "ClutterActor",
  *   "width"  : 100,
  *   "height" : 100,
- *   "color"  : "&num;ff0000ff"
+ *   "background-color" : "&num;ff0000ff"
  * }
  * ]]></programlisting></informalexample>
  *
- * This will produce a red #ClutterRectangle, 100x100 pixels wide, and
+ * This will produce a red #ClutterActor, 100x100 pixels wide, and
  * with a ClutterScript id of "red-button"; it can be retrieved by calling:
  *
  * |[
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index ced37073e7..f7680a53f1 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -221,11 +221,6 @@ clutter_nonintrospected_sources = [
 clutter_deprecated_headers = [
   'deprecated/clutter-actor.h',
   'deprecated/clutter-container.h',
-  'deprecated/clutter-rectangle.h',
-]
-
-clutter_deprecated_sources = [
-  'deprecated/clutter-rectangle.c',
 ]
 
 clutter_backend_sources = []
@@ -283,7 +278,6 @@ cally_headers = [
     'cally/cally-factory.h',
     'cally/cally.h',
     'cally/cally-main.h',
-    'cally/cally-rectangle.h',
     'cally/cally-root.h',
     'cally/cally-stage.h',
     'cally/cally-text.h',
@@ -294,7 +288,6 @@ cally_sources = [
     'cally/cally-actor.c',
     'cally/cally.c',
     'cally/cally-clone.c',
-    'cally/cally-rectangle.c',
     'cally/cally-root.c',
     'cally/cally-stage.c',
     'cally/cally-text.c',
@@ -376,7 +369,6 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
     clutter_headers,
     clutter_private_headers,
     clutter_nonintrospected_sources,
-    clutter_deprecated_sources,
     clutter_deprecated_headers,
     clutter_backend_sources,
     clutter_backend_nonintrospected_sources,
@@ -422,7 +414,6 @@ if have_introspection
       clutter_built_headers,
       clutter_sources,
       clutter_headers,
-      clutter_deprecated_sources,
       clutter_deprecated_headers,
     ],
     nsversion: libmutter_api_version,
diff --git a/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build
index 842cd6f84c..2c05799fb5 100644
--- a/src/tests/clutter/conform/meson.build
+++ b/src/tests/clutter/conform/meson.build
@@ -40,15 +40,10 @@ clutter_conform_tests_general_tests = [
   'units',
 ]
 
-clutter_conform_tests_deprecated_tests = [
-  'rectangle',
-]
-
 clutter_conform_tests = []
 clutter_conform_tests +=  clutter_conform_tests_actor_tests
 clutter_conform_tests += clutter_conform_tests_classes_tests
 clutter_conform_tests += clutter_conform_tests_general_tests
-clutter_conform_tests += clutter_conform_tests_deprecated_tests
 
 test_env = environment()
 test_env.set('G_TEST_SRCDIR', meson.current_source_dir())