[libgnomekbd: 1/6] Use plain "const" instead of deprecated "G_CONST_RETURN"




commit 3f25ce16020bc592e26d238a5fe1084757ad8ec0
Author: Daniel Kahn Gillmor <dkg fifthhorseman net>
Date:   Fri Apr 8 10:06:28 2022 -0700

    Use plain "const" instead of deprecated "G_CONST_RETURN"

 libgnomekbd/gkbd-keyboard-drawing.c | 10 +++++-----
 libgnomekbd/gkbd-keyboard-drawing.h | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index da526d2..f39d44e 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -2315,7 +2315,7 @@ gkbd_keyboard_drawing_set_keyboard (GkbdKeyboardDrawing * drawing,
        return TRUE;
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_keycodes (GkbdKeyboardDrawing * drawing)
 {
        if (!drawing->xkb || drawing->xkb->names->keycodes <= 0)
@@ -2325,7 +2325,7 @@ gkbd_keyboard_drawing_get_keycodes (GkbdKeyboardDrawing * drawing)
                                     drawing->xkb->names->keycodes);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_geometry (GkbdKeyboardDrawing * drawing)
 {
        if (!drawing->xkb || drawing->xkb->names->geometry <= 0)
@@ -2335,7 +2335,7 @@ gkbd_keyboard_drawing_get_geometry (GkbdKeyboardDrawing * drawing)
                                     drawing->xkb->names->geometry);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_symbols (GkbdKeyboardDrawing * drawing)
 {
        if (!drawing->xkb || drawing->xkb->names->symbols <= 0)
@@ -2345,7 +2345,7 @@ gkbd_keyboard_drawing_get_symbols (GkbdKeyboardDrawing * drawing)
                                     drawing->xkb->names->symbols);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing * drawing)
 {
        if (!drawing->xkb || drawing->xkb->names->types <= 0)
@@ -2355,7 +2355,7 @@ gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing * drawing)
                                     drawing->xkb->names->types);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_compat (GkbdKeyboardDrawing * drawing)
 {
        if (!drawing->xkb || drawing->xkb->names->compat <= 0)
diff --git a/libgnomekbd/gkbd-keyboard-drawing.h b/libgnomekbd/gkbd-keyboard-drawing.h
index 9c87643..118596b 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.h
+++ b/libgnomekbd/gkbd-keyboard-drawing.h
@@ -181,15 +181,15 @@ gboolean gkbd_keyboard_drawing_set_keyboard (GkbdKeyboardDrawing *
 void gkbd_keyboard_drawing_set_layout (GkbdKeyboardDrawing * kbdrawing,
                                       const gchar * id);
 
-G_CONST_RETURN gchar
+const gchar
     * gkbd_keyboard_drawing_get_keycodes (GkbdKeyboardDrawing * kbdrawing);
-G_CONST_RETURN gchar
+const gchar
     * gkbd_keyboard_drawing_get_geometry (GkbdKeyboardDrawing * kbdrawing);
-G_CONST_RETURN gchar
+const gchar
     * gkbd_keyboard_drawing_get_symbols (GkbdKeyboardDrawing * kbdrawing);
-G_CONST_RETURN gchar *gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing
+const gchar *gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing
                                                       * kbdrawing);
-G_CONST_RETURN gchar *gkbd_keyboard_drawing_get_compat (GkbdKeyboardDrawing
+const gchar *gkbd_keyboard_drawing_get_compat (GkbdKeyboardDrawing
                                                        * kbdrawing);
 
 void gkbd_keyboard_drawing_set_track_modifiers (GkbdKeyboardDrawing *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]