Eliminate G_CONST_RETURN

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

View File

@ -429,7 +429,7 @@ cb_button_set_text_color (CbButton *self,
*
* Returns: the button's text. This must not be freed by the application.
*/
G_CONST_RETURN gchar *
const gchar *
cb_button_get_text (CbButton *self)
{
g_return_val_if_fail (CB_IS_BUTTON (self), NULL);

View File

@ -67,7 +67,7 @@ struct _CbButtonClass
ClutterActor *cb_button_new (void);
/* getter */
G_CONST_RETURN gchar * cb_button_get_text (CbButton *self);
const gchar *cb_button_get_text (CbButton *self);
/* setters - these are wrappers round functions
* which change properties of the internal actors