[gtk+/gtk-2-24] gail: Use 'const' instead G_CONST_RETURN
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] gail: Use 'const' instead G_CONST_RETURN
- Date: Wed, 15 Jun 2011 17:20:53 +0000 (UTC)
commit bfe0193eaf4cec1f9be25bd210007fa1bd48e675
Author: Javier JardÃn <jjardon gnome org>
Date: Wed Jun 15 18:20:17 2011 +0100
gail: Use 'const' instead G_CONST_RETURN
modules/other/gail/gailarrow.c | 4 ++--
modules/other/gail/gailbutton.c | 26 +++++++++++++-------------
modules/other/gail/gailcell.c | 12 ++++++------
modules/other/gail/gailclist.c | 8 ++++----
modules/other/gail/gailclistcell.c | 4 ++--
modules/other/gail/gailcombo.c | 8 ++++----
modules/other/gail/gailcombobox.c | 18 +++++++++---------
modules/other/gail/gailentry.c | 16 ++++++++--------
modules/other/gail/gailexpander.c | 26 +++++++++++++-------------
modules/other/gail/gailframe.c | 6 +++---
modules/other/gail/gailimage.c | 8 ++++----
modules/other/gail/gailimagecell.c | 4 ++--
modules/other/gail/gailitem.c | 6 +++---
modules/other/gail/gaillabel.c | 6 +++---
modules/other/gail/gailmenuitem.c | 12 ++++++------
modules/other/gail/gailnotebookpage.c | 4 ++--
modules/other/gail/gailoptionmenu.c | 12 ++++++------
modules/other/gail/gailpixmap.c | 4 ++--
modules/other/gail/gailrange.c | 16 ++++++++--------
modules/other/gail/gailscalebutton.c | 12 ++++++------
modules/other/gail/gailstatusbar.c | 6 +++---
modules/other/gail/gailtextcell.c | 4 ++--
modules/other/gail/gailtextview.c | 4 ++--
modules/other/gail/gailtreeview.c | 10 ++++------
modules/other/gail/gailutil.c | 8 ++++----
modules/other/gail/gailwidget.c | 4 ++--
modules/other/gail/gailwindow.c | 6 +++---
27 files changed, 126 insertions(+), 128 deletions(-)
---
diff --git a/modules/other/gail/gailarrow.c b/modules/other/gail/gailarrow.c
index 7799224..9253d84 100644
--- a/modules/other/gail/gailarrow.c
+++ b/modules/other/gail/gailarrow.c
@@ -29,7 +29,7 @@ static void gail_arrow_initialize (AtkObject *accessible,
/* AtkImage */
static void atk_image_interface_init (AtkImageIface *iface);
-static G_CONST_RETURN gchar* gail_arrow_get_image_description
+static const gchar* gail_arrow_get_image_description
(AtkImage *obj);
static gboolean gail_arrow_set_image_description
(AtkImage *obj,
@@ -72,7 +72,7 @@ atk_image_interface_init (AtkImageIface *iface)
iface->set_image_description = gail_arrow_set_image_description;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_arrow_get_image_description (AtkImage *obj)
{
GailArrow* arrow;
diff --git a/modules/other/gail/gailbutton.c b/modules/other/gail/gailbutton.c
index 9b579e0..7812679 100644
--- a/modules/other/gail/gailbutton.c
+++ b/modules/other/gail/gailbutton.c
@@ -30,7 +30,7 @@
static void gail_button_class_init (GailButtonClass *klass);
static void gail_button_init (GailButton *button);
-static G_CONST_RETURN gchar* gail_button_get_name (AtkObject *obj);
+static const gchar* gail_button_get_name (AtkObject *obj);
static gint gail_button_get_n_children (AtkObject *obj);
static AtkObject* gail_button_ref_child (AtkObject *obj,
gint i);
@@ -59,11 +59,11 @@ static gboolean gail_button_do_action (AtkAction *action,
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_button_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* gail_button_get_description(AtkAction *action,
+static const gchar* gail_button_get_description(AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_button_get_keybinding (AtkAction *action,
+static const gchar* gail_button_get_keybinding (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_button_action_get_name(AtkAction *action,
+static const gchar* gail_button_action_get_name(AtkAction *action,
gint i);
static gboolean gail_button_set_description(AtkAction *action,
gint i,
@@ -76,7 +76,7 @@ static void gail_button_notify_weak_ref (gpointer data,
/* AtkImage.h */
static void atk_image_interface_init (AtkImageIface *iface);
-static G_CONST_RETURN gchar* gail_button_get_image_description
+static const gchar* gail_button_get_image_description
(AtkImage *image);
static void gail_button_get_image_position
(AtkImage *image,
@@ -182,10 +182,10 @@ gail_button_init (GailButton *button)
button->textutil = NULL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_button_get_name (AtkObject *obj)
{
- G_CONST_RETURN gchar* name = NULL;
+ const gchar* name = NULL;
g_return_val_if_fail (GAIL_IS_BUTTON (obj), NULL);
@@ -585,12 +585,12 @@ gail_button_get_n_actions (AtkAction *action)
return 3;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_button_get_description (AtkAction *action,
gint i)
{
GailButton *button;
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
button = GAIL_BUTTON (action);
@@ -619,7 +619,7 @@ gail_button_get_description (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_button_get_keybinding (AtkAction *action,
gint i)
{
@@ -703,11 +703,11 @@ gail_button_get_keybinding (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_button_action_get_name (AtkAction *action,
gint i)
{
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
GailButton *button;
button = GAIL_BUTTON (action);
@@ -966,7 +966,7 @@ get_image_from_button (GtkWidget *button)
return image;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_button_get_image_description (AtkImage *image) {
GtkWidget *widget;
diff --git a/modules/other/gail/gailcell.c b/modules/other/gail/gailcell.c
index cb03f0b..62ae86c 100644
--- a/modules/other/gail/gailcell.c
+++ b/modules/other/gail/gailcell.c
@@ -47,10 +47,10 @@ static void _gail_cell_destroy_action_info
static gint gail_cell_action_get_n_actions
(AtkAction *action);
-static G_CONST_RETURN gchar*
+static const gchar *
gail_cell_action_get_name (AtkAction *action,
gint index);
-static G_CONST_RETURN gchar *
+static const gchar *
gail_cell_action_get_description
(AtkAction *action,
gint index);
@@ -58,7 +58,7 @@ static gboolean gail_cell_action_set_description
(AtkAction *action,
gint index,
const gchar *desc);
-static G_CONST_RETURN gchar *
+static const gchar *
gail_cell_action_get_keybinding
(AtkAction *action,
gint index);
@@ -410,7 +410,7 @@ gail_cell_action_get_n_actions (AtkAction *action)
return 0;
}
-static G_CONST_RETURN gchar *
+static const gchar *
gail_cell_action_get_name (AtkAction *action,
gint index)
{
@@ -422,7 +422,7 @@ gail_cell_action_get_name (AtkAction *action,
return info->name;
}
-static G_CONST_RETURN gchar *
+static const gchar *
gail_cell_action_get_description (AtkAction *action,
gint index)
{
@@ -449,7 +449,7 @@ gail_cell_action_set_description (AtkAction *action,
return TRUE;
}
-static G_CONST_RETURN gchar *
+static const gchar *
gail_cell_action_get_keybinding (AtkAction *action,
gint index)
{
diff --git a/modules/other/gail/gailclist.c b/modules/other/gail/gailclist.c
index 6a68ffe..436f2ca 100644
--- a/modules/other/gail/gailclist.c
+++ b/modules/other/gail/gailclist.c
@@ -151,13 +151,13 @@ static AtkObject*
static gint gail_clist_get_n_columns (AtkTable *table);
static gint gail_clist_get_n_actual_columns (GtkCList *clist);
-static G_CONST_RETURN gchar*
+static const gchar*
gail_clist_get_column_description(AtkTable *table,
gint column);
static AtkObject* gail_clist_get_column_header (AtkTable *table,
gint column);
static gint gail_clist_get_n_rows (AtkTable *table);
-static G_CONST_RETURN gchar*
+static const gchar*
gail_clist_get_row_description (AtkTable *table,
gint row);
static AtkObject* gail_clist_get_row_header (AtkTable *table,
@@ -779,7 +779,7 @@ gail_clist_get_n_actual_columns (GtkCList *clist)
return clist->columns;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_clist_get_column_description (AtkTable *table,
gint column)
{
@@ -848,7 +848,7 @@ gail_clist_get_n_rows (AtkTable *table)
return clist->rows;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_clist_get_row_description (AtkTable *table,
gint row)
{
diff --git a/modules/other/gail/gailclistcell.c b/modules/other/gail/gailclistcell.c
index b683fa7..5dfc9b9 100644
--- a/modules/other/gail/gailclistcell.c
+++ b/modules/other/gail/gailclistcell.c
@@ -27,7 +27,7 @@
static void gail_clist_cell_class_init (GailCListCellClass *klass);
static void gail_clist_cell_init (GailCListCell *cell);
-static G_CONST_RETURN gchar* gail_clist_cell_get_name (AtkObject *accessible);
+static const gchar* gail_clist_cell_get_name (AtkObject *accessible);
G_DEFINE_TYPE (GailCListCell, gail_clist_cell, GAIL_TYPE_CELL)
@@ -62,7 +62,7 @@ gail_clist_cell_new (void)
return atk_object;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_clist_cell_get_name (AtkObject *accessible)
{
if (accessible->name)
diff --git a/modules/other/gail/gailcombo.c b/modules/other/gail/gailcombo.c
index 3f42130..0e7fea7 100644
--- a/modules/other/gail/gailcombo.c
+++ b/modules/other/gail/gailcombo.c
@@ -43,9 +43,9 @@ static gboolean gail_combo_do_action (AtkAction *action,
static gboolean idle_do_action (gpointer data);
static gint gail_combo_get_n_actions (AtkAction *action)
;
-static G_CONST_RETURN gchar* gail_combo_get_description(AtkAction *action,
+static const gchar* gail_combo_get_description (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_combo_get_name (AtkAction *action,
+static const gchar* gail_combo_get_name (AtkAction *action,
gint i);
static gboolean gail_combo_set_description(AtkAction *action,
gint i,
@@ -353,7 +353,7 @@ gail_combo_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_combo_get_description (AtkAction *action,
gint i)
{
@@ -368,7 +368,7 @@ gail_combo_get_description (AtkAction *action,
return NULL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_combo_get_name (AtkAction *action,
gint i)
{
diff --git a/modules/other/gail/gailcombobox.c b/modules/other/gail/gailcombobox.c
index 2c40639..2b12bea 100644
--- a/modules/other/gail/gailcombobox.c
+++ b/modules/other/gail/gailcombobox.c
@@ -32,7 +32,7 @@ static void gail_combo_box_real_initialize (AtkObject *obj,
static void gail_combo_box_changed_gtk (GtkWidget *widget);
-static G_CONST_RETURN gchar* gail_combo_box_get_name (AtkObject *obj);
+static const gchar* gail_combo_box_get_name (AtkObject *obj);
static gint gail_combo_box_get_n_children (AtkObject *obj);
static AtkObject* gail_combo_box_ref_child (AtkObject *obj,
gint i);
@@ -43,11 +43,11 @@ static gboolean gail_combo_box_do_action (AtkAction *acti
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_combo_box_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* gail_combo_box_get_description(AtkAction *action,
+static const gchar* gail_combo_box_get_description (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_combo_box_get_keybinding (AtkAction *action,
+static const gchar* gail_combo_box_get_keybinding (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_combo_box_action_get_name(AtkAction *action,
+static const gchar* gail_combo_box_action_get_name (AtkAction *action,
gint i);
static gboolean gail_combo_box_set_description(AtkAction *action,
gint i,
@@ -145,14 +145,14 @@ gail_combo_box_changed_gtk (GtkWidget *widget)
}
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_combo_box_get_name (AtkObject *obj)
{
GtkWidget *widget;
GtkComboBox *combo_box;
GailComboBox *gail_combo_box;
GtkTreeIter iter;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
GtkTreeModel *model;
gint n_columns;
gint i;
@@ -341,7 +341,7 @@ gail_combo_box_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_combo_box_get_description (AtkAction *action,
gint i)
{
@@ -356,7 +356,7 @@ gail_combo_box_get_description (AtkAction *action,
return NULL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_combo_box_get_keybinding (AtkAction *action,
gint i)
{
@@ -410,7 +410,7 @@ gail_combo_box_get_keybinding (AtkAction *action,
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_combo_box_action_get_name (AtkAction *action,
gint i)
{
diff --git a/modules/other/gail/gailentry.c b/modules/other/gail/gailentry.c
index 7f7590e..5ea17fe 100644
--- a/modules/other/gail/gailentry.c
+++ b/modules/other/gail/gailentry.c
@@ -151,11 +151,11 @@ static gboolean gail_entry_do_action (AtkAction *actio
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_entry_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* gail_entry_get_description (AtkAction *action,
+static const gchar* gail_entry_get_description (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_entry_get_keybinding (AtkAction *action,
+static const gchar* gail_entry_get_keybinding (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_entry_action_get_name (AtkAction *action,
+static const gchar* gail_entry_action_get_name (AtkAction *action,
gint i);
static gboolean gail_entry_set_description (AtkAction *action,
gint i,
@@ -1254,12 +1254,12 @@ gail_entry_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_entry_get_description (AtkAction *action,
gint i)
{
GailEntry *entry;
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
entry = GAIL_ENTRY (action);
switch (i)
@@ -1274,7 +1274,7 @@ gail_entry_get_description (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_entry_get_keybinding (AtkAction *action,
gint i)
{
@@ -1341,11 +1341,11 @@ gail_entry_get_keybinding (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_entry_action_get_name (AtkAction *action,
gint i)
{
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
switch (i)
{
diff --git a/modules/other/gail/gailexpander.c b/modules/other/gail/gailexpander.c
index 1d46819..b1fb738 100644
--- a/modules/other/gail/gailexpander.c
+++ b/modules/other/gail/gailexpander.c
@@ -28,7 +28,7 @@
static void gail_expander_class_init (GailExpanderClass *klass);
static void gail_expander_init (GailExpander *expander);
-static G_CONST_RETURN gchar* gail_expander_get_name (AtkObject *obj);
+static const gchar* gail_expander_get_name (AtkObject *obj);
static gint gail_expander_get_n_children (AtkObject *obj)
;
static AtkObject* gail_expander_ref_child (AtkObject *obj,
@@ -45,20 +45,20 @@ static void gail_expander_real_initialize (AtkObject *
static void gail_expander_finalize (GObject *object);
static void gail_expander_init_textutil (GailExpander *expander,
GtkExpander *widget);
-static G_CONST_RETURN gchar* gail_expander_get_full_text (GtkExpander *widget);
+static const gchar* gail_expander_get_full_text (GtkExpander *widget);
static void atk_action_interface_init (AtkActionIface *iface);
static gboolean gail_expander_do_action (AtkAction *action,
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_expander_get_n_actions(AtkAction *action);
-static G_CONST_RETURN gchar* gail_expander_get_description
+static const gchar* gail_expander_get_description
(AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_expander_get_keybinding
+static const gchar* gail_expander_get_keybinding
(AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_expander_action_get_name
+static const gchar* gail_expander_action_get_name
(AtkAction *action,
gint i);
static gboolean gail_expander_set_description
@@ -145,10 +145,10 @@ gail_expander_init (GailExpander *expander)
expander->textutil = NULL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_expander_get_name (AtkObject *obj)
{
- G_CONST_RETURN gchar *name;
+ const gchar *name;
g_return_val_if_fail (GAIL_IS_EXPANDER (obj), NULL);
name = ATK_OBJECT_CLASS (gail_expander_parent_class)->get_name (obj);
@@ -324,7 +324,7 @@ gail_expander_real_notify_gtk (GObject *obj,
GAIL_WIDGET_CLASS (gail_expander_parent_class)->notify_gtk (obj, pspec);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_expander_get_full_text (GtkExpander *widget)
{
GtkWidget *label_widget;
@@ -418,12 +418,12 @@ gail_expander_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_expander_get_description (AtkAction *action,
gint i)
{
GailExpander *expander;
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
expander = GAIL_EXPANDER (action);
@@ -439,7 +439,7 @@ gail_expander_get_description (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_expander_get_keybinding (AtkAction *action,
gint i)
{
@@ -485,11 +485,11 @@ gail_expander_get_keybinding (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_expander_action_get_name (AtkAction *action,
gint i)
{
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
switch (i)
{
diff --git a/modules/other/gail/gailframe.c b/modules/other/gail/gailframe.c
index f779142..3e8f32f 100644
--- a/modules/other/gail/gailframe.c
+++ b/modules/other/gail/gailframe.c
@@ -27,7 +27,7 @@ static void gail_frame_class_init (GailFrameClass *klass
static void gail_frame_init (GailFrame *frame);
static void gail_frame_initialize (AtkObject *accessible,
gpointer data);
-static G_CONST_RETURN gchar* gail_frame_get_name (AtkObject *obj);
+static const gchar* gail_frame_get_name (AtkObject *obj);
G_DEFINE_TYPE (GailFrame, gail_frame, GAIL_TYPE_CONTAINER)
@@ -54,10 +54,10 @@ gail_frame_initialize (AtkObject *accessible,
accessible->role = ATK_ROLE_PANEL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_frame_get_name (AtkObject *obj)
{
- G_CONST_RETURN gchar *name;
+ const gchar *name;
g_return_val_if_fail (GAIL_IS_FRAME (obj), NULL);
name = ATK_OBJECT_CLASS (gail_frame_parent_class)->get_name (obj);
diff --git a/modules/other/gail/gailimage.c b/modules/other/gail/gailimage.c
index d6e9da1..586a472 100644
--- a/modules/other/gail/gailimage.c
+++ b/modules/other/gail/gailimage.c
@@ -27,12 +27,12 @@ static void gail_image_class_init (GailImageClass *klass);
static void gail_image_init (GailImage *image);
static void gail_image_initialize (AtkObject *accessible,
gpointer data);
-static G_CONST_RETURN gchar* gail_image_get_name (AtkObject *accessible);
+static const gchar* gail_image_get_name (AtkObject *accessible);
static void atk_image_interface_init (AtkImageIface *iface);
-static G_CONST_RETURN gchar *
+static const gchar *
gail_image_get_image_description (AtkImage *image);
static void gail_image_get_image_position (AtkImage *image,
gint *x,
@@ -118,7 +118,7 @@ elide_underscores (const gchar *original)
return result;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_image_get_name (AtkObject *accessible)
{
GtkWidget* widget;
@@ -165,7 +165,7 @@ atk_image_interface_init (AtkImageIface *iface)
iface->set_image_description = gail_image_set_image_description;
}
-static G_CONST_RETURN gchar *
+static const gchar *
gail_image_get_image_description (AtkImage *image)
{
GailImage* aimage = GAIL_IMAGE (image);
diff --git a/modules/other/gail/gailimagecell.c b/modules/other/gail/gailimagecell.c
index 6e08150..aa9f125 100644
--- a/modules/other/gail/gailimagecell.c
+++ b/modules/other/gail/gailimagecell.c
@@ -29,7 +29,7 @@ static void gail_image_cell_finalize (GObject *object
/* AtkImage */
static void atk_image_interface_init (AtkImageIface *iface);
-static G_CONST_RETURN gchar *
+static const gchar *
gail_image_cell_get_image_description (AtkImage *image);
static gboolean gail_image_cell_set_image_description (AtkImage *image,
const gchar *description);
@@ -120,7 +120,7 @@ atk_image_interface_init (AtkImageIface *iface)
iface->get_image_size = gail_image_cell_get_image_size;
}
-static G_CONST_RETURN gchar *
+static const gchar *
gail_image_cell_get_image_description (AtkImage *image)
{
GailImageCell *image_cell;
diff --git a/modules/other/gail/gailitem.c b/modules/other/gail/gailitem.c
index 308e161..a2c4e54 100644
--- a/modules/other/gail/gailitem.c
+++ b/modules/other/gail/gailitem.c
@@ -29,7 +29,7 @@
static void gail_item_class_init (GailItemClass *klass);
static void gail_item_init (GailItem *item);
-static G_CONST_RETURN gchar* gail_item_get_name (AtkObject *obj);
+static const gchar* gail_item_get_name (AtkObject *obj);
static gint gail_item_get_n_children (AtkObject *obj);
static AtkObject* gail_item_ref_child (AtkObject *obj,
gint i);
@@ -191,10 +191,10 @@ gail_item_finalize (GObject *object)
G_OBJECT_CLASS (gail_item_parent_class)->finalize (object);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_item_get_name (AtkObject *obj)
{
- G_CONST_RETURN gchar* name;
+ const gchar* name;
g_return_val_if_fail (GAIL_IS_ITEM (obj), NULL);
diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c
index b7e06eb..de2347e 100644
--- a/modules/other/gail/gaillabel.c
+++ b/modules/other/gail/gaillabel.c
@@ -44,7 +44,7 @@ static void atk_text_interface_init (AtkTextIface *iface);
/* atkobject.h */
-static G_CONST_RETURN gchar* gail_label_get_name (AtkObject *accessible);
+static const gchar* gail_label_get_name (AtkObject *accessible);
static AtkStateSet* gail_label_ref_state_set (AtkObject *accessible);
static AtkRelationSet* gail_label_ref_relation_set (AtkObject *accessible);
@@ -535,10 +535,10 @@ gail_label_ref_relation_set (AtkObject *obj)
return relation_set;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_label_get_name (AtkObject *accessible)
{
- G_CONST_RETURN gchar *name;
+ const gchar *name;
g_return_val_if_fail (GAIL_IS_LABEL (accessible), NULL);
diff --git a/modules/other/gail/gailmenuitem.c b/modules/other/gail/gailmenuitem.c
index 44e9638..ae3ddd7 100644
--- a/modules/other/gail/gailmenuitem.c
+++ b/modules/other/gail/gailmenuitem.c
@@ -41,11 +41,11 @@ static gboolean gail_menu_item_do_action (AtkAction *acti
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_menu_item_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* gail_menu_item_get_description(AtkAction *action,
+static const gchar* gail_menu_item_get_description(AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_menu_item_get_name (AtkAction *action,
+static const gchar* gail_menu_item_get_name (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_menu_item_get_keybinding (AtkAction *action,
+static const gchar* gail_menu_item_get_keybinding (AtkAction *action,
gint i);
static gboolean gail_menu_item_set_description(AtkAction *action,
gint i,
@@ -373,7 +373,7 @@ gail_menu_item_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_menu_item_get_description (AtkAction *action,
gint i)
{
@@ -388,7 +388,7 @@ gail_menu_item_get_description (AtkAction *action,
return NULL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_menu_item_get_name (AtkAction *action,
gint i)
{
@@ -398,7 +398,7 @@ gail_menu_item_get_name (AtkAction *action,
return NULL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_menu_item_get_keybinding (AtkAction *action,
gint i)
{
diff --git a/modules/other/gail/gailnotebookpage.c b/modules/other/gail/gailnotebookpage.c
index a258d35..7efeb22 100644
--- a/modules/other/gail/gailnotebookpage.c
+++ b/modules/other/gail/gailnotebookpage.c
@@ -31,7 +31,7 @@ static void gail_notebook_page_finalize (GObject *objec
static void gail_notebook_page_label_map_gtk (GtkWidget *widget,
gpointer data);
-static G_CONST_RETURN gchar* gail_notebook_page_get_name (AtkObject *accessible);
+static const gchar* gail_notebook_page_get_name (AtkObject *accessible);
static AtkObject* gail_notebook_page_get_parent (AtkObject *accessible);
static gint gail_notebook_page_get_n_children (AtkObject *accessible);
static AtkObject* gail_notebook_page_ref_child (AtkObject *accessible,
@@ -295,7 +295,7 @@ gail_notebook_page_finalize (GObject *object)
G_OBJECT_CLASS (gail_notebook_page_parent_class)->finalize (object);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_notebook_page_get_name (AtkObject *accessible)
{
g_return_val_if_fail (GAIL_IS_NOTEBOOK_PAGE (accessible), NULL);
diff --git a/modules/other/gail/gailoptionmenu.c b/modules/other/gail/gailoptionmenu.c
index 680ab20..c637524 100644
--- a/modules/other/gail/gailoptionmenu.c
+++ b/modules/other/gail/gailoptionmenu.c
@@ -50,9 +50,9 @@ static gboolean gail_option_menu_do_action (AtkAction
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_option_menu_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* gail_option_menu_get_description (AtkAction *action,
+static const gchar* gail_option_menu_get_description (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_option_menu_action_get_name (AtkAction *action,
+static const gchar* gail_option_menu_action_get_name (AtkAction *action,
gint i);
static gboolean gail_option_menu_set_description (AtkAction *action,
gint i,
@@ -272,12 +272,12 @@ gail_option_menu_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_option_menu_get_description (AtkAction *action,
gint i)
{
GailButton *button;
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
button = GAIL_BUTTON (action);
@@ -293,11 +293,11 @@ gail_option_menu_get_description (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_option_menu_action_get_name (AtkAction *action,
gint i)
{
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
switch (i)
{
diff --git a/modules/other/gail/gailpixmap.c b/modules/other/gail/gailpixmap.c
index d5abf65..7d12787 100644
--- a/modules/other/gail/gailpixmap.c
+++ b/modules/other/gail/gailpixmap.c
@@ -32,7 +32,7 @@ static void gail_pixmap_initialize (AtkObject *accessible,
/* AtkImage */
static void atk_image_interface_init (AtkImageIface *iface);
-static G_CONST_RETURN gchar* gail_pixmap_get_image_description
+static const gchar* gail_pixmap_get_image_description
(AtkImage *obj);
static void gail_pixmap_get_image_position
(AtkImage *obj,
@@ -85,7 +85,7 @@ atk_image_interface_init (AtkImageIface *iface)
iface->set_image_description = gail_pixmap_set_image_description;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_pixmap_get_image_description (AtkImage *obj)
{
GailPixmap* pixmap;
diff --git a/modules/other/gail/gailrange.c b/modules/other/gail/gailrange.c
index aad39ed..bb125bb 100644
--- a/modules/other/gail/gailrange.c
+++ b/modules/other/gail/gailrange.c
@@ -60,11 +60,11 @@ static gboolean gail_range_do_action (AtkAction *action,
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_range_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* gail_range_get_description (AtkAction *action,
+static const gchar* gail_range_get_description (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_range_get_keybinding (AtkAction *action,
+static const gchar* gail_range_get_keybinding (AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_range_action_get_name (AtkAction *action,
+static const gchar* gail_range_action_get_name (AtkAction *action,
gint i);
static gboolean gail_range_set_description (AtkAction *action,
gint i,
@@ -419,12 +419,12 @@ gail_range_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_range_get_description (AtkAction *action,
gint i)
{
GailRange *range;
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
range = GAIL_RANGE (action);
if (i==0)
@@ -434,7 +434,7 @@ gail_range_get_description (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_range_get_keybinding (AtkAction *action,
gint i)
{
@@ -481,11 +481,11 @@ gail_range_get_keybinding (AtkAction *action,
return return_value;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_range_action_get_name (AtkAction *action,
gint i)
{
- G_CONST_RETURN gchar *return_value;
+ const gchar *return_value;
if (i==0)
return_value = "activate";
diff --git a/modules/other/gail/gailscalebutton.c b/modules/other/gail/gailscalebutton.c
index bf79a5a..f04c690 100644
--- a/modules/other/gail/gailscalebutton.c
+++ b/modules/other/gail/gailscalebutton.c
@@ -42,11 +42,11 @@ static void atk_action_interface_init (AtkActionIface *i
static gboolean gail_scale_button_do_action (AtkAction *action,
gint i);
static gint gail_scale_button_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* gail_scale_button_get_description(AtkAction *action,
+static const gchar* gail_scale_button_get_description(AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_scale_button_action_get_name(AtkAction *action,
+static const gchar* gail_scale_button_action_get_name(AtkAction *action,
gint i);
-static G_CONST_RETURN gchar* gail_scale_button_get_keybinding (AtkAction *action,
+static const gchar* gail_scale_button_get_keybinding (AtkAction *action,
gint i);
static gboolean gail_scale_button_set_description(AtkAction *action,
gint i,
@@ -136,14 +136,14 @@ gail_scale_button_get_n_actions (AtkAction *action)
return 2;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_scale_button_get_description (AtkAction *action,
gint i)
{
return NULL;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_scale_button_action_get_name (AtkAction *action,
gint i)
{
@@ -157,7 +157,7 @@ gail_scale_button_action_get_name (AtkAction *action,
}
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_scale_button_get_keybinding (AtkAction *action,
gint i)
{
diff --git a/modules/other/gail/gailstatusbar.c b/modules/other/gail/gailstatusbar.c
index e8b84cf..e617b33 100644
--- a/modules/other/gail/gailstatusbar.c
+++ b/modules/other/gail/gailstatusbar.c
@@ -26,7 +26,7 @@
static void gail_statusbar_class_init (GailStatusbarClass *klass);
static void gail_statusbar_init (GailStatusbar *bar);
-static G_CONST_RETURN gchar* gail_statusbar_get_name (AtkObject *obj);
+static const gchar* gail_statusbar_get_name (AtkObject *obj);
static gint gail_statusbar_get_n_children (AtkObject *obj);
static AtkObject* gail_statusbar_ref_child (AtkObject *obj,
gint i);
@@ -119,10 +119,10 @@ gail_statusbar_init (GailStatusbar *bar)
{
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_statusbar_get_name (AtkObject *obj)
{
- G_CONST_RETURN gchar* name;
+ const gchar* name;
g_return_val_if_fail (GAIL_IS_STATUSBAR (obj), NULL);
diff --git a/modules/other/gail/gailtextcell.c b/modules/other/gail/gailtextcell.c
index d264b10..e8a2df8 100644
--- a/modules/other/gail/gailtextcell.c
+++ b/modules/other/gail/gailtextcell.c
@@ -30,7 +30,7 @@ static void gail_text_cell_class_init (GailTextCellClass *klass);
static void gail_text_cell_init (GailTextCell *text_cell);
static void gail_text_cell_finalize (GObject *object);
-static G_CONST_RETURN gchar* gail_text_cell_get_name (AtkObject *atk_obj);
+static const gchar* gail_text_cell_get_name (AtkObject *atk_obj);
static void atk_text_interface_init (AtkTextIface *iface);
@@ -190,7 +190,7 @@ gail_text_cell_finalize (GObject *object)
G_OBJECT_CLASS (gail_text_cell_parent_class)->finalize (object);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_text_cell_get_name (AtkObject *atk_obj)
{
if (atk_obj->name)
diff --git a/modules/other/gail/gailtextview.c b/modules/other/gail/gailtextview.c
index 499406d..985cb40 100644
--- a/modules/other/gail/gailtextview.c
+++ b/modules/other/gail/gailtextview.c
@@ -133,7 +133,7 @@ static void gail_text_view_paste_received (GtkClipboard *clipbo
/* AtkStreamableContent */
static void atk_streamable_content_interface_init (AtkStreamableContentIface *iface);
static gint gail_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
-static G_CONST_RETURN gchar* gail_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+static const gchar* gail_streamable_content_get_mime_type (AtkStreamableContent *streamable,
gint i);
static GIOChannel* gail_streamable_content_get_stream (AtkStreamableContent *streamable,
const gchar *mime_type);
@@ -1674,7 +1674,7 @@ static gint gail_streamable_content_get_n_mime_types (AtkStreamableContent
return n_mime_types;
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_streamable_content_get_mime_type (AtkStreamableContent *streamable, gint i)
{
if (GAIL_IS_TEXT_VIEW (streamable) && GAIL_TEXT_VIEW (streamable)->textutil)
diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
index f0d344f..47d079c 100644
--- a/modules/other/gail/gailtreeview.c
+++ b/modules/other/gail/gailtreeview.c
@@ -116,16 +116,14 @@ static void gail_tree_view_set_caption (AtkTable
static AtkObject* gail_tree_view_get_summary (AtkTable *table);
static void gail_tree_view_set_summary (AtkTable *table,
AtkObject *accessible);
-static G_CONST_RETURN gchar*
- gail_tree_view_get_row_description
+static const gchar* gail_tree_view_get_row_description
(AtkTable *table,
gint row);
static void gail_tree_view_set_row_description
(AtkTable *table,
gint row,
const gchar *description);
-static G_CONST_RETURN gchar*
- gail_tree_view_get_column_description
+static const gchar* gail_tree_view_get_column_description
(AtkTable *table,
gint column);
static void gail_tree_view_set_column_description
@@ -1609,7 +1607,7 @@ gail_tree_view_set_caption (AtkTable *table,
g_object_unref (old_caption);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_tree_view_get_column_description (AtkTable *table,
gint in_col)
{
@@ -1674,7 +1672,7 @@ gail_tree_view_set_column_description (AtkTable *table,
&values, NULL);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_tree_view_get_row_description (AtkTable *table,
gint row)
{
diff --git a/modules/other/gail/gailutil.c b/modules/other/gail/gailutil.c
index 3da6105..cab0113 100644
--- a/modules/other/gail/gailutil.c
+++ b/modules/other/gail/gailutil.c
@@ -38,8 +38,8 @@ static guint gail_util_add_key_event_listener (AtkKeySnoopFunc listener,
gpointer data);
static void gail_util_remove_key_event_listener (guint remove_listener);
static AtkObject* gail_util_get_root (void);
-static G_CONST_RETURN gchar *gail_util_get_toolkit_name (void);
-static G_CONST_RETURN gchar *gail_util_get_toolkit_version (void);
+static const gchar * gail_util_get_toolkit_name (void);
+static const gchar * gail_util_get_toolkit_version (void);
/* gailmisc/AtkMisc */
static void gail_misc_class_init (GailMiscClass *klass);
@@ -333,13 +333,13 @@ gail_util_get_root (void)
return root;
}
-static G_CONST_RETURN gchar *
+static const gchar *
gail_util_get_toolkit_name (void)
{
return "GAIL";
}
-static G_CONST_RETURN gchar *
+static const gchar *
gail_util_get_toolkit_version (void)
{
/*
diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 4bd31dd..b700b29 100644
--- a/modules/other/gail/gailwidget.c
+++ b/modules/other/gail/gailwidget.c
@@ -39,7 +39,7 @@ static void gail_widget_connect_widget_destroyed (GtkAccessible *accessible);
static void gail_widget_destroyed (GtkWidget *widget,
GtkAccessible *accessible);
-static G_CONST_RETURN gchar* gail_widget_get_description (AtkObject *accessible);
+static const gchar* gail_widget_get_description (AtkObject *accessible);
static AtkObject* gail_widget_get_parent (AtkObject *accessible);
static AtkStateSet* gail_widget_ref_state_set (AtkObject *accessible);
static AtkRelationSet* gail_widget_ref_relation_set (AtkObject *accessible);
@@ -234,7 +234,7 @@ gail_widget_destroyed (GtkWidget *widget,
TRUE);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_widget_get_description (AtkObject *accessible)
{
if (accessible->description)
diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index 81babd0..3152701 100644
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -50,7 +50,7 @@ static void gail_window_real_initialize (AtkObject *obj,
gpointer data);
static void gail_window_finalize (GObject *object);
-static G_CONST_RETURN gchar* gail_window_get_name (AtkObject *accessible);
+static const gchar* gail_window_get_name (AtkObject *accessible);
static AtkObject* gail_window_get_parent (AtkObject *accessible);
static gint gail_window_get_index_in_parent (AtkObject *accessible);
@@ -263,10 +263,10 @@ gail_window_finalize (GObject *object)
G_OBJECT_CLASS (gail_window_parent_class)->finalize (object);
}
-static G_CONST_RETURN gchar*
+static const gchar*
gail_window_get_name (AtkObject *accessible)
{
- G_CONST_RETURN gchar* name;
+ const gchar* name;
name = ATK_OBJECT_CLASS (gail_window_parent_class)->get_name (accessible);
if (name == NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
