[clutter/wip/apocalypses/apocalypse-1: 73/92] container: Provide default implementation of vfuncs

[Emmanuele Bassi <ebassi src gnome org>]

commit 2291468194ccd780e130833de4da73c4c266186d
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Tue Dec 20 15:04:24 2011 +0000

    container: Provide default implementation of vfuncs
    
    Instead of making ClutterActor implement the basic add/remove/foreach
    virtual functions of ClutterContainer, we can simply do that from
    within the ClutterContainer implementation.

 clutter/clutter-actor.c     |   49 -----------------------
 clutter/clutter-container.c |   92 +++++++++++++++++++++++++++---------------
 2 files changed, 59 insertions(+), 82 deletions(-)
---
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index a439628..5cebae7 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -10819,51 +10819,6 @@ clutter_actor_set_anchor_point_from_gravity (ClutterActor   *self,
 }
 
 static void
-container_add_actor (ClutterContainer *container,
-                     ClutterActor     *actor)
-{
-  clutter_actor_add_child (CLUTTER_ACTOR (container), actor);
-}
-
-static void
-container_remove_actor (ClutterContainer *container,
-                        ClutterActor     *actor)
-{
-  clutter_actor_remove_child (CLUTTER_ACTOR (container), actor);
-}
-
-typedef struct {
-  ClutterCallback callback;
-  gpointer data;
-} ForeachClosure;
-
-static gboolean
-foreach_cb (ClutterActor *actor,
-            gpointer      data)
-{
-  ForeachClosure *clos = data;
-
-  clos->callback (actor, clos->data);
-
-  return TRUE;
-}
-
-static void
-container_foreach (ClutterContainer *container,
-                   ClutterCallback   callback,
-                   gpointer          user_data)
-{
-  ForeachClosure clos;
-
-  clos.callback = callback;
-  clos.data = user_data;
-
-  _clutter_actor_foreach_child (CLUTTER_ACTOR (container),
-                                foreach_cb,
-                                &clos);
-}
-
-static void
 container_raise (ClutterContainer *container,
                  ClutterActor     *child,
                  ClutterActor     *sibling)
@@ -10897,10 +10852,6 @@ container_sort_by_depth (ClutterContainer *container)
 static void
 clutter_container_iface_init (ClutterContainerIface *iface)
 {
-  iface->add = container_add_actor;
-  iface->remove = container_remove_actor;
-  iface->foreach = container_foreach;
-
   iface->raise = container_raise;
   iface->lower = container_lower;
   iface->sort_depth_order = container_sort_by_depth;
diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c
index aa181b0..69561ce 100644
--- a/clutter/clutter-container.c
+++ b/clutter/clutter-container.c
@@ -37,8 +37,8 @@
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "deprecated/clutter-container.h"
 
+#include "clutter-actor-private.h"
 #include "clutter-child-meta.h"
-
 #include "clutter-debug.h"
 #include "clutter-main.h"
 #include "clutter-marshal.h"
@@ -103,6 +103,51 @@ typedef ClutterContainerIface   ClutterContainerInterface;
 G_DEFINE_INTERFACE (ClutterContainer, clutter_container, G_TYPE_OBJECT);
 
 static void
+container_real_add (ClutterContainer *container,
+                    ClutterActor     *actor)
+{
+  clutter_actor_add_child (CLUTTER_ACTOR (container), actor);
+}
+
+static void
+container_real_remove (ClutterContainer *container,
+                       ClutterActor     *actor)
+{
+  clutter_actor_remove_child (CLUTTER_ACTOR (container), actor);
+}
+
+typedef struct {
+  ClutterCallback callback;
+  gpointer data;
+} ForeachClosure;
+
+static gboolean
+foreach_cb (ClutterActor *actor,
+            gpointer      data)
+{
+  ForeachClosure *clos = data;
+
+  clos->callback (actor, clos->data);
+
+  return TRUE;
+}
+
+static void
+container_real_foreach (ClutterContainer *container,
+                        ClutterCallback   callback,
+                        gpointer          user_data)
+{
+  ForeachClosure clos;
+
+  clos.callback = callback;
+  clos.data = user_data;
+
+  _clutter_actor_foreach_child (CLUTTER_ACTOR (container),
+                                foreach_cb,
+                                &clos);
+}
+
+static void
 clutter_container_default_init (ClutterContainerInterface *iface)
 {
   GType iface_type = G_TYPE_FROM_INTERFACE (iface);
@@ -171,27 +216,23 @@ clutter_container_default_init (ClutterContainerInterface *iface)
                   G_TYPE_NONE, 2,
                   CLUTTER_TYPE_ACTOR, G_TYPE_PARAM);
 
-  iface->child_meta_type    = G_TYPE_INVALID;
-  iface->create_child_meta  = create_child_meta;
+  iface->add = container_real_add;
+  iface->remove = container_real_remove;
+  iface->foreach = container_real_foreach;
+
+  iface->child_meta_type = G_TYPE_INVALID;
+  iface->create_child_meta = create_child_meta;
   iface->destroy_child_meta = destroy_child_meta;
-  iface->get_child_meta     = get_child_meta;
-  iface->child_notify       = child_notify;
+  iface->get_child_meta = get_child_meta;
+  iface->child_notify = child_notify;
 }
 
 static inline void
 container_add_actor (ClutterContainer *container,
                      ClutterActor     *actor)
 {
-  ClutterContainerIface *iface;
   ClutterActor *parent;
 
-  iface = CLUTTER_CONTAINER_GET_IFACE (container);
-  if (G_UNLIKELY (iface->add == NULL))
-    {
-      CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED (container, "add");
-      return;
-    }
-
   parent = clutter_actor_get_parent (actor);
   if (G_UNLIKELY (parent != NULL))
     {
@@ -206,23 +247,15 @@ container_add_actor (ClutterContainer *container,
 
   clutter_container_create_child_meta (container, actor);
 
-  iface->add (container, actor);
+  CLUTTER_CONTAINER_GET_IFACE (container)->add (container, actor);
 }
 
 static inline void
 container_remove_actor (ClutterContainer *container,
                         ClutterActor     *actor)
 {
-  ClutterContainerIface *iface;
   ClutterActor *parent;
 
-  iface = CLUTTER_CONTAINER_GET_IFACE (container);
-  if (G_UNLIKELY (iface->remove == NULL))
-    {
-      CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED (container, "remove");
-      return;
-    }
-
   parent = clutter_actor_get_parent (actor);
   if (parent != CLUTTER_ACTOR (container))
     {
@@ -236,7 +269,7 @@ container_remove_actor (ClutterContainer *container,
 
   clutter_container_destroy_child_meta (container, actor);
 
-  iface->remove (container, actor);
+  CLUTTER_CONTAINER_GET_IFACE (container)->remove (container, actor);
 }
 
 static inline void
@@ -485,19 +518,12 @@ clutter_container_foreach (ClutterContainer *container,
                            ClutterCallback   callback,
                            gpointer          user_data)
 {
-  ClutterContainerIface *iface;
-
   g_return_if_fail (CLUTTER_IS_CONTAINER (container));
   g_return_if_fail (callback != NULL);
 
-  iface = CLUTTER_CONTAINER_GET_IFACE (container);
-  if (!iface->foreach)
-    {
-      CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED (container, "foreach");
-      return;
-    }
-
-  iface->foreach (container, callback, user_data);
+  CLUTTER_CONTAINER_GET_IFACE (container)->foreach (container,
+                                                    callback,
+                                                    user_data);
 }
 
 /**