[gtksourceview] search: migrate (allow-none) annotations



commit 1f84b9db15fce7886e1d993d7ffea59ddb36f117
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon Jun 13 10:35:08 2016 +0200

    search: migrate (allow-none) annotations

 gtksourceview/gtksourcesearchcontext.c  |   26 +++++++++++++-------------
 gtksourceview/gtksourcesearchsettings.c |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c
index 61dbfe0..316fcda 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtksourcesearchcontext.c
@@ -2806,7 +2806,7 @@ gtk_source_search_context_init (GtkSourceSearchContext *search)
 /**
  * gtk_source_search_context_new:
  * @buffer: a #GtkSourceBuffer.
- * @settings: (allow-none): a #GtkSourceSearchSettings, or %NULL.
+ * @settings: (nullable): a #GtkSourceSearchSettings, or %NULL.
  *
  * Creates a new search context, associated with @buffer, and customized with
  * @settings. If @settings is %NULL, a new #GtkSourceSearchSettings object will
@@ -2862,7 +2862,7 @@ gtk_source_search_context_get_settings (GtkSourceSearchContext *search)
 /**
  * gtk_source_search_context_set_settings:
  * @search: a #GtkSourceSearchContext.
- * @settings: (allow-none): the new #GtkSourceSearchSettings, or %NULL.
+ * @settings: (nullable): the new #GtkSourceSearchSettings, or %NULL.
  *
  * Associate a #GtkSourceSearchSettings with the search context. If @settings is
  * %NULL, a new one will be created.
@@ -2968,7 +2968,7 @@ gtk_source_search_context_get_match_style (GtkSourceSearchContext *search)
 /**
  * gtk_source_search_context_set_match_style:
  * @search: a #GtkSourceSearchContext.
- * @match_style: (allow-none): a #GtkSourceStyle.
+ * @match_style: (nullable): a #GtkSourceStyle, or %NULL.
  *
  * Set the style to apply on search matches. If @match_style is %NULL, default
  * theme's scheme 'match-style' will be used.
@@ -3163,8 +3163,8 @@ gtk_source_search_context_get_occurrence_position (GtkSourceSearchContext *searc
  * gtk_source_search_context_forward:
  * @search: a #GtkSourceSearchContext.
  * @iter: start of search.
- * @match_start: (out) (allow-none): return location for start of match, or %NULL.
- * @match_end: (out) (allow-none): return location for end of match, or %NULL.
+ * @match_start: (out) (optional): return location for start of match, or %NULL.
+ * @match_end: (out) (optional): return location for end of match, or %NULL.
  *
  * Synchronous forward search. It is recommended to use the asynchronous
  * functions instead, to not block the user interface. However, if you are sure
@@ -3269,7 +3269,7 @@ gtk_source_search_context_forward2 (GtkSourceSearchContext *search,
  * gtk_source_search_context_forward_async:
  * @search: a #GtkSourceSearchContext.
  * @iter: start of search.
- * @cancellable: (allow-none): a #GCancellable, or %NULL.
+ * @cancellable: (nullable): a #GCancellable, or %NULL.
  * @callback: a #GAsyncReadyCallback to call when the operation is finished.
  * @user_data: the data to pass to the @callback function.
  *
@@ -3311,8 +3311,8 @@ gtk_source_search_context_forward_async (GtkSourceSearchContext *search,
  * gtk_source_search_context_forward_finish:
  * @search: a #GtkSourceSearchContext.
  * @result: a #GAsyncResult.
- * @match_start: (out) (allow-none): return location for start of match, or %NULL.
- * @match_end: (out) (allow-none): return location for end of match, or %NULL.
+ * @match_start: (out) (optional): return location for start of match, or %NULL.
+ * @match_end: (out) (optional): return location for end of match, or %NULL.
  * @error: a #GError, or %NULL.
  *
  * Finishes a forward search started with
@@ -3416,8 +3416,8 @@ gtk_source_search_context_forward_finish2 (GtkSourceSearchContext  *search,
  * gtk_source_search_context_backward:
  * @search: a #GtkSourceSearchContext.
  * @iter: start of search.
- * @match_start: (out) (allow-none): return location for start of match, or %NULL.
- * @match_end: (out) (allow-none): return location for end of match, or %NULL.
+ * @match_start: (out) (optional): return location for start of match, or %NULL.
+ * @match_end: (out) (optional): return location for end of match, or %NULL.
  *
  * Synchronous backward search. It is recommended to use the asynchronous
  * functions instead, to not block the user interface. However, if you are sure
@@ -3523,7 +3523,7 @@ gtk_source_search_context_backward2 (GtkSourceSearchContext *search,
  * gtk_source_search_context_backward_async:
  * @search: a #GtkSourceSearchContext.
  * @iter: start of search.
- * @cancellable: (allow-none): a #GCancellable, or %NULL.
+ * @cancellable: (nullable): a #GCancellable, or %NULL.
  * @callback: a #GAsyncReadyCallback to call when the operation is finished.
  * @user_data: the data to pass to the @callback function.
  *
@@ -3565,8 +3565,8 @@ gtk_source_search_context_backward_async (GtkSourceSearchContext *search,
  * gtk_source_search_context_backward_finish:
  * @search: a #GtkSourceSearchContext.
  * @result: a #GAsyncResult.
- * @match_start: (out) (allow-none): return location for start of match, or %NULL.
- * @match_end: (out) (allow-none): return location for end of match, or %NULL.
+ * @match_start: (out) (optional): return location for start of match, or %NULL.
+ * @match_end: (out) (optional): return location for end of match, or %NULL.
  * @error: a #GError, or %NULL.
  *
  * Finishes a backward search started with
diff --git a/gtksourceview/gtksourcesearchsettings.c b/gtksourceview/gtksourcesearchsettings.c
index b24b869..dbda9c6 100644
--- a/gtksourceview/gtksourcesearchsettings.c
+++ b/gtksourceview/gtksourcesearchsettings.c
@@ -262,7 +262,7 @@ gtk_source_search_settings_new (void)
 /**
  * gtk_source_search_settings_set_search_text:
  * @settings: a #GtkSourceSearchSettings.
- * @search_text: (allow-none): the nul-terminated text to search, or %NULL to disable the search.
+ * @search_text: (nullable): the nul-terminated text to search, or %NULL to disable the search.
  *
  * Sets the text to search. If @text is %NULL or is empty, the search will be
  * disabled. A copy of @text will be made, so you can safely free @text after


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