[gtk/doc-tweaks: 4/4] docs: Reduce redundancy
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/doc-tweaks: 4/4] docs: Reduce redundancy
- Date: Fri, 21 May 2021 00:46:50 +0000 (UTC)
commit 4a0d3d7acc35ce7c1f2fcb29facf58b9720eb6a5
Author: Matthias Clasen <mclasen redhat com>
Date: Thu May 20 20:45:06 2021 -0400
docs: Reduce redundancy
Remove a boatload of "or %NULL" from nullable parameters
and return values. gi-docgen generates suitable text from
the annotation that we don't need to duplicate.
This adds a few missing nullable annotations too.
gdk/gdkapplaunchcontext.c | 4 +--
gdk/gdkclipboard.c | 14 ++++-----
gdk/gdkcontentformats.c | 2 +-
gdk/gdkcontentprovider.c | 4 +--
gdk/gdkcursor.c | 2 +-
gdk/gdkdevice.c | 6 ++--
gdk/gdkdrag.c | 2 +-
gdk/gdkdrawcontext.c | 4 +--
gdk/gdkdrop.c | 6 ++--
gdk/gdkevents.c | 9 +++---
gdk/gdkglcontext.c | 8 ++---
gdk/gdkmonitor.c | 5 ++--
gdk/gdkpixbuf-drawable.c | 3 +-
gdk/gdkrectangle.c | 2 +-
gdk/gdksurface.c | 29 ++++++++----------
gdk/gdktexture.c | 2 +-
gdk/wayland/gdkdisplay-wayland.c | 2 +-
gdk/x11/gdkdisplay-x11.c | 6 ++--
gdk/x11/gdkvisual-x11.c | 3 +-
gsk/gskglshader.c | 3 +-
gsk/gskrendernode.c | 2 +-
gsk/gsktransform.c | 4 +--
gsk/ngl/gskngldriver.c | 5 ++--
gtk/css/gtkcssdataurl.c | 4 +--
gtk/css/gtkcssparser.c | 5 ++--
gtk/gtkappchooserdialog.c | 4 +--
gtk/gtkapplicationwindow.c | 2 +-
gtk/gtkassistant.c | 2 +-
gtk/gtkbox.c | 2 +-
gtk/gtkbuildable.c | 2 +-
gtk/gtkbuilder.c | 25 +++++++---------
gtk/gtkbuilderparser.c | 6 ++--
gtk/gtkbuilderscope.c | 2 +-
gtk/gtkbutton.c | 2 +-
gtk/gtkcellarea.c | 29 +++++++++---------
gtk/gtkcellareacontext.c | 4 +--
gtk/gtkcelllayout.c | 5 ++--
gtk/gtkcellrenderer.c | 36 +++++++++++-----------
gtk/gtkcellview.c | 6 ++--
gtk/gtkcenterbox.c | 6 ++--
gtk/gtkcolorchooser.c | 2 +-
gtk/gtkcolorchooserdialog.c | 4 +--
gtk/gtkcolumnview.c | 6 ++--
gtk/gtkcolumnviewcolumn.c | 6 ++--
gtk/gtkcombobox.c | 10 +++----
gtk/gtkcomboboxtext.c | 6 ++--
gtk/gtkcsslookup.c | 2 +-
gtk/gtkcustompaperunixdialog.c | 4 +--
gtk/gtkdialog.c | 6 ++--
gtk/gtkdragicon.c | 4 +--
gtk/gtkdragsource.c | 8 ++---
gtk/gtkdropcontrollermotion.c | 2 +-
gtk/gtkdropdown.c | 14 ++++-----
gtk/gtkeditable.c | 4 +--
gtk/gtkentry.c | 37 +++++++++--------------
gtk/gtkentrybuffer.c | 2 +-
gtk/gtkentrycompletion.c | 5 ++--
gtk/gtkexpander.c | 3 +-
gtk/gtkfilechooser.c | 10 +++----
gtk/gtkfilechooserdialog.c | 6 ++--
gtk/gtkfilechooserentry.c | 7 ++---
gtk/gtkfilechoosernative.c | 14 ++++-----
gtk/gtkfilefilter.c | 4 +--
gtk/gtkfilesystemmodel.c | 2 +-
gtk/gtkfilterlistmodel.c | 6 ++--
gtk/gtkfixed.c | 5 ++--
gtk/gtkflattenlistmodel.c | 2 +-
gtk/gtkfontchooser.c | 15 ++++------
gtk/gtkfontchooserdialog.c | 4 +--
gtk/gtkframe.c | 3 +-
gtk/gtkgesture.c | 4 +--
gtk/gtkglarea.c | 2 +-
gtk/gtkgrid.c | 2 +-
gtk/gtkgridview.c | 10 +++----
gtk/gtkheaderbar.c | 6 ++--
gtk/gtkicontheme.c | 9 ++----
gtk/gtkiconview.c | 17 +++++------
gtk/gtkimage.c | 21 +++++++------
gtk/gtkinfobar.c | 2 +-
gtk/gtklabel.c | 12 ++++----
gtk/gtklistbox.c | 17 +++++------
gtk/gtkliststore.c | 8 ++---
gtk/gtklistview.c | 8 ++---
gtk/gtklockbutton.c | 2 +-
gtk/gtkmain.c | 2 +-
gtk/gtkmaplistmodel.c | 6 ++--
gtk/gtkmediacontrols.c | 2 +-
gtk/gtkmediafile.c | 4 +--
gtk/gtkmenubutton.c | 2 +-
gtk/gtkmessagedialog.c | 10 +++----
gtk/gtkmountoperation.c | 4 +--
gtk/gtkmultiselection.c | 2 +-
gtk/gtknativedialog.c | 2 +-
gtk/gtknoselection.c | 2 +-
gtk/gtknotebook.c | 4 +--
gtk/gtknumericsorter.c | 4 +--
gtk/gtkpagesetup.c | 14 ++++-----
gtk/gtkpagesetupunixdialog.c | 4 +--
gtk/gtkpango.c | 4 +--
gtk/gtkpapersize.c | 7 ++---
gtk/gtkpicture.c | 13 ++++----
gtk/gtkpopovermenu.c | 4 +--
gtk/gtkpopovermenubar.c | 4 +--
gtk/gtkprintjob.c | 2 +-
gtk/gtkprintoperation-unix.c | 4 +--
gtk/gtkprintoperation.c | 10 +++----
gtk/gtkprintsettings.c | 12 ++++----
gtk/gtkprintunixdialog.c | 6 ++--
gtk/gtkprogressbar.c | 5 ++--
gtk/gtkrecentmanager.c | 4 +--
gtk/gtkroot.c | 3 +-
gtk/gtkscale.c | 7 ++---
gtk/gtkselectionfiltermodel.c | 2 +-
gtk/gtkshortcuttrigger.c | 1 -
gtk/gtksingleselection.c | 2 +-
gtk/gtksizerequest.c | 12 ++++----
gtk/gtkslicelistmodel.c | 2 +-
gtk/gtksortlistmodel.c | 4 +--
gtk/gtkspinbutton.c | 11 ++++---
gtk/gtkstack.c | 2 +-
gtk/gtkstackswitcher.c | 3 +-
gtk/gtkstringsorter.c | 4 +--
gtk/gtkstyleproperty.c | 3 +-
gtk/gtktext.c | 10 +++----
gtk/gtktextbuffer.c | 10 +++----
gtk/gtktextiter.c | 22 +++++++-------
gtk/gtktextlayout.c | 4 +--
gtk/gtktextmark.c | 2 +-
gtk/gtktexttag.c | 2 +-
gtk/gtktexttagtable.c | 3 +-
gtk/gtktextview.c | 12 ++++----
gtk/gtktooltip.c | 8 ++---
gtk/gtktreednd.c | 2 +-
gtk/gtktreeexpander.c | 4 +--
gtk/gtktreelistrowsorter.c | 4 +--
gtk/gtktreemodel.c | 28 ++++++++---------
gtk/gtktreemodelfilter.c | 14 ++++-----
gtk/gtktreemodelsort.c | 6 ++--
gtk/gtktreeselection.c | 2 +-
gtk/gtktreesortable.c | 8 ++---
gtk/gtktreestore.c | 26 ++++++++--------
gtk/gtktreeview.c | 65 ++++++++++++++++++++--------------------
gtk/gtktreeviewcolumn.c | 10 +++----
gtk/gtkwidget.c | 11 ++++---
gtk/gtkwidgetpaintable.c | 4 +--
gtk/gtkwindow.c | 30 ++++++++-----------
146 files changed, 502 insertions(+), 570 deletions(-)
---
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 86739dd0ec..b842026a74 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -237,7 +237,7 @@ gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
/**
* gdk_app_launch_context_set_icon:
* @context: a `GdkAppLaunchContext`
- * @icon: (nullable): a #GIcon, or %NULL
+ * @icon: (nullable): a #GIcon
*
* Sets the icon for applications that are launched with this
* context.
@@ -267,7 +267,7 @@ gdk_app_launch_context_set_icon (GdkAppLaunchContext *context,
/**
* gdk_app_launch_context_set_icon_name:
* @context: a `GdkAppLaunchContext`
- * @icon_name: (nullable): an icon name, or %NULL
+ * @icon_name: (nullable): an icon name
*
* Sets the icon for applications that are launched with this context.
*
diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c
index fc507358f3..1f97994fd5 100644
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -574,7 +574,7 @@ gdk_clipboard_store_async (GdkClipboard *clipboard,
* gdk_clipboard_store_finish:
* @clipboard: a `GdkClipboard`
* @result: a `GAsyncResult`
- * @error: a `GError` location to store the error occurring, or %NULL to ignore.
+ * @error: a `GError` location to store the error occurring
*
* Finishes an asynchronous clipboard store.
*
@@ -684,7 +684,7 @@ gdk_clipboard_read_async (GdkClipboard *clipboard,
*
* See [method@Gdk.Clipboard.read_async].
*
- * Returns: (transfer full) (nullable): a `GInputStream` or %NULL on error
+ * Returns: (transfer full) (nullable): a `GInputStream`
*/
GInputStream *
gdk_clipboard_read_finish (GdkClipboard *clipboard,
@@ -872,7 +872,7 @@ gdk_clipboard_read_value_async (GdkClipboard *clipboard,
* gdk_clipboard_read_value_finish:
* @clipboard: a `GdkClipboard`
* @result: a `GAsyncResult`
- * @error: a GError` location to store the error occurring, or %NULL to ignore
+ * @error: a GError` location to store the error occurring
*
* Finishes an asynchronous clipboard read.
*
@@ -931,13 +931,13 @@ gdk_clipboard_read_texture_async (GdkClipboard *clipboard,
* gdk_clipboard_read_texture_finish:
* @clipboard: a `GdkClipboard`
* @result: a `GAsyncResult`
- * @error: a `GError` location to store the error occurring, or %NULL to ignore
+ * @error: a `GError` location to store the error occurring
*
* Finishes an asynchronous clipboard read.
*
* See [method@Gdk.Clipboard.read_texture_async].
*
- * Returns: (transfer full) (nullable): a new `GdkTexture` or %NULL on error
+ * Returns: (transfer full) (nullable): a new `GdkTexture`
*/
GdkTexture *
gdk_clipboard_read_texture_finish (GdkClipboard *clipboard,
@@ -996,13 +996,13 @@ gdk_clipboard_read_text_async (GdkClipboard *clipboard,
* gdk_clipboard_read_text_finish:
* @clipboard: a `GdkClipboard`
* @result: a `GAsyncResult`
- * @error: a `GError` location to store the error occurring, or %NULL to ignore
+ * @error: a `GError` location to store the error occurring
*
* Finishes an asynchronous clipboard read.
*
* See [method@Gdk.Clipboard.read_text_async].
*
- * Returns: (transfer full) (nullable): a new string or %NULL on error
+ * Returns: (transfer full) (nullable): a new string
*/
char *
gdk_clipboard_read_text_finish (GdkClipboard *clipboard,
diff --git a/gdk/gdkcontentformats.c b/gdk/gdkcontentformats.c
index d4dae7bbb5..d7bc490465 100644
--- a/gdk/gdkcontentformats.c
+++ b/gdk/gdkcontentformats.c
@@ -384,7 +384,7 @@ gdk_content_formats_match_gtype (const GdkContentFormats *first,
*
* If no matching mime type is found, %NULL is returned.
*
- * Returns: (nullable): The first common mime type or %NULL if none.
+ * Returns: (nullable): The first common mime type or %NULL if none
*/
const char *
gdk_content_formats_match_mime_type (const GdkContentFormats *first,
diff --git a/gdk/gdkcontentprovider.c b/gdk/gdkcontentprovider.c
index 73e0951b2e..af96695c84 100644
--- a/gdk/gdkcontentprovider.c
+++ b/gdk/gdkcontentprovider.c
@@ -319,7 +319,7 @@ gdk_content_provider_write_mime_type_async (GdkContentProvider *provider,
* gdk_content_provider_write_mime_type_finish:
* @provider: a `GdkContentProvider`
* @result: a `GAsyncResult`
- * @error: a `GError` location to store the error occurring, or %NULL to ignore
+ * @error: a `GError` location to store the error occurring
*
* Finishes an asynchronous write operation.
*
@@ -343,7 +343,7 @@ gdk_content_provider_write_mime_type_finish (GdkContentProvider *provider,
* gdk_content_provider_get_value:
* @provider: a `GdkContentProvider`
* @value: the `GValue` to fill
- * @error: a `GError` location to store the error occurring, or %NULL to ignore
+ * @error: a `GError` location to store the error occurring
*
* Gets the contents of @provider stored in @value.
*
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 62ba4143c9..105009ce82 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -379,7 +379,7 @@ gdk_cursor_new_from_texture (GdkTexture *texture,
* it is used on does not support textured cursors.
*
* Returns: (transfer none) (nullable): the fallback of the cursor or %NULL
- * to use the default cursor as fallback.
+ * to use the default cursor as fallback
*/
GdkCursor *
gdk_cursor_get_fallback (GdkCursor *cursor)
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 21854d46b5..f3e754ee03 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -1145,7 +1145,7 @@ _gdk_device_surface_at_position (GdkDevice *device,
* }
* ```
*
- * Returns: (nullable): the vendor ID, or %NULL
+ * Returns: (nullable): the vendor ID
*/
const char *
gdk_device_get_vendor_id (GdkDevice *device)
@@ -1164,7 +1164,7 @@ gdk_device_get_vendor_id (GdkDevice *device)
* This ID is retrieved from the device, and does not change.
* See [method@Gdk.Device.get_vendor_id] for more information.
*
- * Returns: (nullable): the product ID, or %NULL
+ * Returns: (nullable): the product ID
*/
const char *
gdk_device_get_product_id (GdkDevice *device)
@@ -1239,7 +1239,7 @@ gdk_device_get_num_touches (GdkDevice *device)
*
* Retrieves the current tool for @device.
*
- * Returns: (transfer none): the `GdkDeviceTool`, or %NULL
+ * Returns: (transfer none): the `GdkDeviceTool`
*/
GdkDeviceTool *
gdk_device_get_device_tool (GdkDevice *device)
diff --git a/gdk/gdkdrag.c b/gdk/gdkdrag.c
index 24b66b8726..1f8abf8749 100644
--- a/gdk/gdkdrag.c
+++ b/gdk/gdkdrag.c
@@ -692,7 +692,7 @@ gdk_drag_set_selected_action (GdkDrag *drag,
* drag operation. The surface is owned by @drag and will be destroyed
* when the drag operation is over.
*
- * Returns: (nullable) (transfer none): the drag surface, or %NULL
+ * Returns: (nullable) (transfer none): the drag surface
*/
GdkSurface *
gdk_drag_get_drag_surface (GdkDrag *drag)
diff --git a/gdk/gdkdrawcontext.c b/gdk/gdkdrawcontext.c
index 60cc894f75..a0942add71 100644
--- a/gdk/gdkdrawcontext.c
+++ b/gdk/gdkdrawcontext.c
@@ -219,7 +219,7 @@ gdk_draw_context_surface_resized (GdkDrawContext *context)
*
* Retrieves the `GdkDisplay` the @context is created for
*
- * Returns: (nullable) (transfer none): a `GdkDisplay` or %NULL
+ * Returns: (nullable) (transfer none): the `GdkDisplay`
*/
GdkDisplay *
gdk_draw_context_get_display (GdkDrawContext *context)
@@ -237,7 +237,7 @@ gdk_draw_context_get_display (GdkDrawContext *context)
*
* Retrieves the surface that @context is bound to.
*
- * Returns: (nullable) (transfer none): a #GdkSurface or %NULL
+ * Returns: (nullable) (transfer none): the #GdkSurface
*/
GdkSurface *
gdk_draw_context_get_surface (GdkDrawContext *context)
diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c
index 75ed6beeb2..0825df69d2 100644
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -694,7 +694,7 @@ gdk_drop_read_async (GdkDrop *self,
* @self: a `GdkDrop`
* @result: a `GAsyncResult`
* @out_mime_type: (out) (type utf8): return location for the used mime type
- * @error: (nullable): location to store error information on failure, or %NULL
+ * @error: (nullable): location to store error information on failure
*
* Finishes an async drop read operation.
*
@@ -705,7 +705,7 @@ gdk_drop_read_async (GdkDrop *self,
*
* See [method Gdk Drop.read_async].
*
- * Returns: (nullable) (transfer full): the `GInputStream`, or %NULL
+ * Returns: (nullable) (transfer full): the `GInputStream`
*/
GInputStream *
gdk_drop_read_finish (GdkDrop *self,
@@ -891,7 +891,7 @@ gdk_drop_read_value_async (GdkDrop *self,
* gdk_drop_read_value_finish:
* @self: a `GdkDrop`
* @result: a `GAsyncResult`
- * @error: a `GError` location to store the error occurring, or %NULL to ignore
+ * @error: a `GError` location to store the error occurring
*
* Finishes an async drop read.
*
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 43e9c9f01a..4775c95635 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -574,9 +574,8 @@ _gdk_event_queue_remove_link (GdkDisplay *display,
* Removes and returns the first event from the event
* queue that is not still being filled in.
*
- * Returns: (nullable): the event, or %NULL. Ownership is transferred
- * to the caller.
- **/
+ * Returns: (nullable) (transfer full): the event
+ */
GdkEvent*
_gdk_event_unqueue (GdkDisplay *display)
{
@@ -1238,8 +1237,8 @@ gdk_event_get_device (GdkEvent *event)
* the application lifetime, if settings must be stored
* persistently across runs, see [method@Gdk.DeviceTool.get_serial].
*
- * Returns: (transfer none) (nullable): The current device tool, or %NULL
- **/
+ * Returns: (transfer none) (nullable): The current device tool
+ */
GdkDeviceTool *
gdk_event_get_device_tool (GdkEvent *event)
{
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 7c3c0a0a79..a82c7e3bc4 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -1127,7 +1127,7 @@ gdk_gl_context_make_current (GdkGLContext *context)
*
* Retrieves the display the @context is created for
*
- * Returns: (nullable) (transfer none): a `GdkDisplay` or %NULL
+ * Returns: (nullable) (transfer none): a `GdkDisplay`
*/
GdkDisplay *
gdk_gl_context_get_display (GdkGLContext *context)
@@ -1143,7 +1143,7 @@ gdk_gl_context_get_display (GdkGLContext *context)
*
* Retrieves the surface used by the @context.
*
- * Returns: (nullable) (transfer none): a `GdkSurface` or %NULL
+ * Returns: (nullable) (transfer none): a `GdkSurface`
*/
GdkSurface *
gdk_gl_context_get_surface (GdkGLContext *context)
@@ -1159,7 +1159,7 @@ gdk_gl_context_get_surface (GdkGLContext *context)
*
* Retrieves the `GdkGLContext` that this @context share data with.
*
- * Returns: (nullable) (transfer none): a `GdkGLContext` or %NULL
+ * Returns: (nullable) (transfer none): a `GdkGLContext`
*/
GdkGLContext *
gdk_gl_context_get_shared_context (GdkGLContext *context)
@@ -1223,7 +1223,7 @@ gdk_gl_context_clear_current (void)
*
* Retrieves the current `GdkGLContext`.
*
- * Returns: (nullable) (transfer none): the current `GdkGLContext`, or %NULL
+ * Returns: (nullable) (transfer none): the current `GdkGLContext`
*/
GdkGLContext *
gdk_gl_context_get_current (void)
diff --git a/gdk/gdkmonitor.c b/gdk/gdkmonitor.c
index b1aafd5756..47ebb3c519 100644
--- a/gdk/gdkmonitor.c
+++ b/gdk/gdkmonitor.c
@@ -421,8 +421,7 @@ gdk_monitor_get_connector (GdkMonitor *monitor)
* The PNP ID registry is located at
* [https://uefi.org/pnp_id_list](https://uefi.org/pnp_id_list).
*
- * Returns: (transfer none) (nullable): the name of the manufacturer,
- * or %NULL
+ * Returns: (transfer none) (nullable): the name of the manufacturer
*/
const char *
gdk_monitor_get_manufacturer (GdkMonitor *monitor)
@@ -438,7 +437,7 @@ gdk_monitor_get_manufacturer (GdkMonitor *monitor)
*
* Gets the string identifying the monitor model, if available.
*
- * Returns: (transfer none) (nullable): the monitor model, or %NULL
+ * Returns: (transfer none) (nullable): the monitor model
*/
const char *
gdk_monitor_get_model (GdkMonitor *monitor)
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index ca016c1228..a337d798fe 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -225,8 +225,7 @@ gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
* stages will almost certainly convert the pixbuf back into a texture
* to draw it on screen.
*
- * Returns: (transfer full) (nullable): a new #GdkPixbuf or %NULL
- * in case of an error
+ * Returns: (transfer full) (nullable): a new #GdkPixbuf
*/
GdkPixbuf *
gdk_pixbuf_get_from_texture (GdkTexture *texture)
diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index b433235655..f2c3b3d605 100644
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -92,7 +92,7 @@ gdk_rectangle_union (const GdkRectangle *src1,
* @src1: a `GdkRectangle`
* @src2: a `GdkRectangle`
* @dest: (out caller-allocates) (optional): return location for the
- * intersection of @src1 and @src2, or %NULL
+ * intersection of @src1 and @src2
*
* Calculates the intersection of two rectangles.
*
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index d71773032a..395516102b 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -1164,8 +1164,7 @@ gdk_surface_get_paint_gl_context (GdkSurface *surface,
* Before using the returned `GdkGLContext`, you will need to
* call [method@Gdk.GLContext.make_current] or [method@Gdk.GLContext.realize].
*
- * Returns: (transfer full): the newly created `GdkGLContext`,
- * or %NULL on error
+ * Returns: (transfer full) (nullable): the newly created `GdkGLContext`
*/
GdkGLContext *
gdk_surface_create_gl_context (GdkSurface *surface,
@@ -1696,9 +1695,9 @@ gdk_surface_constrain_size (GdkGeometry *geometry,
* gdk_surface_get_device_position:
* @surface: a `GdkSurface`
* @device: pointer `GdkDevice` to query to
- * @x: (out) (optional): return locatio for the X coordinate of @device, or %NULL
- * @y: (out) (optional): return location for the Y coordinate of @device, or %NULL
- * @mask: (out) (optional): return location for the modifier mask, or %NULL
+ * @x: (out) (optional): return locatio for the X coordinate of @device
+ * @y: (out) (optional): return location for the Y coordinate of @device
+ * @mask: (out) (optional): return location for the modifier mask
*
* Obtains the current device position and modifier state.
*
@@ -1839,10 +1838,9 @@ gdk_surface_set_cursor_internal (GdkSurface *surface,
* If the return value is %NULL then there is no custom cursor set on
* the surface, and it is using the cursor for its parent surface.
*
- * Returns: (nullable) (transfer none): a `GdkCursor`, or %NULL. The
- * returned object is owned by the `GdkSurface` and should not be
- * unreferenced directly. Use [method@Gdk.Surface.set_cursor] to
- * unset the cursor of the surface
+ * Use [method@Gdk.Surface.set_cursor] to unset the cursor of the surface.
+ *
+ * Returns: (nullable) (transfer none): a `GdkCursor`
*/
GdkCursor *
gdk_surface_get_cursor (GdkSurface *surface)
@@ -1920,10 +1918,9 @@ gdk_surface_set_cursor (GdkSurface *surface,
* If the return value is %NULL then there is no custom cursor set on the
* specified surface, and it is using the cursor for its parent surface.
*
- * Returns: (nullable) (transfer none): a `GdkCursor`, or %NULL. The
- * returned object is owned by the `GdkSurface` and should not be
- * unreferenced directly. Use [method@Gdk.Surface.set_cursor] to unset
- * the cursor of the surface
+ * Use [method@Gdk.Surface.set_cursor] to unset the cursor of the surface.
+ *
+ * Returns: (nullable) (transfer none): a `GdkCursor`
*/
GdkCursor *
gdk_surface_get_device_cursor (GdkSurface *surface,
@@ -2415,8 +2412,7 @@ gdk_surface_destroy_notify (GdkSurface *surface)
* the source if [method Gdk Drag.get_selected_action] returns
* %GDK_ACTION_MOVE.
*
- * Returns: (transfer full) (nullable): a newly created [class Gdk Drag]
- * or %NULL on error
+ * Returns: (transfer full) (nullable): a newly created `GdkDrag`
*/
GdkDrag *
gdk_drag_begin (GdkSurface *surface,
@@ -2624,7 +2620,8 @@ gdk_surface_get_scale_factor (GdkSurface *surface)
/**
* gdk_surface_set_opaque_region:
* @surface: a top-level `GdkSurface`
- * @region: (nullable): a region, or %NULL
+ * @region: (nullable): a region, or %NULL to make the entire
+ * surface opaque
*
* Marks a region of the `GdkSurface` as opaque.
*
diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c
index c7da7d66dd..0332fca146 100644
--- a/gdk/gdktexture.c
+++ b/gdk/gdktexture.c
@@ -353,7 +353,7 @@ gdk_texture_new_from_resource (const char *resource_path)
*
* If %NULL is returned, then @error will be set.
*
- * Return value: A newly-created `GdkTexture` or %NULL if an error occurred.
+ * Return value: A newly-created `GdkTexture`
*/
GdkTexture *
gdk_texture_new_from_file (GFile *file,
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 34fbf234c4..443d7656f6 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -818,7 +818,7 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
* Gets the startup notification ID for a Wayland display, or %NULL
* if no ID has been defined.
*
- * Returns: (nullable): the startup notification ID for @display, or %NULL
+ * Returns: (nullable): the startup notification ID for @display
*/
const char *
gdk_wayland_display_get_startup_notification_id (GdkDisplay *display)
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 5f0a379f04..54840a87bd 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2001,9 +2001,9 @@ gdk_x11_lookup_xdisplay (Display *xdisplay)
* Given the root window ID of one of the screen’s of a #GdkDisplay,
* finds the screen.
*
- * Returns: (transfer none): the #GdkX11Screen corresponding to
- * @xrootwin, or %NULL.
- **/
+ * Returns: (transfer none) (nullable): the #GdkX11Screen
+ * corresponding to @xrootwin
+ */
GdkX11Screen *
_gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
Window xrootwin)
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 36d95bff2e..a6dce8699f 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -290,8 +290,7 @@ _gdk_x11_screen_init_visuals (GdkX11Screen *x11_screen,
*
* Looks up the #GdkVisual for a particular screen and X Visual ID.
*
- * Returns: (transfer none) (type GdkX11Visual): the #GdkVisual (owned by the screen
- * object), or %NULL if the visual ID wasn’t found.
+ * Returns: (transfer none) (nullable) (type GdkX11Visual): the #GdkVisual
*/
GdkX11Visual *
gdk_x11_screen_lookup_visual (GdkX11Screen *x11_screen,
diff --git a/gsk/gskglshader.c b/gsk/gskglshader.c
index 87004e5a3f..b179f909b6 100644
--- a/gsk/gskglshader.c
+++ b/gsk/gskglshader.c
@@ -578,8 +578,7 @@ gsk_gl_shader_get_source (GskGLShader *shader)
* Gets the resource path for the GLSL sourcecode being used
* to render this shader.
*
- * Returns: (transfer none): The resource path for the shader,
- * or %NULL if none.
+ * Returns: (transfer none) (nullable): The resource path for the shader
*/
const char *
gsk_gl_shader_get_resource (GskGLShader *shader)
diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index f99aaefa39..7c442a760b 100644
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -600,7 +600,7 @@ gsk_render_node_write_to_file (GskRenderNode *node,
/**
* gsk_render_node_deserialize:
* @bytes: the bytes containing the data
- * @error_func: (nullable) (scope call): Callback on parsing errors or %NULL
+ * @error_func: (nullable) (scope call): Callback on parsing errors
* @user_data: (closure error_func): user_data for @error_func
*
* Loads data previously created via gsk_render_node_serialize().
diff --git a/gsk/gsktransform.c b/gsk/gsktransform.c
index 51a5d49e04..dabb583f07 100644
--- a/gsk/gsktransform.c
+++ b/gsk/gsktransform.c
@@ -94,7 +94,7 @@ gsk_transform_has_class (GskTransform *self,
* @transform_class: class structure for this self
* @category: The category of this transform. Will be used to initialize
* the result's category together with &next's category
- * @next: (transfer full): Next transform to multiply with or %NULL if none
+ * @next: (transfer full) (nullable): Next transform to multiply with
*
* Returns: (transfer full): the newly created #GskTransform
*/
@@ -217,7 +217,7 @@ static const GskTransformClass GSK_IDENTITY_TRANSFORM_CLASS =
/*<private>
* gsk_transform_is_identity:
- * @transform: (nullable): A transform or %NULL
+ * @transform: (nullable): A transform
*
* Checks if the transform is a representation of the identity
* transform.
diff --git a/gsk/ngl/gskngldriver.c b/gsk/ngl/gskngldriver.c
index b365519c18..a58f14f5f1 100644
--- a/gsk/ngl/gskngldriver.c
+++ b/gsk/ngl/gskngldriver.c
@@ -1016,14 +1016,13 @@ gsk_ngl_driver_release_render_target (GskNglDriver *self,
* gsk_ngl_driver_lookup_shader:
* @self: a #GskNglDriver
* @shader: the shader to lookup or load
- * @error: a location for a #GError, or %NULL
+ * @error: a location for a #GError
*
* Attepts to load @shader from the shader cache.
*
* If it has not been loaded, then it will compile the shader on demand.
*
- * Returns: (transfer none): a #GskGLShader if successful; otherwise
- * %NULL and @error is set.
+ * Returns: (nullable) (transfer none): a #GskGLShader
*/
GskNglProgram *
gsk_ngl_driver_lookup_shader (GskNglDriver *self,
diff --git a/gtk/css/gtkcssdataurl.c b/gtk/css/gtkcssdataurl.c
index 7bc9224dbd..77ab75687e 100644
--- a/gtk/css/gtkcssdataurl.c
+++ b/gtk/css/gtkcssdataurl.c
@@ -38,11 +38,11 @@
* @url: the URL to parse
* @out_mimetype: (out nullable optional): Return location to set the contained
* mime type to. If no mime type was specified, this value is set to %NULL.
- * @error: error location or %NULL for none
+ * @error: error location
*
* Decodes a data URL according to RFC2397 and returns the decoded data.
*
- * Returns: a new #GBytes with the decoded data or %NULL on error
+ * Returns: a new #GBytes with the decoded data
**/
GBytes *
gtk_css_data_url_parse (const char *url,
diff --git a/gtk/css/gtkcssparser.c b/gtk/css/gtkcssparser.c
index f213900a84..f8b403c3d8 100644
--- a/gtk/css/gtkcssparser.c
+++ b/gtk/css/gtkcssparser.c
@@ -158,8 +158,7 @@ gtk_css_parser_unref (GtkCssParser *self)
* for example when raw data is parsed - %NULL is returned.
*
* Returns: (nullable) (transfer none): The file being parsed
- * or %NULL.
- **/
+ */
GFile *
gtk_css_parser_get_file (GtkCssParser *self)
{
@@ -971,7 +970,7 @@ gtk_css_parser_parse_url_arg (GtkCssParser *parser,
* consumes it, resolves the URL and returns the resulting #GFile.
* On failure, an error is emitted and %NULL is returned.
*
- * Returns: (nullable) (transfer full): the resulting URL or %NULL on error
+ * Returns: (nullable) (transfer full): the resulting URL
**/
char *
gtk_css_parser_consume_url (GtkCssParser *self)
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 68ad9c6e63..b770b554dc 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -666,7 +666,7 @@ set_parent_and_flags (GtkWidget *dialog,
/**
* gtk_app_chooser_dialog_new:
- * @parent: (nullable): a `GtkWindow`, or %NULL
+ * @parent: (nullable): a `GtkWindow`
* @flags: flags for this dialog
* @file: a `GFile`
*
@@ -696,7 +696,7 @@ gtk_app_chooser_dialog_new (GtkWindow *parent,
/**
* gtk_app_chooser_dialog_new_for_content_type:
- * @parent: (nullable): a `GtkWindow`, or %NULL
+ * @parent: (nullable): a `GtkWindow`
* @flags: flags for this dialog
* @content_type: a content type string
*
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 341aec92b1..1dc9a08d18 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -843,7 +843,7 @@ gtk_application_window_set_help_overlay (GtkApplicationWindow *window,
* See [method@Gtk.ApplicationWindow.set_help_overlay].
*
* Returns: (transfer none) (nullable): the help overlay associated
- * with @window, or %NULL
+ * with @window
*/
GtkShortcutsWindow *
gtk_application_window_get_help_overlay (GtkApplicationWindow *window)
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index e36c38332a..0f13eb29bb 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1776,7 +1776,7 @@ gtk_assistant_remove_page (GtkAssistant *assistant,
/**
* gtk_assistant_set_forward_page_func:
* @assistant: a `GtkAssistant`
- * @page_func: (nullable): the `GtkAssistant`PageFunc, or %NULL
+ * @page_func: (nullable): the `GtkAssistantPageFunc`, or %NULL
* to use the default one
* @data: user data for @page_func
* @destroy: destroy notifier for @data
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index ea24cf7637..b4fbad8b9c 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -530,7 +530,7 @@ gtk_box_insert_child_after (GtkBox *box,
* gtk_box_reorder_child_after:
* @box: a `GtkBox`
* @child: the `GtkWidget` to move, must be a child of @box
- * @sibling: (nullable): the sibling to move @child after, or %NULL
+ * @sibling: (nullable): the sibling to move @child after
*
* Moves @child to the position after @sibling in the list
* of @box children.
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index 46076eb21c..1b384dac6c 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -106,7 +106,7 @@ gtk_buildable_get_buildable_id (GtkBuildable *buildable)
* @buildable: a `GtkBuildable`
* @builder: a `GtkBuilder`
* @child: child to add
- * @type: (nullable): kind of child or %NULL
+ * @type: (nullable): kind of child
*
* Adds a child to @buildable. @type is an optional string
* describing how the child should be added.
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index b52ece9f8e..cfb698fa40 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1176,7 +1176,7 @@ gtk_builder_new (void)
* gtk_builder_add_from_file:
* @builder: a `GtkBuilder`
* @filename: the name of the file to parse
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Parses a file containing a UI definition and merges it with
* the current contents of @builder.
@@ -1247,7 +1247,7 @@ gtk_builder_add_from_file (GtkBuilder *builder,
* @builder: a `GtkBuilder`
* @filename: the name of the file to parse
* @object_ids: (array zero-terminated=1) (element-type utf8): nul-terminated array of objects to build
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Parses a file containing a UI definition building only the
* requested objects and merges them with the current contents
@@ -1315,7 +1315,7 @@ gtk_builder_add_objects_from_file (GtkBuilder *builder,
* @template_type: the type that the template is for
* @buffer: the string to parse
* @length: the length of @buffer (may be -1 if @buffer is nul-terminated)
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Main private entry point for building composite components
* from template XML.
@@ -1372,7 +1372,7 @@ gtk_builder_extend_with_template (GtkBuilder *builder,
* gtk_builder_add_from_resource:
* @builder: a `GtkBuilder`
* @resource_path: the path of the resource file to parse
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an erro
*
* Parses a resource file containing a UI definition
* and merges it with the current contents of @builder.
@@ -1450,7 +1450,7 @@ gtk_builder_add_from_resource (GtkBuilder *builder,
* @builder: a `GtkBuilder`
* @resource_path: the path of the resource file to parse
* @object_ids: (array zero-terminated=1) (element-type utf8): nul-terminated array of objects to build
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Parses a resource file containing a UI definition, building
* only the requested objects and merges them with the current
@@ -1525,7 +1525,7 @@ gtk_builder_add_objects_from_resource (GtkBuilder *builder,
* @builder: a `GtkBuilder`
* @buffer: the string to parse
* @length: the length of @buffer (may be -1 if @buffer is nul-terminated)
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Parses a string containing a UI definition and merges it
* with the current contents of @builder.
@@ -1584,7 +1584,7 @@ gtk_builder_add_from_string (GtkBuilder *builder,
* @buffer: the string to parse
* @length: the length of @buffer (may be -1 if @buffer is nul-terminated)
* @object_ids: (array zero-terminated=1) (element-type utf8): nul-terminated array of objects to build
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Parses a string containing a UI definition, building only the
* requested objects and merges them with the current contents of
@@ -1646,7 +1646,6 @@ gtk_builder_add_objects_from_string (GtkBuilder *builder,
* of the returned object.
*
* Returns: (nullable) (transfer none): the object named @name
- * or %NULL if it could not be found in the object tree.
*/
GObject *
gtk_builder_get_object (GtkBuilder *builder,
@@ -1694,7 +1693,7 @@ gtk_builder_get_objects (GtkBuilder *builder)
/**
* gtk_builder_set_translation_domain: (attributes org.gtk.Method.set_property=translation-domain)
* @builder: a `GtkBuilder`
- * @domain: (nullable): the translation domain or %NULL
+ * @domain: (nullable): the translation domain
*
* Sets the translation domain of @builder.
*/
@@ -1721,8 +1720,6 @@ gtk_builder_set_translation_domain (GtkBuilder *builder,
* Gets the translation domain of @builder.
*
* Returns: (transfer none) (nullable): the translation domain
- * or %NULL. This string is owned by the builder object and
- * must not be modified or freed.
*/
const char *
gtk_builder_get_translation_domain (GtkBuilder *builder)
@@ -1938,7 +1935,7 @@ _gtk_builder_finish (GtkBuilder *builder,
* @pspec: the `GParamSpec` for the property
* @string: the string representation of the value
* @value: (out): the `GValue` to store the result in
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Demarshals a value from a string.
*
@@ -2064,7 +2061,7 @@ error:
* @type: the `GType` of the value
* @string: the string representation of the value
* @value: (out): the #GValue to store the result in
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Demarshals a value from a string.
*
@@ -2732,7 +2729,7 @@ _gtk_builder_get_template_type (GtkBuilder *builder)
* @function_name: name of the function to look up
* @flags: closure creation flags
* @object: (nullable): Object to create the closure with
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Creates a closure to invoke the function called @function_name.
*
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 425c5afa4e..be030fd0a4 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -309,7 +309,7 @@ gtk_buildable_parse_context_pop (GtkBuildableParseContext *context)
* give the element_name as passed to those functions. For the parent
* elements, see gtk_buildable_parse_context_get_element_stack().
*
- * Returns: (nullable): the name of the currently open element, or %NULL
+ * Returns: (nullable): the name of the currently open element
*/
const char *
gtk_buildable_parse_context_get_element (GtkBuildableParseContext *context)
@@ -346,8 +346,8 @@ gtk_buildable_parse_context_get_element_stack (GtkBuildableParseContext *context
/**
* gtk_buildable_parse_context_get_position:
* @context: a #GtkBuildableParseContext
- * @line_number: (out) (optional): return location for a line number, or %NULL
- * @char_number: (out) (optional): return location for a char-on-line number, or %NULL
+ * @line_number: (out) (optional): return location for a line number
+ * @char_number: (out) (optional): return location for a char-on-line number
*
* Retrieves the current line number and the number of the character on
* that line. Intended for use in error messages; there are no strict
diff --git a/gtk/gtkbuilderscope.c b/gtk/gtkbuilderscope.c
index f7290f8913..f5503c8b11 100644
--- a/gtk/gtkbuilderscope.c
+++ b/gtk/gtkbuilderscope.c
@@ -515,7 +515,7 @@ gtk_builder_cscope_add_callback_symbols (GtkBuilderCScope *self,
* gtk_builder_cscope_add_callback_symbol().
*
* Returns: (nullable) (transfer none): The callback symbol
- * in @builder for @callback_name, or %NULL
+ * in @builder for @callback_name
*/
GCallback
gtk_builder_cscope_lookup_callback_symbol (GtkBuilderCScope *self,
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 2b2c1455b9..58e6b34210 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -640,7 +640,7 @@ gtk_button_new_with_label (const char *label)
/**
* gtk_button_new_from_icon_name:
- * @icon_name: (nullable): an icon name or %NULL
+ * @icon_name: (nullable): an icon name
*
* Creates a new button containing an icon from the current icon theme.
*
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 440a81d74e..5d7c328606 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -1883,11 +1883,11 @@ get_cell_by_position (GtkCellRenderer *renderer,
* @context: the #GtkCellAreaContext used to hold sizes for @area.
* @widget: the #GtkWidget that @area is rendering on
* @cell_area: the whole allocated area for @area in @widget
- * for this row
+ * for this row
* @x: the x position
* @y: the y position
* @alloc_area: (out) (optional): where to store the inner allocated area of the
- * returned cell renderer, or %NULL.
+ * returned cell renderer
*
* Gets the #GtkCellRenderer at @x and @y coordinates inside @area and optionally
* returns the full cell allocation for it inside @cell_area.
@@ -1997,8 +1997,8 @@ gtk_cell_area_get_request_mode (GtkCellArea *area)
* @area: a #GtkCellArea
* @context: the #GtkCellAreaContext to perform this request with
* @widget: the #GtkWidget where @area will be rendering
- * @minimum_width: (out) (optional): location to store the minimum width, or %NULL
- * @natural_width: (out) (optional): location to store the natural width, or %NULL
+ * @minimum_width: (out) (optional): location to store the minimum width
+ * @natural_width: (out) (optional): location to store the natural width
*
* Retrieves a cell area’s initial minimum and natural width.
*
@@ -2028,8 +2028,8 @@ gtk_cell_area_get_preferred_width (GtkCellArea *area,
* @context: the #GtkCellAreaContext which has already been requested for widths.
* @widget: the #GtkWidget where @area will be rendering
* @width: the width for which to check the height of this area
- * @minimum_height: (out) (optional): location to store the minimum height, or %NULL
- * @natural_height: (out) (optional): location to store the natural height, or %NULL
+ * @minimum_height: (out) (optional): location to store the minimum height
+ * @natural_height: (out) (optional): location to store the natural height
*
* Retrieves a cell area’s minimum and natural height if it would be given
* the specified @width.
@@ -2069,8 +2069,8 @@ gtk_cell_area_get_preferred_height_for_width (GtkCellArea *area,
* @area: a #GtkCellArea
* @context: the #GtkCellAreaContext to perform this request with
* @widget: the #GtkWidget where @area will be rendering
- * @minimum_height: (out) (optional): location to store the minimum height, or %NULL
- * @natural_height: (out) (optional): location to store the natural height, or %NULL
+ * @minimum_height: (out) (optional): location to store the minimum height
+ * @natural_height: (out) (optional): location to store the natural height
*
* Retrieves a cell area’s initial minimum and natural height.
*
@@ -2100,8 +2100,8 @@ gtk_cell_area_get_preferred_height (GtkCellArea *area,
* @context: the #GtkCellAreaContext which has already been requested for widths.
* @widget: the #GtkWidget where @area will be rendering
* @height: the height for which to check the width of this area
- * @minimum_width: (out) (optional): location to store the minimum width, or %NULL
- * @natural_width: (out) (optional): location to store the natural width, or %NULL
+ * @minimum_width: (out) (optional): location to store the minimum width
+ * @natural_width: (out) (optional): location to store the natural width
*
* Retrieves a cell area’s minimum and natural width if it would be given
* the specified @height.
@@ -2381,8 +2381,7 @@ gtk_cell_area_class_install_cell_property (GtkCellAreaClass *aclass,
*
* Finds a cell property of a cell area class by name.
*
- * Returns: (transfer none): the #GParamSpec of the child property
- * or %NULL if @aclass has no child property with that name.
+ * Returns: (nullable) (transfer none): the #GParamSpec of the child property
*/
GParamSpec*
gtk_cell_area_class_find_cell_property (GtkCellAreaClass *aclass,
@@ -3073,7 +3072,7 @@ gtk_cell_area_get_focus_siblings (GtkCellArea *area,
* cell may have been a sibling.
*
* Returns: (nullable) (transfer none): the #GtkCellRenderer for which @renderer
- * is a sibling, or %NULL.
+ * is a sibling
*/
GtkCellRenderer *
gtk_cell_area_get_focus_from_sibling (GtkCellArea *area,
@@ -3438,8 +3437,8 @@ gtk_cell_area_inner_cell_area (GtkCellArea *area,
* @widget: the #GtkWidget that @area is rendering onto
* @for_size: the allocation contextual size to request for, or -1 if
* the base request for the orientation is to be returned.
- * @minimum_size: (out) (optional): location to store the minimum size, or %NULL
- * @natural_size: (out) (optional): location to store the natural size, or %NULL
+ * @minimum_size: (out) (optional): location to store the minimum size
+ * @natural_size: (out) (optional): location to store the natural size
*
* This is a convenience function for #GtkCellArea implementations
* to request size for cell renderers. It’s important to use this
diff --git a/gtk/gtkcellareacontext.c b/gtk/gtkcellareacontext.c
index 9e68008894..058ee41e64 100644
--- a/gtk/gtkcellareacontext.c
+++ b/gtk/gtkcellareacontext.c
@@ -507,8 +507,8 @@ gtk_cell_area_context_get_preferred_width_for_height (GtkCellAreaContext *contex
/**
* gtk_cell_area_context_get_allocation:
* @context: a #GtkCellAreaContext
- * @width: (out) (optional): location to store the allocated width, or %NULL
- * @height: (out) (optional): location to store the allocated height, or %NULL
+ * @width: (out) (optional): location to store the allocated width
+ * @height: (out) (optional): location to store the allocated height
*
* Fetches the current allocation size for @context.
*
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 12a1ba7bf9..c30497daee 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -489,7 +489,7 @@ gtk_cell_layout_add_attribute (GtkCellLayout *cell_layout,
* gtk_cell_layout_set_cell_data_func:
* @cell_layout: a #GtkCellLayout
* @cell: a #GtkCellRenderer
- * @func: (nullable): the #GtkCellLayoutDataFunc to use, or %NULL
+ * @func: (nullable): the #GtkCellLayoutDataFunc to use
* @func_data: (closure): user data for @func
* @destroy: destroy notify for @func_data
*
@@ -582,8 +582,7 @@ gtk_cell_layout_get_cells (GtkCellLayout *cell_layout)
* if called on a #GtkCellArea or might be %NULL if no #GtkCellArea
* is used by @cell_layout.
*
- * Returns: (transfer none) (nullable): the cell area used by @cell_layout,
- * or %NULL in case no cell area is used.
+ * Returns: (transfer none) (nullable): the cell area used by @cell_layout
*/
GtkCellArea *
gtk_cell_layout_get_area (GtkCellLayout *cell_layout)
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index 4870d58f95..72021a8f0e 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -877,8 +877,8 @@ gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell,
/**
* gtk_cell_renderer_get_fixed_size:
* @cell: A #GtkCellRenderer
- * @width: (out) (optional): location to fill in with the fixed width of the cell, or %NULL
- * @height: (out) (optional): location to fill in with the fixed height of the cell, or %NULL
+ * @width: (out) (optional): location to fill in with the fixed width of the cell
+ * @height: (out) (optional): location to fill in with the fixed height of the cell
*
* Fills in @width and @height with the appropriate size of @cell.
**/
@@ -943,8 +943,8 @@ gtk_cell_renderer_set_alignment (GtkCellRenderer *cell,
/**
* gtk_cell_renderer_get_alignment:
* @cell: A #GtkCellRenderer
- * @xalign: (out) (optional): location to fill in with the x alignment of the cell, or %NULL
- * @yalign: (out) (optional): location to fill in with the y alignment of the cell, or %NULL
+ * @xalign: (out) (optional): location to fill in with the x alignment of the cell
+ * @yalign: (out) (optional): location to fill in with the y alignment of the cell
*
* Fills in @xalign and @yalign with the appropriate values of @cell.
**/
@@ -1008,8 +1008,8 @@ gtk_cell_renderer_set_padding (GtkCellRenderer *cell,
/**
* gtk_cell_renderer_get_padding:
* @cell: A #GtkCellRenderer
- * @xpad: (out) (optional): location to fill in with the x padding of the cell, or %NULL
- * @ypad: (out) (optional): location to fill in with the y padding of the cell, or %NULL
+ * @xpad: (out) (optional): location to fill in with the x padding of the cell
+ * @ypad: (out) (optional): location to fill in with the y padding of the cell
*
* Fills in @xpad and @ypad with the appropriate values of @cell.
**/
@@ -1363,8 +1363,8 @@ gtk_cell_renderer_get_request_mode (GtkCellRenderer *cell)
* gtk_cell_renderer_get_preferred_width:
* @cell: a #GtkCellRenderer instance
* @widget: the #GtkWidget this cell will be rendering to
- * @minimum_size: (out) (optional): location to store the minimum size, or %NULL
- * @natural_size: (out) (optional): location to store the natural size, or %NULL
+ * @minimum_size: (out) (optional): location to store the minimum size
+ * @natural_size: (out) (optional): location to store the natural size
*
* Retrieves a renderer’s natural size when rendered to @widget.
*/
@@ -1409,8 +1409,8 @@ gtk_cell_renderer_get_preferred_width (GtkCellRenderer *cell,
* gtk_cell_renderer_get_preferred_height:
* @cell: a #GtkCellRenderer instance
* @widget: the #GtkWidget this cell will be rendering to
- * @minimum_size: (out) (optional): location to store the minimum size, or %NULL
- * @natural_size: (out) (optional): location to store the natural size, or %NULL
+ * @minimum_size: (out) (optional): location to store the minimum size
+ * @natural_size: (out) (optional): location to store the natural size
*
* Retrieves a renderer’s natural size when rendered to @widget.
*/
@@ -1456,8 +1456,8 @@ gtk_cell_renderer_get_preferred_height (GtkCellRenderer *cell,
* @cell: a #GtkCellRenderer instance
* @widget: the #GtkWidget this cell will be rendering to
* @height: the size which is available for allocation
- * @minimum_width: (out) (optional): location for storing the minimum size, or %NULL
- * @natural_width: (out) (optional): location for storing the preferred size, or %NULL
+ * @minimum_width: (out) (optional): location for storing the minimum size
+ * @natural_width: (out) (optional): location for storing the preferred size
*
* Retrieves a cell renderers’s minimum and natural width if it were rendered to
* @widget with the specified @height.
@@ -1504,8 +1504,8 @@ gtk_cell_renderer_get_preferred_width_for_height (GtkCellRenderer *cell,
* @cell: a #GtkCellRenderer instance
* @widget: the #GtkWidget this cell will be rendering to
* @width: the size which is available for allocation
- * @minimum_height: (out) (optional): location for storing the minimum size, or %NULL
- * @natural_height: (out) (optional): location for storing the preferred size, or %NULL
+ * @minimum_height: (out) (optional): location for storing the minimum size
+ * @natural_height: (out) (optional): location for storing the preferred size
*
* Retrieves a cell renderers’s minimum and natural height if it were rendered to
* @widget with the specified @width.
@@ -1551,8 +1551,8 @@ gtk_cell_renderer_get_preferred_height_for_width (GtkCellRenderer *cell,
* gtk_cell_renderer_get_preferred_size:
* @cell: a #GtkCellRenderer instance
* @widget: the #GtkWidget this cell will be rendering to
- * @minimum_size: (out) (optional): location for storing the minimum size, or %NULL
- * @natural_size: (out) (optional): location for storing the natural size, or %NULL
+ * @minimum_size: (out) (optional): location for storing the minimum size
+ * @natural_size: (out) (optional): location for storing the natural size
*
* Retrieves the minimum and natural size of a cell taking
* into account the widget’s preference for height-for-width management.
@@ -1643,8 +1643,8 @@ gtk_cell_renderer_get_aligned_area (GtkCellRenderer *cell,
/**
* gtk_cell_renderer_get_state:
- * @cell: (nullable): a #GtkCellRenderer, or %NULL
- * @widget: (nullable): a #GtkWidget, or %NULL
+ * @cell: (nullable): a #GtkCellRenderer
+ * @widget: (nullable): a #GtkWidget
* @cell_state: cell renderer state
*
* Translates the cell renderer state to #GtkStateFlags,
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 8cbfd1e79c..57a8b82b4e 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1023,8 +1023,8 @@ gtk_cell_view_set_model (GtkCellView *cell_view,
* Returns the model for @cell_view. If no model is used %NULL is
* returned.
*
- * Returns: (nullable) (transfer none): a #GtkTreeModel used or %NULL
- **/
+ * Returns: (nullable) (transfer none): a #GtkTreeModel used
+ */
GtkTreeModel *
gtk_cell_view_get_model (GtkCellView *cell_view)
{
@@ -1077,7 +1077,7 @@ gtk_cell_view_set_displayed_row (GtkCellView *cell_view,
* displayed row. If no row is currently displayed,
* %NULL is returned.
*
- * Returns: (nullable) (transfer full): the currently displayed row or %NULL
+ * Returns: (nullable) (transfer full): the currently displayed row
*/
GtkTreePath *
gtk_cell_view_get_displayed_row (GtkCellView *cell_view)
diff --git a/gtk/gtkcenterbox.c b/gtk/gtkcenterbox.c
index 73b1f17888..8319acc667 100644
--- a/gtk/gtkcenterbox.c
+++ b/gtk/gtkcenterbox.c
@@ -245,7 +245,7 @@ gtk_center_box_new (void)
/**
* gtk_center_box_set_start_widget:
* @self: a `GtkCenterBox`
- * @child: (nullable): the new start widget, or %NULL
+ * @child: (nullable): the new start widget
*
* Sets the start widget.
*
@@ -271,7 +271,7 @@ gtk_center_box_set_start_widget (GtkCenterBox *self,
/**
* gtk_center_box_set_center_widget:
* @self: a `GtkCenterBox`
- * @child: (nullable): the new center widget, or %NULL
+ * @child: (nullable): the new center widget
*
* Sets the center widget.
*
@@ -297,7 +297,7 @@ gtk_center_box_set_center_widget (GtkCenterBox *self,
/**
* gtk_center_box_set_end_widget:
* @self: a `GtkCenterBox`
- * @child: (nullable): the new end widget, or %NULL
+ * @child: (nullable): the new end widget
*
* Sets the end widget.
*
diff --git a/gtk/gtkcolorchooser.c b/gtk/gtkcolorchooser.c
index d15b13ede8..f8b9c9c774 100644
--- a/gtk/gtkcolorchooser.c
+++ b/gtk/gtkcolorchooser.c
@@ -193,7 +193,7 @@ gtk_color_chooser_set_use_alpha (GtkColorChooser *chooser,
* be displayed in rows, %GTK_ORIENTATION_VERTICAL for columns
* @colors_per_line: the number of colors to show in each row/column
* @n_colors: the total number of elements in @colors
- * @colors: (nullable) (array length=n_colors): the colors of the palette, or %NULL
+ * @colors: (nullable) (array length=n_colors): the colors of the palette
*
* Adds a palette to the color chooser.
*
diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c
index 8c8067e41e..66a9df24a5 100644
--- a/gtk/gtkcolorchooserdialog.c
+++ b/gtk/gtkcolorchooserdialog.c
@@ -276,8 +276,8 @@ gtk_color_chooser_dialog_iface_init (GtkColorChooserInterface *iface)
/**
* gtk_color_chooser_dialog_new:
- * @title: (nullable): Title of the dialog, or %NULL
- * @parent: (nullable): Transient parent of the dialog, or %NULL
+ * @title: (nullable): Title of the dialog
+ * @parent: (nullable): Transient parent of the dialog
*
* Creates a new `GtkColorChooserDialog`.
*
diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c
index 47d55f7d69..5bb6f2e8d5 100644
--- a/gtk/gtkcolumnview.c
+++ b/gtk/gtkcolumnview.c
@@ -1327,7 +1327,7 @@ gtk_column_view_init (GtkColumnView *self)
/**
* gtk_column_view_new:
- * @model: (nullable) (transfer full): the list model to use, or %NULL
+ * @model: (nullable) (transfer full): the list model to use
*
* Creates a new `GtkColumnView`.
*
@@ -1372,7 +1372,7 @@ gtk_column_view_get_model (GtkColumnView *self)
/**
* gtk_column_view_set_model: (attributes org.gtk.Method.set_property=model)
* @self: a #GtkColumnView
- * @model: (nullable) (transfer none): the model to use or %NULL for none
+ * @model: (nullable) (transfer none): the model to use
*
* Sets the model to use.
*
@@ -1678,7 +1678,7 @@ gtk_column_view_get_sorter (GtkColumnView *self)
/**
* gtk_column_view_sort_by_column:
* @self: a `GtkColumnView`
- * @column: (nullable): the `GtkColumnViewColumn` to sort by, or %NULL
+ * @column: (nullable): the `GtkColumnViewColumn` to sort by
* @direction: the direction to sort in
*
* Sets the sorting of the view.
diff --git a/gtk/gtkcolumnviewcolumn.c b/gtk/gtkcolumnviewcolumn.c
index bae0674544..32eb8dd7b5 100644
--- a/gtk/gtkcolumnviewcolumn.c
+++ b/gtk/gtkcolumnviewcolumn.c
@@ -655,7 +655,7 @@ gtk_column_view_column_get_factory (GtkColumnViewColumn *self)
/**
* gtk_column_view_column_set_factory: (attributes org.gtk.Method.set_property=factory)
* @self: a `GtkColumnViewColumn`
- * @factory: (nullable) (transfer none): the factory to use or %NULL for none
+ * @factory: (nullable) (transfer none): the factory to use
*
* Sets the `GtkListItemFactory` to use for populating list items for this
* column.
@@ -848,7 +848,7 @@ gtk_column_view_column_get_visible (GtkColumnViewColumn *self)
/**
* gtk_column_view_column_set_header_menu: (attributes org.gtk.Method.set_property=header-menu)
* @self: a `GtkColumnViewColumn`
- * @menu: (nullable): a `GMenuModel`, or %NULL
+ * @menu: (nullable): a `GMenuModel`
*
* Sets the menu model that is used to create the context menu
* for the column header.
@@ -876,7 +876,7 @@ gtk_column_view_column_set_header_menu (GtkColumnViewColumn *self,
* Gets the menu model that is used to create the context menu
* for the column header.
*
- * Returns: (transfer none) (nullable): the #GMenuModel, or %NULL
+ * Returns: (transfer none) (nullable): the #GMenuModel
*/
GMenuModel *
gtk_column_view_column_get_header_menu (GtkColumnViewColumn *self)
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index adbc69f83a..69e8ea949a 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2060,7 +2060,7 @@ gtk_combo_box_get_active_iter (GtkComboBox *combo_box,
/**
* gtk_combo_box_set_active_iter:
* @combo_box: A `GtkComboBox`
- * @iter: (nullable): The `GtkTreeIter`, or %NULL
+ * @iter: (nullable): The `GtkTreeIter`
*
* Sets the current active item to be the one referenced by @iter.
*
@@ -2569,8 +2569,8 @@ gtk_combo_box_get_row_separator_func (GtkComboBox *combo_box)
* gtk_combo_box_set_row_separator_func:
* @combo_box: a `GtkComboBox`
* @func: (nullable): a `GtkTreeViewRowSeparatorFunc`
- * @data: (nullable): user data to pass to @func, or %NULL
- * @destroy: (nullable): destroy notifier for @data, or %NULL
+ * @data: (nullable): user data to pass to @func
+ * @destroy: (nullable): destroy notifier for @data
*
* Sets the row separator function, which is used to determine
* whether a row should be drawn as a separator.
@@ -2848,7 +2848,7 @@ gtk_combo_box_get_id_column (GtkComboBox *combo_box)
* not set, or if no row is active, or if the active row has a %NULL
* ID value, then %NULL is returned.
*
- * Returns: (nullable): the ID of the active row, or %NULL
+ * Returns: (nullable): the ID of the active row
*/
const char *
gtk_combo_box_get_active_id (GtkComboBox *combo_box)
@@ -2887,7 +2887,7 @@ gtk_combo_box_get_active_id (GtkComboBox *combo_box)
/**
* gtk_combo_box_set_active_id: (attributes org.gtk.Method.set_property=active-id)
* @combo_box: a `GtkComboBox`
- * @active_id: (nullable): the ID of the row to select, or %NULL
+ * @active_id: (nullable): the ID of the row to select
*
* Changes the active row of @combo_box to the one that has an ID equal to
* @active_id.
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index 964d529dd6..cb5de3ff5e 100644
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -431,7 +431,7 @@ gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box,
/**
* gtk_combo_box_text_append:
* @combo_box: A `GtkComboBoxText`
- * @id: (nullable): a string ID for this value, or %NULL
+ * @id: (nullable): a string ID for this value
* @text: A string
*
* Appends @text to the list of strings stored in @combo_box.
@@ -452,7 +452,7 @@ gtk_combo_box_text_append (GtkComboBoxText *combo_box,
/**
* gtk_combo_box_text_prepend:
* @combo_box: A `GtkComboBox`
- * @id: (nullable): a string ID for this value, or %NULL
+ * @id: (nullable): a string ID for this value
* @text: a string
*
* Prepends @text to the list of strings stored in @combo_box.
@@ -475,7 +475,7 @@ gtk_combo_box_text_prepend (GtkComboBoxText *combo_box,
* gtk_combo_box_text_insert:
* @combo_box: A `GtkComboBoxText`
* @position: An index to insert @text
- * @id: (nullable): a string ID for this value, or %NULL
+ * @id: (nullable): a string ID for this value
* @text: A string to display
*
* Inserts @text at @position in the list of strings stored in @combo_box.
diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c
index 9f3d047253..5d7d4112a9 100644
--- a/gtk/gtkcsslookup.c
+++ b/gtk/gtkcsslookup.c
@@ -51,7 +51,7 @@ _gtk_css_lookup_is_missing (const GtkCssLookup *lookup,
* _gtk_css_lookup_set:
* @lookup: the lookup
* @id: id of the property to set, see _gtk_style_property_get_id()
- * @section: (nullable): The @section the value was defined in or %NULL
+ * @section: (nullable): The @section the value was defined in
* @value: the “cascading value” to use
*
* Sets the @value for a given @id. No value may have been set for @id
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index eb19e527fe..815d2d262e 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -385,8 +385,8 @@ gtk_custom_paper_unix_dialog_finalize (GObject *object)
/**
* gtk_custom_paper_unix_dialog_new:
- * @title: (nullable): the title of the dialog, or %NULL
- * @parent: (nullable): transient parent of the dialog, or %NULL
+ * @title: (nullable): the title of the dialog
+ * @parent: (nullable): transient parent of the dialog
*
* Creates a new custom paper dialog.
*
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 8d00884aad..31e7f98684 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -724,10 +724,10 @@ gtk_dialog_new_empty (const char *title,
/**
* gtk_dialog_new_with_buttons:
- * @title: (nullable): Title of the dialog, or %NULL
- * @parent: (nullable): Transient parent of the dialog, or %NULL
+ * @title: (nullable): Title of the dialog
+ * @parent: (nullable): Transient parent of the dialog
* @flags: from `GtkDialogFlags`
- * @first_button_text: (nullable): text to go in first button, or %NULL
+ * @first_button_text: (nullable): text to go in first button
* @...: response ID for first button, then additional buttons, ending with %NULL
*
* Creates a new `GtkDialog` with the given title and transient parent.
diff --git a/gtk/gtkdragicon.c b/gtk/gtkdragicon.c
index 096fe9d01d..0b37d59119 100644
--- a/gtk/gtkdragicon.c
+++ b/gtk/gtkdragicon.c
@@ -457,7 +457,7 @@ gtk_drag_icon_set_from_paintable (GdkDrag *drag,
/**
* gtk_drag_icon_set_child: (attributes org.gtk.Method.set_property=child)
* @self: a `GtkDragIcon`
- * @child: (nullable): a `GtkWidget` or %NULL
+ * @child: (nullable): a `GtkWidget`
*
* Sets the widget to display as the drag icon.
*/
@@ -491,7 +491,7 @@ gtk_drag_icon_set_child (GtkDragIcon *self,
*
* Gets the widget currently used as drag icon.
*
- * Returns: (nullable) (transfer none): The drag icon or %NULL if none.
+ * Returns: (nullable) (transfer none): The drag icon
**/
GtkWidget *
gtk_drag_icon_get_child (GtkDragIcon *self)
diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c
index a75f60f5c2..ef70d6793c 100644
--- a/gtk/gtkdragsource.c
+++ b/gtk/gtkdragsource.c
@@ -359,7 +359,7 @@ gtk_drag_source_class_init (GtkDragSourceClass *class)
* the [property@Gtk.DragSource:content] property, so if you set up that
* property ahead of time, you don't need to connect to this signal.
*
- * Returns: (transfer full) (nullable): a `GdkContentProvider`, or %NULL
+ * Returns: (transfer full) (nullable): a `GdkContentProvider`
*/
signals[PREPARE] =
g_signal_new (I_("prepare"),
@@ -635,7 +635,7 @@ gtk_drag_source_get_content (GtkDragSource *source)
/**
* gtk_drag_source_set_content: (attributes org.gtk.Method.set_property=content)
* @source: a `GtkDragSource`
- * @content: (nullable): a `GdkContentProvider`, or %NULL
+ * @content: (nullable): a `GdkContentProvider`
*
* Sets a content provider on a `GtkDragSource`.
*
@@ -708,7 +708,7 @@ gtk_drag_source_set_actions (GtkDragSource *source,
/**
* gtk_drag_source_set_icon:
* @source: a `GtkDragSource`
- * @paintable: (nullable): the #GdkPaintable to use as icon, or %NULL
+ * @paintable: (nullable): the #GdkPaintable to use as icon
* @hot_x: the hotspot X coordinate on the icon
* @hot_y: the hotspot Y coordinate on the icon
*
@@ -744,7 +744,7 @@ gtk_drag_source_set_icon (GtkDragSource *source,
* Returns the underlying `GdkDrag` object for an ongoing drag.
*
* Returns: (nullable) (transfer none): the `GdkDrag` of the current
- * drag operation, or %NULL
+ * drag operation
*/
GdkDrag *
gtk_drag_source_get_drag (GtkDragSource *source)
diff --git a/gtk/gtkdropcontrollermotion.c b/gtk/gtkdropcontrollermotion.c
index 8f10748fa2..75c816cb74 100644
--- a/gtk/gtkdropcontrollermotion.c
+++ b/gtk/gtkdropcontrollermotion.c
@@ -371,7 +371,7 @@ gtk_drop_controller_motion_contains_pointer (GtkDropControllerMotion *self)
* over the widget of @self.
*
* Returns: (transfer none) (nullable): The `GdkDrop` currently
- * happening within @self or %NULL if none
+ * happening within @self
*/
GdkDrop *
gtk_drop_controller_motion_get_drop (GtkDropControllerMotion *self)
diff --git a/gtk/gtkdropdown.c b/gtk/gtkdropdown.c
index 201776a138..baf918179d 100644
--- a/gtk/gtkdropdown.c
+++ b/gtk/gtkdropdown.c
@@ -662,8 +662,8 @@ gtk_drop_down_init (GtkDropDown *self)
/**
* gtk_drop_down_new:
- * @model: (transfer full) (nullable): the model to use or %NULL for none
- * @expression: (transfer full) (nullable): the expression to use or %NULL for none
+ * @model: (transfer full) (nullable): the model to use
+ * @expression: (transfer full) (nullable): the expression to use
*
* Creates a new `GtkDropDown`.
*
@@ -724,7 +724,7 @@ gtk_drop_down_get_model (GtkDropDown *self)
/**
* gtk_drop_down_set_model: (attributes org.gtk.Method.set_property=model)
* @self: a `GtkDropDown`
- * @model: (nullable) (transfer none): the model to use or %NULL for none
+ * @model: (nullable) (transfer none): the model to use
*
* Sets the `GListModel` to use.
*/
@@ -798,7 +798,7 @@ gtk_drop_down_get_factory (GtkDropDown *self)
/**
* gtk_drop_down_set_factory: (attributes org.gtk.Method.set_property=factory)
* @self: a `GtkDropDown`
- * @factory: (nullable) (transfer none): the factory to use or %NULL for none
+ * @factory: (nullable) (transfer none): the factory to use
*
* Sets the `GtkListItemFactory` to use for populating list items.
**/
@@ -838,7 +838,7 @@ gtk_drop_down_get_list_factory (GtkDropDown *self)
/**
* gtk_drop_down_set_list_factory: (attributes org.gtk.Method.set_property=list-factory)
* @self: a `GtkDropDown`
- * @factory: (nullable) (transfer none): the factory to use or %NULL for none
+ * @factory: (nullable) (transfer none): the factory to use
*
* Sets the `GtkListItemFactory` to use for populating list items in the popup.
*/
@@ -968,7 +968,7 @@ gtk_drop_down_get_enable_search (GtkDropDown *self)
/**
* gtk_drop_down_set_expression: (attributes org.gtk.Method.set_property=expression)
* @self: a `GtkDropDown`
- * @expression: (nullable): a `GtkExpression`, or %NULL
+ * @expression: (nullable): a `GtkExpression`
*
* Sets the expression that gets evaluated to obtain strings from items.
*
@@ -1005,7 +1005,7 @@ gtk_drop_down_set_expression (GtkDropDown *self,
*
* See [method@Gtk.DropDown.set_expression].
*
- * Returns: (nullable) (transfer none): a `GtkExpression` or %NULL
+ * Returns: (nullable) (transfer none): a `GtkExpression`
*/
GtkExpression *
gtk_drop_down_get_expression (GtkDropDown *self)
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index c579f5b961..8095bca07f 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -666,8 +666,8 @@ gtk_editable_get_position (GtkEditable *editable)
/**
* gtk_editable_get_selection_bounds:
* @editable: a `GtkEditable`
- * @start_pos: (out) (optional): location to store the starting position, or %NULL
- * @end_pos: (out) (optional): location to store the end position, or %NULL
+ * @start_pos: (out) (optional): location to store the starting position
+ * @end_pos: (out) (optional): location to store the end position
*
* Retrieves the selection bound of the editable.
*
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index aa6157154e..267b174e5b 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2467,7 +2467,7 @@ gtk_entry_get_alignment (GtkEntry *entry)
* gtk_entry_set_icon_from_paintable:
* @entry: a `GtkEntry`
* @icon_pos: Icon position
- * @paintable: (nullable): A `GdkPaintable`, or %NULL
+ * @paintable: (nullable): A `GdkPaintable`
*
* Sets the icon shown in the specified position using a `GdkPaintable`.
*
@@ -2522,7 +2522,7 @@ gtk_entry_set_icon_from_paintable (GtkEntry *entry,
* gtk_entry_set_icon_from_icon_name:
* @entry: A `GtkEntry`
* @icon_pos: The position at which to set the icon
- * @icon_name: (nullable): An icon name, or %NULL
+ * @icon_name: (nullable): An icon name
*
* Sets the icon shown in the entry at the specified position
* from the current icon theme.
@@ -2578,7 +2578,7 @@ gtk_entry_set_icon_from_icon_name (GtkEntry *entry,
* gtk_entry_set_icon_from_gicon:
* @entry: A `GtkEntry`
* @icon_pos: The position at which to set the icon
- * @icon: (nullable): The icon to set, or %NULL
+ * @icon: (nullable): The icon to set
*
* Sets the icon shown in the entry at the specified position
* from the current icon theme.
@@ -2697,7 +2697,7 @@ gtk_entry_get_icon_activatable (GtkEntry *entry,
*
* If no `GdkPaintable` was used for the icon, %NULL is returned.
*
- * Returns: (transfer none) (nullable): A `GdkPaintable`, or %NULL
+ * Returns: (transfer none) (nullable): A `GdkPaintable`
* if no icon is set for this position or the icon set is not
* a `GdkPaintable`.
*/
@@ -2729,8 +2729,7 @@ gtk_entry_get_icon_paintable (GtkEntry *entry,
* %NULL will be returned if there is no icon or if the icon was
* set by some other method (e.g., by `GdkPaintable` or icon name).
*
- * Returns: (transfer none) (nullable): A `GIcon`, or %NULL if no
- * icon is set or if the icon is not a `GIcon`
+ * Returns: (transfer none) (nullable): A `GIcon`
*/
GIcon *
gtk_entry_get_icon_gicon (GtkEntry *entry,
@@ -2760,8 +2759,7 @@ gtk_entry_get_icon_gicon (GtkEntry *entry,
* %NULL is returned if there is no icon or if the icon was set
* by some other method (e.g., by `GdkPaintable` or gicon).
*
- * Returns: (nullable): An icon name, or %NULL if no icon is set
- * or if the icon wasn’t set from an icon name
+ * Returns: (nullable): An icon name
*/
const char *
gtk_entry_get_icon_name (GtkEntry *entry,
@@ -3061,8 +3059,7 @@ ensure_has_tooltip (GtkEntry *entry)
* Gets the contents of the tooltip on the icon at the specified
* position in @entry.
*
- * Returns: (nullable): the tooltip text, or %NULL. Free the returned
- * string with g_free() when done.
+ * Returns: (nullable) (transfer full): the tooltip text
*/
char *
gtk_entry_get_icon_tooltip_text (GtkEntry *entry,
@@ -3091,8 +3088,7 @@ gtk_entry_get_icon_tooltip_text (GtkEntry *entry,
* gtk_entry_set_icon_tooltip_text:
* @entry: a `GtkEntry`
* @icon_pos: the icon position
- * @tooltip: (nullable): the contents of the tooltip for the
- * icon, or %NULL
+ * @tooltip: (nullable): the contents of the tooltip for the icon
*
* Sets @tooltip as the contents of the tooltip for the icon
* at the specified position.
@@ -3152,8 +3148,7 @@ gtk_entry_set_icon_tooltip_text (GtkEntry *entry,
* Gets the contents of the tooltip on the icon at the specified
* position in @entry.
*
- * Returns: (nullable): the tooltip text, or %NULL. Free the
- * returned string with g_free() when done.
+ * Returns: (nullable) (transfer full): the tooltip text
*/
char *
gtk_entry_get_icon_tooltip_markup (GtkEntry *entry,
@@ -3177,8 +3172,7 @@ gtk_entry_get_icon_tooltip_markup (GtkEntry *entry,
* gtk_entry_set_icon_tooltip_markup:
* @entry: a `GtkEntry`
* @icon_pos: the icon position
- * @tooltip: (nullable): the contents of the tooltip for the
- * icon, or %NULL
+ * @tooltip: (nullable): the contents of the tooltip for the icon
*
* Sets @tooltip as the contents of the tooltip for the icon at
* the specified position.
@@ -3261,7 +3255,7 @@ gtk_entry_query_tooltip (GtkWidget *widget,
/**
* gtk_entry_set_completion: (attributes org.gtk.Method.set_property=completion)
* @entry: A `GtkEntry`
- * @completion: (nullable): The `GtkEntryCompletion` or %NULL
+ * @completion: (nullable): The `GtkEntryCompletion`
*
* Sets @completion to be the auxiliary completion object
* to use with @entry.
@@ -3480,8 +3474,7 @@ gtk_entry_progress_pulse (GtkEntry *entry)
/**
* gtk_entry_set_placeholder_text: (attributes org.gtk.Method.set_property=placeholder-text)
* @entry: a `GtkEntry`
- * @text: (nullable): a string to be displayed when @entry is
- * empty and unfocused, or %NULL
+ * @text: (nullable): a string to be displayed when @entry is empty and unfocused
*
* Sets text to be displayed in @entry when it is empty.
*
@@ -3634,8 +3627,7 @@ gtk_entry_set_attributes (GtkEntry *entry,
*
* See [method@Gtk.Entry.set_attributes].
*
- * Returns: (transfer none) (nullable): the attribute list,
- * or %NULL if none was set.
+ * Returns: (transfer none) (nullable): the attribute list
*/
PangoAttrList *
gtk_entry_get_attributes (GtkEntry *entry)
@@ -3676,8 +3668,7 @@ gtk_entry_set_tabs (GtkEntry *entry,
*
* See [method@Gtk.Entry.set_tabs].
*
- * Returns: (nullable) (transfer none): the tabstops,
- * or %NULL if none was set.
+ * Returns: (nullable) (transfer none): the tabstops
*/
PangoTabArray *
diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c
index 113b864647..b96b895742 100644
--- a/gtk/gtkentrybuffer.c
+++ b/gtk/gtkentrybuffer.c
@@ -424,7 +424,7 @@ gtk_entry_buffer_class_init (GtkEntryBufferClass *klass)
/**
* gtk_entry_buffer_new:
- * @initial_chars: (nullable): initial buffer text, or %NULL
+ * @initial_chars: (nullable): initial buffer text
* @n_initial_chars: number of characters in @initial_chars, or -1
*
* Create a new `GtkEntryBuffer` object.
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 00aeb71934..f64b851a30 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -927,8 +927,7 @@ gtk_entry_completion_set_model (GtkEntryCompletion *completion,
*
* Returns %NULL if the model is unset.
*
- * Returns: (nullable) (transfer none): A `GtkTreeModel`, or %NULL if none
- * is currently being used
+ * Returns: (nullable) (transfer none): A `GtkTreeModel`
*/
GtkTreeModel *
gtk_entry_completion_get_model (GtkEntryCompletion *completion)
@@ -1248,7 +1247,7 @@ gtk_entry_completion_cursor_on_match (GtkEntryCompletion *completion,
* see [method@Gtk.EntryCompletion.set_text_column] for details.
*
* Returns: (nullable) (transfer full): The common prefix all rows
- * starting with @key or %NULL if no row matches @key.
+ * starting with @key
*/
char *
gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion,
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 9a2eac7039..173726ea2f 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -1134,8 +1134,7 @@ gtk_expander_set_label_widget (GtkExpander *expander,
*
* Retrieves the label widget for the frame.
*
- * Returns: (nullable) (transfer none): the label widget,
- * or %NULL if there is none
+ * Returns: (nullable) (transfer none): the label widget
*/
GtkWidget *
gtk_expander_get_label_widget (GtkExpander *expander)
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index f52315839a..cfe31e8899 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -370,7 +370,7 @@ gtk_file_chooser_unselect_all (GtkFileChooser *chooser)
* gtk_file_chooser_set_current_folder:
* @chooser: a `GtkFileChooser`
* @file: the `GFile` for the new folder
- * @error: location to store error, or %NULL.
+ * @error: location to store error
*
* Sets the current folder for @chooser from a #GFile.
*
@@ -450,7 +450,7 @@ gtk_file_chooser_get_files (GtkFileChooser *chooser)
* gtk_file_chooser_set_file:
* @chooser: a `GtkFileChooser`
* @file: the `GFile` to set as current
- * @error: (nullable): location to store the error, or %NULL to ignore errors.
+ * @error: (nullable): location to store the error
*
* Sets @file as the current filename for the file chooser.
*
@@ -546,7 +546,7 @@ gtk_file_chooser_get_file (GtkFileChooser *chooser)
* gtk_file_chooser_add_shortcut_folder:
* @chooser: a `GtkFileChooser`
* @folder: a `GFile` for the folder to add
- * @error: location to store error, or %NULL
+ * @error: location to store error
*
* Adds a folder to be displayed with the shortcut folders
* in a file chooser.
@@ -569,7 +569,7 @@ gtk_file_chooser_add_shortcut_folder (GtkFileChooser *chooser,
* gtk_file_chooser_remove_shortcut_folder:
* @chooser: a `GtkFileChooser`
* @folder: a `GFile` for the folder to remove
- * @error: location to store error, or %NULL
+ * @error: location to store error
*
* Removes a folder from the shortcut folders in a file chooser.
*
@@ -679,7 +679,7 @@ gtk_file_chooser_set_filter (GtkFileChooser *chooser,
*
* Gets the current filter.
*
- * Returns: (nullable) (transfer none): the current filter, or %NULL
+ * Returns: (nullable) (transfer none): the current filter
*/
GtkFileFilter *
gtk_file_chooser_get_filter (GtkFileChooser *chooser)
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index ab5b260bcf..76f2d3e901 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -707,10 +707,10 @@ gtk_file_chooser_dialog_new_valist (const char *title,
/**
* gtk_file_chooser_dialog_new:
- * @title: (nullable): Title of the dialog, or %NULL
- * @parent: (nullable): Transient parent of the dialog, or %NULL
+ * @title: (nullable): Title of the dialog
+ * @parent: (nullable): Transient parent of the dialog
* @action: Open or save mode for the dialog
- * @first_button_text: (nullable): text to go in the first button, or %NULL
+ * @first_button_text: (nullable): text to go in the first button
* @...: response ID for the first button, then additional (button, id) pairs, ending with %NULL
*
* Creates a new `GtkFileChooserDialog`.
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 59b0d34619..7e9f1ec473 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -859,10 +859,9 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
* be different. If the user has entered unparsable text, or text which
* the entry cannot handle, this will return %NULL.
*
- * Returns: (nullable): the file for the current folder or %NULL if the
- * current folder can not be determined. Unref the file with
- * g_object_unref() after use.
- **/
+ * Returns: (nullable) (transfer full): the file for the current folder
+ * or %NULL if the current folder can not be determined
+ */
GFile *
_gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
{
diff --git a/gtk/gtkfilechoosernative.c b/gtk/gtkfilechoosernative.c
index f0c12265e6..0a9cce88e1 100644
--- a/gtk/gtkfilechoosernative.c
+++ b/gtk/gtkfilechoosernative.c
@@ -217,8 +217,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkFileChooserNative, gtk_file_chooser_native, GTK_TYPE
*
* Retrieves the custom label text for the accept button.
*
- * Returns: (nullable): The custom label, or %NULL for the default.
- * This string is owned by GTK and should not be modified or freed
+ * Returns: (nullable): The custom label
*/
const char *
gtk_file_chooser_native_get_accept_label (GtkFileChooserNative *self)
@@ -231,7 +230,7 @@ gtk_file_chooser_native_get_accept_label (GtkFileChooserNative *self)
/**
* gtk_file_chooser_native_set_accept_label: (attributes org.gtk.Method.set_property=accept-label)
* @self: a `GtkFileChooserNative`
- * @accept_label: (nullable): custom label or %NULL for the default
+ * @accept_label: (nullable): custom label
*
* Sets the custom label text for the accept button.
*
@@ -260,8 +259,7 @@ gtk_file_chooser_native_set_accept_label (GtkFileChooserNative *self,
*
* Retrieves the custom label text for the cancel button.
*
- * Returns: (nullable): The custom label, or %NULL for the default.
- * This string is owned by GTK and should not be modified or freed
+ * Returns: (nullable): The custom label
*/
const char *
gtk_file_chooser_native_get_cancel_label (GtkFileChooserNative *self)
@@ -274,7 +272,7 @@ gtk_file_chooser_native_get_cancel_label (GtkFileChooserNative *self)
/**
* gtk_file_chooser_native_set_cancel_label: (attributes org.gtk.Method.set_property=cancel-label)
* @self: a `GtkFileChooserNative`
- * @cancel_label: (nullable): custom label or %NULL for the default
+ * @cancel_label: (nullable): custom label
*
* Sets the custom label text for the cancel button.
*
@@ -520,8 +518,8 @@ gtk_file_chooser_native_init (GtkFileChooserNative *self)
/**
* gtk_file_chooser_native_new:
- * @title: (nullable): Title of the native, or %NULL
- * @parent: (nullable): Transient parent of the native, or %NULL
+ * @title: (nullable): Title of the native
+ * @parent: (nullable): Transient parent of the native
* @action: Open or save mode for the dialog
* @accept_label: (nullable): text to go in the accept button, or %NULL for the default
* @cancel_label: (nullable): text to go in the cancel button, or %NULL for the default
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 1d9e8929b2..ed933fd030 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -473,9 +473,7 @@ gtk_file_filter_set_name (GtkFileFilter *filter,
*
* See [method@Gtk.FileFilter.set_name].
*
- * Returns: (nullable): The human-readable name of the filter,
- * or %NULL. This value is owned by GTK and must not
- * be modified or freed.
+ * Returns: (nullable): The human-readable name of the filter
*/
const char *
gtk_file_filter_get_name (GtkFileFilter *filter)
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 6477021881..73e6b3afe0 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -1662,7 +1662,7 @@ _gtk_file_system_model_get_file (GtkFileSystemModel *model,
*
* Returns: a pointer to the actual value as stored in @model or %NULL
* if no value available yet
- **/
+ */
const GValue *
_gtk_file_system_model_get_value (GtkFileSystemModel *model,
GtkTreeIter * iter,
diff --git a/gtk/gtkfilterlistmodel.c b/gtk/gtkfilterlistmodel.c
index 0b06f8f4e5..06498b31bd 100644
--- a/gtk/gtkfilterlistmodel.c
+++ b/gtk/gtkfilterlistmodel.c
@@ -610,8 +610,8 @@ gtk_filter_list_model_init (GtkFilterListModel *self)
/**
* gtk_filter_list_model_new:
- * @model: (nullable) (transfer full): the model to sort, or %NULL
- * @filter: (nullable) (transfer full): filter or %NULL to not filter items
+ * @model: (nullable) (transfer full): the model to sort
+ * @filter: (nullable) (transfer full): filter
*
* Creates a new `GtkFilterListModel` that will filter @model using the given
* @filter.
@@ -642,7 +642,7 @@ gtk_filter_list_model_new (GListModel *model,
/**
* gtk_filter_list_model_set_filter: (attributes org.gtk.Method.set_property=filter)
* @self: a `GtkFilterListModel`
- * @filter: (nullable) (transfer none): filter to use or %NULL to not filter items
+ * @filter: (nullable) (transfer none): filter to use
*
* Sets the filter used to filter items.
**/
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index ae12abeb14..2231bdd780 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -273,7 +273,7 @@ gtk_fixed_get_child_position (GtkFixed *fixed,
* gtk_fixed_set_child_transform:
* @fixed: a `GtkFixed`
* @widget: a `GtkWidget`, child of @fixed
- * @transform: (nullable): the transformation assigned to @widget or %NULL
+ * @transform: (nullable): the transformation assigned to @widget
* to reset @widget's transform
*
* Sets the transformation for @widget.
@@ -306,8 +306,7 @@ gtk_fixed_set_child_transform (GtkFixed *fixed,
* Retrieves the transformation for @widget set using
* gtk_fixed_set_child_transform().
*
- * Returns: (transfer none) (nullable): a `GskTransform` or %NULL
- * in case no transform has been set on @widget
+ * Returns: (transfer none) (nullable): a `GskTransform`
*/
GskTransform *
gtk_fixed_get_child_transform (GtkFixed *fixed,
diff --git a/gtk/gtkflattenlistmodel.c b/gtk/gtkflattenlistmodel.c
index 6d7974d4e6..23b26a35f4 100644
--- a/gtk/gtkflattenlistmodel.c
+++ b/gtk/gtkflattenlistmodel.c
@@ -447,7 +447,7 @@ gtk_flatten_list_model_new (GListModel *model)
/**
* gtk_flatten_list_model_set_model: (attributes org.gtk.Method.set_property=model)
* @self: a `GtkFlattenListModel`
- * @model: (nullable) (transfer none): the new model or %NULL
+ * @model: (nullable) (transfer none): the new model
*
* Sets a new model to be flattened.
*/
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 81736af59a..3b01659d28 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -181,8 +181,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
* If the selected font is not installed, returns %NULL.
*
* Returns: (nullable) (transfer none): A `PangoFontFamily` representing the
- * selected font family, or %NULL. The returned object is owned by @fontchooser
- * and must not be modified or freed.
+ * selected font family
*/
PangoFontFamily *
gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser)
@@ -202,8 +201,7 @@ gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser)
* If the selected font is not installed, returns %NULL.
*
* Returns: (nullable) (transfer none): A `PangoFontFace` representing the
- * selected font group details, or %NULL. The returned object is owned by
- * @fontchooser and must not be modified or freed.
+ * selected font group details
*/
PangoFontFace *
gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser)
@@ -246,8 +244,7 @@ gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser)
* font descriptions.
*
* Returns: (nullable) (transfer full): A string with the name
- * of the current font, or %NULL if no font is selected. You must
- * free this string with g_free().
+ * of the current font
*/
char *
gtk_font_chooser_get_font (GtkFontChooser *fontchooser)
@@ -295,7 +292,7 @@ gtk_font_chooser_set_font (GtkFontChooser *fontchooser,
* font descriptions.
*
* Returns: (nullable) (transfer full): A `PangoFontDescription` for the
- * current font, or %NULL if no font is selected.
+ * current font
*/
PangoFontDescription *
gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser)
@@ -405,7 +402,7 @@ gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
/**
* gtk_font_chooser_set_filter_func:
* @fontchooser: a `GtkFontChooser`
- * @filter: (nullable): a `GtkFontFilterFunc`, or %NULL
+ * @filter: (nullable): a `GtkFontFilterFunc`
* @user_data: (closure): data to pass to @filter
* @destroy: function to call to free @data when it is no longer needed
*
@@ -484,7 +481,7 @@ gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser,
* Gets the custom font map of this font chooser widget,
* or %NULL if it does not have one.
*
- * Returns: (nullable) (transfer full): a `PangoFontMap`, or %NULL
+ * Returns: (nullable) (transfer full): a `PangoFontMap`
*/
PangoFontMap *
gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser)
diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
index 9e703976b5..e731df8e45 100644
--- a/gtk/gtkfontchooserdialog.c
+++ b/gtk/gtkfontchooserdialog.c
@@ -281,8 +281,8 @@ gtk_font_chooser_dialog_init (GtkFontChooserDialog *dialog)
/**
* gtk_font_chooser_dialog_new:
- * @title: (nullable): Title of the dialog, or %NULL
- * @parent: (nullable): Transient parent of the dialog, or %NULL
+ * @title: (nullable): Title of the dialog
+ * @parent: (nullable): Transient parent of the dialog
*
* Creates a new `GtkFontChooserDialog`.
*
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 2c1542c9e2..428ca8be73 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -448,8 +448,7 @@ gtk_frame_set_label_widget (GtkFrame *frame,
*
* Retrieves the label widget for the frame.
*
- * Returns: (nullable) (transfer none): the label widget, or %NULL if
- * there is none.
+ * Returns: (nullable) (transfer none): the label widget
*/
GtkWidget *
gtk_frame_get_label_widget (GtkFrame *frame)
diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index caf1bd9f21..2dc5b3756c 100644
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -919,7 +919,7 @@ gtk_gesture_init (GtkGesture *gesture)
*
* This returns %NULL if the gesture is not being interacted.
*
- * Returns: (nullable) (transfer none): a `GdkDevice`, or %NULL
+ * Returns: (nullable) (transfer none): a `GdkDevice`
*/
GdkDevice *
gtk_gesture_get_device (GtkGesture *gesture)
@@ -1450,7 +1450,7 @@ _gtk_gesture_check (GtkGesture *gesture)
/**
* gtk_gesture_handles_sequence:
* @gesture: a `GtkGesture`
- * @sequence: (nullable): a `GdkEventSequence` or %NULL
+ * @sequence: (nullable): a `GdkEventSequence`
*
* Returns %TRUE if @gesture is currently handling events
* corresponding to @sequence.
diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
index 9c808e8f6a..8782ff7e8a 100644
--- a/gtk/gtkglarea.c
+++ b/gtk/gtkglarea.c
@@ -1019,7 +1019,7 @@ gtk_gl_area_set_error (GtkGLArea *area,
*
* Gets the current error set on the @area.
*
- * Returns: (nullable) (transfer none): the #GError or %NULL
+ * Returns: (nullable) (transfer none): the #GError
*/
GError *
gtk_gl_area_get_error (GtkGLArea *area)
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 25374f178b..9e86a58a62 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -682,7 +682,7 @@ gtk_grid_attach_next_to (GtkGrid *grid,
* Gets the child of @grid whose area covers the grid
* cell at @column, @row.
*
- * Returns: (transfer none) (nullable): the child at the given position, or %NULL
+ * Returns: (transfer none) (nullable): the child at the given position
*/
GtkWidget *
gtk_grid_get_child_at (GtkGrid *grid,
diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c
index fe7ad3a1e9..c6cefbb10e 100644
--- a/gtk/gtkgridview.c
+++ b/gtk/gtkgridview.c
@@ -214,7 +214,7 @@ cell_augment (GtkRbTree *tree,
* In particular that means that for an empty grid, %NULL is returned
* for any value.
*
- * Returns: (nullable): The first cell at offset y or %NULL if none
+ * Returns: (nullable): The first cell at offset y
**/
static Cell *
gtk_grid_view_get_cell_at_y (GtkGridView *self,
@@ -1185,8 +1185,8 @@ gtk_grid_view_init (GtkGridView *self)
/**
* gtk_grid_view_new:
- * @model: (nullable) (transfer full): the model to use, or %NULL
- * @factory: (nullable) (transfer full): The factory to populate items with, or %NULL
+ * @model: (nullable) (transfer full): the model to use
+ * @factory: (nullable) (transfer full): The factory to populate items with
*
* Creates a new `GtkGridView` that uses the given @factory for
* mapping items to widgets.
@@ -1240,7 +1240,7 @@ gtk_grid_view_get_model (GtkGridView *self)
/**
* gtk_grid_view_set_model: (attributes org.gtk.Method.set_property=model)
* @self: a `GtkGridView`
- * @model: (nullable) (transfer none): the model to use or %NULL for none
+ * @model: (nullable) (transfer none): the model to use
*
* Sets the imodel to use.
*
@@ -1282,7 +1282,7 @@ gtk_grid_view_get_factory (GtkGridView *self)
/**
* gtk_grid_view_set_factory: (attributes org.gtk.Method.set_property=factory)
* @self: a `GtkGridView`
- * @factory: (nullable) (transfer none): the factory to use or %NULL for none
+ * @factory: (nullable) (transfer none): the factory to use
*
* Sets the `GtkListItemFactory` to use for populating list items.
*/
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index abba4d4d1d..12f24ee1c0 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -338,8 +338,7 @@ gtk_header_bar_set_title_widget (GtkHeaderBar *bar,
*
* See [method@Gtk.HeaderBar.set_title_widget].
*
- * Returns: (nullable) (transfer none): the title widget
- * of the header, or %NULL if none has been set explicitly.
+ * Returns: (nullable) (transfer none): the title widget of the header
*/
GtkWidget *
gtk_header_bar_get_title_widget (GtkHeaderBar *bar)
@@ -769,8 +768,7 @@ gtk_header_bar_set_show_title_buttons (GtkHeaderBar *bar,
/**
* gtk_header_bar_set_decoration_layout: (attributes org.gtk.Method.set_property=decoration-layout)
* @bar: a `GtkHeaderBar`
- * @layout: (nullable): a decoration layout, or %NULL to
- * unset the layout
+ * @layout: (nullable): a decoration layout, or %NULL to unset the layout
*
* Sets the decoration layout for this header bar.
*
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 26ff0d52b4..3e03c231b1 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1484,8 +1484,7 @@ gtk_icon_theme_set_search_path (GtkIconTheme *self,
* See [method@Gtk.IconTheme.set_search_path].
*
* Returns: (transfer full) (array zero-terminated=1) (element-type filename) (nullable):
- * a list of icon theme path directories or %NULL.
- * The returned value should be freed with g_strfreev().
+ * a list of icon theme path directories
*/
char **
gtk_icon_theme_get_search_path (GtkIconTheme *self)
@@ -1581,8 +1580,7 @@ gtk_icon_theme_set_resource_path (GtkIconTheme *self,
* See [method@Gtk.IconTheme.set_resource_path].
*
* Returns: (transfer full) (array zero-terminated=1) (element-type utf8) (nullable):
- * A list of resource paths or %NULL.
- * The returned value should be freed with g_strfreev().
+ * A list of resource paths
*/
char **
gtk_icon_theme_get_resource_path (GtkIconTheme *self)
@@ -3679,8 +3677,7 @@ new_resource_file (const char *filename)
*
* Returns %NULL if the icon was not loaded from a file.
*
- * Returns: (nullable) (transfer full): the #GFile for the icon, or %NULL.
- * Free with g_object_unref().
+ * Returns: (nullable) (transfer full): the #GFile for the icon
*/
GFile *
gtk_icon_paintable_get_file (GtkIconPaintable *icon)
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index fa26588e8f..095c19a271 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1955,7 +1955,7 @@ gtk_icon_view_remove_editable (GtkCellArea *area,
* gtk_icon_view_set_cursor:
* @icon_view: A #GtkIconView
* @path: A #GtkTreePath
- * @cell: (nullable): One of the cell renderers of @icon_view, or %NULL
+ * @cell: (nullable): One of the cell renderers of @icon_view
* @start_editing: %TRUE if the specified cell should start being edited.
*
* Sets the current keyboard focus to be at @path, and selects it. This is
@@ -4110,9 +4110,9 @@ gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
* @icon_view: A #GtkIconView.
* @x: The x position to be identified
* @y: The y position to be identified
- * @path: (out) (optional): Return location for the path, or %NULL
+ * @path: (out) (optional): Return location for the path
* @cell: (out) (optional) (transfer none): Return location for the renderer
- * responsible for the cell at (@x, @y), or %NULL
+ * responsible for the cell at (@x, @y)
*
* Gets the path and cell for the icon at the given position.
*
@@ -4150,7 +4150,7 @@ gtk_icon_view_get_item_at_pos (GtkIconView *icon_view,
* gtk_icon_view_get_cell_rect:
* @icon_view: a #GtkIconView
* @path: a #GtkTreePath
- * @cell: (nullable): a #GtkCellRenderer or %NULL
+ * @cell: (nullable): a #GtkCellRenderer
* @rect: (out): rectangle to fill with cell rect
*
* Fills the bounding rectangle in widget coordinates for the cell specified by
@@ -4225,7 +4225,7 @@ gtk_icon_view_set_tooltip_item (GtkIconView *icon_view,
* @icon_view: a #GtkIconView
* @tooltip: a #GtkTooltip
* @path: a #GtkTreePath
- * @cell: (nullable): a #GtkCellRenderer or %NULL
+ * @cell: (nullable): a #GtkCellRenderer
*
* Sets the tip area of @tooltip to the area which @cell occupies in
* the item pointed to by @path. See also gtk_tooltip_set_tip_area().
@@ -6368,7 +6368,7 @@ gtk_icon_view_unset_model_drag_dest (GtkIconView *icon_view)
/**
* gtk_icon_view_set_drag_dest_item:
* @icon_view: a #GtkIconView
- * @path: (nullable): The path of the item to highlight, or %NULL.
+ * @path: (nullable): The path of the item to highlight
* @pos: Specifies where to drop, relative to the item
*
* Sets the item that is highlighted for feedback.
@@ -6455,9 +6455,8 @@ gtk_icon_view_get_drag_dest_item (GtkIconView *icon_view,
* @icon_view: a #GtkIconView
* @drag_x: the position to determine the destination item for
* @drag_y: the position to determine the destination item for
- * @path: (out) (optional): Return location for the path of the item,
- * or %NULL.
- * @pos: (out) (optional): Return location for the drop position, or %NULL
+ * @path: (out) (optional): Return location for the path of the item
+ * @pos: (out) (optional): Return location for the drop position
*
* Determines the destination item for a given position.
*
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 016bdc3b86..6f82934e0c 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -477,7 +477,7 @@ gtk_image_new_from_resource (const char *resource_path)
/**
* gtk_image_new_from_pixbuf:
- * @pixbuf: (nullable): a `GdkPixbuf`, or %NULL
+ * @pixbuf: (nullable): a `GdkPixbuf`
*
* Creates a new `GtkImage` displaying @pixbuf.
*
@@ -508,7 +508,7 @@ gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf)
/**
* gtk_image_new_from_paintable:
- * @paintable: (nullable): a `GdkPaintable`, or %NULL
+ * @paintable: (nullable): a `GdkPaintable`
*
* Creates a new `GtkImage` displaying @paintable.
*
@@ -535,7 +535,7 @@ gtk_image_new_from_paintable (GdkPaintable *paintable)
/**
* gtk_image_new_from_icon_name:
- * @icon_name: (nullable): an icon name or %NULL
+ * @icon_name: (nullable): an icon name
*
* Creates a `GtkImage` displaying an icon from the current icon theme.
*
@@ -584,7 +584,7 @@ gtk_image_new_from_gicon (GIcon *icon)
/**
* gtk_image_set_from_file: (attributes org.gtk.Method.set_property=file)
* @image: a `GtkImage`
- * @filename: (type filename) (nullable): a filename or %NULL
+ * @filename: (type filename) (nullable): a filename
*
* Sets a `GtkImage` to show a file.
*
@@ -662,7 +662,7 @@ out:
/**
* gtk_image_set_from_resource: (attributes org.gtk.Method.set_property=resource)
* @image: a `GtkImage`
- * @resource_path: (nullable): a resource path or %NULL
+ * @resource_path: (nullable): a resource path
*
* Sets a `GtkImage` to show a resource.
*
@@ -753,7 +753,7 @@ gtk_image_set_from_pixbuf (GtkImage *image,
/**
* gtk_image_set_from_icon_name: (attributes org.gtk.Method.set_property=icon-name)
* @image: a `GtkImage`
- * @icon_name: (nullable): an icon name or %NULL
+ * @icon_name: (nullable): an icon name
*
* Sets a `GtkImage` to show a named icon.
*
@@ -827,7 +827,7 @@ gtk_image_paintable_invalidate_size (GdkPaintable *paintable,
/**
* gtk_image_set_from_paintable: (attributes org.gtk.Method.set_property=paintable)
* @image: a `GtkImage`
- * @paintable: (nullable): a `GdkPaintable` or %NULL
+ * @paintable: (nullable): a `GdkPaintable`
*
* Sets a `GtkImage` to show a `GdkPaintable`.
*
@@ -903,8 +903,7 @@ gtk_image_get_storage_type (GtkImage *image)
* The caller of this function does not own a reference to the
* returned paintable.
*
- * Returns: (nullable) (transfer none): the displayed paintable,
- * or %NULL if the image is empty
+ * Returns: (nullable) (transfer none): the displayed paintable
*/
GdkPaintable *
gtk_image_get_paintable (GtkImage *image)
@@ -925,7 +924,7 @@ gtk_image_get_paintable (GtkImage *image)
* The returned string is owned by the `GtkImage` and should not
* be freed.
*
- * Returns: (transfer none) (nullable): the icon name, or %NULL
+ * Returns: (transfer none) (nullable): the icon name
*/
const char *
gtk_image_get_icon_name (GtkImage *image)
@@ -946,7 +945,7 @@ gtk_image_get_icon_name (GtkImage *image)
* The caller of this function does not own a reference to the
* returned `GIcon`.
*
- * Returns: (transfer none) (nullable): a `GIcon`, or %NULL
+ * Returns: (transfer none) (nullable): a `GIcon`
**/
GIcon *
gtk_image_get_gicon (GtkImage *image)
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 82061f77c6..0389ba5e0c 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -702,7 +702,7 @@ gtk_info_bar_new (void)
/**
* gtk_info_bar_new_with_buttons:
- * @first_button_text: (nullable): ext to go in first button, or %NULL
+ * @first_button_text: (nullable): ext to go in first button
* @...: response ID for first button, then additional buttons, ending
* with %NULL
*
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 68148491c0..8e1570b47e 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3043,7 +3043,7 @@ gtk_label_set_text (GtkLabel *self,
/**
* gtk_label_set_attributes: (attributes org.gtk.Method.set_property=attributes)
* @self: a `GtkLabel`
- * @attrs: (nullable): a [struct@Pango.AttrList], or %NULL
+ * @attrs: (nullable): a [struct@Pango.AttrList]
*
* Apply attributes to the label text.
*
@@ -3089,8 +3089,7 @@ gtk_label_set_attributes (GtkLabel *self,
* attributes for the label, use
* `pango_layout_get_attribute (gtk_label_get_layout (self))`.
*
- * Returns: (nullable) (transfer none): the attribute list, or %NULL
- * if none was set.
+ * Returns: (nullable) (transfer none): the attribute list
*/
PangoAttrList *
gtk_label_get_attributes (GtkLabel *self)
@@ -5011,8 +5010,8 @@ gtk_label_get_layout (GtkLabel *self)
/**
* gtk_label_get_layout_offsets:
* @self: a `GtkLabel`
- * @x: (out) (optional): location to store X offset of layout, or %NULL
- * @y: (out) (optional): location to store Y offset of layout, or %NULL
+ * @x: (out) (optional): location to store X offset of layout
+ * @y: (out) (optional): location to store Y offset of layout
*
* Obtains the coordinates where the label will draw its `PangoLayout`.
*
@@ -5549,8 +5548,7 @@ gtk_label_do_popup (GtkLabel *self,
* This function is intended for use in a [signal@Gtk.Label::activate-link]
* handler or for use in a [signal@Gtk.Widget::query-tooltip] handler.
*
- * Returns: (nullable): the currently active URI or %NULL if there is none.
- * The string is owned by GTK and must not be freed or modified.
+ * Returns: (nullable): the currently active URI
*/
const char *
gtk_label_get_current_uri (GtkLabel *self)
diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index 0a0992f0b4..4513892e32 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -760,7 +760,7 @@ gtk_list_box_init (GtkListBox *box)
* case you should use [method@Gtk.ListBox.selected_foreach] to
* find all selected rows.
*
- * Returns: (transfer none) (nullable): the selected row or %NULL
+ * Returns: (transfer none) (nullable): the selected row
*/
GtkListBoxRow *
gtk_list_box_get_selected_row (GtkListBox *box)
@@ -780,7 +780,7 @@ gtk_list_box_get_selected_row (GtkListBox *box)
* If @index_ is negative or larger than the number of items in the
* list, %NULL is returned.
*
- * Returns: (transfer none) (nullable): the child `GtkWidget` or %NULL
+ * Returns: (transfer none) (nullable): the child `GtkWidget`
*/
GtkListBoxRow *
gtk_list_box_get_row_at_index (GtkListBox *box,
@@ -821,8 +821,7 @@ row_y_cmp_func (gconstpointer a,
*
* Gets the row at the @y position.
*
- * Returns: (transfer none) (nullable): the row or %NULL
- * in case no row exists for the given y coordinate.
+ * Returns: (transfer none) (nullable): the row
*/
GtkListBoxRow *
gtk_list_box_get_row_at_y (GtkListBox *box,
@@ -846,7 +845,7 @@ gtk_list_box_get_row_at_y (GtkListBox *box,
/**
* gtk_list_box_select_row:
* @box: a `GtkListBox`
- * @row: (nullable): The row to select or %NULL
+ * @row: (nullable): The row to select
*
* Make @row the currently selected row.
*/
@@ -1014,7 +1013,7 @@ gtk_list_box_get_selected_rows (GtkListBox *box)
/**
* gtk_list_box_set_placeholder:
* @box: a `GtkListBox`
- * @placeholder: (nullable): a #GtkWidget or %NULL
+ * @placeholder: (nullable): a #GtkWidget
*
* Sets the placeholder widget that is shown in the list when
* it doesn't display any visible children.
@@ -1045,7 +1044,7 @@ gtk_list_box_set_placeholder (GtkListBox *box,
/**
* gtk_list_box_set_adjustment:
* @box: a `GtkListBox`
- * @adjustment: (nullable): the adjustment, or %NULL
+ * @adjustment: (nullable): the adjustment
*
* Sets the adjustment (if any) that the widget uses to
* for vertical scrolling.
@@ -3154,7 +3153,7 @@ gtk_list_box_row_changed (GtkListBoxRow *row)
* there is a header set already, and if so to update
* the state of it.
*
- * Returns: (transfer none) (nullable): the current header, or %NULL if none
+ * Returns: (transfer none) (nullable): the current header
*/
GtkWidget *
gtk_list_box_row_get_header (GtkListBoxRow *row)
@@ -3167,7 +3166,7 @@ gtk_list_box_row_get_header (GtkListBoxRow *row)
/**
* gtk_list_box_row_set_header:
* @row: a `GtkListBoxRow`
- * @header: (nullable): the header, or %NULL
+ * @header: (nullable): the header
*
* Sets the current header of the @row.
*
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 5b64bfefe5..32af78e5e2 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1284,7 +1284,7 @@ gtk_list_store_insert (GtkListStore *list_store,
* gtk_list_store_insert_before:
* @list_store: A #GtkListStore
* @iter: (out): An unset #GtkTreeIter to set to the new row
- * @sibling: (nullable): A valid #GtkTreeIter, or %NULL
+ * @sibling: (nullable): A valid #GtkTreeIter
*
* Inserts a new row before @sibling. If @sibling is %NULL, then the row will
* be appended to the end of the list. @iter will be changed to point to this
@@ -1320,7 +1320,7 @@ gtk_list_store_insert_before (GtkListStore *list_store,
* gtk_list_store_insert_after:
* @list_store: A #GtkListStore
* @iter: (out): An unset #GtkTreeIter to set to the new row
- * @sibling: (nullable): A valid #GtkTreeIter, or %NULL
+ * @sibling: (nullable): A valid #GtkTreeIter
*
* Inserts a new row after @sibling. If @sibling is %NULL, then the row will be
* prepended to the beginning of the list. @iter will be changed to point to
@@ -1840,7 +1840,7 @@ gtk_list_store_move_to (GtkListStore *store,
* gtk_list_store_move_before:
* @store: A #GtkListStore.
* @iter: A #GtkTreeIter.
- * @position: (nullable): A #GtkTreeIter, or %NULL.
+ * @position: (nullable): A #GtkTreeIter
*
* Moves @iter in @store to the position before @position. Note that this
* function only works with unsorted stores. If @position is %NULL, @iter
@@ -1871,7 +1871,7 @@ gtk_list_store_move_before (GtkListStore *store,
* gtk_list_store_move_after:
* @store: A #GtkListStore.
* @iter: A #GtkTreeIter.
- * @position: (nullable): A #GtkTreeIter or %NULL.
+ * @position: (nullable): A #GtkTreeIter
*
* Moves @iter in @store to the position after @position. Note that this
* function only works with unsorted stores. If @position is %NULL, @iter
diff --git a/gtk/gtklistview.c b/gtk/gtklistview.c
index 94797953cf..1868bdc36e 100644
--- a/gtk/gtklistview.c
+++ b/gtk/gtklistview.c
@@ -926,8 +926,8 @@ gtk_list_view_init (GtkListView *self)
/**
* gtk_list_view_new:
- * @model: (nullable) (transfer full): the model to use, or %NULL
- * @factory: (nullable) (transfer full): The factory to populate items with, or %NULL
+ * @model: (nullable) (transfer full): the model to use
+ * @factory: (nullable) (transfer full): The factory to populate items with
*
* Creates a new `GtkListView` that uses the given @factory for
* mapping items to widgets.
@@ -981,7 +981,7 @@ gtk_list_view_get_model (GtkListView *self)
/**
* gtk_list_view_set_model: (attributes org.gtk.Method.set_property=model)
* @self: a `GtkListView`
- * @model: (nullable) (transfer none): the model to use or %NULL for none
+ * @model: (nullable) (transfer none): the model to use
*
* Sets the model to use.
*
@@ -1023,7 +1023,7 @@ gtk_list_view_get_factory (GtkListView *self)
/**
* gtk_list_view_set_factory: (attributes org.gtk.Method.set_property=factory)
* @self: a `GtkListView`
- * @factory: (nullable) (transfer none): the factory to use or %NULL for none
+ * @factory: (nullable) (transfer none): the factory to use
*
* Sets the `GtkListItemFactory` to use for populating list items.
*/
diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c
index 015c0e9f88..5862e866d8 100644
--- a/gtk/gtklockbutton.c
+++ b/gtk/gtklockbutton.c
@@ -548,7 +548,7 @@ gtk_lock_button_get_permission (GtkLockButton *button)
/**
* gtk_lock_button_set_permission: (attributes org.gtk.Method.set_property=permission)
* @button: a `GtkLockButton`
- * @permission: (nullable): a `GPermission` object, or %NULL
+ * @permission: (nullable): a `GPermission` object
*
* Sets the `GPermission` object that controls @button.
*/
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index cf0e347956..6ea63ab6d3 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1789,7 +1789,7 @@ gtk_get_current_event_time (void)
* originally.
*
* Returns: (transfer none) (nullable): the widget that originally
- * received @event, or %NULL
+ * received @event
*/
GtkWidget *
gtk_get_event_widget (GdkEvent *event)
diff --git a/gtk/gtkmaplistmodel.c b/gtk/gtkmaplistmodel.c
index 553a53ee9d..72dea55616 100644
--- a/gtk/gtkmaplistmodel.c
+++ b/gtk/gtkmaplistmodel.c
@@ -410,8 +410,8 @@ gtk_map_list_model_augment (GtkRbTree *map,
/**
* gtk_map_list_model_new:
- * @model: (transfer full) (nullable): The model to map or %NULL for none
- * @map_func: (nullable): map function or %NULL to not map items
+ * @model: (transfer full) (nullable): The model to map
+ * @map_func: (nullable): map function
* @user_data: (closure): user data passed to @map_func
* @user_destroy: destroy notifier for @user_data
*
@@ -488,7 +488,7 @@ gtk_map_list_model_init_items (GtkMapListModel *self)
/**
* gtk_map_list_model_set_map_func:
* @self: a `GtkMapListModel`
- * @map_func: (nullable): map function or %NULL to not map items
+ * @map_func: (nullable): map function
* @user_data: (closure): user data passed to @map_func
* @user_destroy: destroy notifier for @user_data
*
diff --git a/gtk/gtkmediacontrols.c b/gtk/gtkmediacontrols.c
index 86b0dbf7f6..8fd3329296 100644
--- a/gtk/gtkmediacontrols.c
+++ b/gtk/gtkmediacontrols.c
@@ -480,7 +480,7 @@ gtk_media_controls_notify_cb (GtkMediaStream *stream,
/**
* gtk_media_controls_set_media_stream: (attributes org.gtk.Method.set_property=media-stream)
* @controls: a `GtkMediaControls` widget
- * @stream: (nullable): a `GtkMediaStream`, or %NULL
+ * @stream: (nullable): a `GtkMediaStream`
*
* Sets the stream that is controlled by @controls.
*/
diff --git a/gtk/gtkmediafile.c b/gtk/gtkmediafile.c
index 8c64e221fa..079e1b367d 100644
--- a/gtk/gtkmediafile.c
+++ b/gtk/gtkmediafile.c
@@ -534,7 +534,6 @@ gtk_media_file_set_file (GtkMediaFile *self,
* %NULL is returned.
*
* Returns: (nullable) (transfer none): The currently playing file
- * or %NULL if not playing from a file.
*/
GFile *
gtk_media_file_get_file (GtkMediaFile *self)
@@ -594,8 +593,7 @@ gtk_media_file_set_input_stream (GtkMediaFile *self,
* When @self is not playing or not playing from a stream,
* %NULL is returned.
*
- * Returns: (nullable) (transfer none): The currently playing
- * stream or %NULL if not playing from a stream.
+ * Returns: (nullable) (transfer none): The currently playing stream
*/
GInputStream *
gtk_media_file_get_input_stream (GtkMediaFile *self)
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 6024068c2d..2566c7cb00 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -600,7 +600,7 @@ gtk_menu_button_set_menu_model (GtkMenuButton *menu_button,
*
* Returns the `GMenuModel` used to generate the popup.
*
- * Returns: (nullable) (transfer none): a `GMenuModel` or %NULL
+ * Returns: (nullable) (transfer none): a `GMenuModel`
*/
GMenuModel *
gtk_menu_button_get_menu_model (GtkMenuButton *menu_button)
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 1ff504dcf6..463d14b3a9 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -478,11 +478,11 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
/**
* gtk_message_dialog_new:
- * @parent: (nullable): transient parent, or %NULL for none
+ * @parent: (nullable): transient parent
* @flags: flags
* @type: type of message
* @buttons: set of buttons to use
- * @message_format: (nullable): printf()-style format string, or %NULL
+ * @message_format: (nullable): printf()-style format string
* @...: arguments for @message_format
*
* Creates a new message dialog.
@@ -542,11 +542,11 @@ gtk_message_dialog_new (GtkWindow *parent,
/**
* gtk_message_dialog_new_with_markup:
- * @parent: (nullable): transient parent, or %NULL for none
+ * @parent: (nullable): transient parent
* @flags: flags
* @type: type of message
* @buttons: set of buttons to use
- * @message_format: (nullable): printf()-style format string, or %NULL
+ * @message_format: (nullable): printf()-style format string
* @...: arguments for @message_format
*
* Creates a new message dialog.
@@ -632,7 +632,7 @@ gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog,
/**
* gtk_message_dialog_format_secondary_text:
* @message_dialog: a `GtkMessageDialog`
- * @message_format: (nullable): printf()-style format string, or %NULL
+ * @message_format: (nullable): printf()-style format string
* @...: arguments for @message_format
*
* Sets the secondary text of the message dialog.
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 7ea76bb56d..baa4f785e5 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -1790,7 +1790,7 @@ gtk_mount_operation_aborted (GMountOperation *op)
/**
* gtk_mount_operation_new:
- * @parent: (nullable): transient parent of the window, or %NULL
+ * @parent: (nullable): transient parent of the window
*
* Creates a new `GtkMountOperation`.
*
@@ -1827,7 +1827,7 @@ gtk_mount_operation_is_showing (GtkMountOperation *op)
/**
* gtk_mount_operation_set_parent: (attributes org.gtk.Method.set_property=parent)
* @op: a `GtkMountOperation`
- * @parent: (nullable): transient parent of the window, or %NULL
+ * @parent: (nullable): transient parent of the window
*
* Sets the transient parent for windows shown by the
* `GtkMountOperation`.
diff --git a/gtk/gtkmultiselection.c b/gtk/gtkmultiselection.c
index 04ee89d7f5..26590ec55f 100644
--- a/gtk/gtkmultiselection.c
+++ b/gtk/gtkmultiselection.c
@@ -367,7 +367,7 @@ gtk_multi_selection_init (GtkMultiSelection *self)
/**
* gtk_multi_selection_new:
- * @model: (nullable) (transfer full): the `GListModel` to manage, or %NULL
+ * @model: (nullable) (transfer full): the `GListModel` to manage
*
* Creates a new selection to handle @model.
*
diff --git a/gtk/gtknativedialog.c b/gtk/gtknativedialog.c
index 308d6fe460..1c687e0753 100644
--- a/gtk/gtknativedialog.c
+++ b/gtk/gtknativedialog.c
@@ -501,7 +501,7 @@ parent_destroyed (GtkWidget *parent,
/**
* gtk_native_dialog_set_transient_for: (attributes org.gtk.Method.set_property=transient-for)
* @self: a `GtkNativeDialog`
- * @parent: (nullable): parent window, or %NULL
+ * @parent: (nullable): parent window
*
* Dialog windows should be set transient for the main application
* window they were spawned from.
diff --git a/gtk/gtknoselection.c b/gtk/gtknoselection.c
index 2184ea275a..7727ccc00b 100644
--- a/gtk/gtknoselection.c
+++ b/gtk/gtknoselection.c
@@ -213,7 +213,7 @@ gtk_no_selection_init (GtkNoSelection *self)
/**
* gtk_no_selection_new:
- * @model: (nullable) (transfer full): the `GListModel` to manage, or %NULL
+ * @model: (nullable) (transfer full): the `GListModel` to manage
*
* Creates a new selection to handle @model.
*
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 7cd69ca87a..d62c38f2aa 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1376,8 +1376,8 @@ gtk_notebook_class_init (GtkNotebookClass *class)
* necessary properties to the notebook (e.g. the
* `GtkNotebook`:group-name ).
*
- * Returns: (transfer none): a `GtkNotebook` that @page should be
- * added to, or %NULL.
+ * Returns: (nullable) (transfer none): a `GtkNotebook` that
+ * @page should be added to
*/
notebook_signals[CREATE_WINDOW] =
g_signal_new (I_("create-window"),
diff --git a/gtk/gtknumericsorter.c b/gtk/gtknumericsorter.c
index 688bb38614..bc1227b343 100644
--- a/gtk/gtknumericsorter.c
+++ b/gtk/gtknumericsorter.c
@@ -607,7 +607,7 @@ gtk_numeric_sorter_new (GtkExpression *expression)
*
* Gets the expression that is evaluated to obtain numbers from items.
*
- * Returns: (transfer none) (nullable): a `GtkExpression`, or %NULL
+ * Returns: (transfer none) (nullable): a `GtkExpression`
*/
GtkExpression *
gtk_numeric_sorter_get_expression (GtkNumericSorter *self)
@@ -620,7 +620,7 @@ gtk_numeric_sorter_get_expression (GtkNumericSorter *self)
/**
* gtk_numeric_sorter_set_expression: (attributes org.gtk.Method.set_property=expression)
* @self: a `GtkNumericSorter`
- * @expression: (nullable) (transfer none): a `GtkExpression`, or %NULL
+ * @expression: (nullable) (transfer none): a `GtkExpression`
*
* Sets the expression that is evaluated to obtain numbers from items.
*
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index 18d1c4c4b3..d106edab9a 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -491,7 +491,7 @@ gtk_page_setup_get_page_height (GtkPageSetup *setup,
* gtk_page_setup_load_file:
* @setup: a `GtkPageSetup`
* @file_name: (type filename): the filename to read the page setup from
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Reads the page setup from the file @file_name.
*
@@ -524,7 +524,7 @@ gtk_page_setup_load_file (GtkPageSetup *setup,
/**
* gtk_page_setup_new_from_file:
* @file_name: (type filename): the filename to read the page setup from
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Reads the page setup from the file @file_name.
*
@@ -574,9 +574,9 @@ string_to_enum (GType type,
* gtk_page_setup_load_key_file:
* @setup: a `GtkPageSetup`
* @key_file: the `GKeyFile` to retrieve the page_setup from
- * @group_name: (nullable): the name of the group in the key_file to read, or %NULL
+ * @group_name: (nullable): the name of the group in the key_file to read
* to use the default name “Page Setup”
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Reads the page setup from the group @group_name in the key file
* @key_file.
@@ -660,9 +660,9 @@ out:
/**
* gtk_page_setup_new_from_key_file:
* @key_file: the `GKeyFile` to retrieve the page_setup from
- * @group_name: (nullable): the name of the group in the key_file to read, or %NULL
+ * @group_name: (nullable): the name of the group in the key_file to read
* to use the default name “Page Setup”
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Reads the page setup from the group @group_name in the key file
* @key_file.
@@ -692,7 +692,7 @@ gtk_page_setup_new_from_key_file (GKeyFile *key_file,
* gtk_page_setup_to_file:
* @setup: a `GtkPageSetup`
* @file_name: (type filename): the file to save to
- * @error: (nullable): return location for errors, or %NULL
+ * @error: (nullable): return location for errors
*
* This function saves the information from @setup to @file_name.
*
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 593be8d678..7bb9ed305f 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -767,8 +767,8 @@ paper_size_changed (GtkDropDown *combo_box,
/**
* gtk_page_setup_unix_dialog_new:
- * @title: (nullable): the title of the dialog, or %NULL
- * @parent: (nullable): transient parent of the dialog, or %NULL
+ * @title: (nullable): the title of the dialog
+ * @parent: (nullable): transient parent of the dialog
*
* Creates a new page setup dialog.
*
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index 58c43c8cf2..a712944170 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -38,8 +38,8 @@ attr_list_merge_filter (PangoAttribute *attribute,
/*
* _gtk_pango_attr_list_merge:
- * @into: a #PangoAttrList where attributes are merged or %NULL
- * @from: a #PangoAttrList with the attributes to merge or %NULL
+ * @into: (nullable): a #PangoAttrList where attributes are merged
+ * @from: (nullable): a #PangoAttrList with the attributes to merge
*
* Merges attributes from @from into @into.
*
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 8f94dc4075..91d2bb1404 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -205,7 +205,7 @@ gtk_paper_size_new_from_info (const PaperInfo *info)
/**
* gtk_paper_size_new:
- * @name: (nullable): a paper size name, or %NULL
+ * @name: (nullable): a paper size name
*
* Creates a new `GtkPaperSize` object by parsing a
* [PWG 5101.1-2002](ftp://ftp.pwg.org/pub/pwg/candidates/cs-pwgmsn10-20020226-5101.1.pdf)
@@ -910,13 +910,12 @@ gtk_paper_size_get_default_right_margin (GtkPaperSize *size,
* @key_file: the `GKeyFile` to retrieve the papersize from
* @group_name: (nullable): the name of the group in the key file to read,
* or %NULL to read the first group
- * @error: (nullable): return location for an error, or %NULL
+ * @error: (nullable): return location for an error
*
* Reads a paper size from the group @group_name in the key file
* @key_file.
*
- * Returns: a new `GtkPaperSize` object with the restored
- * paper size, or %NULL if an error occurred
+ * Returns: a new `GtkPaperSize` object with the restored paper size
*/
GtkPaperSize *
gtk_paper_size_new_from_key_file (GKeyFile *key_file,
diff --git a/gtk/gtkpicture.c b/gtk/gtkpicture.c
index 6b9fb1c51e..c6f82be0c0 100644
--- a/gtk/gtkpicture.c
+++ b/gtk/gtkpicture.c
@@ -410,7 +410,7 @@ gtk_picture_new (void)
/**
* gtk_picture_new_for_paintable:
- * @paintable: (nullable): a `GdkPaintable`, or %NULL
+ * @paintable: (nullable): a `GdkPaintable`
*
* Creates a new `GtkPicture` displaying @paintable.
*
@@ -431,7 +431,7 @@ gtk_picture_new_for_paintable (GdkPaintable *paintable)
/**
* gtk_picture_new_for_pixbuf:
- * @pixbuf: (nullable): a `GdkPixbuf`, or %NULL
+ * @pixbuf: (nullable): a `GdkPixbuf`
*
* Creates a new `GtkPicture` displaying @pixbuf.
*
@@ -563,7 +563,7 @@ gtk_picture_new_for_resource (const char *resource_path)
/**
* gtk_picture_set_file: (attributes org.gtk.Method.set_property=file)
* @self: a `GtkPicture`
- * @file: (nullable): a `GFile` or %NULL
+ * @file: (nullable): a `GFile`
*
* Makes @self load and display @file.
*
@@ -684,7 +684,7 @@ gtk_picture_set_resource (GtkPicture *self,
/**
* gtk_picture_set_pixbuf:
* @self: a `GtkPicture`
- * @pixbuf: (nullable): a `GdkPixbuf` or %NULL
+ * @pixbuf: (nullable): a `GdkPixbuf`
*
* Sets a `GtkPicture` to show a `GdkPixbuf`.
*
@@ -729,7 +729,7 @@ gtk_picture_paintable_invalidate_size (GdkPaintable *paintable,
/**
* gtk_picture_set_paintable: (attributes org.gtk.Method.set_property=paintable)
* @self: a `GtkPicture`
- * @paintable: (nullable): a `GdkPaintable` or %NULL
+ * @paintable: (nullable): a `GdkPaintable`
*
* Makes @self display the given @paintable.
*
@@ -801,8 +801,7 @@ gtk_picture_set_paintable (GtkPicture *self,
*
* Gets the `GdkPaintable` being displayed by the `GtkPicture`.
*
- * Returns: (nullable) (transfer none): the displayed paintable, or %NULL if
- * the picture is empty
+ * Returns: (nullable) (transfer none): the displayed paintable
*/
GdkPaintable *
gtk_picture_get_paintable (GtkPicture *self)
diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index 2610bf9cf3..8018d861c7 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -691,7 +691,7 @@ gtk_popover_menu_add_submenu (GtkPopoverMenu *popover,
/**
* gtk_popover_menu_new_from_model:
- * @model: (nullable): a `GMenuModel`, or %NULL
+ * @model: (nullable): a `GMenuModel`
*
* Creates a `GtkPopoverMenu` and populates it according to @model.
*
@@ -753,7 +753,7 @@ gtk_popover_menu_new_from_model_full (GMenuModel *model,
/**
* gtk_popover_menu_set_menu_model: (attributes org.gtk.Method.set_property=menu-model)
* @popover: a `GtkPopoverMenu`
- * @model: (nullable): a `GMenuModel`, or %NULL
+ * @model: (nullable): a `GMenuModel`
*
* Sets a new menu model on @popover.
*
diff --git a/gtk/gtkpopovermenubar.c b/gtk/gtkpopovermenubar.c
index 2881b687d5..193e77baa6 100644
--- a/gtk/gtkpopovermenubar.c
+++ b/gtk/gtkpopovermenubar.c
@@ -683,7 +683,7 @@ gtk_popover_menu_bar_buildable_iface_init (GtkBuildableIface *iface)
/**
* gtk_popover_menu_bar_new_from_model:
- * @model: (nullable): a `GMenuModel`, or %NULL
+ * @model: (nullable): a `GMenuModel`
*
* Creates a `GtkPopoverMenuBar` from a `GMenuModel`.
*
@@ -700,7 +700,7 @@ gtk_popover_menu_bar_new_from_model (GMenuModel *model)
/**
* gtk_popover_menu_bar_set_menu_model: (attributes org.gtk.Method.set_property=menu-model)
* @bar: a `GtkPopoverMenuBar`
- * @model: (nullable): a `GMenuModel`, or %NULL
+ * @model: (nullable): a `GMenuModel`
*
* Sets a menu model from which @bar should take
* its contents.
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index 530ffe09b0..f71156d9de 100644
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -493,7 +493,7 @@ gtk_print_job_set_source_fd (GtkPrintJob *job,
/**
* gtk_print_job_get_surface:
* @job: a `GtkPrintJob`
- * @error: (nullable): return location for errors, or %NULL
+ * @error: (nullable): return location for errors
*
* Gets a cairo surface onto which the pages of
* the print job should be rendered.
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 7dd2894698..32411ed22b 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -1012,8 +1012,8 @@ gtk_print_run_page_setup_dialog (GtkWindow *parent,
/**
* gtk_print_run_page_setup_dialog_async:
- * @parent: (nullable): transient parent, or %NULL
- * @page_setup: (nullable): an existing #GtkPageSetup, or %NULL
+ * @parent: (nullable): transient parent
+ * @page_setup: (nullable): an existing #GtkPageSetup
* @settings: a #GtkPrintSettings
* @done_cb: (scope async): a function to call when the user saves
* the modified page setup
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index f37b161fc8..817b65701f 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -978,8 +978,8 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
* signal is emitted on the operation. Then you can read out any
* information you need from the widgets.
*
- * Returns: (transfer none): A custom widget that gets embedded in
- * the print dialog, or %NULL
+ * Returns: (nullable) (transfer none): A custom widget that gets embedded in
+ * the print dialog
*/
signals[CREATE_CUSTOM_WIDGET] =
g_signal_new (I_("create-custom-widget"),
@@ -1037,7 +1037,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
* @operation: the `GtkPrintOperation` on which the signal was emitted
* @preview: the `GtkPrintOperationPreview` for the current operation
* @context: the `GtkPrintContext` that will be used
- * @parent: (nullable): the `GtkWindow` to use as window parent, or %NULL
+ * @parent: (nullable): the `GtkWindow` to use as window parent
*
* Gets emitted when a preview is requested from the native dialog.
*
@@ -1422,7 +1422,7 @@ gtk_print_operation_new (void)
/**
* gtk_print_operation_set_default_page_setup: (attributes org.gtk.Method.set_property=default-page-setup)
* @op: a `GtkPrintOperation`
- * @default_page_setup: (nullable): a `GtkPageSetup`, or %NULL
+ * @default_page_setup: (nullable): a `GtkPageSetup`
*
* Makes @default_page_setup the default page setup for @op.
*
@@ -3012,7 +3012,7 @@ gtk_print_operation_get_error (GtkPrintOperation *op,
* @op: a `GtkPrintOperation`
* @action: the action to start
* @parent: (nullable): Transient parent of the dialog
- * @error: (nullable): Return location for errors, or %NULL
+ * @error: (nullable): Return location for errors
*
* Runs the print operation.
*
diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c
index 113e3be13f..dbc8a099e8 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -167,7 +167,7 @@ gtk_print_settings_get (GtkPrintSettings *settings,
* gtk_print_settings_set:
* @settings: a `GtkPrintSettings`
* @key: a key
- * @value: (nullable): a string value, or %NULL
+ * @value: (nullable): a string value
*
* Associates @value with @key.
*/
@@ -1557,7 +1557,7 @@ gtk_print_settings_set_output_bin (GtkPrintSettings *settings,
* gtk_print_settings_load_file:
* @settings: a `GtkPrintSettings`
* @file_name: (type filename): the filename to read the settings from
- * @error: (nullable): return location for errors, or %NULL
+ * @error: (nullable): return location for errors
*
* Reads the print settings from @file_name.
*
@@ -1593,7 +1593,7 @@ gtk_print_settings_load_file (GtkPrintSettings *settings,
/**
* gtk_print_settings_new_from_file:
* @file_name: (type filename): the filename to read the settings from
- * @error: (nullable): return location for errors, or %NULL
+ * @error: (nullable): return location for errors
*
* Reads the print settings from @file_name.
*
@@ -1626,7 +1626,7 @@ gtk_print_settings_new_from_file (const char *file_name,
* @key_file: the `GKeyFile` to retrieve the settings from
* @group_name: (nullable): the name of the group to use, or %NULL
* to use the default “Print Settings”
- * @error: (nullable): return location for errors, or %NULL
+ * @error: (nullable): return location for errors
*
* Reads the print settings from the group @group_name in @key_file.
*
@@ -1686,7 +1686,7 @@ gtk_print_settings_load_key_file (GtkPrintSettings *settings,
* @key_file: the `GKeyFile` to retrieve the settings from
* @group_name: (nullable): the name of the group to use, or %NULL to use
* the default “Print Settings”
- * @error: (nullable): return location for errors, or %NULL
+ * @error: (nullable): return location for errors
*
* Reads the print settings from the group @group_name in @key_file.
*
@@ -1717,7 +1717,7 @@ gtk_print_settings_new_from_key_file (GKeyFile *key_file,
* gtk_print_settings_to_file:
* @settings: a `GtkPrintSettings`
* @file_name: (type filename): the file to save to
- * @error: (nullable): return location for errors, or %NULL
+ * @error: (nullable): return location for errors
*
* This function saves the print settings from @settings to @file_name.
*
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 8b5ea2d8f3..c0f8825a3f 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -3051,8 +3051,8 @@ paper_size_changed (GtkDropDown *combo_box,
/**
* gtk_print_unix_dialog_new:
- * @title: (nullable): Title of the dialog, or %NULL
- * @parent: (nullable): Transient parent of the dialog, or %NULL
+ * @title: (nullable): Title of the dialog
+ * @parent: (nullable): Transient parent of the dialog
*
* Creates a new `GtkPrintUnixDialog`.
*
@@ -3222,7 +3222,7 @@ set_active_printer (GtkPrintUnixDialog *dialog,
/**
* gtk_print_unix_dialog_set_settings: (attributes org.gtk.Method.set_property=print-settings)
* @dialog: a `GtkPrintUnixDialog`
- * @settings: (nullable): a `GtkPrintSettings`, or %NULL
+ * @settings: (nullable): a `GtkPrintSettings`
*
* Sets the `GtkPrintSettings` for the `GtkPrintUnixDialog`.
*
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index aaf0c06271..2af936066a 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -835,7 +835,7 @@ gtk_progress_bar_pulse (GtkProgressBar *pbar)
/**
* gtk_progress_bar_set_text: (attributes org.gtk.Method.set_property=text)
* @pbar: a `GtkProgressBar`
- * @text: (nullable): a UTF-8 string, or %NULL
+ * @text: (nullable): a UTF-8 string
*
* Causes the given @text to appear next to the progress bar.
*
@@ -1039,8 +1039,7 @@ gtk_progress_bar_set_inverted (GtkProgressBar *pbar,
* The return value is a reference to the text, not a copy of it,
* so will become invalid if you change the text in the progress bar.
*
- * Returns: (nullable): text, or %NULL; this string is owned by the widget
- * and should not be modified or freed.
+ * Returns: (nullable): the text
*/
const char *
gtk_progress_bar_get_text (GtkProgressBar *pbar)
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 2c5315e60e..00cb6c7af9 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -995,7 +995,7 @@ gtk_recent_manager_add_full (GtkRecentManager *manager,
* gtk_recent_manager_remove_item:
* @manager: a `GtkRecentManager`
* @uri: the URI of the item you wish to remove
- * @error: (nullable): return location for a #GError, or %NULL
+ * @error: (nullable): return location for a #GError
*
* Removes a resource pointed by @uri from the recently used resources
* list handled by a recent manager.
@@ -1144,7 +1144,7 @@ build_recent_info (GBookmarkFile *bookmarks,
* gtk_recent_manager_lookup_item:
* @manager: a `GtkRecentManager`
* @uri: a URI
- * @error: (nullable): a return location for a #GError, or %NULL
+ * @error: (nullable): a return location for a #GError
*
* Searches for a URI inside the recently used resources list, and
* returns a `GtkRecentInfo` containing information about the resource
diff --git a/gtk/gtkroot.c b/gtk/gtkroot.c
index 576b939a74..d8b1102016 100644
--- a/gtk/gtkroot.c
+++ b/gtk/gtkroot.c
@@ -151,8 +151,7 @@ gtk_root_set_focus (GtkRoot *self,
* `gtk_widget_has_focus (widget)` will be %FALSE for the
* widget.
*
- * Returns: (nullable) (transfer none): the currently focused
- * widget, or %NULL if there is none.
+ * Returns: (nullable) (transfer none): the currently focused widget
*/
GtkWidget *
gtk_root_get_focus (GtkRoot *self)
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index c05ccb9760..a44c863a73 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -1596,8 +1596,8 @@ gtk_scale_get_layout (GtkScale *scale)
/**
* gtk_scale_get_layout_offsets:
* @scale: a #GtkScale
- * @x: (out) (optional): location to store X offset of layout, or %NULL
- * @y: (out) (optional): location to store Y offset of layout, or %NULL
+ * @x: (out) (optional): location to store X offset of layout
+ * @y: (out) (optional): location to store Y offset of layout
*
* Obtains the coordinates where the scale will draw the
* `PangoLayout` representing the text in the scale.
@@ -1678,8 +1678,7 @@ gtk_scale_clear_marks (GtkScale *scale)
* and %GTK_POS_LEFT are drawn above the scale, anything else below.
* For a vertical scale, #GTK_POS_LEFT and %GTK_POS_TOP are drawn to
* the left of the scale, anything else to the right.
- * @markup: (nullable): Text to be shown at the mark, using
- * Pango markup, or %NULL
+ * @markup: (nullable): Text to be shown at the mark, using Pango markup
*
* Adds a mark at @value.
*
diff --git a/gtk/gtkselectionfiltermodel.c b/gtk/gtkselectionfiltermodel.c
index 52459b9761..46cde1e965 100644
--- a/gtk/gtkselectionfiltermodel.c
+++ b/gtk/gtkselectionfiltermodel.c
@@ -236,7 +236,7 @@ gtk_selection_filter_model_init (GtkSelectionFilterModel *self)
/**
* gtk_selection_filter_model_new:
- * @model: (nullable) (transfer none): the selection model to filter, or %NULL
+ * @model: (nullable) (transfer none): the selection model to filter
*
* Creates a new `GtkSelectionFilterModel` that will include the
* selected items from the underlying selection model.
diff --git a/gtk/gtkshortcuttrigger.c b/gtk/gtkshortcuttrigger.c
index 848860ae62..0d0064897c 100644
--- a/gtk/gtkshortcuttrigger.c
+++ b/gtk/gtkshortcuttrigger.c
@@ -126,7 +126,6 @@ gtk_shortcut_trigger_trigger (GtkShortcutTrigger *self,
* `<` and `>` instead of `>`.
*
* Returns: (nullable) (transfer full): a new `GtkShortcutTrigger`
- * or %NULL on error
*/
GtkShortcutTrigger *
gtk_shortcut_trigger_parse_string (const char *string)
diff --git a/gtk/gtksingleselection.c b/gtk/gtksingleselection.c
index f8c8be3639..8990ce3e62 100644
--- a/gtk/gtksingleselection.c
+++ b/gtk/gtksingleselection.c
@@ -449,7 +449,7 @@ gtk_single_selection_init (GtkSingleSelection *self)
/**
* gtk_single_selection_new:
- * @model: (nullable) (transfer full): the `GListModel` to manage, or %NULL
+ * @model: (nullable) (transfer full): the `GListModel` to manage
*
* Creates a new selection to handle @model.
*
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c
index bcac4d6626..8f038596e1 100644
--- a/gtk/gtksizerequest.c
+++ b/gtk/gtksizerequest.c
@@ -453,12 +453,12 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
* the height the widget should be measured with. The %GTK_ORIENTATION_VERTICAL
* case is analogous. This way, both height-for-width and width-for-height
* requests can be implemented. If no size is known, -1 can be passed.
- * @minimum: (out) (optional): location to store the minimum size, or %NULL
- * @natural: (out) (optional): location to store the natural size, or %NULL
+ * @minimum: (out) (optional): location to store the minimum size
+ * @natural: (out) (optional): location to store the natural size
* @minimum_baseline: (out) (optional): location to store the baseline
- * position for the minimum size, or %NULL
+ * position for the minimum size
* @natural_baseline: (out) (optional): location to store the baseline
- * position for the natural size, or %NULL
+ * position for the natural size
*
* Measures @widget in the orientation @orientation and for the given @for_size.
*
@@ -577,8 +577,8 @@ gtk_widget_get_request_mode (GtkWidget *widget)
/**
* gtk_widget_get_preferred_size:
* @widget: a `GtkWidget` instance
- * @minimum_size: (out) (optional): location for storing the minimum size, or %NULL
- * @natural_size: (out) (optional): location for storing the natural size, or %NULL
+ * @minimum_size: (out) (optional): location for storing the minimum size
+ * @natural_size: (out) (optional): location for storing the natural size
*
* Retrieves the minimum and natural size of a widget, taking
* into account the widget’s preference for height-for-width management.
diff --git a/gtk/gtkslicelistmodel.c b/gtk/gtkslicelistmodel.c
index 9c3d798af1..2642d514a5 100644
--- a/gtk/gtkslicelistmodel.c
+++ b/gtk/gtkslicelistmodel.c
@@ -297,7 +297,7 @@ gtk_slice_list_model_init (GtkSliceListModel *self)
/**
* gtk_slice_list_model_new:
- * @model: (transfer full) (nullable): The model to use, or %NULL
+ * @model: (transfer full) (nullable): The model to use
* @offset: the offset of the slice
* @size: maximum size of the slice
*
diff --git a/gtk/gtksortlistmodel.c b/gtk/gtksortlistmodel.c
index 8f8091cb1b..43fc43e173 100644
--- a/gtk/gtksortlistmodel.c
+++ b/gtk/gtksortlistmodel.c
@@ -829,8 +829,8 @@ gtk_sort_list_model_init (GtkSortListModel *self)
/**
* gtk_sort_list_model_new:
- * @model: (nullable) (transfer full): the model to sort, or %NULL
- * @sorter: (nullable) (transfer full): the `GtkSorter` to sort @model with, or %NULL
+ * @model: (nullable) (transfer full): the model to sort
+ * @sorter: (nullable) (transfer full): the `GtkSorter` to sort @model with,
*
* Creates a new sort list model that uses the @sorter to sort @model.
*
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index d90a178c52..9a41486cde 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1773,8 +1773,7 @@ gtk_spin_button_configure (GtkSpinButton *spin_button,
/**
* gtk_spin_button_new:
- * @adjustment: (nullable): the `GtkAdjustment` that this spin
- * button should use, or %NULL
+ * @adjustment: (nullable): the `GtkAdjustment` that this spin button should use
* @climb_rate: specifies by how much the rate of change in the value will
* accelerate if you continue to hold down an up/down button or arrow key
* @digits: the number of decimal places to display
@@ -1964,8 +1963,8 @@ gtk_spin_button_set_increments (GtkSpinButton *spin_button,
/**
* gtk_spin_button_get_increments:
* @spin_button: a `GtkSpinButton`
- * @step: (out) (optional): location to store step increment, or %NULL
- * @page: (out) (optional): location to store page increment, or %NULL
+ * @step: (out) (optional): location to store step increment
+ * @page: (out) (optional): location to store page increment
*
* Gets the current step and page the increments
* used by @spin_button.
@@ -2019,8 +2018,8 @@ gtk_spin_button_set_range (GtkSpinButton *spin_button,
/**
* gtk_spin_button_get_range:
* @spin_button: a `GtkSpinButton`
- * @min: (out) (optional): location to store minimum allowed value, or %NULL
- * @max: (out) (optional): location to store maximum allowed value, or %NULL
+ * @min: (out) (optional): location to store minimum allowed value
+ * @max: (out) (optional): location to store maximum allowed value
*
* Gets the range allowed for @spin_button.
*
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index 896a0b63de..4d77e89ef4 100644
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -1476,7 +1476,7 @@ gtk_stack_add_child (GtkStack *stack,
* gtk_stack_add_named:
* @stack: a `GtkStack`
* @child: the widget to add
- * @name: (nullable): the name for @child or %NULL
+ * @name: (nullable): the name for @child
*
* Adds a child to @stack.
*
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index a56d81a44a..c738babf65 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -425,8 +425,7 @@ gtk_stack_switcher_set_stack (GtkStackSwitcher *switcher,
*
* Retrieves the stack.
*
- * Returns: (nullable) (transfer none): the stack, or %NULL if
- * none has been set explicitly.
+ * Returns: (nullable) (transfer none): the stack
*/
GtkStack *
gtk_stack_switcher_get_stack (GtkStackSwitcher *switcher)
diff --git a/gtk/gtkstringsorter.c b/gtk/gtkstringsorter.c
index fa4712099a..a6fcefab77 100644
--- a/gtk/gtkstringsorter.c
+++ b/gtk/gtkstringsorter.c
@@ -354,7 +354,7 @@ gtk_string_sorter_new (GtkExpression *expression)
*
* Gets the expression that is evaluated to obtain strings from items.
*
- * Returns: (transfer none) (nullable): a `GtkExpression`, or %NULL
+ * Returns: (transfer none) (nullable): a `GtkExpression`
*/
GtkExpression *
gtk_string_sorter_get_expression (GtkStringSorter *self)
@@ -367,7 +367,7 @@ gtk_string_sorter_get_expression (GtkStringSorter *self)
/**
* gtk_string_sorter_set_expression: (attributes org.gtk.Method.set_property=expression)
* @self: a `GtkStringSorter`
- * @expression: (nullable) (transfer none): a `GtkExpression`, or %NULL
+ * @expression: (nullable) (transfer none): a `GtkExpression`
*
* Sets the expression that is evaluated to obtain strings from items.
*
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 153c4f1b09..f753070402 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -166,8 +166,7 @@ _gtk_style_property_init_properties (void)
* Looks up the CSS property with the given @name. If no such
* property exists, %NULL is returned.
*
- * Returns: (nullable) (transfer none): The property or %NULL if no
- * property with the given name exists.
+ * Returns: (nullable) (transfer none): The property
*/
GtkStyleProperty *
_gtk_style_property_lookup (const char *name)
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 3537b6e0dc..8db3495a44 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -6615,7 +6615,7 @@ gtk_text_reset_blink_time (GtkText *self)
* gtk_text_set_placeholder_text: (attributes org.gtk.Method.set_property=placeholder-text)
* @self: a `GtkText`
* @text: (nullable): a string to be displayed when @self
- * is empty and unfocused, or %NULL
+ * is empty and unfocused
*
* Sets text to be displayed in @self when it is empty.
*
@@ -6776,7 +6776,7 @@ gtk_text_get_input_hints (GtkText *self)
/**
* gtk_text_set_attributes: (attributes org.gtk.Method.set_property=attributes)
* @self: a `GtkText`
- * @attrs: (nullable): a `PangoAttrList` or %NULL to unset
+ * @attrs: (nullable): a `PangoAttrList`
*
* Sets attributes that are applied to the text.
*/
@@ -6811,8 +6811,7 @@ gtk_text_set_attributes (GtkText *self,
* Gets the attribute list that was set on the `GtkText`
* using gtk_text_set_attributes().
*
- * Returns: (transfer none) (nullable): the attribute list,
- * or %NULL if none was set.
+ * Returns: (transfer none) (nullable): the attribute list
*/
PangoAttrList *
gtk_text_get_attributes (GtkText *self)
@@ -6860,8 +6859,7 @@ gtk_text_set_tabs (GtkText *self,
* Gets the tabstops that were set on the `GtkText`
* using gtk_text_set_tabs().
*
- * Returns: (nullable) (transfer none): the tabstops,
- * or %NULL if none was set.
+ * Returns: (nullable) (transfer none): the tabstops
*/
PangoTabArray *
gtk_text_get_tabs (GtkText *self)
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index d6394df923..80127c3fde 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -2445,7 +2445,7 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
/**
* gtk_text_buffer_create_mark:
* @buffer: a `GtkTextBuffer`
- * @mark_name: (nullable): name for mark, or %NULL
+ * @mark_name: (nullable): name for mark
* @where: location to place mark
* @left_gravity: whether the mark has left gravity
*
@@ -2615,7 +2615,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
* Returns the mark named @name in buffer @buffer, or %NULL if no such
* mark exists in the buffer.
*
- * Returns: (nullable) (transfer none): a #GtkTextMark, or %NULL
+ * Returns: (nullable) (transfer none): a #GtkTextMark
**/
GtkTextMark*
gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
@@ -2826,8 +2826,8 @@ gtk_text_buffer_select_range (GtkTextBuffer *buffer,
/**
* gtk_text_buffer_create_tag:
* @buffer: a `GtkTextBuffer`
- * @tag_name: (nullable): name of the new tag, or %NULL
- * @first_property_name: (nullable): name of first property to set, or %NULL
+ * @tag_name: (nullable): name of the new tag
+ * @first_property_name: (nullable): name of first property to set
* @...: %NULL-terminated list of property names and values
*
* Creates a tag and adds it to the tag table for @buffer.
@@ -3919,7 +3919,7 @@ remove_all_selection_clipboards (GtkTextBuffer *buffer)
* gtk_text_buffer_paste_clipboard:
* @buffer: a `GtkTextBuffer`
* @clipboard: the `GdkClipboard` to paste from
- * @override_location: (nullable): location to insert pasted text, or %NULL
+ * @override_location: (nullable): location to insert pasted text
* @default_editable: whether the buffer is editable by default
*
* Pastes the contents of a clipboard.
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 823cc915a5..e19befe88d 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -1185,7 +1185,7 @@ gtk_text_iter_get_toggled_tags (const GtkTextIter *iter,
/**
* gtk_text_iter_starts_tag:
* @iter: an iterator
- * @tag: (nullable): a `GtkTextTag`, or %NULL
+ * @tag: (nullable): a `GtkTextTag`
*
* Returns %TRUE if @tag is toggled on at exactly this point.
*
@@ -1235,7 +1235,7 @@ gtk_text_iter_starts_tag (const GtkTextIter *iter,
/**
* gtk_text_iter_ends_tag:
* @iter: an iterator
- * @tag: (nullable): a `GtkTextTag`, or %NULL
+ * @tag: (nullable): a `GtkTextTag`
*
* Returns %TRUE if @tag is toggled off at exactly this point.
*
@@ -1285,7 +1285,7 @@ gtk_text_iter_ends_tag (const GtkTextIter *iter,
/**
* gtk_text_iter_toggles_tag:
* @iter: an iterator
- * @tag: (nullable): a `GtkTextTag`, or %NULL
+ * @tag: (nullable): a `GtkTextTag`
*
* Gets whether a range with @tag applied to it begins
* or ends at @iter.
@@ -4232,7 +4232,7 @@ gtk_text_iter_forward_to_line_end (GtkTextIter *iter)
/**
* gtk_text_iter_forward_to_tag_toggle:
* @iter: a `GtkTextIter`
- * @tag: (nullable): a `GtkTextTag`, or %NULL
+ * @tag: (nullable): a `GtkTextTag`
*
* Moves forward to the next toggle (on or off) of the
* @tag, or to the next toggle of any tag if
@@ -4319,7 +4319,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
/**
* gtk_text_iter_backward_to_tag_toggle:
* @iter: a `GtkTextIter`
- * @tag: (nullable): a `GtkTextTag`, or %NULL
+ * @tag: (nullable): a `GtkTextTag`
*
* Moves backward to the next toggle (on or off) of the
* @tag, or to the next toggle of any tag if
@@ -4436,7 +4436,7 @@ matches_pred (GtkTextIter *iter,
* @iter: a `GtkTextIter`
* @pred: (scope call): a function to be called on each character
* @user_data: (closure): user data for @pred
- * @limit: (nullable): search limit, or %NULL for none
+ * @limit: (nullable): search limit
*
* Advances @iter, calling @pred on each character.
*
@@ -4475,7 +4475,7 @@ gtk_text_iter_forward_find_char (GtkTextIter *iter,
* @iter: a `GtkTextIter`
* @pred: (scope call): function to be called on each character
* @user_data: (closure): user data for @pred
- * @limit: (nullable): search limit, or %NULL for none
+ * @limit: (nullable): search limit
*
* Same as gtk_text_iter_forward_find_char(),
* but goes backward from @iter.
@@ -4955,8 +4955,8 @@ strbreakup (const char *string,
* @iter: start of search
* @str: a search string
* @flags: flags affecting how the search is done
- * @match_start: (out caller-allocates) (optional): return location for start of match, or %NULL
- * @match_end: (out caller-allocates) (optional): return location for end of match, or %NULL
+ * @match_start: (out caller-allocates) (optional): return location for start of match
+ * @match_end: (out caller-allocates) (optional): return location for end of match
* @limit: (nullable): location of last possible @match_end, or %NULL for the end of the buffer
*
* Searches forward for @str.
@@ -5285,8 +5285,8 @@ lines_window_free (LinesWindow *win)
* @iter: a `GtkTextIter` where the search begins
* @str: search string
* @flags: bitmask of flags affecting the search
- * @match_start: (out caller-allocates) (optional): return location for start of match, or %NULL
- * @match_end: (out caller-allocates) (optional): return location for end of match, or %NULL
+ * @match_start: (out caller-allocates) (optional): return location for start of match
+ * @match_end: (out caller-allocates) (optional): return location for end of match
* @limit: (nullable): location of last possible @match_start, or %NULL for start of buffer
*
* Same as gtk_text_iter_forward_search(), but moves backward.
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index cd600a9bed..ec8307a742 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -2826,8 +2826,8 @@ gtk_text_layout_get_iter_at_position (GtkTextLayout *layout,
* gtk_text_layout_get_cursor_locations:
* @layout: a #GtkTextLayout
* @iter: a #GtkTextIter
- * @strong_pos: (out) (optional): location to store the strong cursor position, or %NULL
- * @weak_pos: (out) (optional): location to store the weak cursor position, or %NULL
+ * @strong_pos: (out) (optional): location to store the strong cursor position
+ * @weak_pos: (out) (optional): location to store the weak cursor position
*
* Given an iterator within a text layout, determine the positions of the
* strong and weak cursors if the insertion point is at that
diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index 39a264b955..878c6ed57f 100644
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@@ -245,7 +245,7 @@ gtk_text_mark_get_property (GObject *object,
/**
* gtk_text_mark_new:
- * @name: (nullable): mark name or %NULL
+ * @name: (nullable): mark name
* @left_gravity: whether the mark should have left gravity
*
* Creates a text mark.
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index ac92f49eec..fdf17a6efc 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -1024,7 +1024,7 @@ gtk_text_tag_init (GtkTextTag *text_tag)
/**
* gtk_text_tag_new:
- * @name: (nullable): tag name, or %NULL
+ * @name: (nullable): tag name
*
* Creates a `GtkTextTag`.
*
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index fef2a88449..eb545daec7 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -343,8 +343,7 @@ gtk_text_tag_table_add (GtkTextTagTable *table,
*
* Look up a named tag.
*
- * Returns: (nullable) (transfer none): The tag,
- * or %NULL if none by that name is in the table.
+ * Returns: (nullable) (transfer none): The tag
*/
GtkTextTag*
gtk_text_tag_table_lookup (GtkTextTagTable *table,
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index f86fbcff26..d15c020d14 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4458,7 +4458,7 @@ find_child_for_window_type (GtkTextView *text_view,
* @win must be one of %GTK_TEXT_WINDOW_LEFT, %GTK_TEXT_WINDOW_RIGHT,
* %GTK_TEXT_WINDOW_TOP, or %GTK_TEXT_WINDOW_BOTTOM.
*
- * Returns: (transfer none) (nullable): a `GtkWidget` or %NULL
+ * Returns: (transfer none) (nullable): a `GtkWidget`
*/
GtkWidget *
gtk_text_view_get_gutter (GtkTextView *text_view,
@@ -4484,7 +4484,7 @@ gtk_text_view_get_gutter (GtkTextView *text_view,
* gtk_text_view_set_gutter:
* @text_view: a `GtkTextView`
* @win: a `GtkTextWindowType`
- * @widget: (nullable): a `GtkWidget` or %NULL
+ * @widget: (nullable): a `GtkWidget`
*
* Places @widget into the gutter specified by @win.
*
@@ -9211,8 +9211,8 @@ text_window_get_height (GtkTextWindow *win)
* @win: a #GtkTextWindowType
* @buffer_x: buffer x coordinate
* @buffer_y: buffer y coordinate
- * @window_x: (out) (optional): window x coordinate return location or %NULL
- * @window_y: (out) (optional): window y coordinate return location or %NULL
+ * @window_x: (out) (optional): window x coordinate return location
+ * @window_y: (out) (optional): window y coordinate return location
*
* Converts buffer coordinates to window coordinates.
*/
@@ -9274,8 +9274,8 @@ gtk_text_view_buffer_to_window_coords (GtkTextView *text_view,
* @win: a #GtkTextWindowType
* @window_x: window x coordinate
* @window_y: window y coordinate
- * @buffer_x: (out) (optional): buffer x coordinate return location or %NULL
- * @buffer_y: (out) (optional): buffer y coordinate return location or %NULL
+ * @buffer_x: (out) (optional): buffer x coordinate return location
+ * @buffer_y: (out) (optional): buffer y coordinate return location
*
* Converts coordinates on the window identified by @win to buffer
* coordinates.
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 1a364f1df6..62fd6b6c13 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -222,7 +222,7 @@ gtk_tooltip_set_markup (GtkTooltip *tooltip,
/**
* gtk_tooltip_set_text:
* @tooltip: a `GtkTooltip`
- * @text: (nullable): a text string or %NULL
+ * @text: (nullable): a text string
*
* Sets the text of the tooltip to be @text.
*
@@ -241,7 +241,7 @@ gtk_tooltip_set_text (GtkTooltip *tooltip,
/**
* gtk_tooltip_set_icon:
* @tooltip: a #GtkTooltip
- * @paintable: (nullable): a #GdkPaintable, or %NULL
+ * @paintable: (nullable): a #GdkPaintable
*
* Sets the icon of the tooltip (which is in front of the text) to be
* @paintable. If @paintable is %NULL, the image will be hidden.
@@ -259,7 +259,7 @@ gtk_tooltip_set_icon (GtkTooltip *tooltip,
/**
* gtk_tooltip_set_icon_from_icon_name:
* @tooltip: a #GtkTooltip
- * @icon_name: (nullable): an icon name, or %NULL
+ * @icon_name: (nullable): an icon name
*
* Sets the icon of the tooltip (which is in front of the text) to be
* the icon indicated by @icon_name with the size indicated
@@ -278,7 +278,7 @@ gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip,
/**
* gtk_tooltip_set_icon_from_gicon:
* @tooltip: a #GtkTooltip
- * @gicon: (nullable): a #GIcon representing the icon, or %NULL
+ * @gicon: (nullable): a #GIcon representing the icon
*
* Sets the icon of the tooltip (which is in front of the text)
* to be the icon indicated by @gicon with the size indicated
diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c
index d42ae10f36..4d1b8fc58e 100644
--- a/gtk/gtktreednd.c
+++ b/gtk/gtktreednd.c
@@ -175,7 +175,7 @@ gtk_tree_drag_source_drag_data_delete (GtkTreeDragSource *drag_source,
* longer found in the model!
*
* Returns: (nullable) (transfer full): a #GdkContentProvider for the
- * given @path or %NULL if none exists
+ * given @path
**/
GdkContentProvider *
gtk_tree_drag_source_drag_data_get (GtkTreeDragSource *drag_source,
diff --git a/gtk/gtktreeexpander.c b/gtk/gtktreeexpander.c
index 4ebc072236..39504afab8 100644
--- a/gtk/gtktreeexpander.c
+++ b/gtk/gtktreeexpander.c
@@ -704,7 +704,7 @@ gtk_tree_expander_get_child (GtkTreeExpander *self)
/**
* gtk_tree_expander_set_child: (attributes org.gtk.Method.set_property=child)
* @self: a `GtkTreeExpander`
- * @child: (nullable): a `GtkWidget`, or %NULL
+ * @child: (nullable): a `GtkWidget`
*
* Sets the content widget to display.
*/
@@ -781,7 +781,7 @@ gtk_tree_expander_get_list_row (GtkTreeExpander *self)
/**
* gtk_tree_expander_set_list_row: (attributes org.gtk.Method.set_property=list-row)
* @self: a `GtkTreeExpander` widget
- * @list_row: (nullable): a `GtkTreeListRow`, or %NULL
+ * @list_row: (nullable): a `GtkTreeListRow`
*
* Sets the tree list row that this expander should manage.
*/
diff --git a/gtk/gtktreelistrowsorter.c b/gtk/gtktreelistrowsorter.c
index 659a35bf21..ee0a7d1e47 100644
--- a/gtk/gtktreelistrowsorter.c
+++ b/gtk/gtktreelistrowsorter.c
@@ -559,7 +559,7 @@ gtk_tree_list_row_sorter_init (GtkTreeListRowSorter *self)
/**
* gtk_tree_list_row_sorter_new:
- * @sorter: (nullable) (transfer full): a `GtkSorter`, or %NULL
+ * @sorter: (nullable) (transfer full): a `GtkSorter`
*
* Create a special-purpose sorter that applies the sorting
* of @sorter to the levels of a `GtkTreeListModel`.
@@ -588,7 +588,7 @@ gtk_tree_list_row_sorter_new (GtkSorter *sorter)
/**
* gtk_tree_list_row_sorter_set_sorter:
* @self: a `GtkTreeListRowSorter`
- * @sorter: (nullable) (transfer none): The sorter to use, or %NULL
+ * @sorter: (nullable) (transfer none): The sorter to use
*
* Sets the sorter to use for items with the same parent.
*
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index d201fef3d6..77741dc7b2 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -625,7 +625,7 @@ gtk_tree_path_new (void)
* child of that 11th child, and the 1st child of that 5th child.
* If an invalid path string is passed in, %NULL is returned.
*
- * Returns: (nullable): A newly-created #GtkTreePath-struct, or %NULL
+ * Returns: (nullable): A newly-created #GtkTreePath
*/
GtkTreePath *
gtk_tree_path_new_from_string (const char *path)
@@ -868,7 +868,7 @@ gtk_tree_path_get_depth (GtkTreePath *path)
*
* The length of the array can be obtained with gtk_tree_path_get_depth().
*
- * Returns: (nullable): The current indices, or %NULL
+ * Returns: (nullable) (transfer none): The current indices
*/
int *
gtk_tree_path_get_indices (GtkTreePath *path)
@@ -882,7 +882,7 @@ gtk_tree_path_get_indices (GtkTreePath *path)
* gtk_tree_path_get_indices_with_depth: (rename-to gtk_tree_path_get_indices)
* @path: a `GtkTreePath`
* @depth: (out) (optional): return location for number of elements
- * returned in the integer array, or %NULL
+ * returned in the integer array
*
* Returns the current indices of @path.
*
@@ -890,8 +890,8 @@ gtk_tree_path_get_indices (GtkTreePath *path)
* It also returns the number of elements in the array.
* The array should not be freed.
*
- * Returns: (array length=depth) (transfer none): The current
- * indices, or %NULL
+ * Returns: (array length=depth) (transfer none) (nullable): The current
+ * indices
*/
int *
gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
@@ -1508,7 +1508,7 @@ gtk_tree_model_iter_previous (GtkTreeModel *tree_model,
* gtk_tree_model_iter_children:
* @tree_model: a #GtkTreeModel
* @iter: (out): the new #GtkTreeIter-struct to be set to the child
- * @parent: (nullable): the #GtkTreeIter-struct, or %NULL
+ * @parent: (nullable): the #GtkTreeIter
*
* Sets @iter to point to the first child of @parent.
*
@@ -1566,7 +1566,7 @@ gtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
/**
* gtk_tree_model_iter_n_children:
* @tree_model: a #GtkTreeModel
- * @iter: (nullable): the #GtkTreeIter-struct, or %NULL
+ * @iter: (nullable): the #GtkTreeIter
*
* Returns the number of children that @iter has.
*
@@ -1592,8 +1592,8 @@ gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
/**
* gtk_tree_model_iter_nth_child:
* @tree_model: a #GtkTreeModel
- * @iter: (out): the #GtkTreeIter-struct to set to the nth child
- * @parent: (nullable): the #GtkTreeIter-struct to get the child from, or %NULL.
+ * @iter: (out): the #GtkTreeIter to set to the nth child
+ * @parent: (nullable): the #GtkTreeIter to get the child from
* @n: the index of the desired child
*
* Sets @iter to be the child of @parent, using the given index.
@@ -2287,7 +2287,7 @@ gtk_tree_row_reference_unref_path (GtkTreePath *path,
* propagated, and the path is updated appropriately. If
* @path isn’t a valid path in @model, then %NULL is returned.
*
- * Returns: (nullable): a newly allocated #GtkTreeRowReference, or %NULL
+ * Returns: (nullable): a newly allocated #GtkTreeRowReference
*/
GtkTreeRowReference *
gtk_tree_row_reference_new (GtkTreeModel *model,
@@ -2334,7 +2334,7 @@ gtk_tree_row_reference_new (GtkTreeModel *model,
* need to carefully monitor exactly when a row reference updates
* itself, and is not generally needed by most applications.
*
- * Returns: (nullable): a newly allocated #GtkTreeRowReference, or %NULL
+ * Returns: (nullable): a newly allocated #GtkTreeRowReference
*/
GtkTreeRowReference *
gtk_tree_row_reference_new_proxy (GObject *proxy,
@@ -2400,7 +2400,7 @@ gtk_tree_row_reference_new_proxy (GObject *proxy,
* Returns a path that the row reference currently points to,
* or %NULL if the path pointed to is no longer valid.
*
- * Returns: (nullable) (transfer full): a current path, or %NULL
+ * Returns: (nullable) (transfer full): a current path
*/
GtkTreePath *
gtk_tree_row_reference_get_path (GtkTreeRowReference *reference)
@@ -2434,7 +2434,7 @@ gtk_tree_row_reference_get_model (GtkTreeRowReference *reference)
/**
* gtk_tree_row_reference_valid:
- * @reference: (nullable): a #GtkTreeRowReference, or %NULL
+ * @reference: (nullable): a #GtkTreeRowReference
*
* Returns %TRUE if the @reference is non-%NULL and refers to
* a current valid path.
@@ -2469,7 +2469,7 @@ gtk_tree_row_reference_copy (GtkTreeRowReference *reference)
/**
* gtk_tree_row_reference_free:
- * @reference: (nullable): a #GtkTreeRowReference, or %NULL
+ * @reference: (nullable): a #GtkTreeRowReference
*
* Free’s @reference. @reference may be %NULL
*/
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index a4a00a4c54..8bf686488d 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -3754,7 +3754,7 @@ gtk_tree_model_filter_set_root (GtkTreeModelFilter *filter,
/**
* gtk_tree_model_filter_new:
* @child_model: A #GtkTreeModel.
- * @root: (nullable): A #GtkTreePath or %NULL.
+ * @root: (nullable): A #GtkTreePath
*
* Creates a new #GtkTreeModel, with @child_model as the child_model
* and @root as the virtual root.
@@ -3793,8 +3793,8 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter)
* gtk_tree_model_filter_set_visible_func:
* @filter: A #GtkTreeModelFilter
* @func: A #GtkTreeModelFilterVisibleFunc, the visible function
- * @data: (nullable): User data to pass to the visible function, or %NULL
- * @destroy: (nullable): Destroy notifier of @data, or %NULL
+ * @data: (nullable): User data to pass to the visible function
+ * @destroy: (nullable): Destroy notifier of @data
*
* Sets the visible function used when filtering the @filter to be @func.
* The function should return %TRUE if the given row should be visible and
@@ -3855,8 +3855,8 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
* @n_columns: The number of columns in the filter model.
* @types: (array length=n_columns): The #GTypes of the columns.
* @func: A #GtkTreeModelFilterModifyFunc
- * @data: (nullable): User data to pass to the modify function, or %NULL.
- * @destroy: (nullable): Destroy notifier of @data, or %NULL.
+ * @data: (nullable): User data to pass to the modify function
+ * @destroy: (nullable): Destroy notifier of @data
*
* With the @n_columns and @types parameters, you give an array of column
* types for this model (which will be exposed to the parent model/view).
@@ -4108,7 +4108,7 @@ gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filte
* child model or points to a row which is not visible in @filter, then %NULL
* is returned.
*
- * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath, or %NULL.
+ * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath
*/
GtkTreePath *
gtk_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filter,
@@ -4149,7 +4149,7 @@ gtk_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filter,
* point to the same location in the model not being filtered. If @filter_path
* does not point to a location in the child model, %NULL is returned.
*
- * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath, or %NULL.
+ * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath
*/
GtkTreePath *
gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter *filter,
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index b4a25df924..104bf304c7 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -2111,7 +2111,7 @@ gtk_tree_model_sort_elt_get_path (SortLevel *level,
/**
* gtk_tree_model_sort_set_model:
* @tree_model_sort: The #GtkTreeModelSort.
- * @child_model: (nullable): A #GtkTreeModel, or %NULL.
+ * @child_model: (nullable): A #GtkTreeModel
*
* Sets the model of @tree_model_sort to be @model. If @model is %NULL,
* then the old model is unset. The sort function is unset as a result
@@ -2280,7 +2280,7 @@ gtk_real_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_mode
* point to the same row in the sorted model. If @child_path isn’t a valid
* path on the child model, then %NULL is returned.
*
- * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath, or %NULL
+ * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath
**/
GtkTreePath *
gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
@@ -2353,7 +2353,7 @@ gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sor
* sorted. If @sorted_path does not point to a location in the child model,
* %NULL is returned.
*
- * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath, or %NULL
+ * Returns: (nullable) (transfer full): A newly allocated #GtkTreePath
**/
GtkTreePath *
gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index 9d64374f18..368d3e77ec 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -521,7 +521,7 @@ gtk_tree_selection_get_selected (GtkTreeSelection *selection,
/**
* gtk_tree_selection_get_selected_rows:
* @selection: A #GtkTreeSelection.
- * @model: (out) (optional) (transfer none): A pointer to set to the #GtkTreeModel, or %NULL.
+ * @model: (out) (optional) (transfer none): A pointer to set to the #GtkTreeModel
*
* Creates a list of path of all selected rows. Additionally, if you are
* planning on modifying the model after calling this function, you may
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index cdcbf1b568..dca92dc513 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -174,8 +174,8 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable *sortable,
* @sortable: A #GtkTreeSortable
* @sort_column_id: the sort column id to set the function for
* @sort_func: The comparison function
- * @user_data: (closure): User data to pass to @sort_func, or %NULL
- * @destroy: (nullable): Destroy notifier of @user_data, or %NULL
+ * @user_data: (closure): User data to pass to @sort_func
+ * @destroy: (nullable): Destroy notifier of @user_data
*
* Sets the comparison function used when sorting to be @sort_func. If the
* current sort column id of @sortable is the same as @sort_column_id, then
@@ -206,8 +206,8 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable,
* gtk_tree_sortable_set_default_sort_func:
* @sortable: A #GtkTreeSortable
* @sort_func: The comparison function
- * @user_data: (closure): User data to pass to @sort_func, or %NULL
- * @destroy: (nullable): Destroy notifier of @user_data, or %NULL
+ * @user_data: (closure): User data to pass to @sort_func
+ * @destroy: (nullable): Destroy notifier of @user_data
*
* Sets the default comparison function used when sorting to be @sort_func.
* If the current sort column id of @sortable is
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 7d5b081ee1..0374f36b2d 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -1260,7 +1260,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store,
* gtk_tree_store_insert:
* @tree_store: A #GtkTreeStore
* @iter: (out): An unset #GtkTreeIter to set to the new row
- * @parent: (nullable): A valid #GtkTreeIter, or %NULL
+ * @parent: (nullable): A valid #GtkTreeIter
* @position: position to insert the new row, or -1 for last
*
* Creates a new row at @position. If parent is non-%NULL, then the row will be
@@ -1322,8 +1322,8 @@ gtk_tree_store_insert (GtkTreeStore *tree_store,
* gtk_tree_store_insert_before:
* @tree_store: A #GtkTreeStore
* @iter: (out): An unset #GtkTreeIter to set to the new row
- * @parent: (nullable): A valid #GtkTreeIter, or %NULL
- * @sibling: (nullable): A valid #GtkTreeIter, or %NULL
+ * @parent: (nullable): A valid #GtkTreeIter
+ * @sibling: (nullable): A valid #GtkTreeIter
*
* Inserts a new row before @sibling. If @sibling is %NULL, then the row will
* be appended to @parent ’s children. If @parent and @sibling are %NULL, then
@@ -1403,8 +1403,8 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store,
* gtk_tree_store_insert_after:
* @tree_store: A #GtkTreeStore
* @iter: (out): An unset #GtkTreeIter to set to the new row
- * @parent: (nullable): A valid #GtkTreeIter, or %NULL
- * @sibling: (nullable): A valid #GtkTreeIter, or %NULL
+ * @parent: (nullable): A valid #GtkTreeIter
+ * @sibling: (nullable): A valid #GtkTreeIter
*
* Inserts a new row after @sibling. If @sibling is %NULL, then the row will be
* prepended to @parent ’s children. If @parent and @sibling are %NULL, then
@@ -1484,8 +1484,8 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store,
/**
* gtk_tree_store_insert_with_values:
* @tree_store: A #GtkTreeStore
- * @iter: (out) (optional): An unset #GtkTreeIter to set the new row, or %NULL.
- * @parent: (nullable): A valid #GtkTreeIter, or %NULL
+ * @iter: (out) (optional): An unset #GtkTreeIter to set the new row
+ * @parent: (nullable): A valid #GtkTreeIter
* @position: position to insert the new row, or -1 to append after existing rows
* @...: pairs of column number and value, terminated with -1
*
@@ -1574,8 +1574,8 @@ gtk_tree_store_insert_with_values (GtkTreeStore *tree_store,
/**
* gtk_tree_store_insert_with_valuesv: (rename-to gtk_tree_store_insert_with_values)
* @tree_store: A #GtkTreeStore
- * @iter: (out) (optional): An unset #GtkTreeIter to set the new row, or %NULL.
- * @parent: (nullable): A valid #GtkTreeIter, or %NULL
+ * @iter: (out) (optional): An unset #GtkTreeIter to set the new row
+ * @parent: (nullable): A valid #GtkTreeIter
* @position: position to insert the new row, or -1 for last
* @columns: (array length=n_values): an array of column numbers
* @values: (array length=n_values): an array of GValues
@@ -1651,7 +1651,7 @@ gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store,
* gtk_tree_store_prepend:
* @tree_store: A #GtkTreeStore
* @iter: (out): An unset #GtkTreeIter to set to the prepended row
- * @parent: (nullable): A valid #GtkTreeIter, or %NULL
+ * @parent: (nullable): A valid #GtkTreeIter
*
* Prepends a new row to @tree_store. If @parent is non-%NULL, then it will prepend
* the new row before the first child of @parent, otherwise it will prepend a row
@@ -1710,7 +1710,7 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store,
* gtk_tree_store_append:
* @tree_store: A #GtkTreeStore
* @iter: (out): An unset #GtkTreeIter to set to the appended row
- * @parent: (nullable): A valid #GtkTreeIter, or %NULL
+ * @parent: (nullable): A valid #GtkTreeIter
*
* Appends a new row to @tree_store. If @parent is non-%NULL, then it will append the
* new row after the last child of @parent, otherwise it will append a row to
@@ -2231,7 +2231,7 @@ gtk_tree_store_reorder_func (gconstpointer a,
/**
* gtk_tree_store_reorder: (skip)
* @tree_store: A `GtkTreeStore`
- * @parent: (nullable): A `GtkTreeIter`, or %NULL
+ * @parent: (nullable): A `GtkTreeIter`
* @new_order: (array): an array of integers mapping the new position of each child
* to its old position before the re-ordering,
* i.e. @new_order`[newpos] = oldpos`.
@@ -2785,7 +2785,7 @@ free_paths_and_out:
* gtk_tree_store_move_before:
* @tree_store: A #GtkTreeStore.
* @iter: A #GtkTreeIter.
- * @position: (nullable): A #GtkTreeIter or %NULL.
+ * @position: (nullable): A #GtkTreeIter
*
* Moves @iter in @tree_store to the position before @position. @iter and
* @position should be in the same level. Note that this function only
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b274262195..2d67d3e5ad 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10217,8 +10217,7 @@ gtk_tree_view_new_with_model (GtkTreeModel *model)
* Returns the model the #GtkTreeView is based on. Returns %NULL if the
* model is unset.
*
- * Returns: (transfer none) (nullable): A #GtkTreeModel, or %NULL if
- * none is currently being used.
+ * Returns: (transfer none) (nullable): A #GtkTreeModel
**/
GtkTreeModel *
gtk_tree_view_get_model (GtkTreeView *tree_view)
@@ -10983,7 +10982,7 @@ gtk_tree_view_get_columns (GtkTreeView *tree_view)
* gtk_tree_view_move_column_after:
* @tree_view: A #GtkTreeView
* @column: The #GtkTreeViewColumn to be moved.
- * @base_column: (nullable): The #GtkTreeViewColumn to be moved relative to, or %NULL.
+ * @base_column: (nullable): The #GtkTreeViewColumn to be moved relative to
*
* Moves @column to be after to @base_column. If @base_column is %NULL, then
* @column is placed in the first position.
@@ -11092,9 +11091,9 @@ gtk_tree_view_get_expander_column (GtkTreeView *tree_view)
/**
* gtk_tree_view_set_column_drag_function:
* @tree_view: A #GtkTreeView.
- * @func: (nullable): A function to determine which columns are reorderable, or %NULL.
- * @user_data: (closure): User data to be passed to @func, or %NULL
- * @destroy: (nullable): Destroy notifier for @user_data, or %NULL
+ * @func: (nullable): A function to determine which columns are reorderable
+ * @user_data: (closure): User data to be passed to @func
+ * @destroy: (nullable): Destroy notifier for @user_data
*
* Sets a user function for determining where a column may be dropped when
* dragged. This function is called on every column pair in turn at the
@@ -11162,8 +11161,8 @@ gtk_tree_view_scroll_to_point (GtkTreeView *tree_view,
/**
* gtk_tree_view_scroll_to_cell:
* @tree_view: A #GtkTreeView.
- * @path: (nullable): The path of the row to move to, or %NULL.
- * @column: (nullable): The #GtkTreeViewColumn to move horizontally to, or %NULL.
+ * @path: (nullable): The path of the row to move to
+ * @column: (nullable): The #GtkTreeViewColumn to move horizontally to
* @use_align: whether to use alignment arguments, or %FALSE.
* @row_align: The vertical alignment of the row specified by @path.
* @col_align: The horizontal alignment of the column specified by @column.
@@ -11933,9 +11932,9 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
* gtk_tree_view_get_cursor:
* @tree_view: A #GtkTreeView
* @path: (out) (transfer full) (optional) (nullable): A pointer to be
- * filled with the current cursor path, or %NULL
+ * filled with the current cursor path
* @focus_column: (out) (transfer none) (optional) (nullable): A
- * pointer to be filled with the current focus column, or %NULL
+ * pointer to be filled with the current focus column
*
* Fills in @path and @focus_column with the current path and focus column. If
* the cursor isn’t currently set, then *@path will be %NULL. If no column
@@ -11972,7 +11971,7 @@ gtk_tree_view_get_cursor (GtkTreeView *tree_view,
* gtk_tree_view_set_cursor:
* @tree_view: A #GtkTreeView
* @path: A #GtkTreePath
- * @focus_column: (nullable): A #GtkTreeViewColumn, or %NULL
+ * @focus_column: (nullable): A #GtkTreeViewColumn
* @start_editing: %TRUE if the specified cell should start being edited.
*
* Sets the current keyboard focus to be at @path, and selects it. This is
@@ -12001,8 +12000,8 @@ gtk_tree_view_set_cursor (GtkTreeView *tree_view,
* gtk_tree_view_set_cursor_on_cell:
* @tree_view: A #GtkTreeView
* @path: A #GtkTreePath
- * @focus_column: (nullable): A #GtkTreeViewColumn, or %NULL
- * @focus_cell: (nullable): A #GtkCellRenderer, or %NULL
+ * @focus_column: (nullable): A #GtkTreeViewColumn
+ * @focus_cell: (nullable): A #GtkCellRenderer
* @start_editing: %TRUE if the specified cell should start being edited.
*
* Sets the current keyboard focus to be at @path, and selects it. This is
@@ -12079,13 +12078,13 @@ gtk_tree_view_set_cursor_on_cell (GtkTreeView *tree_view,
* @x: The x position to be identified (relative to bin_window).
* @y: The y position to be identified (relative to bin_window).
* @path: (out) (optional) (nullable): A pointer to a #GtkTreePath
- * pointer to be filled in, or %NULL
+ * pointer to be filled in
* @column: (out) (transfer none) (optional) (nullable): A pointer to
- * a #GtkTreeViewColumn pointer to be filled in, or %NULL
+ * a #GtkTreeViewColumn pointer to be filled in
* @cell_x: (out) (optional): A pointer where the X coordinate
- * relative to the cell can be placed, or %NULL
+ * relative to the cell can be placed
* @cell_y: (out) (optional): A pointer where the Y coordinate
- * relative to the cell can be placed, or %NULL
+ * relative to the cell can be placed
*
* Finds the path at the point (@x, @y), relative to bin_window coordinates.
* That is, @x and @y are relative to an events coordinates. Widget-relative
@@ -12698,13 +12697,13 @@ gtk_tree_view_get_visible_range (GtkTreeView *tree_view,
* @x: The x position to be identified (relative to bin_window)
* @y: The y position to be identified (relative to bin_window)
* @path: (out) (optional) (nullable): A pointer to a #GtkTreePath pointer to
- * be filled in, or %NULL
+ * be filled in
* @column: (out) (transfer none) (optional) (nullable): A pointer to a
- * #GtkTreeViewColumn pointer to be filled in, or %NULL
+ * #GtkTreeViewColumn pointer to be filled in
* @cell_x: (out) (optional): A pointer where the X coordinate relative to the
- * cell can be placed, or %NULL
+ * cell can be placed
* @cell_y: (out) (optional): A pointer where the Y coordinate relative to the
- * cell can be placed, or %NULL
+ * cell can be placed
*
* Determine whether the point (@x, @y) in @tree_view is blank, that is no
* cell content nor an expander arrow is drawn at the location. If so, the
@@ -12955,7 +12954,7 @@ gtk_tree_view_unset_rows_drag_dest (GtkTreeView *tree_view)
/**
* gtk_tree_view_set_drag_dest_row:
* @tree_view: a #GtkTreeView
- * @path: (nullable): The path of the row to highlight, or %NULL
+ * @path: (nullable): The path of the row to highlight
* @pos: Specifies whether to drop before, after or into the row
*
* Sets the row that is highlighted for feedback.
@@ -13021,8 +13020,8 @@ gtk_tree_view_set_drag_dest_row (GtkTreeView *tree_view,
/**
* gtk_tree_view_get_drag_dest_row:
* @tree_view: a #GtkTreeView
- * @path: (out) (optional) (nullable): Return location for the path of the highlighted row, or %NULL.
- * @pos: (out) (optional): Return location for the drop position, or %NULL
+ * @path: (out) (optional) (nullable): Return location for the path of the highlighted row
+ * @pos: (out) (optional): Return location for the drop position
*
* Gets information about the row that is highlighted for feedback.
**/
@@ -13058,7 +13057,7 @@ gtk_tree_view_get_drag_dest_row (GtkTreeView *tree_view,
* @drag_x: the position to determine the destination row for
* @drag_y: the position to determine the destination row for
* @path: (out) (optional) (nullable): Return location for the path of
- * the highlighted row, or %NULL.
+ * the highlighted row
* @pos: (out) (optional): Return location for the drop position, or
* %NULL
*
@@ -13446,8 +13445,8 @@ gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view)
* gtk_tree_view_set_search_equal_func:
* @tree_view: A #GtkTreeView
* @search_equal_func: the compare function to use during the search
- * @search_user_data: (nullable): user data to pass to @search_equal_func, or %NULL
- * @search_destroy: (nullable): Destroy notifier for @search_user_data, or %NULL
+ * @search_user_data: (nullable): user data to pass to @search_equal_func
+ * @search_destroy: (nullable): Destroy notifier for @search_user_data
*
* Sets the compare function for the interactive search capabilities; note
* that somewhat like strcmp() returning 0 for equality
@@ -13500,7 +13499,7 @@ gtk_tree_view_get_search_entry (GtkTreeView *tree_view)
/**
* gtk_tree_view_set_search_entry:
* @tree_view: A #GtkTreeView
- * @entry: (nullable): the entry the interactive search code of @tree_view should use or %NULL
+ * @entry: (nullable): the entry the interactive search code of @tree_view should use
*
* Sets the entry which the interactive search code will use for this
* @tree_view. This is useful when you want to provide a search entry
@@ -14343,8 +14342,8 @@ gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view)
* gtk_tree_view_set_row_separator_func:
* @tree_view: a #GtkTreeView
* @func: (nullable): a #GtkTreeViewRowSeparatorFunc
- * @data: (nullable): user data to pass to @func, or %NULL
- * @destroy: (nullable): destroy notifier for @data, or %NULL
+ * @data: (nullable): user data to pass to @func
+ * @destroy: (nullable): destroy notifier for @data
*
* Sets the row separator function, which is used to determine
* whether a row should be drawn as a separator. If the row separator
@@ -14586,9 +14585,9 @@ gtk_tree_view_set_tooltip_row (GtkTreeView *tree_view,
* gtk_tree_view_set_tooltip_cell:
* @tree_view: a #GtkTreeView
* @tooltip: a #GtkTooltip
- * @path: (nullable): a #GtkTreePath or %NULL
- * @column: (nullable): a #GtkTreeViewColumn or %NULL
- * @cell: (nullable): a #GtkCellRenderer or %NULL
+ * @path: (nullable): a #GtkTreePath
+ * @column: (nullable): a #GtkTreeViewColumn
+ * @cell: (nullable): a #GtkCellRenderer
*
* Sets the tip area of @tooltip to the area @path, @column and @cell have
* in common. For example if @path is %NULL and @column is set, the tip
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 64fd28f8be..46350b5dbb 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2393,7 +2393,7 @@ gtk_tree_view_column_get_clickable (GtkTreeViewColumn *tree_column)
/**
* gtk_tree_view_column_set_widget:
* @tree_column: A #GtkTreeViewColumn.
- * @widget: (nullable): A child #GtkWidget, or %NULL.
+ * @widget: (nullable): A child #GtkWidget
*
* Sets the widget in the header to be @widget. If widget is %NULL, then the
* header button is set with a #GtkLabel set to the title of @tree_column.
@@ -2732,10 +2732,10 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_cell_get_size:
* @tree_column: A #GtkTreeViewColumn.
- * @x_offset: (out) (optional): location to return x offset of a cell relative to @cell_area, or %NULL
- * @y_offset: (out) (optional): location to return y offset of a cell relative to @cell_area, or %NULL
- * @width: (out) (optional): location to return width needed to render a cell, or %NULL
- * @height: (out) (optional): location to return height needed to render a cell, or %NULL
+ * @x_offset: (out) (optional): location to return x offset of a cell relative to @cell_area
+ * @y_offset: (out) (optional): location to return y offset of a cell relative to @cell_area
+ * @width: (out) (optional): location to return width needed to render a cell
+ * @height: (out) (optional): location to return height needed to render a cell
*
* Obtains the width and height needed to render the column. This is used
* primarily by the #GtkTreeView.
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 86cae84d9f..4015465632 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3687,8 +3687,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
*
* Unrealized widgets do not have a frame clock.
*
- * Returns: (nullable) (transfer none): a `GdkFrameClock`,
- * or %NULL if widget is unrealized
+ * Returns: (nullable) (transfer none): a `GdkFrameClock`
*/
GdkFrameClock*
gtk_widget_get_frame_clock (GtkWidget *widget)
@@ -6480,7 +6479,7 @@ gtk_widget_update_pango_context (GtkWidget *widget)
/**
* gtk_widget_set_font_options:
* @widget: a `GtkWidget`
- * @options: (nullable): a #cairo_font_options_t, or %NULL
+ * @options: (nullable): a #cairo_font_options_t
* to unset any previously set default font options
*
* Sets the `cairo_font_options_t` used for Pango rendering
@@ -6584,7 +6583,7 @@ gtk_widget_set_font_map (GtkWidget *widget,
*
* See [method@Gtk.Widget.set_font_map].
*
- * Returns: (transfer none) (nullable): A `PangoFontMap`, or %NULL
+ * Returns: (transfer none) (nullable): A `PangoFontMap`
*/
PangoFontMap *
gtk_widget_get_font_map (GtkWidget *widget)
@@ -11296,7 +11295,7 @@ gtk_widget_get_template_child (GtkWidget *widget,
* gtk_widget_activate_action_variant: (rename-to gtk_widget_activate_action)
* @widget: a `GtkWidget`
* @name: the name of the action to activate
- * @args: (nullable): parameters to use, or %NULL
+ * @args: (nullable): parameters to use
*
* Looks up the action in the action groups associated with
* @widget and its ancestors, and activates it.
@@ -12460,7 +12459,7 @@ gtk_widget_class_add_action (GtkWidgetClass *widget_class,
* gtk_widget_class_install_action:
* @widget_class: a `GtkWidgetClass`
* @action_name: a prefixed action name, such as "clipboard.paste"
- * @parameter_type: (nullable): the parameter type, or %NULL
+ * @parameter_type: (nullable): the parameter type
* @activate: (scope call): callback to use when the action is activated
*
* This should be called at class initialization time to specify
diff --git a/gtk/gtkwidgetpaintable.c b/gtk/gtkwidgetpaintable.c
index 0f2f4a345f..50ea1582fb 100644
--- a/gtk/gtkwidgetpaintable.c
+++ b/gtk/gtkwidgetpaintable.c
@@ -260,7 +260,7 @@ gtk_widget_paintable_init (GtkWidgetPaintable *self)
/**
* gtk_widget_paintable_new:
- * @widget: (nullable) (transfer none): a `GtkWidget` or %NULL
+ * @widget: (nullable) (transfer none): a `GtkWidget`
*
* Creates a new widget paintable observing the given widget.
*
@@ -312,7 +312,7 @@ gtk_widget_paintable_get_widget (GtkWidgetPaintable *self)
/**
* gtk_widget_paintable_set_widget: (attributes org.gtk.Method.set_property=widget)
* @self: a `GtkWidgetPaintable`
- * @widget: (nullable): the widget to observe or %NULL
+ * @widget: (nullable): the widget to observe
*
* Sets the widget that should be observed.
*/
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3bb24ab30e..4d9830d607 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2206,9 +2206,7 @@ gtk_window_set_title (GtkWindow *window,
*
* Retrieves the title of the window.
*
- * Returns: (nullable): the title of the window, or %NULL if none has
- * been set explicitly. The returned string is owned by the widget
- * and must not be modified or freed.
+ * Returns: (nullable): the title of the window
*/
const char *
gtk_window_get_title (GtkWindow *window)
@@ -2284,7 +2282,7 @@ gtk_window_set_startup_id (GtkWindow *window,
/**
* gtk_window_set_default_widget: (attributes org.gtk.Property.set=default-widget)
* @window: a `GtkWindow`
- * @default_widget: (nullable): widget to be the default, or %NULL
+ * @default_widget: (nullable): widget to be the default
* to unset the default widget for the toplevel
*
* Sets the default widget.
@@ -2350,8 +2348,7 @@ gtk_window_set_default_widget (GtkWindow *window,
*
* Returns the default widget for @window.
*
- * Returns: (nullable) (transfer none): the default widget, or %NULL
- * if there is none.
+ * Returns: (nullable) (transfer none): the default widget
*/
GtkWidget *
gtk_window_get_default_widget (GtkWindow *window)
@@ -2403,8 +2400,7 @@ _gtk_window_notify_keys_changed (GtkWindow *window)
* is not focused then `gtk_widget_has_focus (widget)` will
* not be %TRUE for the widget.
*
- * Returns: (nullable) (transfer none): the currently focused widget,
- * or %NULL if there is none.
+ * Returns: (nullable) (transfer none): the currently focused widget
*/
GtkWidget *
gtk_window_get_focus (GtkWindow *window)
@@ -2650,7 +2646,7 @@ gtk_window_unset_transient_for (GtkWindow *window)
/**
* gtk_window_set_transient_for: (attributes org.gtk.Method.set_property=transient-for)
* @window: a `GtkWindow`
- * @parent: (nullable): parent window, or %NULL
+ * @parent: (nullable): parent window
*
* Dialog windows should be set transient for the main application
* window they were spawned from. This allows window managers to e.g.
@@ -2723,8 +2719,7 @@ gtk_window_set_transient_for (GtkWindow *window,
*
* Fetches the transient parent for this window.
*
- * Returns: (nullable) (transfer none): the transient parent for this
- * window, or %NULL if no transient parent has been set.
+ * Returns: (nullable) (transfer none): the transient parent for this window
*/
GtkWindow *
gtk_window_get_transient_for (GtkWindow *window)
@@ -2742,7 +2737,7 @@ gtk_window_get_transient_for (GtkWindow *window)
*
* Gets the `GtkApplication` associated with the window.
*
- * Returns: (nullable) (transfer none): a `GtkApplication`, or %NULL
+ * Returns: (nullable) (transfer none): a `GtkApplication`
*/
GtkApplication *
gtk_window_get_application (GtkWindow *window)
@@ -3066,7 +3061,7 @@ out:
* Returns the custom titlebar that has been set with
* gtk_window_set_titlebar().
*
- * Returns: (nullable) (transfer none): the custom titlebar, or %NULL
+ * Returns: (nullable) (transfer none): the custom titlebar
*/
GtkWidget *
gtk_window_get_titlebar (GtkWindow *window)
@@ -3460,8 +3455,7 @@ gtk_window_set_icon_name (GtkWindow *window,
*
* Returns the name of the themed icon for the window.
*
- * Returns: (nullable): the icon name or %NULL if the window has
- * no themed icon
+ * Returns: (nullable): the icon name
*/
const char *
gtk_window_get_icon_name (GtkWindow *window)
@@ -3646,8 +3640,8 @@ gtk_window_set_default_size (GtkWindow *window,
/**
* gtk_window_get_default_size:
* @window: a `GtkWindow`
- * @width: (out) (optional): location to store the default width, or %NULL
- * @height: (out) (optional): location to store the default height, or %NULL
+ * @width: (out) (optional): location to store the default width
+ * @height: (out) (optional): location to store the default height
*
* Gets the default size of the window.
*
@@ -5719,7 +5713,7 @@ gtk_window_is_active (GtkWindow *window)
/**
* gtk_window_get_group:
- * @window: (nullable): a `GtkWindow`, or %NULL
+ * @window: (nullable): a `GtkWindow`
*
* Returns the group for @window.
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
