diff options
author | Corentin Noël <corentin.noel@collabora.com> | 2021-09-28 19:30:16 +0200 |
---|---|---|
committer | Corentin Noël <corentin.noel@collabora.com> | 2021-09-28 19:30:16 +0200 |
commit | 7f72806635c93d305a05d15c2c8db0077613d8f8 (patch) | |
tree | 40f6488eea561e0b6f3f4abd05e216e54658fb77 | |
parent | 65e130f35e4ea0d4020192b1ea9112c8c905fa96 (diff) | |
download | gnome-desktop-tintou/no-allow-none.tar.gz |
Avoid the use of `allow-none` for out parameterstintou/no-allow-none
This annotation is deprecated, replace it with the right one.
-rw-r--r-- | libgnome-desktop/gnome-languages.c | 18 | ||||
-rw-r--r-- | libgnome-desktop/gnome-xkb-info.c | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/libgnome-desktop/gnome-languages.c b/libgnome-desktop/gnome-languages.c index bd62489c..11d6ab27 100644 --- a/libgnome-desktop/gnome-languages.c +++ b/libgnome-desktop/gnome-languages.c @@ -104,13 +104,13 @@ normalize_codeset (const char *codeset) /** * gnome_parse_locale: * @locale: a locale string - * @language_codep: (out) (allow-none) (transfer full): location to + * @language_codep: (out) (optional) (transfer full): location to * store the language code, or %NULL - * @country_codep: (out) (allow-none) (transfer full): location to + * @country_codep: (out) (optional) (nullable) (transfer full): location to * store the country code, or %NULL - * @codesetp: (out) (allow-none) (transfer full): location to + * @codesetp: (out) (optional) (nullable) (transfer full): location to * store the codeset, or %NULL - * @modifierp: (out) (allow-none) (transfer full): location to + * @modifierp: (out) (optional) (nullable) (transfer full): location to * store the modifier, or %NULL * * Extracts the various components of a locale string of the form @@ -1065,7 +1065,7 @@ territories_init (void) /** * gnome_get_language_from_locale: * @locale: a locale string - * @translation: (allow-none): a locale string + * @translation: (nullable): a locale string * * Gets the language description for @locale. If @translation is * provided the returned string is translated accordingly. @@ -1157,7 +1157,7 @@ gnome_get_language_from_locale (const char *locale, /** * gnome_get_country_from_locale: * @locale: a locale string - * @translation: (allow-none): a locale string + * @translation: (nullable): a locale string * * Gets the country description for @locale. If @translation is * provided the returned string is translated accordingly. @@ -1284,7 +1284,7 @@ gnome_get_all_locales (void) /** * gnome_get_language_from_code: * @code: an ISO 639 code string - * @translation: (allow-none): a locale string + * @translation: (nullable): a locale string * * Gets the language name for @code. If @translation is provided the * returned string is translated accordingly. @@ -1308,7 +1308,7 @@ gnome_get_language_from_code (const char *code, /** * gnome_get_country_from_code: * @code: an ISO 3166 code string - * @translation: (allow-none): a locale string + * @translation: (nullable): a locale string * * Gets the country name for @code. If @translation is provided the * returned string is translated accordingly. @@ -1332,7 +1332,7 @@ gnome_get_country_from_code (const char *code, /** * gnome_get_translated_modifier: * @modifier: the modifier part of a locale name - * @translation: (allow-none): a locale string + * @translation: (nullable): a locale string * * Gets a translation of the raw @modifier string. If @translation * is provided the returned string is translated accordingly. diff --git a/libgnome-desktop/gnome-xkb-info.c b/libgnome-desktop/gnome-xkb-info.c index c43a2d68..c2a4d3b1 100644 --- a/libgnome-desktop/gnome-xkb-info.c +++ b/libgnome-desktop/gnome-xkb-info.c @@ -1014,13 +1014,13 @@ gnome_xkb_info_description_for_option (GnomeXkbInfo *self, * gnome_xkb_info_get_layout_info: * @self: a #GnomeXkbInfo * @id: layout's identifier about which to retrieve the info - * @display_name: (out) (allow-none) (transfer none): location to store + * @display_name: (out) (optional) (nullable) (transfer none): location to store * the layout's display name, or %NULL - * @short_name: (out) (allow-none) (transfer none): location to store + * @short_name: (out) (optional) (nullable) (transfer none): location to store * the layout's short name, or %NULL - * @xkb_layout: (out) (allow-none) (transfer none): location to store + * @xkb_layout: (out) (optional) (nullable) (transfer none): location to store * the layout's XKB name, or %NULL - * @xkb_variant: (out) (allow-none) (transfer none): location to store + * @xkb_variant: (out) (optional) (nullable) (transfer none): location to store * the layout's XKB variant, or %NULL * * Retrieves information about a layout. Both @display_name and |