From c74f4f63409e8ead2785677e720a5f478954197e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 5 Nov 2019 12:06:44 -0500 Subject: [PATCH] clutter: Remove some unused deprecated clutter_table_layout API https://gitlab.gnome.org/GNOME/mutter/merge_requests/921 --- .../clutter/deprecated/clutter-table-layout.c | 527 ------------------ .../clutter/deprecated/clutter-table-layout.h | 48 -- 2 files changed, 575 deletions(-) diff --git a/clutter/clutter/deprecated/clutter-table-layout.c b/clutter/clutter/deprecated/clutter-table-layout.c index 37ff4aa1d..c05a1b759 100644 --- a/clutter/clutter/deprecated/clutter-table-layout.c +++ b/clutter/clutter/deprecated/clutter-table-layout.c @@ -1785,26 +1785,6 @@ clutter_table_layout_set_column_spacing (ClutterTableLayout *layout, } } -/** - * clutter_table_layout_get_column_spacing: - * @layout: a #ClutterTableLayout - * - * Retrieves the spacing set using clutter_table_layout_set_column_spacing() - * - * Return value: the spacing between columns of the #ClutterTableLayout - * - * Since: 1.4 - * - * Deprecated: 1.18: Use #ClutterGridLayout:column-spacing - */ -guint -clutter_table_layout_get_column_spacing (ClutterTableLayout *layout) -{ - g_return_val_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout), 0); - - return layout->priv->col_spacing; -} - /** * clutter_table_layout_set_row_spacing: * @layout: a #ClutterTableLayout @@ -1839,26 +1819,6 @@ clutter_table_layout_set_row_spacing (ClutterTableLayout *layout, } } -/** - * clutter_table_layout_get_row_spacing: - * @layout: a #ClutterTableLayout - * - * Retrieves the spacing set using clutter_table_layout_set_row_spacing() - * - * Return value: the spacing between rows of the #ClutterTableLayout - * - * Since: 1.4 - * - * Deprecated: 1.18: Use #ClutterGridLayout:row-spacing instead - */ -guint -clutter_table_layout_get_row_spacing (ClutterTableLayout *layout) -{ - g_return_val_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout), 0); - - return layout->priv->row_spacing; -} - /** * clutter_table_layout_pack: * @layout: a #ClutterTableLayout @@ -1972,423 +1932,6 @@ clutter_table_layout_set_span (ClutterTableLayout *layout, table_child_set_span (CLUTTER_TABLE_CHILD (meta), column_span, row_span); } -/** - * clutter_table_layout_get_span: - * @layout: a #ClutterTableLayout - * @actor: a #ClutterActor child of @layout - * @column_span: (out): return location for the col span - * @row_span: (out): return location for the row span - * - * Retrieves the row and column span for @actor as set using - * clutter_table_layout_pack() or clutter_table_layout_set_span() - * - * Since: 1.4 - * - * Deprecated: 1.18: Use the `width` and `height` layout properties - * of #ClutterGridLayout instead - */ -void -clutter_table_layout_get_span (ClutterTableLayout *layout, - ClutterActor *actor, - gint *column_span, - gint *row_span) -{ - ClutterTableLayoutPrivate *priv; - ClutterLayoutManager *manager; - ClutterLayoutMeta *meta; - - g_return_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); - - priv = layout->priv; - - if (priv->container == NULL) - { - g_warning ("The layout of type '%s' must be associated to " - "a ClutterContainer before querying layout " - "properties", - G_OBJECT_TYPE_NAME (layout)); - return; - } - - manager = CLUTTER_LAYOUT_MANAGER (layout); - meta = clutter_layout_manager_get_child_meta (manager, - priv->container, - actor); - if (meta == NULL) - { - g_warning ("No layout meta found for the child of type '%s' " - "inside the layout manager of type '%s'", - G_OBJECT_TYPE_NAME (actor), - G_OBJECT_TYPE_NAME (manager)); - return; - } - - g_assert (CLUTTER_IS_TABLE_CHILD (meta)); - - if (column_span) - *column_span = CLUTTER_TABLE_CHILD (meta)->col_span; - - if (row_span) - *row_span = CLUTTER_TABLE_CHILD (meta)->row_span; -} - -/** - * clutter_table_layout_set_alignment: - * @layout: a #ClutterTableLayout - * @actor: a #ClutterActor child of @layout - * @x_align: Horizontal alignment policy for @actor - * @y_align: Vertical alignment policy for @actor - * - * Sets the horizontal and vertical alignment policies for @actor - * inside @layout - * - * Since: 1.4 - * - * Deprecated: 1.12: Use clutter_actor_set_x_align() and - * clutter_actor_set_y_align() instead. - */ -void -clutter_table_layout_set_alignment (ClutterTableLayout *layout, - ClutterActor *actor, - ClutterTableAlignment x_align, - ClutterTableAlignment y_align) -{ - ClutterTableLayoutPrivate *priv; - ClutterLayoutManager *manager; - ClutterLayoutMeta *meta; - - g_return_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); - - priv = layout->priv; - - if (priv->container == NULL) - { - g_warning ("The layout of type '%s' must be associated to " - "a ClutterContainer before querying layout " - "properties", - G_OBJECT_TYPE_NAME (layout)); - return; - } - - manager = CLUTTER_LAYOUT_MANAGER (layout); - meta = clutter_layout_manager_get_child_meta (manager, - priv->container, - actor); - if (meta == NULL) - { - g_warning ("No layout meta found for the child of type '%s' " - "inside the layout manager of type '%s'", - G_OBJECT_TYPE_NAME (actor), - G_OBJECT_TYPE_NAME (manager)); - return; - } - - g_assert (CLUTTER_IS_TABLE_CHILD (meta)); - - table_child_set_align (CLUTTER_TABLE_CHILD (meta), x_align, y_align); -} - -/** - * clutter_table_layout_get_alignment: - * @layout: a #ClutterTableLayout - * @actor: a #ClutterActor child of @layout - * @x_align: (out): return location for the horizontal alignment policy - * @y_align: (out): return location for the vertical alignment policy - * - * Retrieves the horizontal and vertical alignment policies for @actor - * as set using clutter_table_layout_pack() or - * clutter_table_layout_set_alignment(). - * - * Since: 1.4 - * - * Deprecated: 1.12: Use clutter_actor_get_x_align() and - * clutter_actor_get_y_align() instead. - */ -void -clutter_table_layout_get_alignment (ClutterTableLayout *layout, - ClutterActor *actor, - ClutterTableAlignment *x_align, - ClutterTableAlignment *y_align) -{ - ClutterTableLayoutPrivate *priv; - ClutterLayoutManager *manager; - ClutterLayoutMeta *meta; - - g_return_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); - - priv = layout->priv; - - if (priv->container == NULL) - { - g_warning ("The layout of type '%s' must be associated to " - "a ClutterContainer before querying layout " - "properties", - G_OBJECT_TYPE_NAME (layout)); - return; - } - - manager = CLUTTER_LAYOUT_MANAGER (layout); - meta = clutter_layout_manager_get_child_meta (manager, - priv->container, - actor); - if (meta == NULL) - { - g_warning ("No layout meta found for the child of type '%s' " - "inside the layout manager of type '%s'", - G_OBJECT_TYPE_NAME (actor), - G_OBJECT_TYPE_NAME (manager)); - return; - } - - g_assert (CLUTTER_IS_TABLE_CHILD (meta)); - - if (x_align) - *x_align = CLUTTER_TABLE_CHILD (meta)->x_align; - - if (y_align) - *y_align = CLUTTER_TABLE_CHILD (meta)->y_align; -} - -/** - * clutter_table_layout_set_fill: - * @layout: a #ClutterTableLayout - * @actor: a #ClutterActor child of @layout - * @x_fill: whether @actor should fill horizontally the allocated space - * @y_fill: whether @actor should fill vertically the allocated space - * - * Sets the horizontal and vertical fill policies for @actor - * inside @layout - * - * Since: 1.4 - * - * Deprecated: 1.12: Use clutter_actor_set_x_align() and - * clutter_actor_set_y_align() instead. - */ -void -clutter_table_layout_set_fill (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean x_fill, - gboolean y_fill) -{ - ClutterTableLayoutPrivate *priv; - ClutterLayoutManager *manager; - ClutterLayoutMeta *meta; - - g_return_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); - - priv = layout->priv; - - if (priv->container == NULL) - { - g_warning ("The layout of type '%s' must be associated to " - "a ClutterContainer before querying layout " - "properties", - G_OBJECT_TYPE_NAME (layout)); - return; - } - - manager = CLUTTER_LAYOUT_MANAGER (layout); - meta = clutter_layout_manager_get_child_meta (manager, - priv->container, - actor); - if (meta == NULL) - { - g_warning ("No layout meta found for the child of type '%s' " - "inside the layout manager of type '%s'", - G_OBJECT_TYPE_NAME (actor), - G_OBJECT_TYPE_NAME (manager)); - return; - } - - g_assert (CLUTTER_IS_TABLE_CHILD (meta)); - - table_child_set_fill (CLUTTER_TABLE_CHILD (meta), x_fill, y_fill); -} - -/** - * clutter_table_layout_get_fill: - * @layout: a #ClutterTableLayout - * @actor: a #ClutterActor child of @layout - * @x_fill: (out): return location for the horizontal fill policy - * @y_fill: (out): return location for the vertical fill policy - * - * Retrieves the horizontal and vertical fill policies for @actor - * as set using clutter_table_layout_pack() or clutter_table_layout_set_fill() - * - * Since: 1.4 - * - * Deprecated: 1.12: Use clutter_actor_get_x_align() and - * clutter_actor_get_y_align() instead. - */ -void -clutter_table_layout_get_fill (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean *x_fill, - gboolean *y_fill) -{ - ClutterTableLayoutPrivate *priv; - ClutterLayoutManager *manager; - ClutterLayoutMeta *meta; - - g_return_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); - - priv = layout->priv; - - if (priv->container == NULL) - { - g_warning ("The layout of type '%s' must be associated to " - "a ClutterContainer before querying layout " - "properties", - G_OBJECT_TYPE_NAME (layout)); - return; - } - - manager = CLUTTER_LAYOUT_MANAGER (layout); - meta = clutter_layout_manager_get_child_meta (manager, - priv->container, - actor); - if (meta == NULL) - { - g_warning ("No layout meta found for the child of type '%s' " - "inside the layout manager of type '%s'", - G_OBJECT_TYPE_NAME (actor), - G_OBJECT_TYPE_NAME (manager)); - return; - } - - g_assert (CLUTTER_IS_TABLE_CHILD (meta)); - - if (x_fill) - *x_fill = CLUTTER_TABLE_CHILD (meta)->x_fill; - - if (y_fill) - *y_fill = CLUTTER_TABLE_CHILD (meta)->y_fill; -} - - -/** - * clutter_table_layout_set_expand: - * @layout: a #ClutterTableLayout - * @actor: a #ClutterActor child of @layout - * @x_expand: whether @actor should allocate extra space horizontally - * @y_expand: whether @actor should allocate extra space vertically - * - * Sets the horizontal and vertical expand policies for @actor - * inside @layout - * - * Since: 1.4 - * - * Deprecated: 1.12: Use clutter_actor_set_x_expand() or - * clutter_actor_set_y_expand() instead. - */ -void -clutter_table_layout_set_expand (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean x_expand, - gboolean y_expand) -{ - ClutterTableLayoutPrivate *priv; - ClutterLayoutManager *manager; - ClutterLayoutMeta *meta; - - g_return_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); - - priv = layout->priv; - - if (priv->container == NULL) - { - g_warning ("The layout of type '%s' must be associated to " - "a ClutterContainer before querying layout " - "properties", - G_OBJECT_TYPE_NAME (layout)); - return; - } - - manager = CLUTTER_LAYOUT_MANAGER (layout); - meta = clutter_layout_manager_get_child_meta (manager, - priv->container, - actor); - if (meta == NULL) - { - g_warning ("No layout meta found for the child of type '%s' " - "inside the layout manager of type '%s'", - G_OBJECT_TYPE_NAME (actor), - G_OBJECT_TYPE_NAME (manager)); - return; - } - - g_assert (CLUTTER_IS_TABLE_CHILD (meta)); - - table_child_set_expand (CLUTTER_TABLE_CHILD (meta), x_expand, y_expand); -} - -/** - * clutter_table_layout_get_expand: - * @layout: a #ClutterTableLayout - * @actor: a #ClutterActor child of @layout - * @x_expand: (out): return location for the horizontal expand policy - * @y_expand: (out): return location for the vertical expand policy - * - * Retrieves the horizontal and vertical expand policies for @actor - * as set using clutter_table_layout_pack() or clutter_table_layout_set_expand() - * - * Since: 1.4 - * - * Deprecated: 1.12: Use clutter_actor_get_x_expand() and - * clutter_actor_get_y_expand() instead. - */ -void -clutter_table_layout_get_expand (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean *x_expand, - gboolean *y_expand) -{ - ClutterTableLayoutPrivate *priv; - ClutterLayoutManager *manager; - ClutterLayoutMeta *meta; - - g_return_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); - - priv = layout->priv; - - if (priv->container == NULL) - { - g_warning ("The layout of type '%s' must be associated to " - "a ClutterContainer before querying layout " - "properties", - G_OBJECT_TYPE_NAME (layout)); - return; - } - - manager = CLUTTER_LAYOUT_MANAGER (layout); - meta = clutter_layout_manager_get_child_meta (manager, - priv->container, - actor); - if (meta == NULL) - { - g_warning ("No layout meta found for the child of type '%s' " - "inside the layout manager of type '%s'", - G_OBJECT_TYPE_NAME (actor), - G_OBJECT_TYPE_NAME (manager)); - return; - } - - g_assert (CLUTTER_IS_TABLE_CHILD (meta)); - - if (x_expand) - *x_expand = CLUTTER_TABLE_CHILD (meta)->x_expand; - - if (y_expand) - *y_expand = CLUTTER_TABLE_CHILD (meta)->y_expand; -} - /** * clutter_table_layout_set_use_animations: * @layout: a #ClutterTableLayout @@ -2425,30 +1968,6 @@ clutter_table_layout_set_use_animations (ClutterTableLayout *layout, } } -/** - * clutter_table_layout_get_use_animations: - * @layout: a #ClutterTableLayout - * - * Retrieves whether @layout should animate changes in the layout properties - * - * Since clutter_table_layout_set_use_animations() - * - * Return value: %TRUE if the animations should be used, %FALSE otherwise - * - * Since: 1.4 - * - * Deprecated: 1.12: #ClutterTableLayout will honour the easing state - * of the children when allocating them. See clutter_actor_set_easing_mode() - * and clutter_actor_set_easing_duration(). - */ -gboolean -clutter_table_layout_get_use_animations (ClutterTableLayout *layout) -{ - g_return_val_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout), FALSE); - - return layout->priv->use_animations; -} - /** * clutter_table_layout_set_easing_mode: * @layout: a #ClutterTableLayout @@ -2485,29 +2004,6 @@ clutter_table_layout_set_easing_mode (ClutterTableLayout *layout, } } -/** - * clutter_table_layout_get_easing_mode: - * @layout: a #ClutterTableLayout - * - * Retrieves the easing mode set using clutter_table_layout_set_easing_mode() - * - * Return value: an easing mode - * - * Since: 1.4 - * - * Deprecated: 1.12: #ClutterTableLayout will honour the easing state - * of the children when allocating them. See clutter_actor_set_easing_mode() - * and clutter_actor_set_easing_duration(). - */ -gulong -clutter_table_layout_get_easing_mode (ClutterTableLayout *layout) -{ - g_return_val_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout), - CLUTTER_EASE_OUT_CUBIC); - - return layout->priv->easing_mode; -} - /** * clutter_table_layout_set_easing_duration: * @layout: a #ClutterTableLayout @@ -2543,29 +2039,6 @@ clutter_table_layout_set_easing_duration (ClutterTableLayout *layout, } } -/** - * clutter_table_layout_get_easing_duration: - * @layout: a #ClutterTableLayout - * - * Retrieves the duration set using clutter_table_layout_set_easing_duration() - * - * Return value: the duration of the animations, in milliseconds - * - * Since: 1.4 - * - * Deprecated: 1.12: #ClutterTableLayout will honour the easing state - * of the children when allocating them. See clutter_actor_set_easing_mode() - * and clutter_actor_set_easing_duration(). - */ -guint -clutter_table_layout_get_easing_duration (ClutterTableLayout *layout) -{ - g_return_val_if_fail (CLUTTER_IS_TABLE_LAYOUT (layout), 500); - - return layout->priv->easing_duration; -} - - /** * clutter_table_layout_get_row_count: * @layout: A #ClutterTableLayout diff --git a/clutter/clutter/deprecated/clutter-table-layout.h b/clutter/clutter/deprecated/clutter-table-layout.h index fd503cdf4..325287d1a 100644 --- a/clutter/clutter/deprecated/clutter-table-layout.h +++ b/clutter/clutter/deprecated/clutter-table-layout.h @@ -99,54 +99,12 @@ void clutter_table_layout_set_column_spacing (ClutterTableLayo CLUTTER_DEPRECATED_FOR (clutter_grid_layout_set_row_spacing) void clutter_table_layout_set_row_spacing (ClutterTableLayout *layout, guint spacing); -CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_column_spacing) -guint clutter_table_layout_get_column_spacing (ClutterTableLayout *layout); -CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_row_spacing) -guint clutter_table_layout_get_row_spacing (ClutterTableLayout *layout); - CLUTTER_DEPRECATED void clutter_table_layout_set_span (ClutterTableLayout *layout, ClutterActor *actor, gint column_span, gint row_span); CLUTTER_DEPRECATED -void clutter_table_layout_get_span (ClutterTableLayout *layout, - ClutterActor *actor, - gint *column_span, - gint *row_span); - -CLUTTER_DEPRECATED -void clutter_table_layout_set_alignment (ClutterTableLayout *layout, - ClutterActor *actor, - ClutterTableAlignment x_align, - ClutterTableAlignment y_align); -CLUTTER_DEPRECATED -void clutter_table_layout_get_alignment (ClutterTableLayout *layout, - ClutterActor *actor, - ClutterTableAlignment *x_align, - ClutterTableAlignment *y_align); -CLUTTER_DEPRECATED -void clutter_table_layout_set_fill (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean x_fill, - gboolean y_fill); -CLUTTER_DEPRECATED -void clutter_table_layout_get_fill (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean *x_fill, - gboolean *y_fill); -CLUTTER_DEPRECATED -void clutter_table_layout_set_expand (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean x_expand, - gboolean y_expand); -CLUTTER_DEPRECATED -void clutter_table_layout_get_expand (ClutterTableLayout *layout, - ClutterActor *actor, - gboolean *x_expand, - gboolean *y_expand); - -CLUTTER_DEPRECATED gint clutter_table_layout_get_row_count (ClutterTableLayout *layout); CLUTTER_DEPRECATED gint clutter_table_layout_get_column_count (ClutterTableLayout *layout); @@ -155,17 +113,11 @@ CLUTTER_DEPRECATED void clutter_table_layout_set_use_animations (ClutterTableLayout *layout, gboolean animate); CLUTTER_DEPRECATED -gboolean clutter_table_layout_get_use_animations (ClutterTableLayout *layout); -CLUTTER_DEPRECATED void clutter_table_layout_set_easing_mode (ClutterTableLayout *layout, gulong mode); CLUTTER_DEPRECATED -gulong clutter_table_layout_get_easing_mode (ClutterTableLayout *layout); -CLUTTER_DEPRECATED void clutter_table_layout_set_easing_duration (ClutterTableLayout *layout, guint msecs); -CLUTTER_DEPRECATED -guint clutter_table_layout_get_easing_duration (ClutterTableLayout *layout); G_END_DECLS