[mutter] clutter: Remove deprecated ClutterTableLayout

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

commit 7adaaab2d6b121e34cd74764b3e86f5c031f3220
Author: Adam Jackson <ajax redhat com>
Date:   Wed Nov 6 12:26:04 2019 -0500

    clutter: Remove deprecated ClutterTableLayout
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/921

 clutter/clutter/clutter-constraint.c              |    2 +-
 clutter/clutter/clutter-deprecated.h              |    1 -
 clutter/clutter/clutter-enums.h                   |   23 -
 clutter/clutter/clutter-grid-layout.c             |    8 +-
 clutter/clutter/clutter-layout-manager.c          |    2 +-
 clutter/clutter/deprecated/clutter-table-layout.c | 2082 ---------------------
 clutter/clutter/deprecated/clutter-table-layout.h |  124 --
 clutter/clutter/meson.build                       |    2 -
 src/tests/clutter/interactive/meson.build         |    1 -
 src/tests/clutter/interactive/test-table-layout.c |  290 ---
 src/tests/clutter/interactive/test-text-field.c   |   18 +-
 11 files changed, 15 insertions(+), 2538 deletions(-)
---
diff --git a/clutter/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c
index bd44dab9b..960280009 100644
--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@@ -48,7 +48,7 @@
  * Constraints provide a way to build user interfaces by using
  * relations between #ClutterActors, without explicit fixed
  * positioning and sizing, similarly to how fluid layout managers like
- * #ClutterBoxLayout and #ClutterTableLayout lay out their children.
+ * #ClutterBoxLayout lay out their children.
  *
  * Constraints are attached to a #ClutterActor, and are available
  * for inspection using clutter_actor_get_constraints().
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index d9aa94bc2..e793c3f6b 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -12,7 +12,6 @@
 #include "deprecated/clutter-rectangle.h"
 #include "deprecated/clutter-stage.h"
 #include "deprecated/clutter-state.h"
-#include "deprecated/clutter-table-layout.h"
 #include "deprecated/clutter-timeline.h"
 
 #undef __CLUTTER_DEPRECATED_H_INSIDE__
diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h
index 23b0ab2e1..ee7461bb8 100644
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -1183,29 +1183,6 @@ typedef enum /*< prefix=CLUTTER_PAN >*/
   CLUTTER_PAN_AXIS_AUTO
 } ClutterPanAxis;
 
-
-/**
- * ClutterTableAlignment:
- * @CLUTTER_TABLE_ALIGNMENT_START: Align the child to the top or to the
- *   left of a cell in the table, depending on the axis
- * @CLUTTER_TABLE_ALIGNMENT_CENTER: Align the child to the center of
- *   a cell in the table
- * @CLUTTER_TABLE_ALIGNMENT_END: Align the child to the bottom or to the
- *   right of a cell in the table, depending on the axis
- *
- * The alignment policies available on each axis of the #ClutterTableLayout
- *
- * Since: 1.4
- *
- * Deprecated: 1.22: Use the alignment properties of #ClutterActor
- */
-typedef enum
-{
-  CLUTTER_TABLE_ALIGNMENT_START,
-  CLUTTER_TABLE_ALIGNMENT_CENTER,
-  CLUTTER_TABLE_ALIGNMENT_END
-} ClutterTableAlignment;
-
 /**
  * ClutterTextureFlags:
  * @CLUTTER_TEXTURE_NONE: No flags
diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c
index 70c6ac1ec..29ec54759 100644
--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@@ -44,12 +44,12 @@
  * SECTION:clutter-grid-layout
  * @Short_description: A layout manager for a grid of actors
  * @Title: ClutterGridLayout
- * @See_also: #ClutterTableLayout, #ClutterBoxLayout
+ * @See_also: #ClutterBoxLayout
  *
  * #ClutterGridLayout is a layout manager which arranges its child widgets in
- * rows and columns. It is a very similar to #ClutterTableLayout and
- * #ClutterBoxLayout, but it consistently uses #ClutterActor's
- * alignment and expansion flags instead of custom child properties.
+ * rows and columns. It is a very similar to #ClutterBoxLayout, but it
+ * consistently uses #ClutterActor's alignment and expansion flags instead of
+ * custom child properties.
  *
  * Children are added using clutter_grid_layout_attach(). They can span
  * multiple rows or columns. It is also possible to add a child next to an
diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c
index 212985521..13dbd6c0b 100644
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -98,7 +98,7 @@
  * |[
  * {
  *   "type" : "ClutterBox",
- *   "layout-manager" : { "type" : "ClutterTableLayout" },
+ *   "layout-manager" : { "type" : "ClutterGridLayout" },
  *   "children" : [
  *     {
  *       "type" : "ClutterText",
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index bc1feb4c3..567f5fc23 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -226,7 +226,6 @@ clutter_deprecated_headers = [
   'deprecated/clutter-rectangle.h',
   'deprecated/clutter-stage.h',
   'deprecated/clutter-state.h',
-  'deprecated/clutter-table-layout.h',
   'deprecated/clutter-timeline.h',
 ]
 
@@ -237,7 +236,6 @@ clutter_deprecated_sources = [
   'deprecated/clutter-group.c',
   'deprecated/clutter-rectangle.c',
   'deprecated/clutter-state.c',
-  'deprecated/clutter-table-layout.c',
 ]
 
 clutter_backend_sources = []
diff --git a/src/tests/clutter/interactive/meson.build b/src/tests/clutter/interactive/meson.build
index e456c448d..7a12d8ae2 100644
--- a/src/tests/clutter/interactive/meson.build
+++ b/src/tests/clutter/interactive/meson.build
@@ -41,7 +41,6 @@ clutter_tests_interactive_test_sources = [
   'test-scrolling.c',
   'test-swipe-action.c',
   'test-cogl-point-sprites.c',
-  'test-table-layout.c',
   'test-path-constraint.c',
   'test-state-script.c',
   'test-devices.c',
diff --git a/src/tests/clutter/interactive/test-text-field.c b/src/tests/clutter/interactive/test-text-field.c
index 8d203a22a..34d9f00c1 100644
--- a/src/tests/clutter/interactive/test-text-field.c
+++ b/src/tests/clutter/interactive/test-text-field.c
@@ -254,7 +254,7 @@ test_text_field_main (gint    argc,
 {
   ClutterActor *stage;
   ClutterActor *box, *label, *entry;
-  ClutterLayoutManager *table;
+  ClutterLayoutManager *grid;
   PangoAttrList *entry_attrs;
 
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
@@ -265,12 +265,12 @@ test_text_field_main (gint    argc,
   clutter_actor_set_background_color (stage, CLUTTER_COLOR_Black);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
-  table = clutter_table_layout_new ();
-  clutter_table_layout_set_column_spacing (CLUTTER_TABLE_LAYOUT (table), 6);
-  clutter_table_layout_set_row_spacing (CLUTTER_TABLE_LAYOUT (table), 6);
+  grid = clutter_grid_layout_new ();
+  clutter_grid_layout_set_column_spacing (CLUTTER_GRID_LAYOUT (grid), 6);
+  clutter_grid_layout_set_row_spacing (CLUTTER_GRID_LAYOUT (grid), 6);
 
   box = clutter_actor_new ();
-  clutter_actor_set_layout_manager (box, table);
+  clutter_actor_set_layout_manager (box, grid);
   clutter_actor_add_constraint (box, clutter_bind_constraint_new (stage, CLUTTER_BIND_WIDTH, -24.0));
   clutter_actor_add_constraint (box, clutter_bind_constraint_new (stage, CLUTTER_BIND_HEIGHT, -24.0));
   clutter_actor_set_position (box, 12, 12);
@@ -279,7 +279,7 @@ test_text_field_main (gint    argc,
   label = create_label (CLUTTER_COLOR_White, "<b>Input field:</b>");
   g_object_set (label, "min-width", 150.0, NULL);
   clutter_actor_add_child (box, label);
-  clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), label,
+  clutter_layout_manager_child_set (grid, CLUTTER_CONTAINER (box), label,
                                     "row", 0,
                                     "column", 0,
                                     "x-expand", FALSE,
@@ -291,7 +291,7 @@ test_text_field_main (gint    argc,
   pango_attr_list_insert (entry_attrs, pango_attr_underline_color_new (65535, 0, 0));
   entry = create_entry (CLUTTER_COLOR_Black, "somme misspeeled textt", entry_attrs, 0, 0);
   clutter_actor_add_child (box, entry);
-  clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), entry,
+  clutter_layout_manager_child_set (grid, CLUTTER_CONTAINER (box), entry,
                                     "row", 0,
                                     "column", 1,
                                     "x-expand", TRUE,
@@ -302,7 +302,7 @@ test_text_field_main (gint    argc,
 
   label = create_label (CLUTTER_COLOR_White, "<b>A very long password field:</b>");
   clutter_actor_add_child (box, label);
-  clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), label,
+  clutter_layout_manager_child_set (grid, CLUTTER_CONTAINER (box), label,
                                     "row", 1,
                                     "column", 0,
                                     "x-expand", FALSE,
@@ -311,7 +311,7 @@ test_text_field_main (gint    argc,
 
   entry = create_entry (CLUTTER_COLOR_Black, "password", NULL, '*', 8);
   clutter_actor_add_child (box, entry);
-  clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), entry,
+  clutter_layout_manager_child_set (grid, CLUTTER_CONTAINER (box), entry,
                                     "row", 1,
                                     "column", 1,
                                     "x-expand", TRUE,