summaryrefslogtreecommitdiff
path: root/gobject
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2011-03-12 21:50:45 -0500
committerRyan Lortie <desrt@desrt.ca>2011-03-15 01:32:22 -0400
commit36741245cca56e979fe85e3de676fb3912058f2c (patch)
tree982e292d7cac5a33cdfe7e9efa6c1f36736b4c16 /gobject
parent61b0e1c8d49b6b42d3b6f27f0663ead75967f81a (diff)
Remove all uses of G_CONST_RETURN
Just use 'const'.
Diffstat (limited to 'gobject')
-rw-r--r--gobject/gbinding.c4
-rw-r--r--gobject/gbinding.h4
-rw-r--r--gobject/gparam.c6
-rw-r--r--gobject/gparam.h6
-rw-r--r--gobject/gsignal.c2
-rw-r--r--gobject/gsignal.h2
-rw-r--r--gobject/gtype.c6
-rw-r--r--gobject/gtype.h6
-rw-r--r--gobject/gvaluetypes.c2
-rw-r--r--gobject/gvaluetypes.h2
10 files changed, 20 insertions, 20 deletions
diff --git a/gobject/gbinding.c b/gobject/gbinding.c
index c73c4e654..99a720786 100644
--- a/gobject/gbinding.c
+++ b/gobject/gbinding.c
@@ -742,7 +742,7 @@ g_binding_get_target (GBinding *binding)
*
* Since: 2.26
*/
-G_CONST_RETURN gchar *
+const gchar *
g_binding_get_source_property (GBinding *binding)
{
g_return_val_if_fail (G_IS_BINDING (binding), NULL);
@@ -761,7 +761,7 @@ g_binding_get_source_property (GBinding *binding)
*
* Since: 2.26
*/
-G_CONST_RETURN gchar *
+const gchar *
g_binding_get_target_property (GBinding *binding)
{
g_return_val_if_fail (G_IS_BINDING (binding), NULL);
diff --git a/gobject/gbinding.h b/gobject/gbinding.h
index fe6799d43..1b715402e 100644
--- a/gobject/gbinding.h
+++ b/gobject/gbinding.h
@@ -106,8 +106,8 @@ GType g_binding_get_type (void) G_GNUC_CONST;
GBindingFlags g_binding_get_flags (GBinding *binding);
GObject * g_binding_get_source (GBinding *binding);
GObject * g_binding_get_target (GBinding *binding);
-G_CONST_RETURN gchar *g_binding_get_source_property (GBinding *binding);
-G_CONST_RETURN gchar *g_binding_get_target_property (GBinding *binding);
+const gchar * g_binding_get_source_property (GBinding *binding);
+const gchar * g_binding_get_target_property (GBinding *binding);
GBinding *g_object_bind_property (gpointer source,
const gchar *source_property,
diff --git a/gobject/gparam.c b/gobject/gparam.c
index bca47d225..b1be1e681 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -282,7 +282,7 @@ g_param_spec_ref_sink (GParamSpec *pspec)
*
* Returns: the name of @pspec.
*/
-G_CONST_RETURN gchar*
+const gchar *
g_param_spec_get_name (GParamSpec *pspec)
{
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
@@ -298,7 +298,7 @@ g_param_spec_get_name (GParamSpec *pspec)
*
* Returns: the nickname of @pspec.
*/
-G_CONST_RETURN gchar*
+const gchar *
g_param_spec_get_nick (GParamSpec *pspec)
{
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
@@ -325,7 +325,7 @@ g_param_spec_get_nick (GParamSpec *pspec)
*
* Returns: the short description of @pspec.
*/
-G_CONST_RETURN gchar*
+const gchar *
g_param_spec_get_blurb (GParamSpec *pspec)
{
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
diff --git a/gobject/gparam.h b/gobject/gparam.h
index 9b93c0af4..5ee41ab91 100644
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -301,9 +301,9 @@ gboolean g_param_value_convert (GParamSpec *pspec,
gint g_param_values_cmp (GParamSpec *pspec,
const GValue *value1,
const GValue *value2);
-G_CONST_RETURN gchar* g_param_spec_get_name (GParamSpec *pspec);
-G_CONST_RETURN gchar* g_param_spec_get_nick (GParamSpec *pspec);
-G_CONST_RETURN gchar* g_param_spec_get_blurb (GParamSpec *pspec);
+const gchar * g_param_spec_get_name (GParamSpec *pspec);
+const gchar * g_param_spec_get_nick (GParamSpec *pspec);
+const gchar * g_param_spec_get_blurb (GParamSpec *pspec);
void g_value_set_param (GValue *value,
GParamSpec *param);
GParamSpec* g_value_get_param (const GValue *value);
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index c4375b111..6bc4d40e0 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1223,7 +1223,7 @@ g_signal_list_ids (GType itype,
*
* Returns: the signal name, or %NULL if the signal number was invalid.
*/
-G_CONST_RETURN gchar*
+const gchar *
g_signal_name (guint signal_id)
{
SignalNode *node;
diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index 24ef842cc..8f1639e88 100644
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.h
@@ -308,7 +308,7 @@ void g_signal_emit_by_name (gpointer instance,
...);
guint g_signal_lookup (const gchar *name,
GType itype);
-G_CONST_RETURN gchar* g_signal_name (guint signal_id);
+const gchar * g_signal_name (guint signal_id);
void g_signal_query (guint signal_id,
GSignalQuery *query);
guint* g_signal_list_ids (GType itype,
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 943993962..8f976cdbb 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -3279,7 +3279,7 @@ g_type_default_interface_unref (gpointer g_iface)
*
* Returns: Static type name or %NULL.
*/
-G_CONST_RETURN gchar*
+const gchar *
g_type_name (GType type)
{
TypeNode *node;
@@ -4206,7 +4206,7 @@ g_type_value_table_peek (GType type)
return NULL;
}
-G_CONST_RETURN gchar*
+const gchar *
g_type_name_from_instance (GTypeInstance *instance)
{
if (!instance)
@@ -4215,7 +4215,7 @@ g_type_name_from_instance (GTypeInstance *instance)
return g_type_name_from_class (instance->g_class);
}
-G_CONST_RETURN gchar*
+const gchar *
g_type_name_from_class (GTypeClass *g_class)
{
if (!g_class)
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 549ba036e..7ba9364ba 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -666,7 +666,7 @@ typedef enum /*< skip >*/
/* --- prototypes --- */
void g_type_init (void);
void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags);
-G_CONST_RETURN gchar* g_type_name (GType type);
+const gchar * g_type_name (GType type);
GQuark g_type_qname (GType type);
GType g_type_from_name (const gchar *name);
GType g_type_parent (GType type);
@@ -1657,8 +1657,8 @@ gboolean g_type_test_flags (GType type,
/* --- debugging functions --- */
-G_CONST_RETURN gchar* g_type_name_from_instance (GTypeInstance *instance);
-G_CONST_RETURN gchar* g_type_name_from_class (GTypeClass *g_class);
+const gchar * g_type_name_from_instance (GTypeInstance *instance);
+const gchar * g_type_name_from_class (GTypeClass *g_class);
/* --- internal functions --- */
diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c
index 78c7266d4..3f918f44c 100644
--- a/gobject/gvaluetypes.c
+++ b/gobject/gvaluetypes.c
@@ -1073,7 +1073,7 @@ g_value_take_string (GValue *value,
*
* Returns: string content of @value
*/
-G_CONST_RETURN gchar*
+const gchar *
g_value_get_string (const GValue *value)
{
g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h
index 3d3f7b639..972c8689c 100644
--- a/gobject/gvaluetypes.h
+++ b/gobject/gvaluetypes.h
@@ -214,7 +214,7 @@ void g_value_set_string (GValue *value,
const gchar *v_string);
void g_value_set_static_string (GValue *value,
const gchar *v_string);
-G_CONST_RETURN gchar* g_value_get_string (const GValue *value);
+const gchar * g_value_get_string (const GValue *value);
gchar* g_value_dup_string (const GValue *value);
void g_value_set_pointer (GValue *value,
gpointer v_pointer);