From d6f4f6e74cf408ddd8a24435921e0a9dcb9c19cc Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 25 Oct 2011 09:13:18 +0200 Subject: [PATCH] core: fix typo: childs -> children --- doc/de/autogen/plugin_api/hdata.txt | 2 +- doc/en/autogen/plugin_api/hdata.txt | 2 +- doc/fr/autogen/plugin_api/hdata.txt | 2 +- doc/it/autogen/plugin_api/hdata.txt | 2 +- src/gui/gui-layout.c | 2 +- src/gui/gui-nicklist.c | 42 ++++++++++++++--------------- src/gui/gui-nicklist.h | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/de/autogen/plugin_api/hdata.txt b/doc/de/autogen/plugin_api/hdata.txt index 42fc21137..960783616 100644 --- a/doc/de/autogen/plugin_api/hdata.txt +++ b/doc/de/autogen/plugin_api/hdata.txt @@ -479,7 +479,7 @@ 'visible' (integer) + 'level' (integer) + 'parent' (pointer, hdata: 'nick_group') + - 'childs' (pointer, hdata: 'nick_group') + + 'children' (pointer, hdata: 'nick_group') + 'last_child' (pointer, hdata: 'nick_group') + 'nicks' (pointer, hdata: 'nick') + 'last_nick' (pointer, hdata: 'nick') + diff --git a/doc/en/autogen/plugin_api/hdata.txt b/doc/en/autogen/plugin_api/hdata.txt index 885b56998..368819027 100644 --- a/doc/en/autogen/plugin_api/hdata.txt +++ b/doc/en/autogen/plugin_api/hdata.txt @@ -479,7 +479,7 @@ 'visible' (integer) + 'level' (integer) + 'parent' (pointer, hdata: 'nick_group') + - 'childs' (pointer, hdata: 'nick_group') + + 'children' (pointer, hdata: 'nick_group') + 'last_child' (pointer, hdata: 'nick_group') + 'nicks' (pointer, hdata: 'nick') + 'last_nick' (pointer, hdata: 'nick') + diff --git a/doc/fr/autogen/plugin_api/hdata.txt b/doc/fr/autogen/plugin_api/hdata.txt index e3b4046b2..872bcecbe 100644 --- a/doc/fr/autogen/plugin_api/hdata.txt +++ b/doc/fr/autogen/plugin_api/hdata.txt @@ -479,7 +479,7 @@ 'visible' (integer) + 'level' (integer) + 'parent' (pointer, hdata: 'nick_group') + - 'childs' (pointer, hdata: 'nick_group') + + 'children' (pointer, hdata: 'nick_group') + 'last_child' (pointer, hdata: 'nick_group') + 'nicks' (pointer, hdata: 'nick') + 'last_nick' (pointer, hdata: 'nick') + diff --git a/doc/it/autogen/plugin_api/hdata.txt b/doc/it/autogen/plugin_api/hdata.txt index 4a48fc35e..208b43cd7 100644 --- a/doc/it/autogen/plugin_api/hdata.txt +++ b/doc/it/autogen/plugin_api/hdata.txt @@ -479,7 +479,7 @@ 'visible' (integer) + 'level' (integer) + 'parent' (pointer, hdata: 'nick_group') + - 'childs' (pointer, hdata: 'nick_group') + + 'children' (pointer, hdata: 'nick_group') + 'last_child' (pointer, hdata: 'nick_group') + 'nicks' (pointer, hdata: 'nick') + 'last_nick' (pointer, hdata: 'nick') + diff --git a/src/gui/gui-layout.c b/src/gui/gui-layout.c index f9b2ee0cd..9285a55f4 100644 --- a/src/gui/gui-layout.c +++ b/src/gui/gui-layout.c @@ -295,7 +295,7 @@ gui_layout_buffer_apply (struct t_gui_layout_buffer *layout_buffers) void gui_layout_window_remove (struct t_gui_layout_window *layout_window) { - /* first free childs */ + /* first free children */ if (layout_window->child1) gui_layout_window_remove (layout_window->child1); if (layout_window->child2) diff --git a/src/gui/gui-nicklist.c b/src/gui/gui-nicklist.c index a9a1eff2f..7f652c3ea 100644 --- a/src/gui/gui-nicklist.c +++ b/src/gui/gui-nicklist.c @@ -167,10 +167,10 @@ gui_nicklist_search_group_internal (struct t_gui_buffer *buffer, if (!from_group) return NULL; - if (from_group->childs) + if (from_group->children) { ptr_group = gui_nicklist_search_group_internal (buffer, - from_group->childs, + from_group->children, name, skip_digits); if (ptr_group) @@ -231,7 +231,7 @@ gui_nicklist_add_group (struct t_gui_buffer *buffer, new_group->visible = visible; new_group->parent = (parent_group) ? parent_group : buffer->nicklist_root; new_group->level = (new_group->parent) ? new_group->parent->level + 1 : 0; - new_group->childs = NULL; + new_group->children = NULL; new_group->last_child = NULL; new_group->nicks = NULL; new_group->last_nick = NULL; @@ -240,7 +240,7 @@ gui_nicklist_add_group (struct t_gui_buffer *buffer, if (new_group->parent) { - gui_nicklist_insert_group_sorted (&(new_group->parent->childs), + gui_nicklist_insert_group_sorted (&(new_group->parent->children), &(new_group->parent->last_child), new_group); } @@ -349,7 +349,7 @@ gui_nicklist_search_nick (struct t_gui_buffer *buffer, } /* search nick in child groups */ - for (ptr_group = (from_group) ? from_group->childs : buffer->nicklist_root->childs; + for (ptr_group = (from_group) ? from_group->children : buffer->nicklist_root->children; ptr_group; ptr_group = ptr_group->next_group) { ptr_nick = gui_nicklist_search_nick (buffer, ptr_group, name); @@ -462,10 +462,10 @@ gui_nicklist_remove_group (struct t_gui_buffer *buffer, group_removed = (group->name) ? strdup (group->name) : NULL; - /* remove childs first */ - while (group->childs) + /* remove children first */ + while (group->children) { - gui_nicklist_remove_group (buffer, group->childs); + gui_nicklist_remove_group (buffer, group->children); } /* remove nicks from group */ @@ -481,8 +481,8 @@ gui_nicklist_remove_group (struct t_gui_buffer *buffer, (group->prev_group)->next_group = group->next_group; if (group->next_group) (group->next_group)->prev_group = group->prev_group; - if ((group->parent)->childs == group) - (group->parent)->childs = group->next_group; + if ((group->parent)->children == group) + (group->parent)->children = group->next_group; if ((group->parent)->last_child == group) (group->parent)->last_child = group->prev_group; } @@ -560,9 +560,9 @@ gui_nicklist_get_next_item (struct t_gui_buffer *buffer, if (*group && !*nick) { /* first child */ - if ((*group)->childs) + if ((*group)->children) { - *group = (*group)->childs; + *group = (*group)->children; return; } /* first nick of current group */ @@ -666,9 +666,9 @@ gui_nicklist_get_max_length (struct t_gui_buffer *buffer, max_length = length; } } - if (ptr_group->childs) + if (ptr_group->children) { - length = gui_nicklist_get_max_length (buffer, ptr_group->childs); + length = gui_nicklist_get_max_length (buffer, ptr_group->children); if (length > max_length) max_length = length; } @@ -691,8 +691,8 @@ gui_nicklist_compute_visible_count (struct t_gui_buffer *buffer, if (!buffer || !group) return; - /* count for childs */ - for (ptr_group = group->childs; ptr_group; + /* count for children */ + for (ptr_group = group->children; ptr_group; ptr_group = ptr_group->next_group) { gui_nicklist_compute_visible_count (buffer, ptr_group); @@ -961,7 +961,7 @@ gui_nicklist_hdata_nick_group_cb (void *data, const char *hdata_name) HDATA_VAR(struct t_gui_nick_group, visible, INTEGER, NULL); HDATA_VAR(struct t_gui_nick_group, level, INTEGER, NULL); HDATA_VAR(struct t_gui_nick_group, parent, POINTER, hdata_name); - HDATA_VAR(struct t_gui_nick_group, childs, POINTER, hdata_name); + HDATA_VAR(struct t_gui_nick_group, children, POINTER, hdata_name); HDATA_VAR(struct t_gui_nick_group, last_child, POINTER, hdata_name); HDATA_VAR(struct t_gui_nick_group, nicks, POINTER, "nick"); HDATA_VAR(struct t_gui_nick_group, last_nick, POINTER, "nick"); @@ -1156,9 +1156,9 @@ gui_nicklist_print_log (struct t_gui_nick_group *group, int indent) (indent * 2) + 6); log_printf (format, " ", group->parent); snprintf (format, sizeof (format), - "%%-%dschilds. . . : 0x%%lx", + "%%-%dschildren. . : 0x%%lx", (indent * 2) + 6); - log_printf (format, " ", group->childs); + log_printf (format, " ", group->children); snprintf (format, sizeof (format), "%%-%dslast_child. : 0x%%lx", (indent * 2) + 6); @@ -1181,9 +1181,9 @@ gui_nicklist_print_log (struct t_gui_nick_group *group, int indent) log_printf (format, " ", group->next_group); /* display child groups first */ - if (group->childs) + if (group->children) { - for (ptr_group = group->childs; ptr_group; + for (ptr_group = group->children; ptr_group; ptr_group = ptr_group->next_group) { gui_nicklist_print_log (ptr_group, indent + 1); diff --git a/src/gui/gui-nicklist.h b/src/gui/gui-nicklist.h index 969b47a59..02d34a7b3 100644 --- a/src/gui/gui-nicklist.h +++ b/src/gui/gui-nicklist.h @@ -30,7 +30,7 @@ struct t_gui_nick_group int visible; /* 1 if group is displayed */ int level; /* group level (root is 0) */ struct t_gui_nick_group *parent; /* parent */ - struct t_gui_nick_group *childs; /* childs */ + struct t_gui_nick_group *children; /* children */ struct t_gui_nick_group *last_child; /* last child */ struct t_gui_nick *nicks; /* nicks for group */ struct t_gui_nick *last_nick; /* last nick for group */