brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate G_CONST_RETURN

Browse Source 
The G_CONST_RETURN define in GLib is, and has always been, a bit fuzzy.

We always used it to conform to the platform, at least for public-facing
API.

At first I assumed it has something to do with brain-damaged compilers
or with weird platforms where const was not really supported; sadly,
it's something much, much worse: it's a define that can be toggled at
compile-time to remove const from the signature of public API. This is a
truly terrifying feature that I assume was added in the past century,
and whose inception clearly had something to do with massive doses of
absynthe and opium — because any other explanation would make the
existence of such a feature even worse than assuming drugs had anything
to do with it.

Anyway, and pleasing the gods, this dubious feature is being
removed/deprecated in GLib; see bug:

  https://bugzilla.gnome.org/show_bug.cgi?id=644611

Before deprecation, though, we should just remove its usage from the
whole API. We should especially remove its usage from Cally's internals,
since there it never made sense in the first place.
This commit is contained in:
Emmanuele Bassi
2011-06-07 15:49:20 +01:00
parent 343f54e659
commit 2b81d90dd7
54 changed files with 146 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
clutter/clutter-shader-types.h
View File

@ -74,21 +74,21 @@ GType clutter_shader_float_get_type (void) G_GNUC_CONST;
GType clutter_shader_int_get_type (void) G_GNUC_CONST;
GType clutter_shader_matrix_get_type (void) G_GNUC_CONST;
void clutter_value_set_shader_float (GValue *value,
gint size,
const gfloat *floats);
void clutter_value_set_shader_int (GValue *value,
gint size,
const gint *ints);
void clutter_value_set_shader_matrix (GValue *value,
gint size,
const gfloat *matrix);
G_CONST_RETURN gfloat * clutter_value_get_shader_float (const GValue *value,
gsize *length);
G_CONST_RETURN gint * clutter_value_get_shader_int (const GValue *value,
gsize *length);
G_CONST_RETURN gfloat * clutter_value_get_shader_matrix (const GValue *value,
gsize *length);
void clutter_value_set_shader_float (GValue *value,
gint size,
const gfloat *floats);
void clutter_value_set_shader_int (GValue *value,
gint size,
const gint *ints);
void clutter_value_set_shader_matrix (GValue *value,
gint size,
const gfloat *matrix);
const gfloat * clutter_value_get_shader_float (const GValue *value,
gsize *length);
const gint * clutter_value_get_shader_int (const GValue *value,
gsize *length);
const gfloat * clutter_value_get_shader_matrix (const GValue *value,
gsize *length);
G_END_DECLS