[java-atk-wrapper] Replace G_CONST_RETURN with const
- From: Magdalen Berns <mberns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] Replace G_CONST_RETURN with const
- Date: Sat, 17 Jan 2015 11:09:25 +0000 (UTC)
commit 5c7a11298f8c6a8bb917759a1c0dbdcb2c0601af
Author: Magdalen Berns <m berns thismagpie com>
Date: Sat Jan 17 11:08:27 2015 +0000
Replace G_CONST_RETURN with const
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=743079
jni/src/jawaction.c | 14 +++++++-------
jni/src/jawimage.c | 4 ++--
jni/src/jawobject.c | 8 ++++----
jni/src/jawtoplevel.c | 8 ++++----
jni/src/jawutil.c | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/jni/src/jawaction.c b/jni/src/jawaction.c
index 1e61f84..a596b8f 100644
--- a/jni/src/jawaction.c
+++ b/jni/src/jawaction.c
@@ -28,10 +28,10 @@ extern void jaw_action_data_finalize (gpointer);
static gboolean jaw_action_do_action(AtkAction *action, gint i);
static gint jaw_action_get_n_actions(AtkAction *action);
-static G_CONST_RETURN gchar* jaw_action_get_description(AtkAction *action, gint i);
-static G_CONST_RETURN gchar* jaw_action_get_name(AtkAction *action, gint i);
-static G_CONST_RETURN gchar* jaw_action_get_keybinding (AtkAction *action, gint i);
-/*static G_CONST_RETURN gchar* jaw_get_localized_name (AtkAction *action,
+static const gchar* jaw_action_get_description(AtkAction *action, gint i);
+static const gchar* jaw_action_get_name(AtkAction *action, gint i);
+static const gchar* jaw_action_get_keybinding (AtkAction *action, gint i);
+/*static const gchar* jaw_get_localized_name (AtkAction *action,
gint i);*/
typedef struct _ActionData {
@@ -137,7 +137,7 @@ jaw_action_get_n_actions (AtkAction *action)
return (gint)(*jniEnv)->CallIntMethod(jniEnv, atk_action, jmid);
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_action_get_description (AtkAction *action,
gint i)
{
@@ -161,7 +161,7 @@ jaw_action_get_description (AtkAction *action,
return data->action_description;
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_action_get_name (AtkAction *action,
gint i)
{
@@ -185,7 +185,7 @@ jaw_action_get_name (AtkAction *action,
return data->action_name;
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_action_get_keybinding (AtkAction *action,
gint i)
{
diff --git a/jni/src/jawimage.c b/jni/src/jawimage.c
index 500923b..26b1b2d 100644
--- a/jni/src/jawimage.c
+++ b/jni/src/jawimage.c
@@ -30,7 +30,7 @@ static void jaw_image_get_image_position (AtkImage
*image,
gint *x,
gint *y,
AtkCoordType coord_type);
-static G_CONST_RETURN gchar* jaw_image_get_image_description (AtkImage *image);
+static const gchar* jaw_image_get_image_description(AtkImage *image);
static void jaw_image_get_image_size (AtkImage *image,
gint *width,
gint *height);
@@ -113,7 +113,7 @@ jaw_image_get_image_position (AtkImage *image,
(*y) = (gint)jy;
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_image_get_image_description (AtkImage *image)
{
JawObject *jaw_obj = JAW_OBJECT(image);
diff --git a/jni/src/jawobject.c b/jni/src/jawobject.c
index a78729b..8a08d53 100644
--- a/jni/src/jawobject.c
+++ b/jni/src/jawobject.c
@@ -28,8 +28,8 @@ static void jaw_object_dispose(GObject *gobject);
static void jaw_object_finalize(GObject *gobject);
/* AtkObject */
-static G_CONST_RETURN gchar* jaw_object_get_name(AtkObject *atk_obj);
-static G_CONST_RETURN gchar* jaw_object_get_description(AtkObject *atk_obj);
+static const gchar* jaw_object_get_name(AtkObject *atk_obj);
+static const gchar* jaw_object_get_description(AtkObject *atk_obj);
static gint jaw_object_get_n_children(AtkObject *atk_obj);
@@ -227,7 +227,7 @@ jaw_object_finalize (GObject *gobject)
G_OBJECT_CLASS(jaw_object_parent_class)->finalize(gobject);
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_object_get_name (AtkObject *atk_obj)
{
JawObject *jaw_obj = JAW_OBJECT(atk_obj);
@@ -274,7 +274,7 @@ jaw_object_get_name (AtkObject *atk_obj)
return atk_obj->name;
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_object_get_description (AtkObject *atk_obj)
{
JawObject *jaw_obj = JAW_OBJECT(atk_obj);
diff --git a/jni/src/jawtoplevel.c b/jni/src/jawtoplevel.c
index bf9890f..4847054 100644
--- a/jni/src/jawtoplevel.c
+++ b/jni/src/jawtoplevel.c
@@ -30,8 +30,8 @@ static void jaw_toplevel_initialize(AtkObject *accessible, gpointer data);
static void jaw_toplevel_object_finalize(GObject *obj);
/* override AtkObject function */
-static G_CONST_RETURN gchar* jaw_toplevel_get_name(AtkObject *obj);
-static G_CONST_RETURN gchar* jaw_toplevel_get_description(AtkObject *obj);
+static const gchar* jaw_toplevel_get_name(AtkObject *obj);
+static const gchar* jaw_toplevel_get_description(AtkObject *obj);
static gint jaw_toplevel_get_n_children(AtkObject *obj);
static gint jaw_toplevel_get_index_in_parent(AtkObject *obj);
static AtkRole jaw_toplevel_get_role(AtkObject *obj);
@@ -80,7 +80,7 @@ jaw_toplevel_object_finalize (GObject *obj)
G_OBJECT_CLASS(jaw_toplevel_parent_class)->finalize(obj);
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_toplevel_get_name (AtkObject *obj)
{
gint i;
@@ -99,7 +99,7 @@ jaw_toplevel_get_name (AtkObject *obj)
return "Java Application";
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_toplevel_get_description (AtkObject *obj)
{
return "Accessible Java application";
diff --git a/jni/src/jawutil.c b/jni/src/jawutil.c
index e8241a3..512b867 100644
--- a/jni/src/jawutil.c
+++ b/jni/src/jawutil.c
@@ -35,8 +35,8 @@ static guint jaw_util_add_key_event_listener (AtkKeySnoopFunc
listener,
gpointer data);
static void jaw_util_remove_key_event_listener (guint remove_listener);
static AtkObject* jaw_util_get_root (void);
-static G_CONST_RETURN gchar* jaw_util_get_toolkit_name (void);
-static G_CONST_RETURN gchar* jaw_util_get_toolkit_version (void);
+static const gchar* jaw_util_get_toolkit_name (void);
+static const gchar* jaw_util_get_toolkit_version (void);
static void _listener_info_destroy (gpointer data);
static guint add_listener (GSignalEmissionHook listener,
@@ -249,13 +249,13 @@ jaw_util_get_root (void)
return ATK_OBJECT(root);
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_util_get_toolkit_name (void)
{
return "J2SE-access-bridge";
}
-static G_CONST_RETURN gchar*
+static const gchar*
jaw_util_get_toolkit_version (void)
{
return "1.0";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]