[mutter] clutter: Remove clutter_container_sort_depth_order
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter: Remove clutter_container_sort_depth_order
- Date: Fri, 15 Oct 2021 18:38:31 +0000 (UTC)
commit 1a978df4a7f48130b8418f81150c692e04d49568
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Sep 15 22:40:05 2021 -0300
clutter: Remove clutter_container_sort_depth_order
Unused.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2057>
clutter/clutter/clutter-container.c | 42 --------------------------
clutter/clutter/clutter-container.h | 4 ---
clutter/clutter/deprecated/clutter-container.h | 3 --
3 files changed, 49 deletions(-)
---
diff --git a/clutter/clutter/clutter-container.c b/clutter/clutter/clutter-container.c
index 23169332f3..34e809f05e 100644
--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
@@ -139,11 +139,6 @@ container_real_lower (ClutterContainer *container,
clutter_actor_set_child_below_sibling (self, child, sibling);
}
-static void
-container_real_sort_depth_order (ClutterContainer *container)
-{
-}
-
static void
clutter_container_default_init (ClutterContainerInterface *iface)
{
@@ -215,7 +210,6 @@ clutter_container_default_init (ClutterContainerInterface *iface)
iface->remove = container_real_remove;
iface->raise = container_real_raise;
iface->lower = container_real_lower;
- iface->sort_depth_order = container_real_sort_depth_order;
iface->child_meta_type = G_TYPE_INVALID;
iface->create_child_meta = create_child_meta;
@@ -608,42 +602,6 @@ clutter_container_lower_child (ClutterContainer *container,
iface->lower (container, actor, sibling);
}
-/**
- * clutter_container_sort_depth_order:
- * @container: a #ClutterContainer
- *
- * Sorts a container's children using their depth. This function should not
- * be normally used by applications.
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: The #ClutterContainerIface.sort_depth_order() virtual
- * function should not be used any more; the default implementation in
- * #ClutterContainer does not do anything.
- */
-void
-clutter_container_sort_depth_order (ClutterContainer *container)
-{
- ClutterContainerIface *iface;
-
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
-
- iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- if (iface->sort_depth_order != container_real_sort_depth_order)
- _clutter_diagnostic_message ("The ClutterContainer::sort_depth_order() "
- "virtual function has been deprecated "
- "and it should not be overridden by "
- "newly written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- iface->sort_depth_order (container);
-}
-
/**
* clutter_container_find_child_by_name:
* @container: a #ClutterContainer
diff --git a/clutter/clutter/clutter-container.h b/clutter/clutter/clutter-container.h
index 6575569db7..3d13fe75a9 100644
--- a/clutter/clutter/clutter-container.h
+++ b/clutter/clutter/clutter-container.h
@@ -63,9 +63,6 @@ typedef struct _ClutterContainerIface ClutterContainerIface;
* deprecated and it should not be overridden.
* @lower: virtual function for lowering a child. This virtual function is
* deprecated and it should not be overridden.
- * @sort_depth_order: virtual function for sorting the children of a
- * container depending on their depth. This virtual function is deprecated
- * and it should not be overridden.
* @child_meta_type: The GType used for storing auxiliary information about
* each of the containers children.
* @create_child_meta: virtual function that gets called for each added
@@ -104,7 +101,6 @@ struct _ClutterContainerIface
void (* lower) (ClutterContainer *container,
ClutterActor *actor,
ClutterActor *sibling);
- void (* sort_depth_order) (ClutterContainer *container);
/* ClutterChildMeta management */
GType child_meta_type;
diff --git a/clutter/clutter/deprecated/clutter-container.h b/clutter/clutter/deprecated/clutter-container.h
index c1e2565440..81e5f6e641 100644
--- a/clutter/clutter/deprecated/clutter-container.h
+++ b/clutter/clutter/deprecated/clutter-container.h
@@ -65,9 +65,6 @@ void clutter_container_lower_child (ClutterContaine
ClutterActor *actor,
ClutterActor *sibling);
-CLUTTER_DEPRECATED
-void clutter_container_sort_depth_order (ClutterContainer *container);
-
G_END_DECLS
#endif /* __CLUTTER_CONTAINER_DEPRECATED_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]