[gtkhtml] Use 'const' instead G_CONST_RETURN



commit 5e16169b6d32ef95f5f79b2d27f14059bc3e5089
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Jun 9 17:49:35 2011 +0100

    Use 'const' instead G_CONST_RETURN

 a11y/hyperlink.c |    8 ++++----
 a11y/image.c     |    8 ++++----
 a11y/object.c    |    6 +++---
 a11y/table.c     |    6 ++----
 a11y/text.c      |    2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/a11y/hyperlink.c b/a11y/hyperlink.c
index 4a98f39..b58ffe6 100644
--- a/a11y/hyperlink.c
+++ b/a11y/hyperlink.c
@@ -37,8 +37,8 @@ static void atk_action_interface_init (AtkActionIface *iface);
 
 static gboolean html_a11y_hyper_link_do_action (AtkAction *action, gint i);
 static gint html_a11y_hyper_link_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar * html_a11y_hyper_link_get_description (AtkAction *action, gint i);
-static G_CONST_RETURN gchar * html_a11y_hyper_link_get_name (AtkAction *action, gint i);
+static const gchar * html_a11y_hyper_link_get_description (AtkAction *action, gint i);
+static const gchar * html_a11y_hyper_link_get_name (AtkAction *action, gint i);
 static gboolean html_a11y_hyper_link_set_description (AtkAction *action, gint i, const gchar *description);
 
 static AtkObjectClass *parent_class = NULL;
@@ -187,7 +187,7 @@ html_a11y_hyper_link_get_n_actions (AtkAction *action)
 	return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 html_a11y_hyper_link_get_description (AtkAction *action, gint i)
 {
 	if (i == 0) {
@@ -201,7 +201,7 @@ html_a11y_hyper_link_get_description (AtkAction *action, gint i)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 html_a11y_hyper_link_get_name (AtkAction *action, gint i)
 {
 	return i == 0 ? "link click" : NULL;
diff --git a/a11y/image.c b/a11y/image.c
index f931b7d..bd5e434 100644
--- a/a11y/image.c
+++ b/a11y/image.c
@@ -35,11 +35,11 @@ static void html_a11y_image_class_init    (HTMLA11YImageClass *klass);
 static void html_a11y_image_init          (HTMLA11YImage *a11y_image);
 static void atk_image_interface_init      (AtkImageIface *iface);
 
-static G_CONST_RETURN gchar * html_a11y_image_get_name (AtkObject *accessible);
+static const gchar * html_a11y_image_get_name (AtkObject *accessible);
 
 static void html_a11y_image_get_image_position (AtkImage *image, gint *x, gint *y, AtkCoordType coord_type);
 static void html_a11y_image_get_image_size (AtkImage *image, gint *width, gint *height);
-static G_CONST_RETURN gchar *html_a11y_image_get_image_description (AtkImage *image);
+static const gchar *html_a11y_image_get_image_description (AtkImage *image);
 
 static AtkObjectClass *parent_class = NULL;
 
@@ -138,7 +138,7 @@ html_a11y_image_new (HTMLObject *html_obj)
 	return accessible;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 html_a11y_image_get_name (AtkObject *accessible)
 {
 	HTMLImage *img = HTML_IMAGE (HTML_A11Y_HTML (accessible));
@@ -184,7 +184,7 @@ html_a11y_image_get_image_size (AtkImage *image, gint *width, gint *height)
 	*height -= 2*(img->vspace + img->border);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 html_a11y_image_get_image_description (AtkImage *image)
 {
 	return  html_a11y_image_get_name (ATK_OBJECT (image));
diff --git a/a11y/object.c b/a11y/object.c
index f549bb3..59ac3f2 100644
--- a/a11y/object.c
+++ b/a11y/object.c
@@ -44,7 +44,7 @@ get_n_actions (AtkAction *action)
 	return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 get_description (AtkAction *action, gint i)
 {
 	if (i == 0)
@@ -53,7 +53,7 @@ get_description (AtkAction *action, gint i)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 action_get_name (AtkAction *action, gint i)
 {
 	if (i == 0)
@@ -243,7 +243,7 @@ gtk_html_a11y_ref_child (AtkObject *accessible, gint index)
 	return accessible_child;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gtk_html_a11y_get_name (AtkObject *obj)
 {
 	if (obj->name != NULL) {
diff --git a/a11y/table.c b/a11y/table.c
index c79dbb8..577f3dd 100644
--- a/a11y/table.c
+++ b/a11y/table.c
@@ -336,11 +336,9 @@ html_a11y_table_get_row_header (AtkTable *table, gint row)
 
   AtkObject*
                     (* get_caption)              (AtkTable      *table);
-  G_CONST_RETURN gchar *
-                    (* get_column_description)   (AtkTable      *table,
+  const gchar *     (* get_column_description)   (AtkTable      *table,
                                                   gint          column);
-  G_CONST_RETURN gchar *
-                    (* get_row_description)      (AtkTable      *table,
+  const gchar *     (* get_row_description)      (AtkTable      *table,
                                                   gint          row);
   AtkObject*        (* get_summary)              (AtkTable      *table);
   void              (* set_caption)              (AtkTable      *table,
diff --git a/a11y/text.c b/a11y/text.c
index 579dd93..99df3c7 100644
--- a/a11y/text.c
+++ b/a11y/text.c
@@ -118,7 +118,7 @@ get_n_actions (AtkAction *action)
 	return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 action_get_name (AtkAction *action, gint      i)
 {
 	if (i == 0)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]