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



commit 7f731fb86d135b729aa84875551bebdcd0802f30
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon Jun 13 10:52:29 2016 +0200

    gutter: migrate (allow-none) annotations

 gtksourceview/gtksourcegutterrenderer.c       |   22 ++++++++++++----------
 gtksourceview/gtksourcegutterrenderer.h       |    4 ++--
 gtksourceview/gtksourcegutterrendererpixbuf.c |    8 ++++----
 3 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
index 31e5656..1afac57 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtksourcegutterrenderer.c
@@ -1136,12 +1136,13 @@ gtk_source_gutter_renderer_set_padding (GtkSourceGutterRenderer *renderer,
 /**
  * gtk_source_gutter_renderer_get_padding:
  * @renderer: a #GtkSourceGutterRenderer
- * @xpad: (out caller-allocates) (allow-none): return location for the x-padding (can be %NULL)
- * @ypad: (out caller-allocates) (allow-none): return location for the y-padding (can be %NULL)
+ * @xpad: (out caller-allocates) (optional): return location for the x-padding,
+ *   or %NULL to ignore.
+ * @ypad: (out caller-allocates) (optional): return location for the y-padding,
+ *   or %NULL to ignore.
  *
  * Get the x-padding and y-padding of the gutter renderer.
- *
- **/
+ */
 void
 gtk_source_gutter_renderer_get_padding (GtkSourceGutterRenderer *renderer,
                                         gint                    *xpad,
@@ -1196,12 +1197,13 @@ gtk_source_gutter_renderer_set_alignment (GtkSourceGutterRenderer *renderer,
 /**
  * gtk_source_gutter_renderer_get_alignment:
  * @renderer: a #GtkSourceGutterRenderer
- * @xalign: (out caller-allocates) (allow-none): return location for the x-alignment (can be %NULL)
- * @yalign: (out caller-allocates) (allow-none): return location for the y-alignment (can be %NULL)
+ * @xalign: (out caller-allocates) (optional): return location for the x-alignment,
+ *   or %NULL to ignore.
+ * @yalign: (out caller-allocates) (optional): return location for the y-alignment,
+ *   or %NULL to ignore.
  *
  * Get the x-alignment and y-alignment of the gutter renderer.
- *
- **/
+ */
 void
 gtk_source_gutter_renderer_get_alignment (GtkSourceGutterRenderer *renderer,
                                           gfloat                  *xalign,
@@ -1328,7 +1330,7 @@ gtk_source_gutter_renderer_set_size (GtkSourceGutterRenderer *renderer,
 /**
  * gtk_source_gutter_renderer_get_background:
  * @renderer: a #GtkSourceGutterRenderer
- * @color: (out caller-allocates) (allow-none): return value for a #GdkRGBA
+ * @color: (out caller-allocates) (optional): return value for a #GdkRGBA
  *
  * Get the background color of the renderer.
  *
@@ -1352,7 +1354,7 @@ gtk_source_gutter_renderer_get_background (GtkSourceGutterRenderer *renderer,
 /**
  * gtk_source_gutter_renderer_set_background:
  * @renderer: a #GtkSourceGutterRenderer
- * @color: (allow-none): a #GdkRGBA or %NULL
+ * @color: (nullable): a #GdkRGBA or %NULL
  *
  * Set the background color of the renderer. If @color is set to %NULL, the
  * renderer will not have a background color.
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h
index 51f63f5..5f7f517 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtksourcegutterrenderer.h
@@ -105,7 +105,7 @@ struct _GtkSourceGutterRendererClass
        /**
         * GtkSourceGutterRendererClass::change_view:
         * @renderer: a #GtkSourceGutterRenderer.
-        * @old_view: (allow-none): the old #GtkTextView.
+        * @old_view: (nullable): the old #GtkTextView.
         *
         * This is called when the text view changes for @renderer.
         */
@@ -115,7 +115,7 @@ struct _GtkSourceGutterRendererClass
        /**
         * GtkSourceGutterRendererClass::change_buffer:
         * @renderer: a #GtkSourceGutterRenderer.
-        * @old_buffer: (allow-none): the old #GtkTextBuffer.
+        * @old_buffer: (nullable): the old #GtkTextBuffer.
         *
         * This is called when the text buffer changes for @renderer.
         */
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtksourcegutterrendererpixbuf.c
index b58b8b2..668eff4 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.c
+++ b/gtksourceview/gtksourcegutterrendererpixbuf.c
@@ -386,7 +386,7 @@ gtk_source_gutter_renderer_pixbuf_new (void)
 /**
  * gtk_source_gutter_renderer_pixbuf_set_pixbuf:
  * @renderer: a #GtkSourceGutterRendererPixbuf
- * @pixbuf: (allow-none): the pixbuf
+ * @pixbuf: (nullable): the pixbuf, or %NULL.
  */
 void
 gtk_source_gutter_renderer_pixbuf_set_pixbuf (GtkSourceGutterRendererPixbuf *renderer,
@@ -419,7 +419,7 @@ gtk_source_gutter_renderer_pixbuf_get_pixbuf (GtkSourceGutterRendererPixbuf *ren
 /**
  * gtk_source_gutter_renderer_pixbuf_set_stock_id:
  * @renderer: a #GtkSourceGutterRendererPixbuf
- * @stock_id: (allow-none): the stock id
+ * @stock_id: (nullable): the stock id
  *
  * Deprecated: 3.10: Don't use this function.
  */
@@ -450,7 +450,7 @@ gtk_source_gutter_renderer_pixbuf_get_stock_id (GtkSourceGutterRendererPixbuf *r
 /**
  * gtk_source_gutter_renderer_pixbuf_set_gicon:
  * @renderer: a #GtkSourceGutterRendererPixbuf
- * @icon: (allow-none): the icon
+ * @icon: (nullable): the icon, or %NULL.
  */
 void
 gtk_source_gutter_renderer_pixbuf_set_gicon (GtkSourceGutterRendererPixbuf *renderer,
@@ -482,7 +482,7 @@ gtk_source_gutter_renderer_pixbuf_get_gicon (GtkSourceGutterRendererPixbuf *rend
 /**
  * gtk_source_gutter_renderer_pixbuf_set_icon_name:
  * @renderer: a #GtkSourceGutterRendererPixbuf
- * @icon_name: (allow-none): the icon name
+ * @icon_name: (nullable): the icon name, or %NULL.
  */
 void
 gtk_source_gutter_renderer_pixbuf_set_icon_name (GtkSourceGutterRendererPixbuf *renderer,


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