[clutter] Stop using macros for accessing actor state



commit dac33c5feaa7e5e04490c81b3431a3deb8dede46
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Apr 23 17:39:30 2015 +0100

    Stop using macros for accessing actor state
    
    Use the newly added functions instead.

 clutter/clutter-bin-layout.c              |    6 +++---
 clutter/clutter-box-layout.c              |   16 ++++++++--------
 clutter/clutter-clone.c                   |    2 +-
 clutter/clutter-drop-action.c             |    2 +-
 clutter/clutter-flow-layout.c             |    6 +++---
 clutter/clutter-grid-layout.c             |   10 +++++-----
 clutter/deprecated/clutter-table-layout.c |   10 +++++-----
 examples/layout-manager.c                 |    8 ++++----
 8 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c
index 2ee8012..2360ee2 100644
--- a/clutter/clutter-bin-layout.c
+++ b/clutter/clutter-bin-layout.c
@@ -306,7 +306,7 @@ clutter_bin_layout_get_preferred_width (ClutterLayoutManager *manager,
     {
       gfloat minimum, natural;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       clutter_actor_get_preferred_width (child, for_height,
@@ -343,7 +343,7 @@ clutter_bin_layout_get_preferred_height (ClutterLayoutManager *manager,
     {
       gfloat minimum, natural;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       clutter_actor_get_preferred_height (child, for_width,
@@ -431,7 +431,7 @@ clutter_bin_layout_allocate (ClutterLayoutManager   *manager,
       gboolean x_fill, y_fill, is_fixed_position_set;
       float fixed_x, fixed_y;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta = clutter_layout_manager_get_child_meta (manager,
diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c
index 20b2628..12ce1e3 100644
--- a/clutter/clutter-box-layout.c
+++ b/clutter/clutter-box-layout.c
@@ -485,7 +485,7 @@ get_preferred_size_for_orientation (ClutterBoxLayout   *self,
     {
       gfloat child_min = 0, child_nat = 0;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
        continue;
 
       n_children++;
@@ -533,7 +533,7 @@ get_base_size_for_opposite_orientation (ClutterBoxLayout   *self,
     {
       gfloat child_min = 0, child_nat = 0;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
        continue;
 
       n_children++;
@@ -606,7 +606,7 @@ get_preferred_size_for_opposite_orientation (ClutterBoxLayout   *self,
   clutter_actor_iter_init (&iter, container);
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
        continue;
 
       get_child_size (child, priv->orientation, -1,
@@ -647,7 +647,7 @@ get_preferred_size_for_opposite_orientation (ClutterBoxLayout   *self,
       ClutterBoxChild   *box_child;
 
       /* If widget is not visible, skip it. */
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta      = clutter_layout_manager_get_child_meta (layout, real_container, child);
@@ -686,7 +686,7 @@ get_preferred_size_for_opposite_orientation (ClutterBoxLayout   *self,
     {
       gfloat child_min = 0, child_nat = 0;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       get_child_size (child, opposite_orientation,
@@ -819,7 +819,7 @@ count_expand_children (ClutterLayoutManager *layout,
   clutter_actor_iter_init (&iter, actor);
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (clutter_actor_is_visible (child))
         {
           ClutterLayoutMeta *meta;
 
@@ -990,7 +990,7 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
   clutter_actor_iter_init (&iter, actor);
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL)
@@ -1110,7 +1110,7 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
       ClutterBoxChild *box_child;
 
       /* If widget is not visible, skip it. */
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta = clutter_layout_manager_get_child_meta (layout,
diff --git a/clutter/clutter-clone.c b/clutter/clutter-clone.c
index 5df1447..a84c7fe 100644
--- a/clutter/clutter-clone.c
+++ b/clutter/clutter-clone.c
@@ -178,7 +178,7 @@ clutter_clone_paint (ClutterActor *actor)
                                        clutter_actor_get_paint_opacity (actor));
   _clutter_actor_set_enable_model_view_transform (priv->clone_source, FALSE);
 
-  if (!CLUTTER_ACTOR_IS_MAPPED (priv->clone_source))
+  if (!clutter_actor_is_mapped (priv->clone_source))
     {
       _clutter_actor_set_enable_paint_unmapped (priv->clone_source, TRUE);
       was_unmapped = TRUE;
diff --git a/clutter/clutter-drop-action.c b/clutter/clutter-drop-action.c
index d1940dd..8aa5f26 100644
--- a/clutter/clutter-drop-action.c
+++ b/clutter/clutter-drop-action.c
@@ -307,7 +307,7 @@ on_actor_mapped (ClutterActor      *actor,
                  GParamSpec        *pspec,
                  ClutterDropAction *self)
 {
-  if (CLUTTER_ACTOR_IS_MAPPED (actor))
+  if (clutter_actor_is_mapped (actor))
     {
       if (self->priv->stage == NULL)
         self->priv->stage = clutter_actor_get_stage (actor);
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index 0645666..c32122c 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -239,7 +239,7 @@ clutter_flow_layout_get_preferred_width (ClutterLayoutManager *manager,
       gfloat child_min, child_natural;
       gfloat new_y, item_height;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       if (priv->orientation == CLUTTER_FLOW_VERTICAL && for_height > 0)
@@ -430,7 +430,7 @@ clutter_flow_layout_get_preferred_height (ClutterLayoutManager *manager,
       gfloat child_min, child_natural;
       gfloat new_x, item_width;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       if (priv->orientation == CLUTTER_FLOW_HORIZONTAL && for_width > 0)
@@ -620,7 +620,7 @@ clutter_flow_layout_allocate (ClutterLayoutManager   *manager,
       gfloat new_x, new_y;
       gfloat child_min, child_natural;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       new_x = new_y = 0;
diff --git a/clutter/clutter-grid-layout.c b/clutter/clutter-grid-layout.c
index e9ef8f7..e462153 100644
--- a/clutter/clutter-grid-layout.c
+++ b/clutter/clutter-grid-layout.c
@@ -541,7 +541,7 @@ clutter_grid_request_non_spanning (ClutterGridRequest *request,
   clutter_actor_iter_init (&iter, CLUTTER_ACTOR (priv->container));
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       grid_child = GET_GRID_CHILD (request->grid, child);
@@ -626,7 +626,7 @@ clutter_grid_request_spanning (ClutterGridRequest *request,
   clutter_actor_iter_init (&iter, CLUTTER_ACTOR (priv->container));
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       grid_child = GET_GRID_CHILD (request->grid, child);
@@ -763,7 +763,7 @@ clutter_grid_request_compute_expand (ClutterGridRequest *request,
   clutter_actor_iter_init (&iter, CLUTTER_ACTOR (priv->container));
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       grid_child = GET_GRID_CHILD (request->grid, child);
@@ -782,7 +782,7 @@ clutter_grid_request_compute_expand (ClutterGridRequest *request,
   clutter_actor_iter_init (&iter, CLUTTER_ACTOR (priv->container));
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       grid_child = GET_GRID_CHILD (request->grid, child);
@@ -1416,7 +1416,7 @@ clutter_grid_layout_allocate (ClutterLayoutManager   *layout,
       gfloat x, y, width, height;
       ClutterGridChild *grid_child;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       grid_child = GET_GRID_CHILD (self, child);
diff --git a/clutter/deprecated/clutter-table-layout.c b/clutter/deprecated/clutter-table-layout.c
index c09165b..51944d0 100644
--- a/clutter/deprecated/clutter-table-layout.c
+++ b/clutter/deprecated/clutter-table-layout.c
@@ -724,7 +724,7 @@ calculate_col_widths (ClutterTableLayout *self,
       DimensionData *col;
       gfloat c_min, c_pref;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta =
@@ -766,7 +766,7 @@ calculate_col_widths (ClutterTableLayout *self,
       gint start_col, end_col;
       gint n_expand;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta =
@@ -1001,7 +1001,7 @@ calculate_row_heights (ClutterTableLayout *self,
       DimensionData *row;
       gfloat c_min, c_pref;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta =
@@ -1044,7 +1044,7 @@ calculate_row_heights (ClutterTableLayout *self,
       gint start_row, end_row;
       gint n_expand;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta =
@@ -1405,7 +1405,7 @@ clutter_table_layout_allocate (ClutterLayoutManager   *layout,
       gdouble x_align, y_align;
       gboolean x_fill, y_fill;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       meta =
diff --git a/examples/layout-manager.c b/examples/layout-manager.c
index 909df92..c5518f2 100644
--- a/examples/layout-manager.c
+++ b/examples/layout-manager.c
@@ -64,7 +64,7 @@ multi_layout_get_preferred_width (ClutterLayoutManager *manager,
     {
       float child_minimum, child_natural;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       clutter_actor_get_preferred_width (child, -1.f,
@@ -120,7 +120,7 @@ multi_layout_get_preferred_height (ClutterLayoutManager *manager,
     {
       float child_minimum, child_natural;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       clutter_actor_get_preferred_height (child, -1.f,
@@ -172,7 +172,7 @@ get_visible_children (ClutterActor *actor)
   clutter_actor_iter_init (&iter, actor);
   while (clutter_actor_iter_next (&iter, &child))
     {
-      if (CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (clutter_actor_is_visible (child))
         n_visible_children += 1;
     }
 
@@ -227,7 +227,7 @@ multi_layout_allocate (ClutterLayoutManager   *manager,
     {
       ClutterActorBox child_allocation = CLUTTER_ACTOR_BOX_INIT_ZERO;
 
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!clutter_actor_is_visible (child))
         continue;
 
       if (self->state == MULTI_LAYOUT_GRID)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]