docs/reference/gdk/tmpl/dnd.sgml docs/reference/gdk/tmpl/drawing.sgml

Fri Nov  8 20:14:52 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* docs/reference/gdk/tmpl/dnd.sgml
	docs/reference/gdk/tmpl/drawing.sgml
	docs/reference/gdk/tmpl/gdk-unused.sgml
	docs/reference/gdk/tmpl/gdkdisplay.sgml
	docs/reference/gdk/tmpl/general.sgml
	docs/reference/gdk/tmpl/input_devices.sgml
	docs/reference/gdk/tmpl/selections.sgml
	docs/reference/gtk/tmpl/gtkcellrenderer.sgml
	docs/reference/gtk/tmpl/gtkcurve.sgml
	docs/reference/gtk/tmpl/gtkdnd.sgml
	docs/reference/gtk/tmpl/gtkitemfactory.sgml
	docs/reference/gtk/tmpl/gtkmenu.sgml
	docs/reference/gtk/tmpl/gtkoldeditable.sgml
	docs/reference/gtk/tmpl/gtkoptionmenu.sgml
	docs/reference/gtk/tmpl/gtkpreview.sgml
	docs/reference/gtk/tmpl/gtkselection.sgml
	docs/reference/gtk/tmpl/gtksocket.sgml
	docs/reference/gtk/tmpl/gtkstyle.sgml
	docs/reference/gtk/tmpl/gtktextbuffer.sgml
	docs/reference/gtk/tmpl/gtktreemodel.sgml
	docs/reference/gtk/tmpl/gtkwidget.sgml gdk/gdk.h gdk/gdkdisplay.c
	gdk/gdkdisplay.h gdk/gdkdnd.h gdk/gdkdraw.c gdk/gdkdrawable.h
	gdk/gdkinput.h gdk/gdkselection.h gdk/x11/gdkdisplay-x11.c
	gdk/x11/gdkdnd-x11.c gdk/x11/gdkselection-x11.c gtk/gtkcurve.h
	gtk/gtkdnd.h gtk/gtkitemfactory.c gtk/gtkitemfactory.h
	gtk/gtkmenu.h gtk/gtkoldeditable.c gtk/gtkoldeditable.h
	gtk/gtkoptionmenu.h gtk/gtkplug.c gtk/gtkplug.h gtk/gtkpreview.h
	gtk/gtkrange.h gtk/gtkselection.c gtk/gtkselection.h
	gtk/gtksocket.c gtk/gtksocket.h gtk/gtkstyle.c gtk/gtkstyle.h
	gtk/gtktextlayout.c gtk/gtktextlayout.h gtk/gtktreemodel.c
	gtk/gtktreemodel.h gtk/gtkwidget.h

	Trivial s/foo/foo_/ fixes to make gtk.h includable with -Wshadow
	without warnings. (#91680)

23 files changed, 75 insertions, 75 deletions

diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h
index 0d0c94b363..efc28a4ba1 100644
--- a/gtk/gtkcurve.h
+++ b/gtk/gtkcurve.h
@@ -99,7 +99,7 @@ struct _GtkCurveClass
 GType		gtk_curve_get_type	(void) G_GNUC_CONST;
 GtkWidget*	gtk_curve_new		(void);
 void		gtk_curve_reset		(GtkCurve *curve);
-void		gtk_curve_set_gamma	(GtkCurve *curve, gfloat gamma);
+void		gtk_curve_set_gamma	(GtkCurve *curve, gfloat gamma_);
 void		gtk_curve_set_range	(GtkCurve *curve,
 					 gfloat min_x, gfloat max_x,
 					 gfloat min_y, gfloat max_y);
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 8bb7aeb429..c392442a9e 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -55,11 +55,11 @@ typedef enum {
 void gtk_drag_get_data (GtkWidget      *widget,
 			GdkDragContext *context,
 			GdkAtom         target,
-			guint32         time);
+			guint32         time_);
 void gtk_drag_finish   (GdkDragContext *context,
 			gboolean        success,
 			gboolean        del,
-			guint32         time);
+			guint32         time_);
 
 GtkWidget *gtk_drag_get_source_widget (GdkDragContext *context);
 
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 23e344cf68..0992e3e7d3 100644
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -1472,7 +1472,7 @@ ifactory_delete_popup_data (GtkObject	   *object,
  * @x: the x position 
  * @y: the y position
  * @mouse_button: the mouse button which was pressed to initiate the popup
- * @time: the time at which the activation event occurred
+ * @time_: the time at which the activation event occurred
  *
  * Pops up the menu constructed from the item factory at (@x, @y).
  *
@@ -1481,11 +1481,11 @@ ifactory_delete_popup_data (GtkObject	   *object,
  * a mouse button press, such as a mouse button release or a keypress,
  * @mouse_button should be 0.
  *
- * The @time parameter should be the time stamp of the event that
+ * The @time_ parameter should be the time stamp of the event that
  * initiated the popup. If such an event is not available, use
  * gtk_get_current_event_time() instead.
  *
- * The operation of the @mouse_button and the @time parameter is the same
+ * The operation of the @mouse_button and the @time_ parameter is the same
  * as the @button and @activation_time parameters for gtk_menu_popup().
  */
 void
@@ -1507,7 +1507,7 @@ gtk_item_factory_popup (GtkItemFactory		*ifactory,
  * @x: the x position 
  * @y: the y position
  * @mouse_button: the mouse button which was pressed to initiate the popup
- * @time: the time at which the activation event occurred
+ * @time_: the time at which the activation event occurred
  *
  * Pops up the menu constructed from the item factory at (@x, @y). Callbacks
  * can access the @popup_data while the menu is posted via 
@@ -1518,11 +1518,11 @@ gtk_item_factory_popup (GtkItemFactory		*ifactory,
  * a mouse button press, such as a mouse button release or a keypress,
  * @mouse_button should be 0.
  *
- * The @time parameter should be the time stamp of the event that
+ * The @time_ parameter should be the time stamp of the event that
  * initiated the popup. If such an event is not available, use
  * gtk_get_current_event_time() instead.
  *
- * The operation of the @mouse_button and the @time parameters is the same
+ * The operation of the @mouse_button and the @time_ parameters is the same
  * as the @button and @activation_time parameters for gtk_menu_popup().
  */
 void
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 7efaab2d38..230e46bc05 100644
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -185,14 +185,14 @@ void	gtk_item_factory_popup		(GtkItemFactory		*ifactory,
 					 guint			 x,
 					 guint			 y,
 					 guint			 mouse_button,
-					 guint32		 time);
+					 guint32		 time_);
 void	gtk_item_factory_popup_with_data(GtkItemFactory		*ifactory,
 					 gpointer		 popup_data,
 					 GtkDestroyNotify	 destroy,
 					 guint			 x,
 					 guint			 y,
 					 guint			 mouse_button,
-					 guint32		 time);
+					 guint32		 time_);
 gpointer gtk_item_factory_popup_data	(GtkItemFactory		*ifactory);
 gpointer gtk_item_factory_popup_data_from_widget (GtkWidget	*widget);
 void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 1039069957..62d5ac3e29 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -145,7 +145,7 @@ void	   gtk_menu_popdown		  (GtkMenu	       *menu);
  */
 GtkWidget* gtk_menu_get_active		  (GtkMenu	       *menu);
 void	   gtk_menu_set_active		  (GtkMenu	       *menu,
-					   guint		index);
+					   guint		index_);
 
 /* set/get the accelerator group that holds global accelerators (should
  * be added to the corresponding toplevel with gtk_window_add_accel_group().
diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index f52332cdce..b4c79627e4 100644
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -715,7 +715,7 @@ old_editable_text_received_cb (GtkClipboard *clipboard,
  * @old_editable: a #GtkOldEditable
  * @claim: if %TRUE, claim ownership of the selection, if %FALSE, give
  *   up ownership
- * @time: timestamp for this operation
+ * @time_: timestamp for this operation
  * 
  * Claims or gives up ownership of the selection.
  */
diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h
index f0d181352b..d5983d9e29 100644
--- a/gtk/gtkoldeditable.h
+++ b/gtk/gtkoldeditable.h
@@ -50,7 +50,7 @@ extern "C" {
 typedef struct _GtkOldEditable       GtkOldEditable;
 typedef struct _GtkOldEditableClass  GtkOldEditableClass;
 
-typedef void (*GtkTextFunction) (GtkOldEditable  *editable, guint32 time);
+typedef void (*GtkTextFunction) (GtkOldEditable  *editable, guint32 time_);
 
 struct _GtkOldEditable
 {
@@ -121,7 +121,7 @@ struct _GtkOldEditableClass
 GtkType    gtk_old_editable_get_type        (void) G_GNUC_CONST;
 void       gtk_old_editable_claim_selection (GtkOldEditable *old_editable,
 					     gboolean        claim,
-					     guint32         time);
+					     guint32         time_);
 void       gtk_old_editable_changed         (GtkOldEditable *old_editable);
 
 #ifdef __cplusplus
diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h
index d72cd8c244..e692ca0882 100644
--- a/gtk/gtkoptionmenu.h
+++ b/gtk/gtkoptionmenu.h
@@ -81,7 +81,7 @@ void       gtk_option_menu_set_menu    (GtkOptionMenu *option_menu,
 void       gtk_option_menu_remove_menu (GtkOptionMenu *option_menu);
 gint       gtk_option_menu_get_history (GtkOptionMenu *option_menu);
 void       gtk_option_menu_set_history (GtkOptionMenu *option_menu,
-					guint          index);
+					guint          index_);
 
 
 #ifdef __cplusplus
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 466423d714..fbf25e0f3a 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -213,7 +213,7 @@ gtk_plug_set_is_child (GtkPlug  *plug,
 /**
  * _gtk_plug_add_to_socket:
  * @plug: a #GtkPlug
- * @socket: a #GtkSocket
+ * @socket_: a #GtkSocket
  * 
  * Adds a plug to a socket within the same application.
  **/
@@ -269,7 +269,7 @@ send_delete_event (GtkWidget *widget)
 /**
  * _gtk_plug_remove_from_socket:
  * @plug: a #GtkPlug
- * @socket: a #GtkSocket
+ * @socket_: a #GtkSocket
  * 
  * Removes a plug from a socket within the same application.
  **/
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index cd46ea0ec7..20df3eaa30 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -92,9 +92,9 @@ GtkWidget* gtk_plug_new_for_display       (GdkDisplay      *display,
 GdkNativeWindow gtk_plug_get_id (GtkPlug         *plug);
 
 void _gtk_plug_add_to_socket      (GtkPlug   *plug,
-				   GtkSocket *socket);
+				   GtkSocket *socket_);
 void _gtk_plug_remove_from_socket (GtkPlug   *plug,
-				   GtkSocket *socket);
+				   GtkSocket *socket_);
 
 #ifdef __cplusplus
 }
diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h
index 032cc3c693..d8df2f42c6 100644
--- a/gtk/gtkpreview.h
+++ b/gtk/gtkpreview.h
@@ -113,7 +113,7 @@ void            gtk_preview_draw_row           (GtkPreview      *preview,
 void            gtk_preview_set_expand         (GtkPreview      *preview,
 						gboolean         expand);
 
-void            gtk_preview_set_gamma          (double           gamma);
+void            gtk_preview_set_gamma          (double           gamma_);
 void            gtk_preview_set_color_cube     (guint            nred_shades,
 						guint            ngreen_shades,
 						guint            nblue_shades,
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index e62d4d2b18..02ffdad49c 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -118,7 +118,7 @@ struct _GtkRangeClass
 
   /* Virtual functions */
   void (* get_range_border) (GtkRange     *range,
-                             GtkBorder    *border);
+                             GtkBorder    *border_);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 40ca5206f5..c8a9ec6f0c 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -300,7 +300,7 @@ gtk_target_list_find (GtkTargetList *list,
  * @display: the #Gdkdisplay where the selection is set 
  * @widget: new selection owner (a #GdkWidget), or %NULL.
  * @selection: an interned atom representing the selection to claim.
- * @time: timestamp with which to claim the selection
+ * @time_: timestamp with which to claim the selection
  *
  * Claim ownership of a given selection for a particular widget, or,
  * if @widget is %NULL, release ownership of the selection.
@@ -399,7 +399,7 @@ gtk_selection_owner_set_for_display (GdkDisplay   *display,
  * gtk_selection_owner_set:
  * @widget:  a #GtkWidget, or %NULL.
  * @selection:  an interned atom representing the selection to claim
- * @time: timestamp with which to claim the selection
+ * @time_: timestamp with which to claim the selection
  * 
  * Claims ownership of a given selection for a particular widget,
  * or, if @widget is %NULL, release ownership of the selection.
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index dc783ec6ad..ebaa22fb82 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -108,11 +108,11 @@ gboolean       gtk_target_list_find      (GtkTargetList  *list,
 
 gboolean gtk_selection_owner_set             (GtkWidget  *widget,
 					      GdkAtom     selection,
-					      guint32     time);
+					      guint32     time_);
 gboolean gtk_selection_owner_set_for_display (GdkDisplay *display,
 					      GtkWidget  *widget,
 					      GdkAtom     selection,
-					      guint32     time);
+					      guint32     time_);
 
 void     gtk_selection_add_target    (GtkWidget            *widget,
 				      GdkAtom               selection,
@@ -127,7 +127,7 @@ void     gtk_selection_clear_targets (GtkWidget            *widget,
 gboolean gtk_selection_convert       (GtkWidget            *widget,
 				      GdkAtom               selection,
 				      GdkAtom               target,
-				      guint32               time);
+				      guint32               time_);
 void     gtk_selection_data_set      (GtkSelectionData     *selection_data,
 				      GdkAtom               type,
 				      gint                  format,
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 2fee53f671..e2b488df76 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -256,7 +256,7 @@ gtk_socket_new (void)
 
 /**
  * gtk_socket_steal:
- * @socket: a #GtkSocket
+ * @socket_: a #GtkSocket
  * @wid: the window ID of an existing toplevel window.
  * 
  * Reparents a pre-existing toplevel window into a #GtkSocket. This is
@@ -281,7 +281,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
 
 /**
  * gtk_socket_add_id:
- * @socket: a #GtkSocket
+ * @socket_: a #GtkSocket
  * @window_id: the window ID of a client participating in the XEMBED protocol.
  *
  * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket.  The
@@ -311,7 +311,7 @@ gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow window_id)
 
 /**
  * gtk_socket_get_id:
- * @socket: a #GtkSocket.
+ * @socket_: a #GtkSocket.
  * 
  * Gets the window ID of a #GtkSocket widget, which can then
  * be used to create a client embedded inside the socket, for
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index f47d79ec31..a3f4d489ad 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -72,8 +72,8 @@ struct _GtkSocketClass
 {
   GtkContainerClass parent_class;
 
-  void     (*plug_added)   (GtkSocket *socket);
-  gboolean (*plug_removed) (GtkSocket *socket);
+  void     (*plug_added)   (GtkSocket *socket_);
+  gboolean (*plug_removed) (GtkSocket *socket_);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -86,12 +86,12 @@ struct _GtkSocketClass
 GType          gtk_socket_get_type (void) G_GNUC_CONST;
 GtkWidget*     gtk_socket_new      (void);
 
-void            gtk_socket_add_id (GtkSocket       *socket,
+void            gtk_socket_add_id (GtkSocket       *socket_,
 				   GdkNativeWindow  window_id);
-GdkNativeWindow gtk_socket_get_id (GtkSocket       *socket);
+GdkNativeWindow gtk_socket_get_id (GtkSocket       *socket_);
 
 #ifndef GTK_DISABLE_DEPRECATED
-void           gtk_socket_steal    (GtkSocket      *socket,
+void           gtk_socket_steal    (GtkSocket      *socket_,
 				    GdkNativeWindow wid);
 #endif /* GTK_DISABLE_DEPRECATED */
 
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index ec6e984baa..cb3c1020e1 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -952,11 +952,11 @@ gtk_draw_hline (GtkStyle     *style,
  * @style: a #GtkStyle
  * @window: a #GdkWindow
  * @state_type: a state
- * @y1: the starting y coordinate
- * @y2: the ending y coordinate
+ * @y1_: the starting y coordinate
+ * @y2_: the ending y coordinate
  * @x: the x coordinate
  * 
- * Draws a vertical line from (@x, @y1) to (@x, @y2) in @window
+ * Draws a vertical line from (@x, @y1_) to (@x, @y2_) in @window
  * using the given style and state.
  * 
  * This function is deprecated, use gtk_paint_vline() instead.
@@ -5533,11 +5533,11 @@ gtk_paint_hline (GtkStyle      *style,
  * @area: rectangle to which the output is clipped
  * @widget:
  * @detail: 
- * @y1: the starting y coordinate
- * @y2: the ending y coordinate
+ * @y1_: the starting y coordinate
+ * @y2_: the ending y coordinate
  * @x: the x coordinate
  * 
- * Draws a vertical line from (@x, @y1) to (@x, @y1) in @window
+ * Draws a vertical line from (@x, @y1_) to (@x, @y2_) in @window
  * using the given style and state.
  */
 void
@@ -5946,8 +5946,8 @@ gtk_paint_resize_grip (GtkStyle      *style,
 
 /**
  * gtk_border_copy:
- * @border: a #GtkBorder.
- * @returns: a copy of @border.
+ * @border_: a #GtkBorder.
+ * @returns: a copy of @border_.
  *
  * Copies a #GtkBorder structure.
  **/
@@ -5959,7 +5959,7 @@ gtk_border_copy (const GtkBorder *border)
 
 /**
  * gtk_border_free:
- * @border: a #GtkBorder.
+ * @border_: a #GtkBorder.
  * 
  * Frees a #GtkBorder structure.
  **/
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 0fbdf06fdb..cc6ac74aa7 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -184,8 +184,8 @@ struct _GtkStyleClass
 				 GdkRectangle		*area,
 				 GtkWidget		*widget,
 				 const gchar		*detail,
-				 gint			 y1,
-				 gint			 y2,
+				 gint			 y1_,
+				 gint			 y2_,
 				 gint			 x);
   void (*draw_shadow)		(GtkStyle		*style,
 				 GdkWindow		*window,
@@ -473,8 +473,8 @@ void gtk_draw_hline      (GtkStyle        *style,
 void gtk_draw_vline      (GtkStyle        *style,
 			  GdkWindow       *window,
 			  GtkStateType     state_type,
-			  gint             y1,
-			  gint             y2,
+			  gint             y1_,
+			  gint             y2_,
 			  gint             x);
 void gtk_draw_shadow     (GtkStyle        *style,
 			  GdkWindow       *window,
@@ -642,8 +642,8 @@ void gtk_paint_vline      (GtkStyle        *style,
 			   GdkRectangle    *area,
 			   GtkWidget       *widget,
 			   const gchar     *detail,
-			   gint             y1,
-			   gint             y2,
+			   gint             y1_,
+			   gint             y2_,
 			   gint             x);
 void gtk_paint_shadow     (GtkStyle        *style,
 			   GdkWindow       *window,
@@ -853,8 +853,8 @@ void gtk_paint_resize_grip (GtkStyle		*style,
 
 
 GType      gtk_border_get_type (void);
-GtkBorder *gtk_border_copy     (const GtkBorder *border);
-void       gtk_border_free (   GtkBorder       *border);
+GtkBorder *gtk_border_copy     (const GtkBorder *border_);
+void       gtk_border_free (   GtkBorder       *border_);
 
 /* --- private API --- */
 const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index fbff791534..70125e5227 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -778,12 +778,12 @@ update_layout_size (GtkTextLayout *layout)
  * @layout: a #GtkTextLayout
  * @anchor: iter pointing into a line that will be used as the
  *          coordinate origin
- * @y0: offset from the top of the line pointed to by @anchor at
- *      which to begin validation. (The offset here is in pixels
- *      after validation.)
- * @y1: offset from the top of the line pointed to by @anchor at
- *      which to end validation. (The offset here is in pixels
- *      after validation.)
+ * @y0_: offset from the top of the line pointed to by @anchor at
+ *       which to begin validation. (The offset here is in pixels
+ *       after validation.)
+ * @y1_: offset from the top of the line pointed to by @anchor at
+ *       which to end validation. (The offset here is in pixels
+ *       after validation.)
  *
  * Ensure that a region of a #GtkTextLayout is valid. The ::changed
  * signal will be emitted if any lines are validated.
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index 42126ed73d..58e8e97c45 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -322,8 +322,8 @@ void gtk_text_layout_free_line_data    (GtkTextLayout     *layout,
 gboolean gtk_text_layout_is_valid        (GtkTextLayout *layout);
 void     gtk_text_layout_validate_yrange (GtkTextLayout *layout,
                                           GtkTextIter   *anchor_line,
-                                          gint           y0,
-                                          gint           y1);
+                                          gint           y0_,
+                                          gint           y1_);
 void     gtk_text_layout_validate        (GtkTextLayout *layout,
                                           gint           max_pixels);
 
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index c88373a936..5571e49528 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -307,7 +307,7 @@ gtk_tree_path_new_first (void)
 /**
  * gtk_tree_path_append_index:
  * @path: A #GtkTreePath.
- * @index: The index.
+ * @index_: The index.
  *
  * Appends a new index to a path.  As a result, the depth of the path is
  * increased.
@@ -327,7 +327,7 @@ gtk_tree_path_append_index (GtkTreePath *path,
 /**
  * gtk_tree_path_prepend_index:
  * @path: A #GtkTreePath.
- * @index: The index.
+ * @index_: The index.
  *
  * Prepends a new index to a path.  As a result, the depth of the path is
  * increased.
@@ -701,7 +701,7 @@ gtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
 /**
  * gtk_tree_model_get_column_type:
  * @tree_model: A #GtkTreeModel.
- * @index: The column index.
+ * @index_: The column index.
  *
  * Returns the type of the column.
  *
@@ -978,7 +978,7 @@ gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
  * @n: Then index of the desired child.
  *
  * Sets @iter to be the child of @parent, using the given index.  The first
- * index is 0.  If @index is too big, or @parent has no children, @iter is set
+ * index is 0.  If @index_ is too big, or @parent has no children, @iter is set
  * to an invalid iterator and %FALSE is returned.  @parent will remain a valid
  * node after this function has been called.  As a special case, if @parent is
  * %NULL, then the @n<!-- -->th root node is set.
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index b611729ed1..f922bd7d9e 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -84,7 +84,7 @@ struct _GtkTreeModelIface
 
   gint         (* get_n_columns)   (GtkTreeModel *tree_model);
   GType        (* get_column_type) (GtkTreeModel *tree_model,
-				    gint          index);
+				    gint          index_);
   gboolean     (* get_iter)        (GtkTreeModel *tree_model,
 				    GtkTreeIter  *iter,
 				    GtkTreePath  *path);
@@ -126,9 +126,9 @@ gchar       *gtk_tree_path_to_string        (GtkTreePath       *path);
 #define gtk_tree_path_new_root() gtk_tree_path_new_first()
 GtkTreePath *gtk_tree_path_new_first        (void);
 void         gtk_tree_path_append_index     (GtkTreePath       *path,
-					     gint               index);
+					     gint               index_);
 void         gtk_tree_path_prepend_index    (GtkTreePath       *path,
-					     gint               index);
+					     gint               index_);
 gint         gtk_tree_path_get_depth        (GtkTreePath       *path);
 gint        *gtk_tree_path_get_indices      (GtkTreePath       *path);
 void         gtk_tree_path_free             (GtkTreePath       *path);
@@ -180,7 +180,7 @@ GType             gtk_tree_model_get_type        (void) G_GNUC_CONST;
 GtkTreeModelFlags gtk_tree_model_get_flags       (GtkTreeModel *tree_model);
 gint              gtk_tree_model_get_n_columns   (GtkTreeModel *tree_model);
 GType             gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
-						  gint          index);
+						  gint          index_);
 
 
 /* Iterator movement */
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index fe624c2034..a16c36a999 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -343,10 +343,10 @@ struct _GtkWidgetClass
   void (* selection_get)           (GtkWidget          *widget,
 				    GtkSelectionData   *selection_data,
 				    guint               info,
-				    guint               time);
+				    guint               time_);
   void (* selection_received)      (GtkWidget          *widget,
 				    GtkSelectionData   *selection_data,
-				    guint               time);
+				    guint               time_);
 
   /* Source side drag signals */
   void (* drag_begin)	           (GtkWidget	       *widget,
@@ -357,31 +357,31 @@ struct _GtkWidgetClass
 				    GdkDragContext     *context,
 				    GtkSelectionData   *selection_data,
 				    guint               info,
-				    guint               time);
+				    guint               time_);
   void (* drag_data_delete)        (GtkWidget	       *widget,
 				    GdkDragContext     *context);
 
   /* Target side drag signals */
   void (* drag_leave)	           (GtkWidget	       *widget,
 				    GdkDragContext     *context,
-				    guint               time);
+				    guint               time_);
   gboolean (* drag_motion)         (GtkWidget	       *widget,
 				    GdkDragContext     *context,
 				    gint                x,
 				    gint                y,
-				    guint               time);
+				    guint               time_);
   gboolean (* drag_drop)           (GtkWidget	       *widget,
 				    GdkDragContext     *context,
 				    gint                x,
 				    gint                y,
-				    guint               time);
+				    guint               time_);
   void (* drag_data_received)      (GtkWidget          *widget,
 				    GdkDragContext     *context,
 				    gint                x,
 				    gint                y,
 				    GtkSelectionData   *selection_data,
 				    guint               info,
-				    guint               time);
+				    guint               time_);
 
   /* Signals used only for keybindings */
   gboolean (* popup_menu)          (GtkWidget          *widget);