From 8fb1dc24118bde3e7e46c219aac6a507da9e96e1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 12 Jul 2007 01:13:42 +0000 Subject: [PATCH] Make parameter naming consistent. 2007-07-11 Matthias Clasen * gtk/gtktreeview.c: * gtk/gtktoolitem.[hc]: Make parameter naming consistent. svn path=/trunk/; revision=18452 --- ChangeLog | 5 +++++ gtk/gtktoolitem.c | 53 +++++++++++++++++++++++++---------------------- gtk/gtktoolitem.h | 16 +++++++------- gtk/gtktreeview.c | 20 +++++++++--------- 4 files changed, 51 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 714d7ef0b8..f8f3b4baa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-11 Matthias Clasen + + * gtk/gtktreeview.c: + * gtk/gtktoolitem.[hc]: Make parameter naming consistent. + 2007-07-11 Matthias Clasen * gtk/gtkrange.c: diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index 2ae4406fb7..1916af938c 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -148,13 +148,13 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) /** * GtkToolItem::create-menu-proxy: - * @toolitem: the object the signal was emitted on + * @tool_item: the object the signal was emitted on * * This signal is emitted when the toolbar needs information from @tool_item * about whether the item should appear in the toolbar overflow menu. In * response the tool item should either * - * call gtk_tool_item_set_proxy_menu_item() with a %NULL + * call gtk_tool_item_set_proxy_menu_item() with a %NULL * pointer and return %TRUE to indicate that the item should not appear * in the overflow menu * @@ -186,7 +186,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) /** * GtkToolItem::toolbar-reconfigured: - * @toolitem: the object the signal was emitted on + * @tool_item: the object the signal was emitted on * * This signal is emitted when some property of the toolbar that the * item is a child of changes. For custom subclasses of #GtkToolItem, @@ -210,7 +210,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) G_TYPE_NONE, 0); /** * GtkToolItem::set-tooltip: - * @toolitem: the object the signal was emitted on + * @tool_item: the object the signal was emitted on * @tooltips: the #GtkTooltips * @tip_text: the tooltip text * @tip_private: the tooltip private text @@ -220,6 +220,9 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) * set the item's tooltip. * * Return value: %TRUE if the signal was handled, %FALSE if not + * + * Deprecated: 2.12: With the new tooltip API, there is no + * need to use this signal anymore. **/ toolitem_signals[SET_TOOLTIP] = g_signal_new (I_("set_tooltip"), @@ -857,13 +860,13 @@ gtk_tool_item_set_tooltip_markup (GtkToolItem *tool_item, /** * gtk_tool_item_set_use_drag_window: - * @toolitem: a #GtkToolItem - * @use_drag_window: Whether @toolitem has a drag window. + * @tool_item: a #GtkToolItem + * @use_drag_window: Whether @tool_item has a drag window. * - * Sets whether @toolitem has a drag window. When %TRUE the + * Sets whether @tool_item has a drag window. When %TRUE the * toolitem can be used as a drag source through gtk_drag_source_set(). - * When @toolitem has a drag window it will intercept all events, - * even those that would otherwise be sent to a child of @toolitem. + * When @tool_item has a drag window it will intercept all events, + * even those that would otherwise be sent to a child of @tool_item. * * Since: 2.4 **/ @@ -897,12 +900,12 @@ gtk_tool_item_set_use_drag_window (GtkToolItem *toolitem, /** * gtk_tool_item_get_use_drag_window: - * @toolitem: a #GtkToolItem + * @tool_item: a #GtkToolItem * - * Returns whether @toolitem has a drag window. See + * Returns whether @tool_item has a drag window. See * gtk_tool_item_set_use_drag_window(). * - * Return value: %TRUE if @toolitem uses a drag window. + * Return value: %TRUE if @tool_item uses a drag window. * * Since: 2.4 **/ @@ -916,10 +919,10 @@ gtk_tool_item_get_use_drag_window (GtkToolItem *toolitem) /** * gtk_tool_item_set_visible_horizontal: - * @toolitem: a #GtkToolItem - * @visible_horizontal: Whether @toolitem is visible when in horizontal mode + * @tool_item: a #GtkToolItem + * @visible_horizontal: Whether @tool_item is visible when in horizontal mode * - * Sets whether @toolitem is visible when the toolbar is docked horizontally. + * Sets whether @tool_item is visible when the toolbar is docked horizontally. * * Since: 2.4 **/ @@ -943,12 +946,12 @@ gtk_tool_item_set_visible_horizontal (GtkToolItem *toolitem, /** * gtk_tool_item_get_visible_horizontal: - * @toolitem: a #GtkToolItem + * @tool_item: a #GtkToolItem * - * Returns whether the @toolitem is visible on toolbars that are + * Returns whether the @tool_item is visible on toolbars that are * docked horizontally. * - * Return value: %TRUE if @toolitem is visible on toolbars that are + * Return value: %TRUE if @tool_item is visible on toolbars that are * docked horizontally. * * Since: 2.4 @@ -963,14 +966,14 @@ gtk_tool_item_get_visible_horizontal (GtkToolItem *toolitem) /** * gtk_tool_item_set_visible_vertical: - * @toolitem: a #GtkToolItem - * @visible_vertical: whether @toolitem is visible when the toolbar + * @tool_item: a #GtkToolItem + * @visible_vertical: whether @tool_item is visible when the toolbar * is in vertical mode * - * Sets whether @toolitem is visible when the toolbar is docked + * Sets whether @tool_item is visible when the toolbar is docked * vertically. Some tool items, such as text entries, are too wide to be * useful on a vertically docked toolbar. If @visible_vertical is %FALSE - * @toolitem will not appear on toolbars that are docked vertically. + * @tool_item will not appear on toolbars that are docked vertically. * * Since: 2.4 **/ @@ -994,12 +997,12 @@ gtk_tool_item_set_visible_vertical (GtkToolItem *toolitem, /** * gtk_tool_item_get_visible_vertical: - * @toolitem: a #GtkToolItem + * @tool_item: a #GtkToolItem * - * Returns whether @toolitem is visible when the toolbar is docked vertically. + * Returns whether @tool_item is visible when the toolbar is docked vertically. * See gtk_tool_item_set_visible_vertical(). * - * Return value: Whether @toolitem is visible when the toolbar is docked vertically + * Return value: Whether @tool_item is visible when the toolbar is docked vertically * * Since: 2.4 **/ diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h index 3cc68a2324..dac7c0f0f9 100644 --- a/gtk/gtktoolitem.h +++ b/gtk/gtktoolitem.h @@ -88,22 +88,22 @@ void gtk_tool_item_set_tooltip (GtkToolItem *tool_item, const gchar *tip_text, const gchar *tip_private); #endif /* GTK_DISABLE_DEPRECATED */ -void gtk_tool_item_set_tooltip_text (GtkToolItem *toolitem, +void gtk_tool_item_set_tooltip_text (GtkToolItem *tool_item, const gchar *text); -void gtk_tool_item_set_tooltip_markup (GtkToolItem *toolitem, +void gtk_tool_item_set_tooltip_markup (GtkToolItem *tool_item, const gchar *markup); -void gtk_tool_item_set_use_drag_window (GtkToolItem *toolitem, +void gtk_tool_item_set_use_drag_window (GtkToolItem *tool_item, gboolean use_drag_window); -gboolean gtk_tool_item_get_use_drag_window (GtkToolItem *toolitem); +gboolean gtk_tool_item_get_use_drag_window (GtkToolItem *tool_item); -void gtk_tool_item_set_visible_horizontal (GtkToolItem *toolitem, +void gtk_tool_item_set_visible_horizontal (GtkToolItem *tool_item, gboolean visible_horizontal); -gboolean gtk_tool_item_get_visible_horizontal (GtkToolItem *toolitem); +gboolean gtk_tool_item_get_visible_horizontal (GtkToolItem *tool_item); -void gtk_tool_item_set_visible_vertical (GtkToolItem *toolitem, +void gtk_tool_item_set_visible_vertical (GtkToolItem *tool_item, gboolean visible_vertical); -gboolean gtk_tool_item_get_visible_vertical (GtkToolItem *toolitem); +gboolean gtk_tool_item_get_visible_vertical (GtkToolItem *tool_item); gboolean gtk_tool_item_get_is_important (GtkToolItem *tool_item); void gtk_tool_item_set_is_important (GtkToolItem *tool_item, diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index f40aff2dd7..74f4b02757 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -12892,8 +12892,8 @@ gtk_tree_view_tree_to_widget_coords (GtkTreeView *tree_view, * @tree_view: a #GtkTreeView * @wx: X coordinate relative to the widget * @wy: Y coordinate relative to the widget - * @bx: return location for tree X coordinate - * @by: return location for tree Y coordinate + * @tx: return location for tree X coordinate + * @ty: return location for tree Y coordinate * * Converts widget coordinates to coordinates for the * tree (the full scrollable area of the tree). @@ -12922,10 +12922,10 @@ gtk_tree_view_convert_widget_to_tree_coords (GtkTreeView *tree_view, /** * gtk_tree_view_convert_tree_to_widget_coords: * @tree_view: a #GtkTreeView - * @wx: X coordinate relative to the tree - * @wy: Y coordinate relative to the tree - * @bx: return location for widget X coordinate - * @by: return location for widget Y coordinate + * @tx: X coordinate relative to the tree + * @ty: Y coordinate relative to the tree + * @wx: return location for widget X coordinate + * @wy: return location for widget Y coordinate * * Converts tree coordinates (coordinates in full scrollable area of the tree) * to widget coordinates. @@ -13038,10 +13038,10 @@ gtk_tree_view_convert_tree_to_bin_window_coords (GtkTreeView *tree_view, /** * gtk_tree_view_convert_bin_window_to_tree_coords: * @tree_view: a #GtkTreeView - * @wx: X coordinate relative to bin_window - * @wy: Y coordinate relative to bin_window - * @bx: return location for tree X coordinate - * @by: return location for tree Y coordinate + * @bx: X coordinate relative to bin_window + * @by: Y coordinate relative to bin_window + * @tx: return location for tree X coordinate + * @ty: return location for tree Y coordinate * * Converts bin_window coordinates to coordinates for the * tree (the full scrollable area of the tree).