From 4360fa066018f8cc95d4251d872864f4167517e0 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Fri, 8 Nov 2002 18:53:56 +0000 Subject: [PATCH] atk/atkhyperlink.c atk/atkhyperlink.h atk/atktable.c atk/atktable.h Fri Nov 8 19:55:25 2002 Soeren Sandmann * atk/atkhyperlink.c * atk/atkhyperlink.h * atk/atktable.c * atk/atktable.h * atk/atktext.c * atk/atktext.h * docs/tmpl/atkhyperlink.sgml * docs/tmpl/atkobject.sgml * docs/tmpl/atktable.sgml * docs/tmpl/atktext.sgml Trivial s/foo/foo_/ fixes to make atk.h includable with -Wshadow without warnings. --- ChangeLog | 16 ++++++++++++++++ atk/atkhyperlink.c | 16 ++++++++-------- atk/atkhyperlink.h | 24 ++++++++++++------------ atk/atktable.c | 8 ++++---- atk/atktable.h | 8 ++++---- atk/atktext.c | 2 +- atk/atktext.h | 2 +- docs/tmpl/atkhyperlink.sgml | 12 ++++++------ docs/tmpl/atkobject.sgml | 22 +++++++++++----------- docs/tmpl/atktable.sgml | 12 ++---------- docs/tmpl/atktext.sgml | 4 +--- 11 files changed, 66 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99d0e29..9e97797 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Fri Nov 8 19:55:25 2002 Soeren Sandmann + + * atk/atkhyperlink.c + * atk/atkhyperlink.h + * atk/atktable.c + * atk/atktable.h + * atk/atktext.c + * atk/atktext.h + * docs/tmpl/atkhyperlink.sgml + * docs/tmpl/atkobject.sgml + * docs/tmpl/atktable.sgml + * docs/tmpl/atktext.sgml + + Trivial s/foo/foo_/ fixes to make atk.h includable with -Wshadow + without warnings. + 2002-11-05 Padraig O'Briain * autogen.sh: Add call to autoheader to create config.h.in diff --git a/atk/atkhyperlink.c b/atk/atkhyperlink.c index 7be8c31..569a33f 100755 --- a/atk/atkhyperlink.c +++ b/atk/atkhyperlink.c @@ -76,11 +76,11 @@ atk_hyperlink_init (AtkHyperlink *link, /** * atk_hyperlink_get_uri: - * @link: an #AtkHyperlink + * @link_: an #AtkHyperlink * @i: a (zero-index) integer specifying the desired anchor * * Get a the URI associated with the anchor specified - * by @i of @link. + * by @i of @link_. * * Multiple anchors are primarily used by client-side image maps. * @@ -103,12 +103,12 @@ atk_hyperlink_get_uri (AtkHyperlink *link, /** * atk_hyperlink_get_object: - * @link: an #AtkHyperlink + * @link_: an #AtkHyperlink * @i: a (zero-index) integer specifying the desired anchor * * Returns the item associated with this hyperlinks nth anchor. * For instance, the returned #AtkObject will implement #AtkText - * if @link is a text hyperlink, #AtkImage if @link is an image + * if @link_ is a text hyperlink, #AtkImage if @link_ is an image * hyperlink etc. * * Multiple anchors are primarily used by client-side image maps. @@ -132,7 +132,7 @@ atk_hyperlink_get_object (AtkHyperlink *link, /** * atk_hyperlink_get_end_index: - * @link: an #AtkHyperlink + * @link_: an #AtkHyperlink * * Gets the index with the hypertext document at which this link ends. * @@ -154,7 +154,7 @@ atk_hyperlink_get_end_index (AtkHyperlink *link) /** * atk_hyperlink_get_start_index: - * @link: an #AtkHyperlink + * @link_: an #AtkHyperlink * * Gets the index with the hypertext document at which this link begins. * @@ -176,7 +176,7 @@ atk_hyperlink_get_start_index (AtkHyperlink *link) /** * atk_hyperlink_is_valid: - * @link: an #AtkHyperlink + * @link_: an #AtkHyperlink * * Since the document that a link is associated with may have changed * this method returns %TRUE if the link is still valid (with @@ -200,7 +200,7 @@ atk_hyperlink_is_valid (AtkHyperlink *link) /** * atk_hyperlink_get_n_anchors: - * @link: an #AtkHyperlink + * @link_: an #AtkHyperlink * * Gets the number of anchors associated with this hyperlink. * diff --git a/atk/atkhyperlink.h b/atk/atkhyperlink.h index ca38055..15d804f 100755 --- a/atk/atkhyperlink.h +++ b/atk/atkhyperlink.h @@ -55,35 +55,35 @@ struct _AtkHyperlinkClass * Returns a string specifying the URI associated with the nth anchor * of this link. */ - gchar* (* get_uri) (AtkHyperlink *link, + gchar* (* get_uri) (AtkHyperlink *link_, gint i); /* * Returns an object which represents the link action, as appropriate for * that link. */ - AtkObject* (* get_object) (AtkHyperlink *link, + AtkObject* (* get_object) (AtkHyperlink *link_, gint i); /* * Gets the index with the hypertext document at which this link ends */ - gint (* get_end_index) (AtkHyperlink *link); + gint (* get_end_index) (AtkHyperlink *link_); /* * Gets the index with the hypertext document at which this link begins */ - gint (* get_start_index) (AtkHyperlink *link); + gint (* get_start_index) (AtkHyperlink *link_); /* * Since the document a link is associated with may have changed, this * method returns whether or not this link is still valid (with respect * to the document is references) */ - gboolean (* is_valid) (AtkHyperlink *link); + gboolean (* is_valid) (AtkHyperlink *link_); /* * Returns the number of anchors associated with this link */ - gint (* get_n_anchors) (AtkHyperlink *link); + gint (* get_n_anchors) (AtkHyperlink *link_); AtkFunction pad1; AtkFunction pad2; @@ -93,19 +93,19 @@ struct _AtkHyperlinkClass GType atk_hyperlink_get_type (void); -gchar* atk_hyperlink_get_uri (AtkHyperlink *link, +gchar* atk_hyperlink_get_uri (AtkHyperlink *link_, gint i); -AtkObject* atk_hyperlink_get_object (AtkHyperlink *link, +AtkObject* atk_hyperlink_get_object (AtkHyperlink *link_, gint i); -gint atk_hyperlink_get_end_index (AtkHyperlink *link); +gint atk_hyperlink_get_end_index (AtkHyperlink *link_); -gint atk_hyperlink_get_start_index (AtkHyperlink *link); +gint atk_hyperlink_get_start_index (AtkHyperlink *link_); -gboolean atk_hyperlink_is_valid (AtkHyperlink *link); +gboolean atk_hyperlink_is_valid (AtkHyperlink *link_); -gint atk_hyperlink_get_n_anchors (AtkHyperlink *link); +gint atk_hyperlink_get_n_anchors (AtkHyperlink *link_); #ifdef __cplusplus diff --git a/atk/atktable.c b/atk/atktable.c index 6f1b644..784b310 100755 --- a/atk/atktable.c +++ b/atk/atktable.c @@ -191,9 +191,9 @@ atk_table_get_index_at (AtkTable *table, /** * atk_table_get_row_at_index: * @table: a GObject instance that implements AtkTableInterface - * @index: a #gint representing an index in @table + * @index_: a #gint representing an index in @table * - * Gets a #gint representing the row at the specified @index, or -1 + * Gets a #gint representing the row at the specified @index_, or -1 * if the table does not implement this interface * * Returns: a gint representing the row at the specified index. @@ -217,9 +217,9 @@ atk_table_get_row_at_index (AtkTable *table, /** * atk_table_get_column_at_index: * @table: a GObject instance that implements AtkTableInterface - * @index: a #gint representing an index in @table + * @index_: a #gint representing an index in @table * - * Gets a #gint representing the column at the specified @index, or -1 + * Gets a #gint representing the column at the specified @index_, or -1 * if the table does not implement this interface * * Returns: a gint representing the column at the specified index. diff --git a/atk/atktable.h b/atk/atktable.h index 6f2b45f..790fbb4 100755 --- a/atk/atktable.h +++ b/atk/atktable.h @@ -54,9 +54,9 @@ struct _AtkTableIface gint row, gint column); gint (* get_column_at_index) (AtkTable *table, - gint index); + gint index_); gint (* get_row_at_index) (AtkTable *table, - gint index); + gint index_); gint (* get_n_columns) (AtkTable *table); gint (* get_n_rows) (AtkTable *table); gint (* get_column_extent_at) (AtkTable *table, @@ -148,9 +148,9 @@ gint atk_table_get_index_at (AtkTable *table, gint row, gint column); gint atk_table_get_column_at_index (AtkTable *table, - gint index); + gint index_); gint atk_table_get_row_at_index (AtkTable *table, - gint index); + gint index_); gint atk_table_get_n_columns (AtkTable *table); gint atk_table_get_n_rows (AtkTable *table); gint atk_table_get_column_extent_at (AtkTable *table, diff --git a/atk/atktext.c b/atk/atktext.c index 06bd940..8c423a9 100755 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -1010,7 +1010,7 @@ atk_text_attribute_for_name (const gchar *name) /** * atk_text_attribute_get_value: * @attr: The #AtkTextAttribute for which a value is required - * @index: The index of the required value + * @index_: The index of the required value * * Gets the value for the index of the #AtkTextAttribute * diff --git a/atk/atktext.h b/atk/atktext.h index 533af6c..8ec3469 100755 --- a/atk/atktext.h +++ b/atk/atktext.h @@ -302,7 +302,7 @@ void atk_attribute_set_free (AtkAttributeSet *attri G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr); AtkTextAttribute atk_text_attribute_for_name (const gchar *name); G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr, - gint index); + gint index_); #ifdef __cplusplus } diff --git a/docs/tmpl/atkhyperlink.sgml b/docs/tmpl/atkhyperlink.sgml index 6875c79..87dadc7 100644 --- a/docs/tmpl/atkhyperlink.sgml +++ b/docs/tmpl/atkhyperlink.sgml @@ -27,7 +27,7 @@ The AtkHyperlink structure should not be accessed directly. -@link: +@link_: @i: @Returns: @@ -37,7 +37,7 @@ The AtkHyperlink structure should not be accessed directly. -@link: +@link_: @i: @Returns: @@ -47,7 +47,7 @@ The AtkHyperlink structure should not be accessed directly. -@link: +@link_: @Returns: @@ -56,7 +56,7 @@ The AtkHyperlink structure should not be accessed directly. -@link: +@link_: @Returns: @@ -65,7 +65,7 @@ The AtkHyperlink structure should not be accessed directly. -@link: +@link_: @Returns: @@ -74,7 +74,7 @@ The AtkHyperlink structure should not be accessed directly. -@link: +@link_: @Returns: diff --git a/docs/tmpl/atkobject.sgml b/docs/tmpl/atkobject.sgml index 5ef932a..e52834b 100644 --- a/docs/tmpl/atkobject.sgml +++ b/docs/tmpl/atkobject.sgml @@ -465,37 +465,32 @@ This signal support, which may be any of the accessible state types. @atkobject: the object which received the signal. - - - - - - + - + - + - + - + - + @@ -530,3 +525,8 @@ This signal support, which may be any of the accessible state types. + + + + + diff --git a/docs/tmpl/atktable.sgml b/docs/tmpl/atktable.sgml index b076902..d710d68 100644 --- a/docs/tmpl/atktable.sgml +++ b/docs/tmpl/atktable.sgml @@ -68,7 +68,7 @@ The AtkTable structure does not contain any fields. @table: -@index: +@index_: @Returns: @@ -78,7 +78,7 @@ The AtkTable structure does not contain any fields. @table: -@index: +@index_: @Returns: @@ -149,8 +149,6 @@ The AtkTable structure does not contain any fields. @table: @row: @Returns: - -@r: @@ -189,8 +187,6 @@ The AtkTable structure does not contain any fields. @table: @caption: - -@accessible: @@ -201,8 +197,6 @@ The AtkTable structure does not contain any fields. @table: @row: @description: - -@accessible: @@ -213,8 +207,6 @@ The AtkTable structure does not contain any fields. @table: @column: @description: - -@accessible: diff --git a/docs/tmpl/atktext.sgml b/docs/tmpl/atktext.sgml index 73d280b..89494eb 100644 --- a/docs/tmpl/atktext.sgml +++ b/docs/tmpl/atktext.sgml @@ -181,8 +181,6 @@ The AtkText structure does not contain any fields. @width: @height: @coords: - -@length: @@ -332,7 +330,7 @@ The AtkText structure does not contain any fields. @attr: -@index: +@index_: @Returns: -- 2.7.4