Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bitset: Fix typo: gtk_bitset_slice() => gtk_bitset_splice()

Browse Source
This commit is contained in:
Benjamin Otte
2020-07-06 03:41:12 +02:00
parent 3d931b4fe2
commit 3162e25671
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gtk/gtk4-sections.txt
View File

@@ -375,7 +375,7 @@ gtk_bitset_subtract
gtk_bitset_difference
gtk_bitset_shift_left
gtk_bitset_shift_right
gtk_bitset_slice
gtk_bitset_splice
<SUBSECTION>
GtkBitsetIter
gtk_bitset_iter_init_first

10
gtk/gtkbitset.c
View File

@@ -707,7 +707,7 @@ gtk_bitset_shift_right (GtkBitset *self,
}
/**
* gtk_bitset_slice:
* gtk_bitset_splice:
* @self: a #GtkBitset
* @position: position at which to slice
* @removed: number of values to remove
@@ -725,10 +725,10 @@ gtk_bitset_shift_right (GtkBitset *self,
* up space that can then be filled.
**/
void
gtk_bitset_slice (GtkBitset *self,
guint position,
guint removed,
guint added)
gtk_bitset_splice (GtkBitset *self,
guint position,
guint removed,
guint added)
{
g_return_if_fail (self != NULL);
/* overflow */

2
gtk/gtkbitset.h
View File

@@ -125,7 +125,7 @@ GDK_AVAILABLE_IN_ALL
void gtk_bitset_shift_right (GtkBitset *self,
guint amount);
GDK_AVAILABLE_IN_ALL
void gtk_bitset_slice (GtkBitset *self,
void gtk_bitset_splice (GtkBitset *self,
guint position,
guint removed,
guint added);

4
gtk/gtkfilterlistmodel.c
View File

@@ -302,9 +302,9 @@ gtk_filter_list_model_items_changed_cb (GListModel *model,
else
filter_removed = 0;
gtk_bitset_slice (self->matches, position, removed, added);
gtk_bitset_splice (self->matches, position, removed, added);
if (self->pending)
gtk_bitset_slice (self->pending, position, removed, added);
gtk_bitset_splice (self->pending, position, removed, added);
if (added > 0)
{

2
gtk/gtkmultiselection.c
View File

@@ -222,7 +222,7 @@ gtk_multi_selection_items_changed_cb (GListModel *model,
GHashTable *pending = NULL;
guint i;
gtk_bitset_slice (self->selected, position, removed, added);
gtk_bitset_splice (self->selected, position, removed, added);
g_hash_table_iter_init (&iter, self->items);
while (g_hash_table_iter_next (&iter, &item, &pos_pointer))

6
testsuite/gtk/bitset.c
View File

@@ -424,13 +424,13 @@ test_slice (void)
gtk_bitset_add_range (set, 10, 30);
gtk_bitset_slice (set, 20, 10, 20);
gtk_bitset_splice (set, 20, 10, 20);
for (i = 0; i < 60; i++)
g_assert_cmpint (gtk_bitset_contains (set, i), ==, (i >= 10 && i < 20) ||
(i >= 40 && i < 50));
gtk_bitset_slice (set, 25, 10, 0);
gtk_bitset_splice (set, 25, 10, 0);
for (i = 0; i < 60; i++)
g_assert_cmpint (gtk_bitset_contains (set, i), ==, (i >= 10 && i < 20) ||
@@ -549,7 +549,7 @@ test_splice_overflow (void)
GtkBitset *set, *compare;
set = gtk_bitset_new_range (3, 1);
gtk_bitset_slice (set, 0, 0, 13);
gtk_bitset_splice (set, 0, 0, 13);
compare = gtk_bitset_new_range (16, 1);
g_assert_true (gtk_bitset_equals (set, compare));