gdk: Use const instead G_CONST_RETURN

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 6a8ca210a3ecb24d04ad8fe982091c371a7ece9e..c0431bcbdc32da306facb8bac4859da7bf2f53b2 100644 (file)
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -909,7 +909,7 @@ _gdk_broadway_display_open (const gchar *display_name)
 }
 
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gdk_broadway_display_get_name (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);

diff --git a/gdk/broadway/gdkproperty-broadway.c b/gdk/broadway/gdkproperty-broadway.c
index d3e83064e9a45977e3c44e14c23121e078b2df12..58b096fdaeaceb58e09611fa71bee573ada72557 100644 (file)
--- a/gdk/broadway/gdkproperty-broadway.c
+++ b/gdk/broadway/gdkproperty-broadway.c
@@ -52,7 +52,7 @@ _gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *mana
   return _GDK_MAKE_ATOM (g_quark_from_static_string (atom_name));
 }
 
-static G_CONST_RETURN char *
+static const char *
 get_atom_name (GdkAtom atom)
 {
   return g_quark_to_string (GPOINTER_TO_UINT(atom));

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 16b4e74ca536081f30644c2b26cfdfc69b143b54..b632f4c5f8d3bea6b5b641e646e0144440c7f117 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -319,7 +319,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)
@@ -1052,7 +1052,7 @@ gdk_threads_add_timeout_seconds (guint       interval,
  *
  * Returns: the program class.
  */
-G_CONST_RETURN char *
+const char *
 gdk_get_program_class (void)
 {
   return gdk_progclass;

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index a6ceac0455ef8990b3bfab9b7e95e05a26556443..9109d6523167522f8216cbfff6920caa1a3be5a5 100644 (file)
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -156,7 +156,7 @@ struct _GdkTimeCoord
 
 GType                 gdk_device_get_type       (void) G_GNUC_CONST;
 
-G_CONST_RETURN gchar *gdk_device_get_name       (GdkDevice *device);
+const gchar *         gdk_device_get_name       (GdkDevice *device);
 gboolean              gdk_device_get_has_cursor (GdkDevice *device);
 
 /* Functions to configure a device */

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index ff1d26db486b68e697e14f74da55f8f15fd0d486..cdfc35655c4034ba531d8e9efa7b983b81ada9b0 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1337,7 +1337,7 @@ gdk_display_get_device_manager (GdkDisplay *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);

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 65daad19911730571732916928e51ab746c628ce..3c4179e3b4b9175c52589c1925a3acae0929409d 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
 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,

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 5c50e9d2ddc0dbdc6872bbde3ea1bed13ff08808..2c7b511cc13224c4ac208f7e56fb8d548ddc07e2 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -119,7 +119,7 @@ struct _GdkDisplayClass
 
   GType window_type;          /* type for native windows for this display, set in class_init */
 
-  G_CONST_RETURN gchar *     (*get_name)           (GdkDisplay *display);
+  const gchar *              (*get_name)           (GdkDisplay *display);
   gint                       (*get_n_screens)      (GdkDisplay *display);
   GdkScreen *                (*get_screen)         (GdkDisplay *display,
                                                     gint        screen_num);

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index bcbe4d07dc703e12460ff5c04d332ec3756d680e..411b58f325148ba5e3d1a09c04fe5a6ba4cd7d5e 100644 (file)
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -50,7 +50,7 @@ gboolean              gdk_init_check                      (gint           *argc,
 void                  gdk_add_option_entries_libgtk_only  (GOptionGroup   *group);
 void                  gdk_pre_parse_libgtk_only           (void);
 
-G_CONST_RETURN gchar *gdk_get_program_class               (void);
+const gchar *         gdk_get_program_class               (void);
 void                  gdk_set_program_class               (const gchar    *program_class);
 
 void                  gdk_notify_startup_complete         (void);
@@ -64,7 +64,7 @@ G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop         (void);
 void                           gdk_error_trap_pop_ignored (void);
 
 
-G_CONST_RETURN gchar *gdk_get_display_arg_name (void);
+const gchar *         gdk_get_display_arg_name (void);
 
 /**
  * gdk_get_display:

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index a75654d1db8ef5de7ef58e98c4eb6ae3053adb7f..5cd7be2bb73c338639baa52bad5ea01f1cc55856 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -301,7 +301,7 @@ gdk_wayland_display_finalize (GObject *object)
   G_OBJECT_CLASS (_gdk_display_wayland_parent_class)->finalize (object);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gdk_wayland_display_get_name (GdkDisplay *display)
 {
   return "Wayland";

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 1faa4cf9a058fde457e30b1e950f796a32b9ba7a..8e7c9881b149371f28ca751c0fc67c2381093868 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -236,7 +236,7 @@ struct _GdkWin32DisplayClass
 
 G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gdk_win32_display_get_name (GdkDisplay *display)
 {
   HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ());

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 575c68d1c3a843846e5515457e69f67704bebfb9..77e73cedce4d1a31d1cca809ac32cc44f8366b90 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1502,7 +1502,7 @@ gdk_internal_connection_watch (Display  *display,
 }
 #endif /* HAVE_X11R6 */
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gdk_x11_display_get_name (GdkDisplay *display)
 {
   return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
@@ -2188,7 +2188,7 @@ gdk_x11_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_X11_DISPLAY (display)->startup_notification_id;

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 0cf753c1a20a08e730ba6f30d3e8551bf5639dee..678b196baf535a19f6617a9334bcad151d1e6c2a 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -503,7 +503,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)
 {
@@ -525,7 +525,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));

diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index b544ac47bc5f864708a3df1f0a9e5ca609bc6939..8781edb92fc57028be65fa2386a9229ed7c89049 100644 (file)
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -60,7 +60,7 @@ Display *gdk_x11_display_get_xdisplay     (GdkDisplay  *display);
 
 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_startup_notification_id         (GdkDisplay  *display,
                                                                    const gchar *startup_id);
 

diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 64fb97865d5933c61d1968687fb291b4946e8fd6..92270634714e375047aedd52ea0ca521262403ab 100644 (file)
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -45,13 +45,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
 
 G_END_DECLS