[gucharmap] lib: Remove G_CONST_RETURN



commit 6b114a01a75aaa4179c8bd1891f93d1bce7640da
Author: Christian Persch <chpe gnome org>
Date:   Sun Feb 14 10:27:33 2016 +0100

    lib: Remove G_CONST_RETURN
    
    https://bugzilla.gnome.org/show_bug.cgi?id=759476

 gucharmap/gen-guch-unicode-tables.pl            |    2 +-
 gucharmap/gucharmap-chartable-cell-accessible.c |    4 +-
 gucharmap/gucharmap-script-codepoint-list.c     |    2 +-
 gucharmap/gucharmap-unicode-info.c              |   34 +++++++++++-----------
 gucharmap/gucharmap-unicode-info.h              |   34 +++++++++++-----------
 gucharmap/unicode-unihan.h                      |   14 +++++-----
 6 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/gucharmap/gen-guch-unicode-tables.pl b/gucharmap/gen-guch-unicode-tables.pl
index f147c3b..1dc9511 100755
--- a/gucharmap/gen-guch-unicode-tables.pl
+++ b/gucharmap/gen-guch-unicode-tables.pl
@@ -435,7 +435,7 @@ static inline const char * unihan_get_$name (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_$name (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);
diff --git a/gucharmap/gucharmap-chartable-cell-accessible.c b/gucharmap/gucharmap-chartable-cell-accessible.c
index a41b559..13788f6 100644
--- a/gucharmap/gucharmap-chartable-cell-accessible.c
+++ b/gucharmap/gucharmap-chartable-cell-accessible.c
@@ -173,7 +173,7 @@ gucharmap_chartable_cell_accessible_action_do_action (AtkAction *action,
 }
 
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gucharmap_chartable_cell_accessible_action_get_name (AtkAction *action,
                           gint      index)
 {
@@ -184,7 +184,7 @@ gucharmap_chartable_cell_accessible_action_get_name (AtkAction *action,
 }
 
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gucharmap_chartable_cell_accessible_action_get_description (AtkAction *action,
                                  gint      index)
 {
diff --git a/gucharmap/gucharmap-script-codepoint-list.c b/gucharmap/gucharmap-script-codepoint-list.c
index 6b1562a..3197b2f 100644
--- a/gucharmap/gucharmap-script-codepoint-list.c
+++ b/gucharmap/gucharmap-script-codepoint-list.c
@@ -437,7 +437,7 @@ gucharmap_unicode_list_scripts (void)
  * character belongs. Characters that don't belong to an actual script
  * return %"Common".
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gucharmap_unicode_get_script_for_char (gunichar wc)
 {
   gint min = 0;
diff --git a/gucharmap/gucharmap-unicode-info.c b/gucharmap/gucharmap-unicode-info.c
index a654a9c..80dd6b4 100644
--- a/gucharmap/gucharmap-unicode-info.c
+++ b/gucharmap/gucharmap-unicode-info.c
@@ -58,7 +58,7 @@ static const gchar JAMO_T_TABLE[][4] = {
   "S", "SS", "NG", "J", "C", "K", "T", "P", "H"
 };
 
-G_CONST_RETURN gchar *
+const gchar *
 gucharmap_get_unicode_name (gunichar wc)
 {
   static gchar buf[32];
@@ -119,7 +119,7 @@ gucharmap_get_unicode_name (gunichar wc)
     }
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gucharmap_get_unicode_category_name (gunichar wc)
 {
   _gucharmap_intl_ensure_initialized ();
@@ -161,7 +161,7 @@ gucharmap_get_unicode_category_name (gunichar wc)
 }
 
 /* does a binary search on unicode_names */
-G_CONST_RETURN gchar *
+const gchar *
 gucharmap_get_unicode_data_name (gunichar uc)
 {
   gint min = 0;
@@ -217,7 +217,7 @@ gucharmap_get_unicode_version (gunichar uc)
   return GUCHARMAP_UNICODE_VERSION_UNASSIGNED;
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gucharmap_unicode_version_to_string (GucharmapUnicodeVersion version)
 {
   g_return_val_if_fail (version >= GUCHARMAP_UNICODE_VERSION_UNASSIGNED &&
@@ -239,7 +239,7 @@ gucharmap_get_unihan_count (void)
 
 /* does a binary search; also caches most recent, since it will often be
  * called in succession on the same character */
-static G_CONST_RETURN Unihan *
+static const Unihan *
 _get_unihan (gunichar uc)
 {
   static gunichar most_recent_searched;
@@ -283,43 +283,43 @@ gucharmap_get_unihan_count ()
   return 0;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kDefinition (gunichar uc)
 {
   return "This feature was not compiled in.";
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kCantonese (gunichar uc)
 {
   return "This feature was not compiled in.";
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kMandarin (gunichar uc)
 {
   return "This feature was not compiled in.";
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kTang (gunichar uc)
 {
   return "This feature was not compiled in.";
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kKorean (gunichar uc)
 {
   return "This feature was not compiled in.";
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kJapaneseKun (gunichar uc)
 {
   return "This feature was not compiled in.";
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kJapaneseOn (gunichar uc)
 {
   return "This feature was not compiled in.";
@@ -329,7 +329,7 @@ gucharmap_get_unicode_kJapaneseOn (gunichar uc)
 
 /* does a binary search; also caches most recent, since it will often be
  * called in succession on the same character */
-static G_CONST_RETURN NamesList *
+static const NamesList *
 get_nameslist (gunichar uc)
 {
   static gunichar most_recent_searched;
@@ -402,7 +402,7 @@ gucharmap_get_nameslist_exes (gunichar uc)
  * Returns: (transfer container): newly allocated null-terminated array of gchar*
  * the items are const, but the array should be freed by the caller
  */
-G_CONST_RETURN gchar **
+const gchar **
 gucharmap_get_nameslist_equals (gunichar uc)
 {
   const NamesList *nl;
@@ -433,7 +433,7 @@ gucharmap_get_nameslist_equals (gunichar uc)
  * Returns: (transfer container): newly allocated null-terminated array of gchar*
  * the items are const, but the array should be freed by the caller
  */
-G_CONST_RETURN gchar **
+const gchar **
 gucharmap_get_nameslist_stars (gunichar uc)
 {
   const NamesList *nl;
@@ -464,7 +464,7 @@ gucharmap_get_nameslist_stars (gunichar uc)
  * Returns: (transfer container): newly allocated null-terminated array of gchar*
  * the items are const, but the array should be freed by the caller
  */
-G_CONST_RETURN gchar **
+const gchar **
 gucharmap_get_nameslist_pounds (gunichar uc)
 {
   const NamesList *nl;
@@ -495,7 +495,7 @@ gucharmap_get_nameslist_pounds (gunichar uc)
  * Returns: (transfer container): newly allocated null-terminated array of gchar*
  * the items are const, but the array should be freed by the caller
  */
-G_CONST_RETURN gchar **
+const gchar **
 gucharmap_get_nameslist_colons (gunichar uc)
 {
   const NamesList *nl;
diff --git a/gucharmap/gucharmap-unicode-info.h b/gucharmap/gucharmap-unicode-info.h
index 48e5905..21301d0 100644
--- a/gucharmap/gucharmap-unicode-info.h
+++ b/gucharmap/gucharmap-unicode-info.h
@@ -50,26 +50,26 @@ typedef enum {
 } GucharmapUnicodeVersion;
 
 /* return values are read-only */
-G_CONST_RETURN gchar *  gucharmap_get_unicode_name                (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_data_name           (gunichar uc);
+const gchar *  gucharmap_get_unicode_name                (gunichar uc);
+const gchar *  gucharmap_get_unicode_data_name           (gunichar uc);
 gint                    gucharmap_get_unicode_data_name_count     (void);
 GucharmapUnicodeVersion gucharmap_get_unicode_version             (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_category_name       (gunichar uc);
+const gchar *  gucharmap_get_unicode_category_name       (gunichar uc);
 gint                    gucharmap_get_unihan_count                (void);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_kDefinition         (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_kCantonese          (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_kMandarin           (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_kTang               (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_kKorean             (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_kJapaneseKun        (gunichar uc);
-G_CONST_RETURN gchar *  gucharmap_get_unicode_kJapaneseOn         (gunichar uc);
+const gchar *  gucharmap_get_unicode_kDefinition         (gunichar uc);
+const gchar *  gucharmap_get_unicode_kCantonese          (gunichar uc);
+const gchar *  gucharmap_get_unicode_kMandarin           (gunichar uc);
+const gchar *  gucharmap_get_unicode_kTang               (gunichar uc);
+const gchar *  gucharmap_get_unicode_kKorean             (gunichar uc);
+const gchar *  gucharmap_get_unicode_kJapaneseKun        (gunichar uc);
+const gchar *  gucharmap_get_unicode_kJapaneseOn         (gunichar uc);
 
 /* nameslist stuff */
-G_CONST_RETURN gchar ** gucharmap_get_nameslist_stars             (gunichar  uc);
-G_CONST_RETURN gchar ** gucharmap_get_nameslist_equals            (gunichar  uc);
+const gchar ** gucharmap_get_nameslist_stars             (gunichar  uc);
+const gchar ** gucharmap_get_nameslist_equals            (gunichar  uc);
 gunichar *              gucharmap_get_nameslist_exes              (gunichar  uc);
-G_CONST_RETURN gchar ** gucharmap_get_nameslist_pounds            (gunichar  uc);
-G_CONST_RETURN gchar ** gucharmap_get_nameslist_colons            (gunichar  uc);
+const gchar ** gucharmap_get_nameslist_pounds            (gunichar  uc);
+const gchar ** gucharmap_get_nameslist_colons            (gunichar  uc);
 gboolean                gucharmap_unichar_validate                (gunichar  uc);
 gint                    gucharmap_unichar_to_printable_utf8       (gunichar  uc,
                                                                    gchar    *outbuf);
@@ -78,10 +78,10 @@ gboolean                gucharmap_unichar_isdefined               (gunichar  uc)
 gboolean                gucharmap_unichar_isgraph                 (gunichar  uc);
 
 /* defined in gucharmap-script-codepoint-list.c */
-G_CONST_RETURN gchar ** gucharmap_unicode_list_scripts            (void);
-G_CONST_RETURN gchar *  gucharmap_unicode_get_script_for_char     (gunichar wc);
+const gchar ** gucharmap_unicode_list_scripts            (void);
+const gchar *  gucharmap_unicode_get_script_for_char     (gunichar wc);
 
-G_CONST_RETURN gchar *  gucharmap_unicode_version_to_string       (GucharmapUnicodeVersion version);
+const gchar *  gucharmap_unicode_version_to_string       (GucharmapUnicodeVersion version);
 
 /* doesn't really belong here, but no better place was available */
 gunichar     gucharmap_unicode_get_locale_character (void);
diff --git a/gucharmap/unicode-unihan.h b/gucharmap/unicode-unihan.h
index d15f370..1e93c4c 100644
--- a/gucharmap/unicode-unihan.h
+++ b/gucharmap/unicode-unihan.h
@@ -165935,7 +165935,7 @@ static inline const char * unihan_get_kDefinition (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kDefinition (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);
@@ -165954,7 +165954,7 @@ static inline const char * unihan_get_kCantonese (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kCantonese (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);
@@ -165973,7 +165973,7 @@ static inline const char * unihan_get_kMandarin (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kMandarin (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);
@@ -165992,7 +165992,7 @@ static inline const char * unihan_get_kTang (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kTang (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);
@@ -166011,7 +166011,7 @@ static inline const char * unihan_get_kKorean (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kKorean (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);
@@ -166030,7 +166030,7 @@ static inline const char * unihan_get_kJapaneseKun (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kJapaneseKun (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);
@@ -166049,7 +166049,7 @@ static inline const char * unihan_get_kJapaneseOn (const Unihan *uh)
     return unihan_strings + offset;
 }
 
-G_CONST_RETURN gchar * 
+const gchar * 
 gucharmap_get_unicode_kJapaneseOn (gunichar uc)
 {
   const Unihan *uh = _get_unihan (uc);


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