luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove all uses of G_CONST_RETURN"

Browse Source 
This reverts commit 36741245cc.

The removal has not been discussed, except on Bugzilla:

https://bugzilla.gnome.org/show_bug.cgi?id=644611
This commit is contained in:
Emmanuele Bassi
2011-03-15 09:03:28 +00:00
parent 0c1acc7e74
commit 08f0a31289
35 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gobject/gbinding.c
View File

@@ -742,7 +742,7 @@ g_binding_get_target (GBinding *binding)
*
* Since: 2.26
*/
const gchar *
G_CONST_RETURN 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
*/
const gchar *
G_CONST_RETURN gchar *
g_binding_get_target_property (GBinding *binding)
{
g_return_val_if_fail (G_IS_BINDING (binding), NULL);

4
gobject/gbinding.h
View File

@@ -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);
const gchar * g_binding_get_source_property (GBinding *binding);
const gchar * g_binding_get_target_property (GBinding *binding);
G_CONST_RETURN gchar *g_binding_get_source_property (GBinding *binding);
G_CONST_RETURN gchar *g_binding_get_target_property (GBinding *binding);
GBinding *g_object_bind_property (gpointer source,
const gchar *source_property,

6
gobject/gparam.c
View File

@@ -282,7 +282,7 @@ g_param_spec_ref_sink (GParamSpec *pspec)
*
* Returns: the name of @pspec.
*/
const gchar *
G_CONST_RETURN 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.
*/
const gchar *
G_CONST_RETURN 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.
*/
const gchar *
G_CONST_RETURN gchar*
g_param_spec_get_blurb (GParamSpec *pspec)
{
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);

6
gobject/gparam.h
View File

@@ -301,9 +301,9 @@ gboolean g_param_value_convert (GParamSpec *pspec,
gint g_param_values_cmp (GParamSpec *pspec,
const GValue *value1,
const GValue *value2);
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);
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);
void g_value_set_param (GValue *value,
GParamSpec *param);
GParamSpec* g_value_get_param (const GValue *value);

2
gobject/gsignal.c
View File

@@ -1223,7 +1223,7 @@ g_signal_list_ids (GType itype,
*
* Returns: the signal name, or %NULL if the signal number was invalid.
*/
const gchar *
G_CONST_RETURN gchar*
g_signal_name (guint signal_id)
{
SignalNode *node;

2
gobject/gsignal.h
View File

@@ -308,7 +308,7 @@ void g_signal_emit_by_name (gpointer instance,
...);
guint g_signal_lookup (const gchar *name,
GType itype);
const gchar * g_signal_name (guint signal_id);
G_CONST_RETURN gchar* g_signal_name (guint signal_id);
void g_signal_query (guint signal_id,
GSignalQuery *query);
guint* g_signal_list_ids (GType itype,

6
gobject/gtype.c
View File

@@ -3279,7 +3279,7 @@ g_type_default_interface_unref (gpointer g_iface)
*
* Returns: Static type name or %NULL.
*/
const gchar *
G_CONST_RETURN gchar*
g_type_name (GType type)
{
TypeNode *node;
@@ -4206,7 +4206,7 @@ g_type_value_table_peek (GType type)
return NULL;
}
const gchar *
G_CONST_RETURN 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);
}
const gchar *
G_CONST_RETURN gchar*
g_type_name_from_class (GTypeClass *g_class)
{
if (!g_class)

6
gobject/gtype.h
View File

@@ -666,7 +666,7 @@ typedef enum /*< skip >*/
/* --- prototypes --- */
void g_type_init (void);
void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags);
const gchar * g_type_name (GType type);
G_CONST_RETURN 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 --- */
const gchar * g_type_name_from_instance (GTypeInstance *instance);
const gchar * g_type_name_from_class (GTypeClass *g_class);
G_CONST_RETURN gchar* g_type_name_from_instance (GTypeInstance *instance);
G_CONST_RETURN gchar* g_type_name_from_class (GTypeClass *g_class);
/* --- internal functions --- */

2
gobject/gvaluetypes.c
View File

@@ -1073,7 +1073,7 @@ g_value_take_string (GValue *value,
*
* Returns: string content of @value
*/
const gchar *
G_CONST_RETURN gchar*
g_value_get_string (const GValue *value)
{
g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);

2
gobject/gvaluetypes.h
View File

@@ -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);
const gchar * g_value_get_string (const GValue *value);
G_CONST_RETURN 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);