From ab948d577fbc17ba8d64b86abe9f61eb7eb8c3fa Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Tue, 14 Aug 2007 08:01:33 +0000
Subject: [PATCH] Rename ClutterContainer raise() and lower() methods to avoid
 clashes

Language bindings will have problems with raise() and lower() bein in both
ClutterContainer and ClutterActor; hence, this patch renames
clutter_container_raise() and clutter_container_lower() to
clutter_container_raise_child() and clutter_container_lower_child(),
respectively.
---
 clutter/clutter-actor.c            |  4 ++--
 clutter/clutter-container.c        | 12 ++++++------
 clutter/clutter-container.h        |  4 ++--
 clutter/clutter-group.c            |  8 ++++----
 doc/reference/clutter-sections.txt |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 41a6b81a8..bf3951051 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -2739,7 +2739,7 @@ clutter_actor_raise (ClutterActor *self,
         }
     }
 
-  clutter_container_raise (CLUTTER_CONTAINER (parent), self, below);
+  clutter_container_raise_child (CLUTTER_CONTAINER (parent), self, below);
 }
 
 /**
@@ -2778,7 +2778,7 @@ clutter_actor_lower (ClutterActor *self,
         }
     }
 
-  clutter_container_lower (CLUTTER_CONTAINER (parent), self, above);
+  clutter_container_lower_child (CLUTTER_CONTAINER (parent), self, above);
 }
 
 /**
diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c
index df34260c0..f9ee905b5 100644
--- a/clutter/clutter-container.c
+++ b/clutter/clutter-container.c
@@ -401,7 +401,7 @@ clutter_container_find_child_by_id (ClutterContainer *container,
 }
 
 /**
- * clutter_container_raise:
+ * clutter_container_raise_child:
  * @container: a #ClutterContainer
  * @actor: the actor to raise
  * @sibling: the sibling to raise to, or %NULL to raise at the top
@@ -411,8 +411,8 @@ clutter_container_find_child_by_id (ClutterContainer *container,
  * Since: 0.6
  */
 void
-clutter_container_raise (ClutterContainer *container,
-                         ClutterActor     *actor,
+clutter_container_raise_child (ClutterContainer *container,
+                               ClutterActor     *actor,
                          ClutterActor     *sibling)
 {
   g_return_if_fail (CLUTTER_IS_CONTAINER (container));
@@ -445,7 +445,7 @@ clutter_container_raise (ClutterContainer *container,
 }
 
 /**
- * clutter_container_lower:
+ * clutter_container_lower_child:
  * @container: a #ClutterContainer
  * @actor: the actor to raise
  * @sibling: the sibling to lower to, or %NULL to lower at the bottom
@@ -455,8 +455,8 @@ clutter_container_raise (ClutterContainer *container,
  * Since: 0.6
  */
 void
-clutter_container_lower (ClutterContainer *container,
-                         ClutterActor     *actor,
+clutter_container_lower_child (ClutterContainer *container,
+                               ClutterActor     *actor,
                          ClutterActor     *sibling)
 {
   g_return_if_fail (CLUTTER_IS_CONTAINER (container));
diff --git a/clutter/clutter-container.h b/clutter/clutter-container.h
index 013bb46da..00378dd87 100644
--- a/clutter/clutter-container.h
+++ b/clutter/clutter-container.h
@@ -114,10 +114,10 @@ void          clutter_container_foreach          (ClutterContainer *container,
                                                   gpointer          user_data);
 ClutterActor *clutter_container_find_child_by_id (ClutterContainer *container,
                                                   guint             child_id);
-void          clutter_container_raise            (ClutterContainer *container,
+void          clutter_container_raise_child      (ClutterContainer *container,
                                                   ClutterActor     *actor,
                                                   ClutterActor     *sibling);
-void          clutter_container_lower            (ClutterContainer *container,
+void          clutter_container_lower_child      (ClutterContainer *container,
                                                   ClutterActor     *actor,
                                                   ClutterActor     *sibling);
 void          clutter_container_sort_depth_order (ClutterContainer *container);
diff --git a/clutter/clutter-group.c b/clutter/clutter-group.c
index 23fbe8c6c..4868fefa9 100644
--- a/clutter/clutter-group.c
+++ b/clutter/clutter-group.c
@@ -705,7 +705,7 @@ clutter_group_find_child_by_id (ClutterGroup *self,
  *
  * FIXME
  *
- * Deprecated: 0.6: Use clutter_container_raise() instead.
+ * Deprecated: 0.6: Use clutter_container_raise_child() instead.
  */
 void
 clutter_group_raise (ClutterGroup *self,
@@ -719,7 +719,7 @@ clutter_group_raise (ClutterGroup *self,
   if (actor == sibling)
     return;
 
-  clutter_container_raise (CLUTTER_CONTAINER (self), actor, sibling);
+  clutter_container_raise_child (CLUTTER_CONTAINER (self), actor, sibling);
 }
 
 /**
@@ -730,7 +730,7 @@ clutter_group_raise (ClutterGroup *self,
  *
  * FIXME
  *
- * Deprecated: 0.6: Use clutter_container_lower() instead
+ * Deprecated: 0.6: Use clutter_container_lower_child() instead
  */
 void
 clutter_group_lower (ClutterGroup *self,
@@ -744,7 +744,7 @@ clutter_group_lower (ClutterGroup *self,
   if (actor == sibling)
     return;
 
-  clutter_container_lower (CLUTTER_CONTAINER (self), actor, sibling);
+  clutter_container_lower_child (CLUTTER_CONTAINER (self), actor, sibling);
 }
 
 /**
diff --git a/doc/reference/clutter-sections.txt b/doc/reference/clutter-sections.txt
index ee6158e1c..263337994 100644
--- a/doc/reference/clutter-sections.txt
+++ b/doc/reference/clutter-sections.txt
@@ -219,8 +219,8 @@ clutter_container_remove_valist
 clutter_container_get_children
 clutter_container_foreach
 clutter_container_find_child_by_id
-clutter_container_raise
-clutter_container_lower
+clutter_container_raise_child
+clutter_container_lower_child
 clutter_container_sort_depth_order
 <SUBSECTION Standard>
 ClutterContainer