From 42a2d17bebeb4f24cd14eefbc025268e01120525 Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Wed, 5 Dec 2001 09:34:12 +0000 Subject: [PATCH] Change atk_attribute_register to atk_text_attribute_register, * atk/atk.def atk/atktext.c atk/atktext.h docs/atk-sections.txt docs/tmpl/atktext.sgml tests/testrelation.c: Change atk_attribute_register to atk_text_attribute_register, atk_attribute_get_value to atk_text_attribute_get_value, atk_attribute_get_name to atk_text_attribute_get_name atk_attribute_for_name to atk_text_attribuute_for_name --- ChangeLog | 9 +++++++++ atk/atk.def | 7 ++++--- atk/atktext.c | 18 +++++++++--------- atk/atktext.h | 8 ++++---- docs/atk-sections.txt | 8 ++++---- docs/tmpl/atktext.sgml | 8 ++++---- tests/testrelation.c | 16 ++++++++-------- 7 files changed, 42 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51886a4..c155351 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-12-05 Padraig O'Briain + + * atk/atk.def atk/atktext.c atk/atktext.h docs/atk-sections.txt + docs/tmpl/atktext.sgml tests/testrelation.c: + Change atk_attribute_register to atk_text_attribute_register, + atk_attribute_get_value to atk_text_attribute_get_value, + atk_attribute_get_name to atk_text_attribute_get_name + atk_attribute_for_name to atk_text_attribuute_for_name + 2001-12-04 Padraig O'Briain * atk/atktext.c: diff --git a/atk/atk.def b/atk/atk.def index cbc0d76..5e4ab1f 100644 --- a/atk/atk.def +++ b/atk/atk.def @@ -9,9 +9,6 @@ EXPORTS atk_add_focus_tracker atk_add_global_event_listener atk_add_key_event_listener - atk_attribute_get_value - atk_attribute_for_name - atk_attribute_register atk_attribute_set_free atk_component_add_focus_handler atk_component_contains @@ -176,7 +173,11 @@ EXPORTS atk_table_set_summary atk_text_add_selection atk_text_get_caret_offset + atk_text_attribute_get_name atk_text_attribute_get_type + atk_text_attribute_get_value + atk_text_attribute_for_name + atk_text_attribute_register atk_text_get_character_at_offset atk_text_get_character_count atk_text_get_character_extents diff --git a/atk/atktext.c b/atk/atktext.c index 4ab7415..c0331c5 100755 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -864,7 +864,7 @@ atk_attribute_set_free (AtkAttributeSet *attrib_set) } /** - * atk_attribute_register: + * atk_text_attribute_register: * @name: a name string * * Associate @name with a new #AtkTextAttribute @@ -872,7 +872,7 @@ atk_attribute_set_free (AtkAttributeSet *attrib_set) * Returns: an #AtkTextAttribute associated with @name **/ AtkTextAttribute -atk_attribute_register (const gchar *name) +atk_text_attribute_register (const gchar *name) { g_return_val_if_fail (name, ATK_TEXT_ATTR_INVALID); @@ -884,7 +884,7 @@ atk_attribute_register (const gchar *name) } /** - * atk_attribute_get_name: + * atk_text_attribute_get_name: * @attr: The #AtkTextAttribute whose name is required * * Gets the name corresponding to the #AtkTextAttribute @@ -892,7 +892,7 @@ atk_attribute_register (const gchar *name) * Returns: a string containing the name; this string should not be freed **/ G_CONST_RETURN gchar* -atk_attribute_get_name (AtkTextAttribute attr) +atk_text_attribute_get_name (AtkTextAttribute attr) { GTypeClass *type_class; GEnumValue *value; @@ -925,7 +925,7 @@ atk_attribute_get_name (AtkTextAttribute attr) } /** - * atk_attribute_for_name: + * atk_text_attribute_for_name: * @name: a string which is the (non-localized) name of an ATK text attribute. * * Get the #AtkTextAttribute type corresponding to a text attribute name. @@ -935,7 +935,7 @@ name, * or #ATK_TEXT_ATTRIBUTE_INVALID if no matching text attribute is found. **/ AtkTextAttribute -atk_attribute_for_name (const gchar *name) +atk_text_attribute_for_name (const gchar *name) { GTypeClass *type_class; GEnumValue *value; @@ -979,7 +979,7 @@ atk_attribute_for_name (const gchar *name) /** - * atk_attribute_get_value: + * atk_text_attribute_get_value: * @attr: The #AtkTextAttribute for which a value is required * @index: The index of the required value * @@ -989,8 +989,8 @@ atk_attribute_for_name (const gchar *name) * NULL is returned if there are no values maintained for the attr value. **/ G_CONST_RETURN gchar* -atk_attribute_get_value (AtkTextAttribute attr, - gint index) +atk_text_attribute_get_value (AtkTextAttribute attr, + gint index) { switch (attr) { diff --git a/atk/atktext.h b/atk/atktext.h index 80378ab..bc12a6f 100755 --- a/atk/atktext.h +++ b/atk/atktext.h @@ -122,7 +122,7 @@ typedef enum ATK_TEXT_ATTR_LAST_DEFINED } AtkTextAttribute; -AtkTextAttribute atk_attribute_register (const gchar *name); +AtkTextAttribute atk_text_attribute_register (const gchar *name); #define ATK_TYPE_TEXT (atk_text_get_type ()) @@ -293,9 +293,9 @@ gboolean atk_text_set_selection (AtkText *tex gboolean atk_text_set_caret_offset (AtkText *text, gint offset); void atk_attribute_set_free (AtkAttributeSet *attrib_set); -G_CONST_RETURN gchar* atk_attribute_get_name (AtkTextAttribute attr); -AtkTextAttribute atk_attribute_for_name (const gchar *name); -G_CONST_RETURN gchar* atk_attribute_get_value (AtkTextAttribute attr, +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); #ifdef __cplusplus diff --git a/docs/atk-sections.txt b/docs/atk-sections.txt index bf58b80..b4461f9 100644 --- a/docs/atk-sections.txt +++ b/docs/atk-sections.txt @@ -377,10 +377,10 @@ atk_text_remove_selection atk_text_set_selection atk_text_set_caret_offset atk_attribute_set_free -atk_attribute_register -atk_attribute_get_name -atk_attribute_for_name -atk_attribute_get_value +atk_text_attribute_register +atk_text_attribute_get_name +atk_text_attribute_for_name +atk_text_attribute_get_value ATK_TEXT ATK_IS_TEXT diff --git a/docs/tmpl/atktext.sgml b/docs/tmpl/atktext.sgml index 0e04e6a..89fdfd7 100644 --- a/docs/tmpl/atktext.sgml +++ b/docs/tmpl/atktext.sgml @@ -308,7 +308,7 @@ AtkText @attrib_set: - + @@ -317,7 +317,7 @@ AtkText @Returns: - + @@ -326,7 +326,7 @@ AtkText @Returns: - + @@ -335,7 +335,7 @@ AtkText @Returns: - + diff --git a/tests/testrelation.c b/tests/testrelation.c index 9c2216b..806e48a 100644 --- a/tests/testrelation.c +++ b/tests/testrelation.c @@ -152,7 +152,7 @@ test_text_attr (void) AtkTextAttribute attr1, attr2; G_CONST_RETURN gchar *name; - name = atk_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP); + name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP); g_return_val_if_fail (name, FALSE); if (strcmp (name, "pixels-inside-wrap") != 0) { @@ -160,7 +160,7 @@ test_text_attr (void) return FALSE; } - name = atk_attribute_get_name (ATK_TEXT_ATTR_BG_STIPPLE); + name = atk_text_attribute_get_name (ATK_TEXT_ATTR_BG_STIPPLE); g_return_val_if_fail (name, FALSE); if (strcmp (name, "bg-stipple") != 0) { @@ -168,28 +168,28 @@ test_text_attr (void) return FALSE; } - attr1 = atk_attribute_for_name ("left-margin"); + attr1 = atk_text_attribute_for_name ("left-margin"); if (attr1 != ATK_TEXT_ATTR_LEFT_MARGIN) { g_print ("Unexpected attribute for left-margin\n"); return FALSE; } - attr1 = atk_attribute_register ("test-attribute"); - name = atk_attribute_get_name (attr1); + attr1 = atk_text_attribute_register ("test-attribute"); + name = atk_text_attribute_get_name (attr1); g_return_val_if_fail (name, FALSE); if (strcmp (name, "test-attribute") != 0) { g_print ("Unexpected name for test-attribute %s\n", name); return FALSE; } - attr2 = atk_attribute_for_name ("test-attribute"); + attr2 = atk_text_attribute_for_name ("test-attribute"); if (attr1 != attr2) { g_print ("Unexpected attribute for test-attribute\n"); return FALSE; } - attr2 = atk_attribute_for_name ("TEST_ATTR"); + attr2 = atk_text_attribute_for_name ("TEST_ATTR"); if (attr2 != 0) { g_print ("Unexpected attribute for TEST_ATTR\n"); @@ -198,7 +198,7 @@ test_text_attr (void) /* * Check that a non-existent attribute returns NULL */ - name = atk_attribute_get_name (ATK_TEXT_ATTR_LAST_DEFINED + 2); + name = atk_text_attribute_get_name (ATK_TEXT_ATTR_LAST_DEFINED + 2); if (name) { g_print ("Unexpected name for undefined attribute %s\n", name); -- 2.11.4.GIT