Remove G_CONST_RETURN usage, now that its gone in glib.

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

Gbp-Pq: Name 00git_g_const_return.patch
This commit is contained in:
Stef Walter 2011-06-14 11:33:45 +00:00 committed by openKylinBot
parent 6727c8f0c3
commit 907d499aff
6 changed files with 12 additions and 12 deletions

View File

@ -781,7 +781,7 @@ unique_app_watch_window (UniqueApp *app,
}
G_CONST_RETURN gchar *
const gchar *
unique_command_to_string (UniqueApp *app,
gint command)
{
@ -863,7 +863,7 @@ unique_command_from_string (UniqueApp *app,
return retval;
}
G_CONST_RETURN gchar *
const gchar *
unique_response_to_string (UniqueResponse response)
{
GEnumClass *enum_class;

View File

@ -111,7 +111,7 @@ unique_backend_set_name (UniqueBackend *backend,
*
* Return value: FIXME
*/
G_CONST_RETURN gchar *
const gchar *
unique_backend_get_name (UniqueBackend *backend)
{
g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
@ -154,7 +154,7 @@ unique_backend_set_startup_id (UniqueBackend *backend,
*
* Return value: FIXME
*/
G_CONST_RETURN gchar *
const gchar *
unique_backend_get_startup_id (UniqueBackend *backend)
{
g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);

View File

@ -94,10 +94,10 @@ GType unique_backend_get_type (void) G_GNUC_CONST;
UniqueBackend * unique_backend_create (void);
G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend);
const gchar * unique_backend_get_name (UniqueBackend *backend);
void unique_backend_set_name (UniqueBackend *backend,
const gchar *name);
G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend);
const gchar * unique_backend_get_startup_id (UniqueBackend *backend);
void unique_backend_set_startup_id (UniqueBackend *backend,
const gchar *startup_id);
GdkScreen * unique_backend_get_screen (UniqueBackend *backend);

View File

@ -44,11 +44,11 @@ UniqueResponse unique_app_emit_message_received (UniqueApp *app,
* and then back into an id
*/
UniqueResponse unique_response_from_string (const gchar *response);
G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response);
const gchar * unique_response_to_string (UniqueResponse response);
gint unique_command_from_string (UniqueApp *app,
const gchar *command);
G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app,
const gchar * unique_command_to_string (UniqueApp *app,
gint command);
G_END_DECLS

View File

@ -185,7 +185,7 @@ unique_message_data_set (UniqueMessageData *message_data,
*
* Since: 1.0.2
*/
G_CONST_RETURN guchar *
const guchar *
unique_message_data_get (UniqueMessageData *message_data,
gsize *length)
{
@ -525,7 +525,7 @@ unique_message_data_get_screen (UniqueMessageData *message_data)
* owned by the #UniqueMessageData structure and should not be
* modified or freed
*/
G_CONST_RETURN gchar *
const gchar *
unique_message_data_get_startup_id (UniqueMessageData *message_data)
{
g_return_val_if_fail (message_data != NULL, NULL);

View File

@ -48,7 +48,7 @@ void unique_message_data_free (UniqueMessageData *me
void unique_message_data_set (UniqueMessageData *message_data,
const guchar *data,
gsize length);
G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data,
const guchar * unique_message_data_get (UniqueMessageData *message_data,
gsize *length);
gboolean unique_message_data_set_text (UniqueMessageData *message_data,
@ -63,7 +63,7 @@ void unique_message_data_set_filename (UniqueMessageData *me
gchar * unique_message_data_get_filename (UniqueMessageData *message_data);
GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data);
G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
guint unique_message_data_get_workspace (UniqueMessageData *message_data);
G_END_DECLS