AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 11:07:38 +00:00
Code Issues Projects Releases Wiki Activity

gdk: Use 'const' instead deprecated G_CONST_RETURN

Browse Source
This commit is contained in:
Javier Jardón 2011-06-15 14:45:58 +01:00
parent 149750773e
commit 8d5d9e68ed
12 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdk.c
View File

@ -284,7 +284,7 @@ gdk_parse_args (int *argc,
*
* Since: 2.2
*/
G_CONST_RETURN gchar *
const gchar *
gdk_get_display_arg_name (void)
{
if (!_gdk_display_arg_name)
@ -798,7 +798,7 @@ gdk_threads_add_timeout_seconds (guint interval,
}
G_CONST_RETURN char *
const char *
gdk_get_program_class (void)
{
return gdk_progclass;

4
gdk/gdk.h
View File

@ -80,7 +80,7 @@ void gdk_exit (gint error_code);
gchar* gdk_set_locale (void);
#endif /* GDK_DISABLE_DEPRECATED */
G_CONST_RETURN char *gdk_get_program_class (void);
const char * gdk_get_program_class (void);
void gdk_set_program_class (const char *program_class);
/* Push and pop error handlers for X errors
@ -94,7 +94,7 @@ gboolean gdk_get_use_xshm (void);
#endif /* GDK_DISABLE_DEPRECATED */
gchar* gdk_get_display (void);
G_CONST_RETURN gchar* gdk_get_display_arg_name (void);
const gchar* gdk_get_display_arg_name (void);
#ifndef GDK_DISABLE_DEPRECATED
gint gdk_input_add_full (gint source,

4
gdk/gdkdisplay.h
View File

@ -109,7 +109,7 @@ struct _GdkDisplayClass
{
GObjectClass parent_class;
G_CONST_RETURN gchar * (*get_display_name) (GdkDisplay *display);
const gchar * (*get_display_name) (GdkDisplay *display);
gint (*get_n_screens) (GdkDisplay *display);
GdkScreen * (*get_screen) (GdkDisplay *display,
gint screen_num);
@ -141,7 +141,7 @@ struct _GdkDisplayPointerHooks
GType gdk_display_get_type (void) G_GNUC_CONST;
GdkDisplay *gdk_display_open (const gchar *display_name);
G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);
const gchar * gdk_display_get_name (GdkDisplay *display);
gint gdk_display_get_n_screens (GdkDisplay *display);
GdkScreen * gdk_display_get_screen (GdkDisplay *display,

2
gdk/gdkinput.h
View File

@ -130,7 +130,7 @@ GType gdk_device_get_type (void) G_GNUC_CONST;
GList * gdk_devices_list (void);
#endif /* GDK_MULTIHEAD_SAFE */
G_CONST_RETURN gchar *gdk_device_get_name (GdkDevice *device);
const gchar * gdk_device_get_name (GdkDevice *device);
GdkInputSource gdk_device_get_source (GdkDevice *device);
GdkInputMode gdk_device_get_mode (GdkDevice *device);
gboolean gdk_device_get_has_cursor (GdkDevice *device);

2
gdk/quartz/gdkdisplay-quartz.c
View File

@ -71,7 +71,7 @@ gdk_display_open (const gchar *display_name)
return _gdk_display;
}
G_CONST_RETURN gchar *
const gchar *
gdk_display_get_name (GdkDisplay *display)
{
static gchar *display_name = NULL;

2
gdk/quartz/gdkinput.c
View File

@ -116,7 +116,7 @@ gdk_display_list_devices (GdkDisplay *dpy)
return _gdk_input_devices;
}
G_CONST_RETURN gchar *
const gchar *
gdk_device_get_name (GdkDevice *device)
{
g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);

2
gdk/win32/gdkdisplay-win32.c
View File

@ -223,7 +223,7 @@ gdk_display_open (const gchar *display_name)
return _gdk_display;
}
G_CONST_RETURN gchar *
const gchar *
gdk_display_get_name (GdkDisplay *display)
{
HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ());

2
gdk/win32/gdkinput.c
View File

@ -109,7 +109,7 @@ gdk_display_list_devices (GdkDisplay *dpy)
return _gdk_input_devices;
}
G_CONST_RETURN gchar *
const gchar *
gdk_device_get_name (GdkDevice *device)
{
g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);

4
gdk/x11/gdkdisplay-x11.c
View File

@ -502,7 +502,7 @@ gdk_internal_connection_watch (Display *display,
*
* Since: 2.2
*/
G_CONST_RETURN gchar *
const gchar *
gdk_display_get_name (GdkDisplay *display)
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
@ -1450,7 +1450,7 @@ gdk_display_supports_input_shapes (GdkDisplay *display)
*
* Since: 2.12
*/
G_CONST_RETURN gchar *
const gchar *
gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
{
return GDK_DISPLAY_X11 (display)->startup_notification_id;

2
gdk/x11/gdkfont-x11.c
View File

@ -832,7 +832,7 @@ gdk_x11_font_get_xfont (GdkFont *font)
* Return value: the name of the font. This string is owned
* by GDK and must not be modified or freed.
**/
G_CONST_RETURN char *
const char *
gdk_x11_font_get_name (GdkFont *font)
{
GdkFontPrivateX *private = (GdkFontPrivateX *)font;

6
gdk/x11/gdkproperty-x11.c
View File

@ -425,7 +425,7 @@ gdk_atom_intern_static_string (const gchar *atom_name)
return intern_atom (atom_name, FALSE);
}
static G_CONST_RETURN char *
static const char *
get_atom_name (GdkAtom atom)
{
virtual_atom_check_init ();
@ -496,7 +496,7 @@ gdk_x11_get_xatom_by_name (const gchar *atom_name)
*
* Since: 2.2
**/
G_CONST_RETURN gchar *
const gchar *
gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom xatom)
{
@ -518,7 +518,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
* Return value: name of the X atom; this string is owned by GTK+,
* so it shouldn't be modifed or freed.
**/
G_CONST_RETURN gchar *
const gchar *
gdk_x11_get_xatom_name (Atom xatom)
{
return get_atom_name (gdk_x11_xatom_to_atom (xatom));

8
gdk/x11/gdkx.h
View File

@ -148,7 +148,7 @@ gpointer gdk_xid_table_lookup_for_display (GdkDisplay *display,
guint32 gdk_x11_get_server_time (GdkWindow *window);
guint32 gdk_x11_display_get_user_time (GdkDisplay *display);
G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
const gchar * gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
void gdk_x11_display_set_cursor_theme (GdkDisplay *display,
const gchar *theme,
@ -184,13 +184,13 @@ GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
Atom xatom);
Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
const gchar *atom_name);
G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom xatom);
#ifndef GDK_MULTIHEAD_SAFE
Atom gdk_x11_atom_to_xatom (GdkAtom atom);
GdkAtom gdk_x11_xatom_to_atom (Atom xatom);
Atom gdk_x11_get_xatom_by_name (const gchar *atom_name);
G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom);
const gchar * gdk_x11_get_xatom_name (Atom xatom);
#endif
void gdk_x11_display_grab (GdkDisplay *display);
@ -211,7 +211,7 @@ gpointer gdk_x11_font_get_xfont (GdkFont *font);
#ifndef GDK_DISABLE_DEPRECATED
Display * gdk_x11_font_get_xdisplay (GdkFont *font);
G_CONST_RETURN char *gdk_x11_font_get_name (GdkFont *font);
const char * gdk_x11_font_get_name (GdkFont *font);
#define GDK_FONT_XDISPLAY(font) (gdk_x11_font_get_xdisplay (font))