luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow passing a NULL item to g_list_store_find_with_equal_func()

Browse Source 
The `equal_func` closure can already have all required information
available without the item, and passing the item via the closure instead
of an explicit parameter is more natural for languages that have a
concept of closures that can capture variables.
This commit is contained in:
Sebastian Dröge 2023-02-20 10:16:11 +02:00
parent 5202d1daa9
commit 7c5e930170
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gliststore.c
View File

@ -530,7 +530,7 @@ simple_equal (gconstpointer a,
/** /**
* g_list_store_find_with_equal_func: * g_list_store_find_with_equal_func:
* @store: a #GListStore * @store: a #GListStore
* @item: (type GObject): an item * @item: (type GObject) (nullable): an item
* @equal_func: (scope call): A custom equality check function * @equal_func: (scope call): A custom equality check function
* @position: (out) (optional): the first position of @item, if it was found. * @position: (out) (optional): the first position of @item, if it was found.
* *
@ -539,6 +539,10 @@ simple_equal (gconstpointer a,
* matches. If @item was not found, then @position will not be set, and this * matches. If @item was not found, then @position will not be set, and this
* method will return %FALSE. * method will return %FALSE.
* *
* @item is always passed as second parameter to @equal_func.
*
* Since GLib 2.76 it is possible to pass `NULL` for @item.
*
* Returns: Whether @store contains @item. If it was found, @position will be * Returns: Whether @store contains @item. If it was found, @position will be
* set to the position where @item occurred for the first time. * set to the position where @item occurred for the first time.
* *
@ -559,7 +563,7 @@ g_list_store_find_with_equal_func (GListStore *store,
/** /**
* g_list_store_find_with_equal_func_full: * g_list_store_find_with_equal_func_full:
* @store: a #GListStore * @store: a #GListStore
* @item: (type GObject): an item * @item: (type GObject) (nullable): an item
* @equal_func: (scope call): A custom equality check function * @equal_func: (scope call): A custom equality check function
* @user_data: (closure): user data for @equal_func * @user_data: (closure): user data for @equal_func
* @position: (out) (optional): the first position of @item, if it was found. * @position: (out) (optional): the first position of @item, if it was found.
@ -567,6 +571,10 @@ g_list_store_find_with_equal_func (GListStore *store,
* Like g_list_store_find_with_equal_func() but with an additional @user_data * Like g_list_store_find_with_equal_func() but with an additional @user_data
* that is passed to @equal_func. * that is passed to @equal_func.
* *
* @item is always passed as second parameter to @equal_func.
*
* Since GLib 2.76 it is possible to pass `NULL` for @item.
*
* Returns: Whether @store contains @item. If it was found, @position will be * Returns: Whether @store contains @item. If it was found, @position will be
* set to the position where @item occurred for the first time. * set to the position where @item occurred for the first time.
* *
@ -582,7 +590,7 @@ g_list_store_find_with_equal_func_full (GListStore *store,
GSequenceIter *iter, *begin, *end; GSequenceIter *iter, *begin, *end;
g_return_val_if_fail (G_IS_LIST_STORE (store), FALSE); g_return_val_if_fail (G_IS_LIST_STORE (store), FALSE);
g_return_val_if_fail (g_type_is_a (G_OBJECT_TYPE (item), store->item_type), g_return_val_if_fail (item == NULL || g_type_is_a (G_OBJECT_TYPE (item), store->item_type),
FALSE); FALSE);
g_return_val_if_fail (equal_func != NULL, FALSE); g_return_val_if_fail (equal_func != NULL, FALSE);