diff options
148 files changed, 525 insertions, 525 deletions
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c index 66c9660be4..86739dd0ec 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: (allow-none): a #GIcon, or %NULL + * @icon: (nullable): a #GIcon, or %NULL * * 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: (allow-none): an icon name, or %NULL + * @icon_name: (nullable): an icon name, or %NULL * * Sets the icon for applications that are launched with this context. * diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c index 0be31e9ab0..fc507358f3 100644 --- a/gdk/gdkclipboard.c +++ b/gdk/gdkclipboard.c @@ -676,7 +676,7 @@ gdk_clipboard_read_async (GdkClipboard *clipboard, * gdk_clipboard_read_finish: * @clipboard: a `GdkClipboard` * @result: a `GAsyncResult` - * @out_mime_type: (out) (allow-none) (transfer none): pointer to store + * @out_mime_type: (out) (optional) (transfer none): pointer to store * the chosen mime type * @error: a `GError` location to store the error occurring * @@ -1194,7 +1194,7 @@ gdk_clipboard_claim_remote (GdkClipboard *clipboard, /** * gdk_clipboard_set_content: * @clipboard: a `GdkClipboard` - * @provider: (transfer none) (allow-none): the new contents of @clipboard + * @provider: (transfer none) (nullable): the new contents of @clipboard * or %NULL to clear the clipboard * * Sets a new content provider on @clipboard. diff --git a/gdk/gdkcontentformats.c b/gdk/gdkcontentformats.c index 350b8ff2f5..d4dae7bbb5 100644 --- a/gdk/gdkcontentformats.c +++ b/gdk/gdkcontentformats.c @@ -125,7 +125,7 @@ gdk_content_formats_new_take (GType * gtypes, /** * gdk_content_formats_new: - * @mime_types: (array length=n_mime_types) (allow-none): Pointer to an + * @mime_types: (array length=n_mime_types) (nullable): Pointer to an * array of mime types * @n_mime_types: number of entries in @mime_types. * diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c index ed3afc019e..62ba4143c9 100644 --- a/gdk/gdkcursor.c +++ b/gdk/gdkcursor.c @@ -298,7 +298,7 @@ gdk_cursor_equal (gconstpointer a, /** * gdk_cursor_new_from_name: * @name: the name of the cursor - * @fallback: (allow-none): %NULL or the `GdkCursor` to fall back to when + * @fallback: (nullable): %NULL or the `GdkCursor` to fall back to when * this one cannot be supported * * Creates a new cursor by looking up @name in the current cursor @@ -340,7 +340,7 @@ gdk_cursor_new_from_name (const char *name, * @texture: the texture providing the pixel data * @hotspot_x: the horizontal offset of the “hotspot” of the cursor * @hotspot_y: the vertical offset of the “hotspot” of the cursor - * @fallback: (allow-none): %NULL or the `GdkCursor` to fall back to when + * @fallback: (nullable): %NULL or the `GdkCursor` to fall back to when * this one cannot be supported * * Creates a new cursor from a `GdkTexture`. diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 61b5bb22da..21854d46b5 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -520,9 +520,9 @@ gdk_device_get_property (GObject *object, /** * gdk_device_get_surface_at_position: * @device: pointer `GdkDevice` to query info to - * @win_x: (out) (allow-none): return location for the X coordinate + * @win_x: (out) (optional): return location for the X coordinate * of the device location relative to the surface origin - * @win_y: (out) (allow-none): return location for the Y coordinate + * @win_y: (out) (optional): return location for the Y coordinate * of the device location relative to the surface origin * * Obtains the surface underneath @device, returning the location of the diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c index 90152d8105..75ed6beeb2 100644 --- a/gdk/gdkdrop.c +++ b/gdk/gdkdrop.c @@ -659,7 +659,7 @@ gdk_drop_read_internal (GdkDrop *self, * @mime_types: (array zero-terminated=1) (element-type utf8): * pointer to an array of mime types * @io_priority: the I/O priority for the read operation - * @cancellable: (allow-none): optional `GCancellable` object + * @cancellable: (nullable): optional `GCancellable` object * @callback: (scope async): a `GAsyncReadyCallback` to call when * the request is satisfied * @user_data: (closure): the data to pass to @callback @@ -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: (allow-none): location to store error information on failure, or %NULL + * @error: (nullable): location to store error information on failure, or %NULL * * Finishes an async drop read operation. * diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c index 34afcd280e..d47c4589f2 100644 --- a/gdk/gdkkeys.c +++ b/gdk/gdkkeys.c @@ -551,10 +551,10 @@ gdk_keymap_lookup_key (GdkKeymap *keymap, * @hardware_keycode: a keycode * @state: a modifier state * @group: active keyboard group - * @keyval: (out) (allow-none): return location for keyval - * @effective_group: (out) (allow-none): return location for effective group - * @level: (out) (allow-none): return location for level - * @consumed_modifiers: (out) (allow-none): return location for modifiers + * @keyval: (out) (optional): return location for keyval + * @effective_group: (out) (optional): return location for effective group + * @level: (out) (optional): return location for level + * @consumed_modifiers: (out) (optional): return location for modifiers * that were used to determine the group or level * * Translates the contents of a #GdkEventKey into a keyval, effective diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index 3db6292bfe..b433235655 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -91,7 +91,7 @@ gdk_rectangle_union (const GdkRectangle *src1, * gdk_rectangle_intersect: * @src1: a `GdkRectangle` * @src2: a `GdkRectangle` - * @dest: (out caller-allocates) (allow-none): return location for the + * @dest: (out caller-allocates) (optional): return location for the * intersection of @src1 and @src2, or %NULL * * Calculates the intersection of two rectangles. diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 589dc4e10c..d71773032a 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -1438,7 +1438,7 @@ gdk_surface_paint_on_clock (GdkFrameClock *clock, /* * gdk_surface_invalidate_rect: * @surface: a `GdkSurface` - * @rect: (allow-none): rectangle to invalidate or %NULL to + * @rect: (nullable): rectangle to invalidate or %NULL to * invalidate the whole surface * * Invalidate a rectangular region of @surface. @@ -1696,9 +1696,9 @@ gdk_surface_constrain_size (GdkGeometry *geometry, * gdk_surface_get_device_position: * @surface: a `GdkSurface` * @device: pointer `GdkDevice` to query to - * @x: (out) (allow-none): return locatio for the X coordinate of @device, or %NULL - * @y: (out) (allow-none): return location for the Y coordinate of @device, or %NULL - * @mask: (out) (allow-none): return location for the modifier mask, or %NULL + * @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 * * Obtains the current device position and modifier state. * @@ -1855,7 +1855,7 @@ gdk_surface_get_cursor (GdkSurface *surface) /** * gdk_surface_set_cursor: (attributes org.gtk.Method.set_property=cursor) * @surface: a `GdkSurface` - * @cursor: (allow-none): a `GdkCursor` + * @cursor: (nullable): a `GdkCursor` * * Sets the default mouse pointer for a `GdkSurface`. * @@ -1970,10 +1970,10 @@ gdk_surface_set_device_cursor (GdkSurface *surface, /* * gdk_surface_get_geometry: * @surface: a `GdkSurface` - * @x: (out) (allow-none): return location for X coordinate of surface (relative to its parent) - * @y: (out) (allow-none): return location for Y coordinate of surface (relative to its parent) - * @width: (out) (allow-none): return location for width of surface - * @height: (out) (allow-none): return location for height of surface + * @x: (out) (optional): return location for X coordinate of surface (relative to its parent) + * @y: (out) (optional): return location for Y coordinate of surface (relative to its parent) + * @width: (out) (optional): return location for width of surface + * @height: (out) (optional): return location for height of surface * * Get the geometry of the surface. * @@ -2624,7 +2624,7 @@ gdk_surface_get_scale_factor (GdkSurface *surface) /** * gdk_surface_set_opaque_region: * @surface: a top-level `GdkSurface` - * @region: (allow-none): a region, or %NULL + * @region: (nullable): a region, or %NULL * * Marks a region of the `GdkSurface` as opaque. * diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index ec147eade9..9337ee3ee9 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -328,7 +328,7 @@ _gdk_win32_display_init_monitors (GdkWin32Display *win32_display) /** * gdk_win32_display_set_cursor_theme: * @display: (type GdkWin32Display): a `GdkDisplay` - * @name: (allow-none): the name of the cursor theme to use, or %NULL + * @name: (nullable): the name of the cursor theme to use, or %NULL * to unset a previously set value * @size: the cursor size to use, or 0 to keep the previous size * diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c index 683518f743..2200ba7661 100644 --- a/gdk/x11/gdkdevicemanager-x11.c +++ b/gdk/x11/gdkdevicemanager-x11.c @@ -71,7 +71,7 @@ _gdk_x11_device_manager_new (GdkDisplay *display) * * Returns the #GdkDevice that wraps the given device ID. * - * Returns: (transfer none) (allow-none) (type GdkX11DeviceXI2): The + * Returns: (transfer none) (nullable) (type GdkX11DeviceXI2): The * `GdkDevice` wrapping the device ID, * or %NULL if the given ID doesn’t currently represent a device. **/ diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 67675e83a7..5f0a379f04 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1357,7 +1357,7 @@ gdk_display_setup_window_visual (GdkDisplay *display, /** * gdk_x11_display_open: - * @display_name: (allow-none): name of the X display. + * @display_name: (nullable): name of the X display. * See the XOpenDisplay() for details. * * Tries to open a new display to the X server given by diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index 8d963a5b3a..2cfd3b2e38 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -3059,7 +3059,7 @@ gdk_x11_surface_set_user_time (GdkSurface *surface, * gdk_x11_surface_set_utf8_property: * @surface: (type GdkX11Surface): a #GdkSurface * @name: Property name, will be interned as an X atom - * @value: (allow-none): Property value, or %NULL to delete + * @value: (nullable): Property value, or %NULL to delete * * This function modifies or removes an arbitrary X11 window * property of type UTF8_STRING. If the given @surface is diff --git a/gsk/gskrenderer.c b/gsk/gskrenderer.c index 45b2981a47..9e048b29dc 100644 --- a/gsk/gskrenderer.c +++ b/gsk/gskrenderer.c @@ -339,7 +339,7 @@ gsk_renderer_unrealize (GskRenderer *renderer) * gsk_renderer_render_texture: * @renderer: a realized `GskRenderer` * @root: a `GskRenderNode` - * @viewport: (allow-none): the section to draw or %NULL to use @root's bounds + * @viewport: (nullable): the section to draw or %NULL to use @root's bounds * * Renders the scene graph, described by a tree of `GskRenderNode` instances, * to a `GdkTexture`. diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c index 49149d4c2d..dc7ce1a9ed 100644 --- a/gsk/gskrendernodeimpl.c +++ b/gsk/gskrendernodeimpl.c @@ -3392,7 +3392,7 @@ gsk_repeat_node_draw (GskRenderNode *node, * gsk_repeat_node_new: * @bounds: The bounds of the area to be painted * @child: The child to repeat - * @child_bounds: (allow-none): The area of the child to repeat or %NULL to + * @child_bounds: (nullable): The area of the child to repeat or %NULL to * use the child's bounds * * Creates a `GskRenderNode` that will repeat the drawing of @child across diff --git a/gsk/gsktransform.c b/gsk/gsktransform.c index cc1dea0e93..51a5d49e04 100644 --- a/gsk/gsktransform.c +++ b/gsk/gsktransform.c @@ -217,7 +217,7 @@ static const GskTransformClass GSK_IDENTITY_TRANSFORM_CLASS = /*<private> * gsk_transform_is_identity: - * @transform: (allow-none): A transform or %NULL + * @transform: (nullable): A transform or %NULL * * Checks if the transform is a representation of the identity * transform. @@ -452,7 +452,7 @@ gsk_transform_matrix_with_category (GskTransform *next, /** * gsk_transform_matrix: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @matrix: the matrix to multiply @next with * * Multiplies @next with the given @matrix. @@ -605,7 +605,7 @@ static const GskTransformClass GSK_TRANSLATE_TRANSFORM_CLASS = /** * gsk_transform_translate: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @point: the point to translate the transform by * * Translates @next in 2-dimensional space by @point. @@ -625,7 +625,7 @@ gsk_transform_translate (GskTransform *next, /** * gsk_transform_translate_3d: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @point: the point to translate the transform by * * Translates @next by @point. @@ -840,7 +840,7 @@ normalize_angle (float angle) /** * gsk_transform_rotate: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @angle: the rotation angle, in degrees (clockwise) * * Rotates @next @angle degrees in 2D - or in 3D-speak, around the z axis. @@ -964,7 +964,7 @@ static const GskTransformClass GSK_ROTATE3D_TRANSFORM_CLASS = /** * gsk_transform_rotate_3d: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @angle: the rotation angle, in degrees (clockwise) * @axis: The rotation axis * @@ -1137,7 +1137,7 @@ static const GskTransformClass GSK_SCALE_TRANSFORM_CLASS = /** * gsk_transform_scale: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @factor_x: scaling factor on the X axis * @factor_y: scaling factor on the Y axis * @@ -1157,7 +1157,7 @@ gsk_transform_scale (GskTransform *next, /** * gsk_transform_scale_3d: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @factor_x: scaling factor on the X axis * @factor_y: scaling factor on the Y axis * @factor_z: scaling factor on the Z axis @@ -1286,7 +1286,7 @@ static const GskTransformClass GSK_PERSPECTIVE_TRANSFORM_CLASS = /** * gsk_transform_perspective: - * @next: (allow-none) (transfer full): the next transform + * @next: (nullable) (transfer full): the next transform * @depth: distance of the z=0 plane. Lower values give a more * flattened pyramid and therefore a more pronounced * perspective effect. @@ -1335,7 +1335,7 @@ gsk_transform_finalize (GskTransform *self) /** * gsk_transform_ref: - * @self: (allow-none): a `GskTransform` + * @self: (nullable): a `GskTransform` * * Acquires a reference on the given `GskTransform`. * @@ -1352,7 +1352,7 @@ gsk_transform_ref (GskTransform *self) /** * gsk_transform_unref: - * @self: (allow-none): a `GskTransform` + * @self: (nullable): a `GskTransform` * * Releases a reference on the given `GskTransform`. * @@ -1370,7 +1370,7 @@ gsk_transform_unref (GskTransform *self) /** * gsk_transform_print: - * @self: (allow-none): a `GskTransform` + * @self: (nullable): a `GskTransform` * @string: The string to print into * * Converts @self into a human-readable string representation suitable @@ -1402,7 +1402,7 @@ gsk_transform_print (GskTransform *self, /** * gsk_transform_to_string: - * @self: (allow-none): a #GskTransform + * @self: (nullable): a #GskTransform * * Converts a matrix into a string that is suitable for printing. * @@ -1426,7 +1426,7 @@ gsk_transform_to_string (GskTransform *self) /** * gsk_transform_to_matrix: - * @self: (allow-none): a `GskTransform` + * @self: (nullable): a `GskTransform` * @out_matrix: (out caller-allocates): The matrix to set * * Computes the actual value of @self and stores it in @out_matrix. @@ -1642,8 +1642,8 @@ gsk_transform_to_translate (GskTransform *self, /** * gsk_transform_transform: - * @next: (allow-none) (transfer full): Transform to apply @other to - * @other: (allow-none): Transform to apply + * @next: (nullable) (transfer full): Transform to apply @other to + * @other: (nullable): Transform to apply * * Applies all the operations from @other to @next. * @@ -1673,7 +1673,7 @@ gsk_transform_transform (GskTransform *next, /** * gsk_transform_invert: - * @self: (allow-none) (transfer full): Transform to invert + * @self: (nullable) (transfer full): Transform to invert * * Inverts the given transform. * @@ -1736,7 +1736,7 @@ gsk_transform_equal (GskTransform *first, /** * gsk_transform_get_category: - * @self: (allow-none): A #GskTransform + * @self: (nullable): A #GskTransform * * Returns the category this transform belongs to. * diff --git a/gtk/css/gtkcsstokenizer.c b/gtk/css/gtkcsstokenizer.c index 14a419b790..34d29466b1 100644 --- a/gtk/css/gtkcsstokenizer.c +++ b/gtk/css/gtkcsstokenizer.c @@ -214,7 +214,7 @@ gtk_css_token_is_finite (const GtkCssToken *token) /* * gtk_css_token_is_preserved: * @token: a #GtkCssToken - * @out_closing: (allow-none): Type of the token that closes a block + * @out_closing: (nullable): Type of the token that closes a block * started with this token * * A token is considered preserved when it does not start a block. diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index a4c1aa5021..fed9fe513e 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -228,11 +228,11 @@ is_keycode (const char *string) /** * gtk_accelerator_parse_with_keycode: * @accelerator: string representing an accelerator - * @display: (allow-none): the `GdkDisplay` to look up @accelerator_codes in - * @accelerator_key: (out) (allow-none): return location for accelerator keyval - * @accelerator_codes: (out) (array zero-terminated=1) (transfer full) (allow-none): + * @display: (nullable): the `GdkDisplay` to look up @accelerator_codes in + * @accelerator_key: (out) (optional): return location for accelerator keyval + * @accelerator_codes: (out) (array zero-terminated=1) (transfer full) (optional): * return location for accelerator keycodes - * @accelerator_mods: (out) (allow-none): return location for accelerator + * @accelerator_mods: (out) (optional): return location for accelerator * modifier mask * * Parses a string representing an accelerator. @@ -478,8 +478,8 @@ out: /** * gtk_accelerator_parse: * @accelerator: string representing an accelerator - * @accelerator_key: (out) (allow-none): return location for accelerator keyval - * @accelerator_mods: (out) (allow-none): return location for accelerator + * @accelerator_key: (out) (optional): return location for accelerator keyval + * @accelerator_mods: (out) (optional): return location for accelerator * modifier mask * * Parses a string representing an accelerator. @@ -505,7 +505,7 @@ gtk_accelerator_parse (const char *accelerator, /** * gtk_accelerator_name_with_keycode: - * @display: (allow-none): a `GdkDisplay` or %NULL to use the default display + * @display: (nullable): a `GdkDisplay` or %NULL to use the default display * @accelerator_key: accelerator keyval * @keycode: accelerator keycode * @accelerator_mods: accelerator modifier mask @@ -621,7 +621,7 @@ gtk_accelerator_name (guint accelerator_key, /** * gtk_accelerator_get_label_with_keycode: - * @display: (allow-none): a `GdkDisplay` or %NULL to use the default display + * @display: (nullable): a `GdkDisplay` or %NULL to use the default display * @accelerator_key: accelerator keyval * @keycode: accelerator keycode * @accelerator_mods: accelerator modifier mask diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c index 2d4e0d0af2..bf646c94bc 100644 --- a/gtk/gtkactionbar.c +++ b/gtk/gtkactionbar.c @@ -291,7 +291,7 @@ gtk_action_bar_remove (GtkActionBar *action_bar, /** * gtk_action_bar_set_center_widget: * @action_bar: a `GtkActionBar` - * @center_widget: (allow-none): a widget to use for the center + * @center_widget: (nullable): a widget to use for the center * * Sets the center widget for the `GtkActionBar`. */ diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c index 3b9d6a5835..dc4eb5689b 100644 --- a/gtk/gtkactionmuxer.c +++ b/gtk/gtkactionmuxer.c @@ -1346,7 +1346,7 @@ gtk_action_muxer_get_parent (GtkActionMuxer *muxer) /*< private > * gtk_action_muxer_set_parent: * @muxer: a #GtkActionMuxer - * @parent: (allow-none): the new parent #GtkActionMuxer + * @parent: (nullable): the new parent #GtkActionMuxer * * Sets the parent of @muxer to @parent. */ diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index 8e468c0972..68ad9c6e63 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: (allow-none): a `GtkWindow`, or %NULL + * @parent: (nullable): a `GtkWindow`, or %NULL * @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: (allow-none): a `GtkWindow`, or %NULL + * @parent: (nullable): a `GtkWindow`, or %NULL * @flags: flags for this dialog * @content_type: a content type string * diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 3a69d0190d..805f6ce40e 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -642,7 +642,7 @@ gtk_aspect_frame_get_request_mode (GtkWidget *widget) /** * gtk_aspect_frame_set_child: (attributes org.gtk.Method.set_property=child) * @self: a `GtkAspectFrame` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @self. */ diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 020eecda6f..e36c38332a 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: (allow-none): the `GtkAssistant`PageFunc, or %NULL + * @page_func: (nullable): the `GtkAssistant`PageFunc, or %NULL * to use the default one * @data: user data for @page_func * @destroy: destroy notifier for @data diff --git a/gtk/gtkbitset.c b/gtk/gtkbitset.c index 1b42e51096..2b98b740f3 100644 --- a/gtk/gtkbitset.c +++ b/gtk/gtkbitset.c @@ -56,7 +56,7 @@ G_DEFINE_BOXED_TYPE (GtkBitset, gtk_bitset, /** * gtk_bitset_ref: - * @self: (allow-none): a `GtkBitset` + * @self: (nullable): a `GtkBitset` * * Acquires a reference on the given `GtkBitset`. * @@ -74,7 +74,7 @@ gtk_bitset_ref (GtkBitset *self) /** * gtk_bitset_unref: - * @self: (allow-none): a `GtkBitset` + * @self: (nullable): a `GtkBitset` * * Releases a reference on the given `GtkBitset`. * diff --git a/gtk/gtkbookmarklist.c b/gtk/gtkbookmarklist.c index 6df9d5fa86..63e500a5af 100644 --- a/gtk/gtkbookmarklist.c +++ b/gtk/gtkbookmarklist.c @@ -464,8 +464,8 @@ gtk_bookmark_list_get_filename (GtkBookmarkList *self) /** * gtk_bookmark_list_new: - * @filename: (allow-none): The bookmark file to load - * @attributes: (allow-none): The attributes to query + * @filename: (nullable): The bookmark file to load + * @attributes: (nullable): The attributes to query * * Creates a new `GtkBookmarkList` with the given @attributes. * @@ -484,7 +484,7 @@ gtk_bookmark_list_new (const char *filename, /** * gtk_bookmark_list_set_attributes: (attributes org.gtk.Method.set_property=attributes) * @self: a `GtkBookmarkList` - * @attributes: (allow-none): the attributes to enumerate + * @attributes: (nullable): the attributes to enumerate * * Sets the @attributes to be enumerated and starts the enumeration. * diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c index 232528ae95..46076eb21c 100644 --- a/gtk/gtkbuildable.c +++ b/gtk/gtkbuildable.c @@ -188,7 +188,7 @@ gtk_buildable_construct_child (GtkBuildable *buildable, * gtk_buildable_custom_tag_start: * @buildable: a `GtkBuildable` * @builder: a `GtkBuilder` used to construct this object - * @child: (allow-none): child object or %NULL for non-child tags + * @child: (nullable): child object or %NULL for non-child tags * @tagname: name of tag * @parser: (out): a #GMarkupParser to fill in * @data: (out): return location for user data that will be passed in @@ -224,7 +224,7 @@ gtk_buildable_custom_tag_start (GtkBuildable *buildable, * gtk_buildable_custom_tag_end: * @buildable: A `GtkBuildable` * @builder: `GtkBuilder` used to construct this object - * @child: (allow-none): child object or %NULL for non-child tags + * @child: (nullable): child object or %NULL for non-child tags * @tagname: name of tag * @data: user data that will be passed in to parser functions * @@ -253,7 +253,7 @@ gtk_buildable_custom_tag_end (GtkBuildable *buildable, * gtk_buildable_custom_finished: * @buildable: a `GtkBuildable` * @builder: a `GtkBuilder` - * @child: (allow-none): child object or %NULL for non-child tags + * @child: (nullable): child object or %NULL for non-child tags * @tagname: the name of the tag * @data: user data created in custom_tag_start * diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index a69d1f45c1..b52ece9f8e 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * Parses a string containing a UI definition, building only the * requested objects and merges them with the current contents of @@ -1938,7 +1938,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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * Demarshals a value from a string. * @@ -2064,7 +2064,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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * Demarshals a value from a string. * @@ -2732,7 +2732,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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * Creates a closure to invoke the function called @function_name. * diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index de6306ab64..2b2c1455b9 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1018,7 +1018,7 @@ gtk_button_get_gesture (GtkButton *button) /** * gtk_button_set_child: (attributes org.gtk.Method.set_property=child) * @button: a `GtkButton` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @button. */ diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c index a4190f7957..440a81d74e 100644 --- a/gtk/gtkcellarea.c +++ b/gtk/gtkcellarea.c @@ -1886,7 +1886,7 @@ get_cell_by_position (GtkCellRenderer *renderer, * for this row * @x: the x position * @y: the y position - * @alloc_area: (out) (allow-none): where to store the inner allocated area of the + * @alloc_area: (out) (optional): where to store the inner allocated area of the * returned cell renderer, or %NULL. * * Gets the #GtkCellRenderer at @x and @y coordinates inside @area and optionally @@ -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) (allow-none): location to store the minimum width, or %NULL - * @natural_width: (out) (allow-none): location to store the natural width, or %NULL + * @minimum_width: (out) (optional): location to store the minimum width, or %NULL + * @natural_width: (out) (optional): location to store the natural width, or %NULL * * 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) (allow-none): location to store the minimum height, or %NULL - * @natural_height: (out) (allow-none): location to store the natural height, or %NULL + * @minimum_height: (out) (optional): location to store the minimum height, or %NULL + * @natural_height: (out) (optional): location to store the natural height, or %NULL * * 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) (allow-none): location to store the minimum height, or %NULL - * @natural_height: (out) (allow-none): location to store the natural height, or %NULL + * @minimum_height: (out) (optional): location to store the minimum height, or %NULL + * @natural_height: (out) (optional): location to store the natural height, or %NULL * * 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) (allow-none): location to store the minimum width, or %NULL - * @natural_width: (out) (allow-none): location to store the natural width, or %NULL + * @minimum_width: (out) (optional): location to store the minimum width, or %NULL + * @natural_width: (out) (optional): location to store the natural width, or %NULL * * Retrieves a cell area’s minimum and natural width if it would be given * the specified @height. @@ -3438,8 +3438,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) (allow-none): location to store the minimum size, or %NULL - * @natural_size: (out) (allow-none): location to store the natural size, or %NULL + * @minimum_size: (out) (optional): location to store the minimum size, or %NULL + * @natural_size: (out) (optional): location to store the natural size, or %NULL * * 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 4bb6836d40..9e68008894 100644 --- a/gtk/gtkcellareacontext.c +++ b/gtk/gtkcellareacontext.c @@ -395,8 +395,8 @@ gtk_cell_area_context_allocate (GtkCellAreaContext *context, /** * gtk_cell_area_context_get_preferred_width: * @context: a #GtkCellAreaContext - * @minimum_width: (out) (allow-none): location to store the minimum width - * @natural_width: (out) (allow-none): location to store the natural width + * @minimum_width: (out) (optional): location to store the minimum width + * @natural_width: (out) (optional): location to store the natural width * * Gets the accumulative preferred width for all rows which have been * requested with this context. @@ -423,8 +423,8 @@ gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context, /** * gtk_cell_area_context_get_preferred_height: * @context: a #GtkCellAreaContext - * @minimum_height: (out) (allow-none): location to store the minimum height - * @natural_height: (out) (allow-none): location to store the natural height + * @minimum_height: (out) (optional): location to store the minimum height + * @natural_height: (out) (optional): location to store the natural height * * Gets the accumulative preferred height for all rows which have been * requested with this context. @@ -452,8 +452,8 @@ gtk_cell_area_context_get_preferred_height (GtkCellAreaContext *context, * gtk_cell_area_context_get_preferred_height_for_width: * @context: a #GtkCellAreaContext * @width: a proposed width for allocation - * @minimum_height: (out) (allow-none): location to store the minimum height - * @natural_height: (out) (allow-none): location to store the natural height + * @minimum_height: (out) (optional): location to store the minimum height + * @natural_height: (out) (optional): location to store the natural height * * Gets the accumulative preferred height for @width for all rows * which have been requested for the same said @width with this context. @@ -480,8 +480,8 @@ gtk_cell_area_context_get_preferred_height_for_width (GtkCellAreaContext *contex * gtk_cell_area_context_get_preferred_width_for_height: * @context: a #GtkCellAreaContext * @height: a proposed height for allocation - * @minimum_width: (out) (allow-none): location to store the minimum width - * @natural_width: (out) (allow-none): location to store the natural width + * @minimum_width: (out) (optional): location to store the minimum width + * @natural_width: (out) (optional): location to store the natural width * * Gets the accumulative preferred width for @height for all rows which * have been requested for the same said @height with this context. @@ -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) (allow-none): location to store the allocated width, or %NULL - * @height: (out) (allow-none): location to store the allocated height, or %NULL + * @width: (out) (optional): location to store the allocated width, or %NULL + * @height: (out) (optional): location to store the allocated height, or %NULL * * Fetches the current allocation size for @context. * diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c index c04ffdcf23..12a1ba7bf9 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: (allow-none): the #GtkCellLayoutDataFunc to use, or %NULL + * @func: (nullable): the #GtkCellLayoutDataFunc to use, or %NULL * @func_data: (closure): user data for @func * @destroy: destroy notify for @func_data * diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 84e5c16e8b..4870d58f95 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) (allow-none): location to fill in with the fixed width of the cell, or %NULL - * @height: (out) (allow-none): 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, or %NULL + * @height: (out) (optional): location to fill in with the fixed height of the cell, or %NULL * * 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) (allow-none): location to fill in with the x alignment of the cell, or %NULL - * @yalign: (out) (allow-none): 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, or %NULL + * @yalign: (out) (optional): location to fill in with the y alignment of the cell, or %NULL * * 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) (allow-none): location to fill in with the x padding of the cell, or %NULL - * @ypad: (out) (allow-none): 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, or %NULL + * @ypad: (out) (optional): location to fill in with the y padding of the cell, or %NULL * * 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) (allow-none): location to store the minimum size, or %NULL - * @natural_size: (out) (allow-none): location to store the natural size, or %NULL + * @minimum_size: (out) (optional): location to store the minimum size, or %NULL + * @natural_size: (out) (optional): location to store the natural size, or %NULL * * 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) (allow-none): location to store the minimum size, or %NULL - * @natural_size: (out) (allow-none): location to store the natural size, or %NULL + * @minimum_size: (out) (optional): location to store the minimum size, or %NULL + * @natural_size: (out) (optional): location to store the natural size, or %NULL * * 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) (allow-none): location for storing the minimum size, or %NULL - * @natural_width: (out) (allow-none): location for storing the preferred size, or %NULL + * @minimum_width: (out) (optional): location for storing the minimum size, or %NULL + * @natural_width: (out) (optional): location for storing the preferred size, or %NULL * * 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) (allow-none): location for storing the minimum size, or %NULL - * @natural_height: (out) (allow-none): location for storing the preferred size, or %NULL + * @minimum_height: (out) (optional): location for storing the minimum size, or %NULL + * @natural_height: (out) (optional): location for storing the preferred size, or %NULL * * 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) (allow-none): location for storing the minimum size, or %NULL - * @natural_size: (out) (allow-none): location for storing the natural size, or %NULL + * @minimum_size: (out) (optional): location for storing the minimum size, or %NULL + * @natural_size: (out) (optional): location for storing the natural size, or %NULL * * Retrieves the minimum and natural size of a cell taking * into account the widget’s preference for height-for-width management. diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 6f6709f215..8cbfd1e79c 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -977,7 +977,7 @@ gtk_cell_view_set_value (GtkCellView *cell_view, /** * gtk_cell_view_set_model: * @cell_view: a #GtkCellView - * @model: (allow-none): a #GtkTreeModel + * @model: (nullable): a #GtkTreeModel * * Sets the model for @cell_view. If @cell_view already has a model * set, it will remove it before setting the new model. If @model is @@ -1038,7 +1038,7 @@ gtk_cell_view_get_model (GtkCellView *cell_view) /** * gtk_cell_view_set_displayed_row: * @cell_view: a #GtkCellView - * @path: (allow-none): a #GtkTreePath or %NULL to unset. + * @path: (nullable): a #GtkTreePath or %NULL to unset. * * Sets the row of the model that is currently displayed * by the #GtkCellView. If the path is unset, then the diff --git a/gtk/gtkcolorchooser.c b/gtk/gtkcolorchooser.c index af9d742d99..d15b13ede8 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: (allow-none) (array length=n_colors): the colors of the palette, or %NULL + * @colors: (nullable) (array length=n_colors): the colors of the palette, or %NULL * * Adds a palette to the color chooser. * diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c index 5583074bec..8c8067e41e 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: (allow-none): Title of the dialog, or %NULL - * @parent: (allow-none): Transient parent of the dialog, or %NULL + * @title: (nullable): Title of the dialog, or %NULL + * @parent: (nullable): Transient parent of the dialog, or %NULL * * Creates a new `GtkColorChooserDialog`. * diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c index 51f0c4c94e..47d55f7d69 100644 --- a/gtk/gtkcolumnview.c +++ b/gtk/gtkcolumnview.c @@ -1327,7 +1327,7 @@ gtk_column_view_init (GtkColumnView *self) /** * gtk_column_view_new: - * @model: (allow-none) (transfer full): the list model to use, or %NULL + * @model: (nullable) (transfer full): the list model to use, or %NULL * * 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: (allow-none) (transfer none): the model to use or %NULL for none + * @model: (nullable) (transfer none): the model to use or %NULL for none * * 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: (allow-none): the `GtkColumnViewColumn` to sort by, or %NULL + * @column: (nullable): the `GtkColumnViewColumn` to sort by, or %NULL * @direction: the direction to sort in * * Sets the sorting of the view. diff --git a/gtk/gtkcolumnviewcolumn.c b/gtk/gtkcolumnviewcolumn.c index d47e93fc3d..bae0674544 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: (allow-none) (transfer none): the factory to use or %NULL for none + * @factory: (nullable) (transfer none): the factory to use or %NULL for none * * 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: (allow-none): a `GMenuModel`, or %NULL + * @menu: (nullable): a `GMenuModel`, or %NULL * * Sets the menu model that is used to create the context menu * for the column header. diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 3fb5b8f070..adbc69f83a 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: (allow-none): The `GtkTreeIter`, or %NULL + * @iter: (nullable): The `GtkTreeIter`, or %NULL * * Sets the current active item to be the one referenced by @iter. * @@ -2084,7 +2084,7 @@ gtk_combo_box_set_active_iter (GtkComboBox *combo_box, /** * gtk_combo_box_set_model: (attributes org.gtk.Method.set_property=model) * @combo_box: A `GtkComboBox` - * @model: (allow-none): A `GtkTreeModel` + * @model: (nullable): A `GtkTreeModel` * * Sets the model used by @combo_box to be @model. * @@ -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: (allow-none): user data to pass to @func, or %NULL - * @destroy: (allow-none): destroy notifier for @data, or %NULL + * @data: (nullable): user data to pass to @func, or %NULL + * @destroy: (nullable): destroy notifier for @data, or %NULL * * Sets the row separator function, which is used to determine * whether a row should be drawn as a separator. @@ -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: (allow-none): the ID of the row to select, or %NULL + * @active_id: (nullable): the ID of the row to select, or %NULL * * Changes the active row of @combo_box to the one that has an ID equal to * @active_id. @@ -2962,7 +2962,7 @@ gtk_combo_box_get_popup (GtkComboBox *combo_box) /** * gtk_combo_box_set_child: (attributes org.gtk.Method.set_property=child) * @combo_box: a `GtkComboBox` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @combo_box. */ diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c index 0741fccfb6..964d529dd6 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: (allow-none): a string ID for this value, or %NULL + * @id: (nullable): a string ID for this value, or %NULL * @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: (allow-none): a string ID for this value, or %NULL + * @id: (nullable): a string ID for this value, or %NULL * @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: (allow-none): a string ID for this value, or %NULL + * @id: (nullable): a string ID for this value, or %NULL * @text: A string to display * * Inserts @text at @position in the list of strings stored in @combo_box. diff --git a/gtk/gtkconstraintguide.c b/gtk/gtkconstraintguide.c index cab27e4568..f6fcd8d546 100644 --- a/gtk/gtkconstraintguide.c +++ b/gtk/gtkconstraintguide.c @@ -500,8 +500,8 @@ gtk_constraint_guide_set_min_size (GtkConstraintGuide *guide, /** * gtk_constraint_guide_get_min_size: * @guide: a `GtkConstraintGuide` object - * @width: (allow-none): return location for the minimum width - * @height: (allow-none): return location for the minimum height + * @width: (nullable): return location for the minimum width + * @height: (nullable): return location for the minimum height * * Gets the minimum size of @guide. */ @@ -552,8 +552,8 @@ gtk_constraint_guide_set_nat_size (GtkConstraintGuide *guide, /** * gtk_constraint_guide_get_nat_size: * @guide: a `GtkConstraintGuide` object - * @width: (allow-none): return location for the natural width - * @height: (allow-none): return location for the natural height + * @width: (nullable): return location for the natural width + * @height: (nullable): return location for the natural height * * Gets the natural size of @guide. */ @@ -604,8 +604,8 @@ gtk_constraint_guide_set_max_size (GtkConstraintGuide *guide, /** * gtk_constraint_guide_get_max_size: * @guide: a `GtkConstraintGuide` object - * @width: (allow-none): return location for the maximum width - * @height: (allow-none): return location for the maximum height + * @width: (nullable): return location for the maximum width + * @height: (nullable): return location for the maximum height * * Gets the maximum size of @guide. */ diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c index 704de1560b..9f3d047253 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: (allow-none): The @section the value was defined in or %NULL + * @section: (nullable): The @section the value was defined in or %NULL * @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/gtkcssprovider.c b/gtk/gtkcssprovider.c index a5f7b77577..0baa6f9b68 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -1320,7 +1320,7 @@ _gtk_css_find_theme (const char *name, * gtk_css_provider_load_named: * @provider: a `GtkCssProvider` * @name: A theme name - * @variant: (allow-none): variant to load, for example, "dark", or + * @variant: (nullable): variant to load, for example, "dark", or * %NULL for the default * * Loads a theme from the usual theme paths. diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index b86d86604d..eb19e527fe 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: (allow-none): the title of the dialog, or %NULL - * @parent: (allow-none): transient parent of the dialog, or %NULL + * @title: (nullable): the title of the dialog, or %NULL + * @parent: (nullable): transient parent of the dialog, or %NULL * * Creates a new custom paper dialog. * diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index a606513dc9..8d00884aad 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: (allow-none): Title of the dialog, or %NULL - * @parent: (allow-none): Transient parent of the dialog, or %NULL + * @title: (nullable): Title of the dialog, or %NULL + * @parent: (nullable): Transient parent of the dialog, or %NULL * @flags: from `GtkDialogFlags` - * @first_button_text: (allow-none): text to go in first button, or %NULL + * @first_button_text: (nullable): text to go in first button, or %NULL * @...: 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/gtkdirectorylist.c b/gtk/gtkdirectorylist.c index 3792f1856d..b83721f504 100644 --- a/gtk/gtkdirectorylist.c +++ b/gtk/gtkdirectorylist.c @@ -335,8 +335,8 @@ gtk_directory_list_init (GtkDirectoryList *self) /** * gtk_directory_list_new: - * @file: (allow-none): The file to query - * @attributes: (allow-none): The attributes to query with + * @file: (nullable): The file to query + * @attributes: (nullable): The attributes to query with * * Creates a new `GtkDirectoryList`. * @@ -659,7 +659,7 @@ gtk_directory_list_update_monitoring (GtkDirectoryList *self) /** * gtk_directory_list_set_file: (attributes org.gtk.Method.set_property=file) * @self: a `GtkDirectoryList` - * @file: (allow-none): the #GFile to be enumerated + * @file: (nullable): the #GFile to be enumerated * * Sets the @file to be enumerated and starts the enumeration. * @@ -707,7 +707,7 @@ gtk_directory_list_get_file (GtkDirectoryList *self) /** * gtk_directory_list_set_attributes: (attributes org.gtk.Method.set_property=attributes) * @self: a `GtkDirectoryList` - * @attributes: (allow-none): the attributes to enumerate + * @attributes: (nullable): the attributes to enumerate * * Sets the @attributes to be enumerated and starts the enumeration. * diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index 987bd4735c..6d4dcc6bb0 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -453,7 +453,7 @@ gtk_drawing_area_get_content_height (GtkDrawingArea *self) /** * gtk_drawing_area_set_draw_func: * @self: a `GtkDrawingArea` - * @draw_func: (allow-none): callback that lets you draw + * @draw_func: (nullable): callback that lets you draw * the drawing area's contents * @user_data: (closure): user data passed to @draw_func * @destroy: destroy notifier for @user_data diff --git a/gtk/gtkdropdown.c b/gtk/gtkdropdown.c index c96d14328c..201776a138 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) (allow-none): the model to use or %NULL for none - * @expression: (transfer full) (allow-none): the expression to use or %NULL for none + * @model: (transfer full) (nullable): the model to use or %NULL for none + * @expression: (transfer full) (nullable): the expression to use or %NULL for none * * 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: (allow-none) (transfer none): the model to use or %NULL for none + * @model: (nullable) (transfer none): the model to use or %NULL for none * * 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: (allow-none) (transfer none): the factory to use or %NULL for none + * @factory: (nullable) (transfer none): the factory to use or %NULL for none * * 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: (allow-none) (transfer none): the factory to use or %NULL for none + * @factory: (nullable) (transfer none): the factory to use or %NULL for none * * Sets the `GtkListItemFactory` to use for populating list items in the popup. */ diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index ebdebabdf7..c579f5b961 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) (allow-none): location to store the starting position, or %NULL - * @end_pos: (out) (allow-none): location to store the end position, or %NULL + * @start_pos: (out) (optional): location to store the starting position, or %NULL + * @end_pos: (out) (optional): location to store the end position, or %NULL * * Retrieves the selection bound of the editable. * diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 00f9f52399..aa6157154e 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: (allow-none): A `GdkPaintable`, or %NULL + * @paintable: (nullable): A `GdkPaintable`, or %NULL * * 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: (allow-none): An icon name, or %NULL + * @icon_name: (nullable): An icon name, or %NULL * * 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: (allow-none): The icon to set, or %NULL + * @icon: (nullable): The icon to set, or %NULL * * Sets the icon shown in the entry at the specified position * from the current icon theme. @@ -3091,7 +3091,7 @@ gtk_entry_get_icon_tooltip_text (GtkEntry *entry, * gtk_entry_set_icon_tooltip_text: * @entry: a `GtkEntry` * @icon_pos: the icon position - * @tooltip: (allow-none): the contents of the tooltip for the + * @tooltip: (nullable): the contents of the tooltip for the * icon, or %NULL * * Sets @tooltip as the contents of the tooltip for the icon @@ -3177,7 +3177,7 @@ gtk_entry_get_icon_tooltip_markup (GtkEntry *entry, * gtk_entry_set_icon_tooltip_markup: * @entry: a `GtkEntry` * @icon_pos: the icon position - * @tooltip: (allow-none): the contents of the tooltip for the + * @tooltip: (nullable): the contents of the tooltip for the * icon, or %NULL * * Sets @tooltip as the contents of the tooltip for the icon at @@ -3261,7 +3261,7 @@ gtk_entry_query_tooltip (GtkWidget *widget, /** * gtk_entry_set_completion: (attributes org.gtk.Method.set_property=completion) * @entry: A `GtkEntry` - * @completion: (allow-none): The `GtkEntryCompletion` or %NULL + * @completion: (nullable): The `GtkEntryCompletion` or %NULL * * Sets @completion to be the auxiliary completion object * to use with @entry. @@ -3772,7 +3772,7 @@ gtk_entry_get_text_widget (GtkEntry *entry) /** * gtk_entry_set_extra_menu: (attributes org.gtk.Method.set_property=extra-menu) * @entry: a `GtkEntry` - * @model: (allow-none): a `GMenuModel` + * @model: (nullable): a `GMenuModel` * * Sets a menu model to add when constructing * the context menu for @entry. diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c index e3ccf7259c..113b864647 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: (allow-none): initial buffer text, or %NULL + * @initial_chars: (nullable): initial buffer text, or %NULL * @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 97bedaf554..00aeb71934 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -877,7 +877,7 @@ gtk_entry_completion_get_entry (GtkEntryCompletion *completion) /** * gtk_entry_completion_set_model: (attributes org.gtk.Method.set_property=model) * @completion: a `GtkEntryCompletion` - * @model: (allow-none): the `GtkTreeModel` + * @model: (nullable): the `GtkTreeModel` * * Sets the model for a `GtkEntryCompletion`. * diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index f7370261e3..9a2eac7039 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -1186,7 +1186,7 @@ gtk_expander_get_resize_toplevel (GtkExpander *expander) /** * gtk_expander_set_child: (attributes org.gtk.Method.set_property=child) * @expander: a `GtkExpander` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @expander. */ diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 3fabd9acd1..f52315839a 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -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: (allow-none): location to store the error, or %NULL to ignore errors. + * @error: (nullable): location to store the error, or %NULL to ignore errors. * * Sets @file as the current filename for the file chooser. * diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 1e345412e8..ab5b260bcf 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: (allow-none): Title of the dialog, or %NULL - * @parent: (allow-none): Transient parent of the dialog, or %NULL + * @title: (nullable): Title of the dialog, or %NULL + * @parent: (nullable): Transient parent of the dialog, or %NULL * @action: Open or save mode for the dialog - * @first_button_text: (allow-none): text to go in the first button, or %NULL + * @first_button_text: (nullable): text to go in the first button, or %NULL * @...: response ID for the first button, then additional (button, id) pairs, ending with %NULL * * Creates a new `GtkFileChooserDialog`. diff --git a/gtk/gtkfilechoosernative.c b/gtk/gtkfilechoosernative.c index 7fa23b6929..f0c12265e6 100644 --- a/gtk/gtkfilechoosernative.c +++ b/gtk/gtkfilechoosernative.c @@ -231,7 +231,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: (allow-none): custom label or %NULL for the default + * @accept_label: (nullable): custom label or %NULL for the default * * Sets the custom label text for the accept button. * @@ -274,7 +274,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: (allow-none): custom label or %NULL for the default + * @cancel_label: (nullable): custom label or %NULL for the default * * Sets the custom label text for the cancel button. * @@ -520,11 +520,11 @@ gtk_file_chooser_native_init (GtkFileChooserNative *self) /** * gtk_file_chooser_native_new: - * @title: (allow-none): Title of the native, or %NULL - * @parent: (allow-none): Transient parent of the native, or %NULL + * @title: (nullable): Title of the native, or %NULL + * @parent: (nullable): Transient parent of the native, or %NULL * @action: Open or save mode for the dialog - * @accept_label: (allow-none): text to go in the accept button, or %NULL for the default - * @cancel_label: (allow-none): text to go in the cancel button, or %NULL for the default + * @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 * * Creates a new `GtkFileChooserNative`. * diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 1914c21029..1d9e8929b2 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -442,7 +442,7 @@ gtk_file_filter_new (void) /** * gtk_file_filter_set_name: (attributes org.gtk.Method.set_property=name) * @filter: a `GtkFileFilter` - * @name: (allow-none): the human-readable-name for the filter, or %NULL + * @name: (nullable): the human-readable-name for the filter, or %NULL * to remove any existing name. * * Sets a human-readable name of the filter. diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 23a91ba07e..6477021881 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -1370,7 +1370,7 @@ _gtk_file_system_model_new (GtkFileSystemModelGetValue get_func, /** * _gtk_file_system_model_new_for_directory: * @directory: the directory to show. - * @attributes: (allow-none): attributes to immediately load or %NULL for all + * @attributes: (nullable): attributes to immediately load or %NULL for all * @get_func: function that the model should call to query data about a file * @get_data: user data to pass to the @get_func * @n_columns: number of columns @@ -1933,7 +1933,7 @@ _gtk_file_system_model_update_files (GtkFileSystemModel *model, /** * _gtk_file_system_model_set_filter: * @mode: a #GtkFileSystemModel - * @filter: (allow-none): %NULL or filter to use + * @filter: (nullable): %NULL or filter to use * * Sets a filter to be used for deciding if a row should be visible or not. * Whether this filter applies to directories can be toggled with diff --git a/gtk/gtkfilterlistmodel.c b/gtk/gtkfilterlistmodel.c index 030d97ad6a..0b06f8f4e5 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: (allow-none) (transfer full): the model to sort, or %NULL - * @filter: (allow-none) (transfer full): filter or %NULL to not filter items + * @model: (nullable) (transfer full): the model to sort, or %NULL + * @filter: (nullable) (transfer full): filter or %NULL to not filter items * * 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: (allow-none) (transfer none): filter to use or %NULL to not filter items + * @filter: (nullable) (transfer none): filter to use or %NULL to not filter items * * Sets the filter used to filter items. **/ @@ -691,7 +691,7 @@ gtk_filter_list_model_get_filter (GtkFilterListModel *self) /** * gtk_filter_list_model_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkFilterListModel` - * @model: (allow-none): The model to be filtered + * @model: (nullable): The model to be filtered * * Sets the model to be filtered. * diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c index b85824cea0..76b8657502 100644 --- a/gtk/gtkflowbox.c +++ b/gtk/gtkflowbox.c @@ -591,7 +591,7 @@ gtk_flow_box_child_new (void) /** * gtk_flow_box_child_set_child: (attributes org.gtk.Method.set_property=child) * @self: a `GtkFlowBoxChild` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @self. */ @@ -4263,7 +4263,7 @@ gtk_flow_box_check_model_compat (GtkFlowBox *box) /** * gtk_flow_box_bind_model: * @box: a `GtkFlowBox` - * @model: (allow-none): the `GListModel` to be bound to @box + * @model: (nullable): the `GListModel` to be bound to @box * @create_widget_func: a function that creates widgets for items * @user_data: (closure): user data passed to @create_widget_func * @user_data_free_func: function for freeing @user_data @@ -4805,7 +4805,7 @@ gtk_flow_box_get_selection_mode (GtkFlowBox *box) /** * gtk_flow_box_set_filter_func: * @box: a `GtkFlowBox` - * @filter_func: (allow-none): callback that + * @filter_func: (nullable): callback that * lets you filter which children to show * @user_data: (closure): user data passed to @filter_func * @destroy: destroy notifier for @user_data @@ -4887,7 +4887,7 @@ gtk_flow_box_invalidate_filter (GtkFlowBox *box) /** * gtk_flow_box_set_sort_func: * @box: a `GtkFlowBox` - * @sort_func: (allow-none): the sort function + * @sort_func: (nullable): the sort function * @user_data: (closure): user data passed to @sort_func * @destroy: destroy notifier for @user_data * diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c index 300517399a..81736af59a 100644 --- a/gtk/gtkfontchooser.c +++ b/gtk/gtkfontchooser.c @@ -405,7 +405,7 @@ gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser, /** * gtk_font_chooser_set_filter_func: * @fontchooser: a `GtkFontChooser` - * @filter: (allow-none): a `GtkFontFilterFunc`, or %NULL + * @filter: (nullable): a `GtkFontFilterFunc`, or %NULL * @user_data: (closure): data to pass to @filter * @destroy: function to call to free @data when it is no longer needed * @@ -438,7 +438,7 @@ _gtk_font_chooser_font_activated (GtkFontChooser *chooser, /** * gtk_font_chooser_set_font_map: * @fontchooser: a `GtkFontChooser` - * @fontmap: (allow-none): a `PangoFontMap` + * @fontmap: (nullable): a `PangoFontMap` * * Sets a custom font map to use for this font chooser widget. * diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c index 3d360cf2ec..9e703976b5 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: (allow-none): Title of the dialog, or %NULL - * @parent: (allow-none): Transient parent of the dialog, or %NULL + * @title: (nullable): Title of the dialog, or %NULL + * @parent: (nullable): Transient parent of the dialog, or %NULL * * Creates a new `GtkFontChooserDialog`. * diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 4d99dc4312..2c1542c9e2 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -323,7 +323,7 @@ gtk_frame_get_property (GObject *object, /** * gtk_frame_new: - * @label: (allow-none): the text to use as the label of the frame + * @label: (nullable): the text to use as the label of the frame * * Creates a new `GtkFrame`, with optional label @label. * @@ -340,7 +340,7 @@ gtk_frame_new (const char *label) /** * gtk_frame_set_label: (attributes org.gtk.Method.set_property=label) * @frame: a `GtkFrame` - * @label: (allow-none): the text to use as the label of the frame + * @label: (nullable): the text to use as the label of the frame * * Creates a new `GtkLabel` with the @label and sets it as the frame's * label widget. @@ -668,7 +668,7 @@ gtk_frame_get_request_mode (GtkWidget *widget) /** * gtk_frame_set_child: (attributes org.gtk.Method.set_property=child) * @frame: a `GtkFrame` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @frame. */ diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c index ea1b5b8cf8..caf1bd9f21 100644 --- a/gtk/gtkgesture.c +++ b/gtk/gtkgesture.c @@ -1226,9 +1226,9 @@ gtk_gesture_get_last_target (GtkGesture *gesture, /** * gtk_gesture_get_point: * @gesture: a `GtkGesture` - * @sequence: (allow-none): a `GdkEventSequence`, or %NULL for pointer events - * @x: (out) (allow-none): return location for X axis of the sequence coordinates - * @y: (out) (allow-none): return location for Y axis of the sequence coordinates + * @sequence: (nullable): a `GdkEventSequence`, or %NULL for pointer events + * @x: (out) (optional): return location for X axis of the sequence coordinates + * @y: (out) (optional): return location for Y axis of the sequence coordinates * * If @sequence is currently being interpreted by @gesture, * returns %TRUE and fills in @x and @y with the last coordinates diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c index 93c8a7a52b..9c808e8f6a 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -938,7 +938,7 @@ gtk_gl_area_class_init (GtkGLAreaClass *klass) /** * GtkGLArea::create-context: * @area: the `GtkGLArea` that emitted the signal - * @error: (allow-none): location to store error information on failure + * @error: (nullable): location to store error information on failure * * Emitted when the widget is being realized. * @@ -992,7 +992,7 @@ gtk_gl_area_new (void) /** * gtk_gl_area_set_error: * @area: a `GtkGLArea` - * @error: (allow-none): a new `GError`, or %NULL to unset the error + * @error: (nullable): a new `GError`, or %NULL to unset the error * * Sets an error on the area which will be shown instead of the * GL rendering. diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 229eb4c70f..25374f178b 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -580,7 +580,7 @@ gtk_grid_attach (GtkGrid *grid, * gtk_grid_attach_next_to: * @grid: a `GtkGrid` * @child: the widget to add - * @sibling: (allow-none): the child of @grid that @child will be placed + * @sibling: (nullable): the child of @grid that @child will be placed * next to, or %NULL to place @child at the beginning or end * @side: the side of @sibling that @child is positioned next to * @width: the number of columns that @child will span diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c index e722881d6d..fe7ad3a1e9 100644 --- a/gtk/gtkgridview.c +++ b/gtk/gtkgridview.c @@ -1185,8 +1185,8 @@ gtk_grid_view_init (GtkGridView *self) /** * gtk_grid_view_new: - * @model: (allow-none) (transfer full): the model to use, or %NULL - * @factory: (allow-none) (transfer full): The factory to populate items with, or %NULL + * @model: (nullable) (transfer full): the model to use, or %NULL + * @factory: (nullable) (transfer full): The factory to populate items with, or %NULL * * 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: (allow-none) (transfer none): the model to use or %NULL for none + * @model: (nullable) (transfer none): the model to use or %NULL for none * * 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: (allow-none) (transfer none): the factory to use or %NULL for none + * @factory: (nullable) (transfer none): the factory to use or %NULL for none * * Sets the `GtkListItemFactory` to use for populating list items. */ diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c index 6cfe5cf1b0..abba4d4d1d 100644 --- a/gtk/gtkheaderbar.c +++ b/gtk/gtkheaderbar.c @@ -284,7 +284,7 @@ construct_title_label (GtkHeaderBar *bar) /** * gtk_header_bar_set_title_widget: * @bar: a `GtkHeaderBar` - * @title_widget: (allow-none): a widget to use for a title + * @title_widget: (nullable): a widget to use for a title * * Sets the title for the `GtkHeaderBar`. * @@ -769,7 +769,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: (allow-none): a decoration layout, or %NULL to + * @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 f1a7bf0034..26ff0d52b4 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1637,7 +1637,7 @@ gtk_icon_theme_add_resource_path (GtkIconTheme *self, /** * gtk_icon_theme_set_theme_name: * @self: a `GtkIconTheme` - * @theme_name: (allow-none): name of icon theme to use instead of + * @theme_name: (nullable): name of icon theme to use instead of * configured theme, or %NULL to unset a previously set custom theme * * Sets the name of the icon theme that the `GtkIconTheme` object uses @@ -3966,13 +3966,13 @@ icon_paintable_snapshot (GdkPaintable *paintable, * @snapshot: a `GdkSnapshot` to snapshot to * @width: width to snapshot in * @height: height to snapshot in - * @foreground_color: (allow-none): a `GdkRGBA` representing the foreground color + * @foreground_color: (nullable): a `GdkRGBA` representing the foreground color * of the icon or %NULL to use the default color. - * @success_color: (allow-none): a `GdkRGBA` representing the warning color + * @success_color: (nullable): a `GdkRGBA` representing the warning color * of the icon or %NULL to use the default color - * @warning_color: (allow-none): a `GdkRGBA` representing the warning color + * @warning_color: (nullable): a `GdkRGBA` representing the warning color * of the icon or %NULL to use the default color - * @error_color: (allow-none): a `GdkRGBA` representing the error color + * @error_color: (nullable): a `GdkRGBA` representing the error color * of the icon or %NULL to use the default color * * Snapshots the `GtkIconPaintable`. diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index a07879a0b2..fa26588e8f 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: (allow-none): One of the cell renderers of @icon_view, or %NULL + * @cell: (nullable): One of the cell renderers of @icon_view, or %NULL * @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 @@ -2009,9 +2009,9 @@ gtk_icon_view_set_cursor (GtkIconView *icon_view, /** * gtk_icon_view_get_cursor: * @icon_view: A #GtkIconView - * @path: (out) (allow-none) (transfer full): Return location for the current + * @path: (out) (optional) (transfer full): Return location for the current * cursor path - * @cell: (out) (allow-none) (transfer none): Return location the current + * @cell: (out) (optional) (transfer none): Return location the current * focus cell * * Fills in @path and @cell with the current cursor path and cell. @@ -4110,8 +4110,8 @@ 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) (allow-none): Return location for the path, or %NULL - * @cell: (out) (allow-none) (transfer none): Return location for the renderer + * @path: (out) (optional): Return location for the path, or %NULL + * @cell: (out) (optional) (transfer none): Return location for the renderer * responsible for the cell at (@x, @y), or %NULL * * 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: (allow-none): a #GtkCellRenderer or %NULL + * @cell: (nullable): a #GtkCellRenderer or %NULL * @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: (allow-none): a #GtkCellRenderer or %NULL + * @cell: (nullable): a #GtkCellRenderer or %NULL * * 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(). @@ -4257,9 +4257,9 @@ gtk_icon_view_set_tooltip_cell (GtkIconView *icon_view, * @x: the x coordinate (relative to widget coordinates) * @y: the y coordinate (relative to widget coordinates) * @keyboard_tip: whether this is a keyboard tooltip or not - * @model: (out) (allow-none) (transfer none): a pointer to receive a `GtkTreeModel` - * @path: (out) (allow-none): a pointer to receive a `GtkTreePath` - * @iter: (out) (allow-none): a pointer to receive a `GtkTreeIter` + * @model: (out) (optional) (transfer none): a pointer to receive a `GtkTreeModel` + * @path: (out) (optional): a pointer to receive a `GtkTreePath` + * @iter: (out) (optional): a pointer to receive a `GtkTreeIter` * * This function is supposed to be used in a #GtkWidget::query-tooltip * signal handler for #GtkIconView. The @x, @y and @keyboard_tip values @@ -4420,8 +4420,8 @@ gtk_icon_view_get_tooltip_column (GtkIconView *icon_view) /** * gtk_icon_view_get_visible_range: * @icon_view: A #GtkIconView - * @start_path: (out) (allow-none): Return location for start of region - * @end_path: (out) (allow-none): Return location for end of region + * @start_path: (out) (optional): Return location for start of region + * @end_path: (out) (optional): Return location for end of region * * Sets @start_path and @end_path to be the first and last visible path. * Note that there may be invisible paths in between. @@ -4548,7 +4548,7 @@ gtk_icon_view_get_selection_mode (GtkIconView *icon_view) /** * gtk_icon_view_set_model: * @icon_view: A #GtkIconView. - * @model: (allow-none): The model. + * @model: (nullable): The model. * * Sets the model for a #GtkIconView. * If the @icon_view already has a model set, it will remove @@ -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: (allow-none): The path of the item to highlight, or %NULL. + * @path: (nullable): The path of the item to highlight, or %NULL. * @pos: Specifies where to drop, relative to the item * * Sets the item that is highlighted for feedback. @@ -6425,9 +6425,9 @@ gtk_icon_view_set_drag_dest_item (GtkIconView *icon_view, /** * gtk_icon_view_get_drag_dest_item: * @icon_view: a #GtkIconView - * @path: (out) (allow-none): Return location for the path of + * @path: (out) (optional): Return location for the path of * the highlighted item - * @pos: (out) (allow-none): Return location for the drop position + * @pos: (out) (optional): Return location for the drop position * * Gets information about the item that is highlighted for feedback. */ @@ -6455,9 +6455,9 @@ 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) (allow-none): Return location for the path of the item, + * @path: (out) (optional): Return location for the path of the item, * or %NULL. - * @pos: (out) (allow-none): Return location for the drop position, or %NULL + * @pos: (out) (optional): Return location for the drop position, or %NULL * * Determines the destination item for a given position. * diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 46a494c738..016bdc3b86 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: (allow-none): a `GdkPixbuf`, or %NULL + * @pixbuf: (nullable): a `GdkPixbuf`, or %NULL * * Creates a new `GtkImage` displaying @pixbuf. * @@ -508,7 +508,7 @@ gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf) /** * gtk_image_new_from_paintable: - * @paintable: (allow-none): a `GdkPaintable`, or %NULL + * @paintable: (nullable): a `GdkPaintable`, or %NULL * * Creates a new `GtkImage` displaying @paintable. * @@ -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) (allow-none): a filename or %NULL + * @filename: (type filename) (nullable): a filename or %NULL * * 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: (allow-none): a resource path or %NULL + * @resource_path: (nullable): a resource path or %NULL * * Sets a `GtkImage` to show a resource. * @@ -720,7 +720,7 @@ gtk_image_set_from_resource (GtkImage *image, /** * gtk_image_set_from_pixbuf: (attributes org.gtk.Method.set_property=paintable) * @image: a `GtkImage` - * @pixbuf: (allow-none): a `GdkPixbuf` or `NULL` + * @pixbuf: (nullable): a `GdkPixbuf` or `NULL` * * Sets a `GtkImage` to show a `GdkPixbuf`. * @@ -925,7 +925,7 @@ gtk_image_get_paintable (GtkImage *image) * The returned string is owned by the `GtkImage` and should not * be freed. * - * Returns: (transfer none) (allow-none): the icon name, or %NULL + * Returns: (transfer none) (nullable): the icon name, or %NULL */ const char * gtk_image_get_icon_name (GtkImage *image) @@ -946,7 +946,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) (allow-none): a `GIcon`, or %NULL + * Returns: (transfer none) (nullable): a `GIcon`, or %NULL **/ GIcon * gtk_image_get_gicon (GtkImage *image) diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 12c1d414f5..add57517fb 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -436,7 +436,7 @@ gtk_im_context_real_get_surrounding_with_selection (GtkIMContext *context, /** * gtk_im_context_set_client_widget: * @context: a `GtkIMContext` - * @widget: (allow-none): the client widget. This may be %NULL to indicate + * @widget: (nullable): the client widget. This may be %NULL to indicate * that the previous client widget no longer exists. * * Set the client widget for the input context. diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index fc317dfafe..82061f77c6 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: (allow-none): ext to go in first button, or %NULL + * @first_button_text: (nullable): ext to go in first button, or %NULL * @...: response ID for first button, then additional buttons, ending * with %NULL * diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 625e5f7a75..68148491c0 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -5729,7 +5729,7 @@ gtk_label_get_yalign (GtkLabel *self) /** * gtk_label_set_extra_menu: (attributes org.gtk.Method.set_property=extra-menu) * @self: a `GtkLabel` - * @model: (allow-none): a `GMenuModel` + * @model: (nullable): a `GMenuModel` * * Sets a menu model to add when constructing * the context menu for @label. diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c index a87f14b84a..ad19f57c46 100644 --- a/gtk/gtklevelbar.c +++ b/gtk/gtklevelbar.c @@ -1329,7 +1329,7 @@ gtk_level_bar_set_inverted (GtkLevelBar *self, /** * gtk_level_bar_remove_offset_value: * @self: a `GtkLevelBar` - * @name: (allow-none): the name of an offset in the bar + * @name: (nullable): the name of an offset in the bar * * Removes an offset marker from a `GtkLevelBar`. * @@ -1391,7 +1391,7 @@ gtk_level_bar_add_offset_value (GtkLevelBar *self, /** * gtk_level_bar_get_offset_value: * @self: a `GtkLevelBar` - * @name: (allow-none): the name of an offset in the bar + * @name: (nullable): the name of an offset in the bar * @value: (out): location where to store the value * * Fetches the value specified for the offset marker @name in @self. diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index f7a543be8b..62d2985b24 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -558,7 +558,7 @@ gtk_link_button_new (const char *uri) /** * gtk_link_button_new_with_label: * @uri: a valid URI - * @label: (allow-none): the text of the button + * @label: (nullable): the text of the button * * Creates a new `GtkLinkButton` containing a label. * diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c index 55471a351a..b529967c44 100644 --- a/gtk/gtklistbase.c +++ b/gtk/gtklistbase.c @@ -111,7 +111,7 @@ static GParamSpec *properties[N_PROPS] = { NULL, }; * @across: position in pixels in the direction cross to the list * @along: position in pixels in the direction of the list * @pos: (out caller-allocates): set to the looked up position - * @area: (out caller-allocates) (allow-none): set to the area occupied + * @area: (out caller-allocates) (optional): set to the area occupied * by the returned position * * Given a coordinate in list coordinates, determine the position of the @@ -324,9 +324,9 @@ gtk_list_base_move_focus (GtkListBase *self, * gtk_list_base_get_allocation_along: * @self: a #GtkListBase * @pos: item to get the size of - * @offset: (out caller-allocates) (allow-none) set to the offset + * @offset: (out caller-allocates) (optional): set to the offset * of the top/left of the item - * @size: (out caller-allocates) (allow-none) set to the size of + * @size: (out caller-allocates) (optional): set to the size of * the item in the direction * * Computes the allocation of the item in the direction along the sizing @@ -347,9 +347,9 @@ gtk_list_base_get_allocation_along (GtkListBase *self, * gtk_list_base_get_allocation_across: * @self: a #GtkListBase * @pos: item to get the size of - * @offset: (out caller-allocates) (allow-none) set to the offset + * @offset: (out caller-allocates) (optional): set to the offset * of the top/left of the item - * @size: (out caller-allocates) (allow-none) set to the size of + * @size: (out caller-allocates) (optional): set to the size of * the item in the direction * * Computes the allocation of the item in the direction across to the sizing diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index 3b2e2eb0c1..0a0992f0b4 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -846,7 +846,7 @@ gtk_list_box_get_row_at_y (GtkListBox *box, /** * gtk_list_box_select_row: * @box: a `GtkListBox` - * @row: (allow-none): The row to select or %NULL + * @row: (nullable): The row to select or %NULL * * Make @row the currently selected row. */ @@ -1014,7 +1014,7 @@ gtk_list_box_get_selected_rows (GtkListBox *box) /** * gtk_list_box_set_placeholder: * @box: a `GtkListBox` - * @placeholder: (allow-none): a #GtkWidget or %NULL + * @placeholder: (nullable): a #GtkWidget or %NULL * * Sets the placeholder widget that is shown in the list when * it doesn't display any visible children. @@ -1045,7 +1045,7 @@ gtk_list_box_set_placeholder (GtkListBox *box, /** * gtk_list_box_set_adjustment: * @box: a `GtkListBox` - * @adjustment: (allow-none): the adjustment, or %NULL + * @adjustment: (nullable): the adjustment, or %NULL * * Sets the adjustment (if any) that the widget uses to * for vertical scrolling. @@ -1190,7 +1190,7 @@ gtk_list_box_get_selection_mode (GtkListBox *box) /** * gtk_list_box_set_filter_func: * @box: a `GtkListBox` - * @filter_func: (allow-none): callback that lets you filter which rows to show + * @filter_func: (nullable): callback that lets you filter which rows to show * @user_data: (closure): user data passed to @filter_func * @destroy: destroy notifier for @user_data * @@ -1231,7 +1231,7 @@ gtk_list_box_set_filter_func (GtkListBox *box, /** * gtk_list_box_set_header_func: * @box: a `GtkListBox` - * @update_header: (allow-none): callback that lets you add row headers + * @update_header: (nullable): callback that lets you add row headers * @user_data: (closure): user data passed to @update_header * @destroy: destroy notifier for @user_data * @@ -1386,7 +1386,7 @@ gtk_list_box_invalidate_headers (GtkListBox *box) /** * gtk_list_box_set_sort_func: * @box: a `GtkListBox` - * @sort_func: (allow-none): the sort function + * @sort_func: (nullable): the sort function * @user_data: (closure): user data passed to @sort_func * @destroy: destroy notifier for @user_data * @@ -2953,7 +2953,7 @@ gtk_list_box_row_new (void) /** * gtk_list_box_row_set_child: (attributes org.gtk.Method.set_property=child) * @row: a `GtkListBoxRow` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @self. */ @@ -3167,7 +3167,7 @@ gtk_list_box_row_get_header (GtkListBoxRow *row) /** * gtk_list_box_row_set_header: * @row: a `GtkListBoxRow` - * @header: (allow-none): the header, or %NULL + * @header: (nullable): the header, or %NULL * * Sets the current header of the @row. * diff --git a/gtk/gtklistbox.h b/gtk/gtklistbox.h index 7cd73104ad..0e41498bda 100644 --- a/gtk/gtklistbox.h +++ b/gtk/gtklistbox.h @@ -100,7 +100,7 @@ typedef int (*GtkListBoxSortFunc) (GtkListBoxRow *row1, /** * GtkListBoxUpdateHeaderFunc: * @row: the row to update - * @before: (allow-none): the row before @row, or %NULL if it is first + * @before: (nullable): the row before @row, or %NULL if it is first * @user_data: (closure): user data * * Whenever @row changes or which row is before @row changes this diff --git a/gtk/gtklistitemmanager.c b/gtk/gtklistitemmanager.c index 54e75a6a84..02772f7c58 100644 --- a/gtk/gtklistitemmanager.c +++ b/gtk/gtklistitemmanager.c @@ -1051,7 +1051,7 @@ gtk_list_item_manager_update_list_item (GtkListItemManager *self, /* * gtk_list_item_manager_release_list_item: * @self: a #GtkListItemManager - * @change: (allow-none): The change associated with this release or + * @change: (nullable): The change associated with this release or * %NULL if this is a final removal * @item: an item previously acquired with * gtk_list_item_manager_acquire_list_item() diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 80bffb481a..5b64bfefe5 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: (allow-none): A valid #GtkTreeIter, or %NULL + * @sibling: (nullable): A valid #GtkTreeIter, or %NULL * * 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: (allow-none): A valid #GtkTreeIter, or %NULL + * @sibling: (nullable): A valid #GtkTreeIter, or %NULL * * 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: (allow-none): A #GtkTreeIter, or %NULL. + * @position: (nullable): A #GtkTreeIter, or %NULL. * * 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: (allow-none): A #GtkTreeIter or %NULL. + * @position: (nullable): A #GtkTreeIter or %NULL. * * 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 c1476b1fe5..94797953cf 100644 --- a/gtk/gtklistview.c +++ b/gtk/gtklistview.c @@ -926,8 +926,8 @@ gtk_list_view_init (GtkListView *self) /** * gtk_list_view_new: - * @model: (allow-none) (transfer full): the model to use, or %NULL - * @factory: (allow-none) (transfer full): The factory to populate items with, or %NULL + * @model: (nullable) (transfer full): the model to use, or %NULL + * @factory: (nullable) (transfer full): The factory to populate items with, or %NULL * * 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: (allow-none) (transfer none): the model to use or %NULL for none + * @model: (nullable) (transfer none): the model to use or %NULL for none * * 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: (allow-none) (transfer none): the factory to use or %NULL for none + * @factory: (nullable) (transfer none): the factory to use or %NULL for none * * Sets the `GtkListItemFactory` to use for populating list items. */ diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c index 55196a4b48..015c0e9f88 100644 --- a/gtk/gtklockbutton.c +++ b/gtk/gtklockbutton.c @@ -515,7 +515,7 @@ gtk_lock_button_clicked (GtkButton *widget) /** * gtk_lock_button_new: - * @permission: (allow-none): a `GPermission` + * @permission: (nullable): a `GPermission` * * Creates a new lock button which reflects the @permission. * @@ -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: (allow-none): a `GPermission` object, or %NULL + * @permission: (nullable): a `GPermission` object, or %NULL * * Sets the `GPermission` object that controls @button. */ diff --git a/gtk/gtkmaplistmodel.c b/gtk/gtkmaplistmodel.c index 214ee39c19..553a53ee9d 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) (allow-none): The model to map or %NULL for none - * @map_func: (allow-none): map function or %NULL to not map items + * @model: (transfer full) (nullable): The model to map or %NULL for none + * @map_func: (nullable): map function or %NULL to not map items * @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: (allow-none): map function or %NULL to not map items + * @map_func: (nullable): map function or %NULL to not map items * @user_data: (closure): user data passed to @map_func * @user_destroy: destroy notifier for @user_data * @@ -545,7 +545,7 @@ gtk_map_list_model_set_map_func (GtkMapListModel *self, /** * gtk_map_list_model_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkMapListModel` - * @model: (allow-none): The model to be mapped + * @model: (nullable): The model to be mapped * * Sets the model to be mapped. * diff --git a/gtk/gtkmediacontrols.c b/gtk/gtkmediacontrols.c index d48a99285b..86b0dbf7f6 100644 --- a/gtk/gtkmediacontrols.c +++ b/gtk/gtkmediacontrols.c @@ -306,7 +306,7 @@ gtk_media_controls_init (GtkMediaControls *controls) /** * gtk_media_controls_new: - * @stream: (allow-none) (transfer none): a `GtkMediaStream` to manage + * @stream: (nullable) (transfer none): a `GtkMediaStream` to manage * * Creates a new `GtkMediaControls` managing the @stream passed to it. * diff --git a/gtk/gtkmediafile.c b/gtk/gtkmediafile.c index f7e72bcefb..8c64e221fa 100644 --- a/gtk/gtkmediafile.c +++ b/gtk/gtkmediafile.c @@ -420,7 +420,7 @@ gtk_media_file_clear (GtkMediaFile *self) /** * gtk_media_file_set_filename: * @self: a `GtkMediaFile` - * @filename: (allow-none): name of file to play + * @filename: (nullable): name of file to play * * Sets the `GtkMediaFile to play the given file. * @@ -449,7 +449,7 @@ gtk_media_file_set_filename (GtkMediaFile *self, /** * gtk_media_file_set_resource: * @self: a `GtkMediaFile` - * @resource_path: (allow-none): path to resource to play + * @resource_path: (nullable): path to resource to play * * Sets the `GtkMediaFile to play the given resource. * @@ -491,7 +491,7 @@ gtk_media_file_set_resource (GtkMediaFile *self, /** * gtk_media_file_set_file: (attributes org.gtk.Method.set_property=file) * @self: a `GtkMediaFile` - * @file: (allow-none): the file to play + * @file: (nullable): the file to play * * Sets the `GtkMediaFile` to play the given file. * @@ -549,7 +549,7 @@ gtk_media_file_get_file (GtkMediaFile *self) /** * gtk_media_file_set_input_stream: (attributes org.gtk.Method.set_property=input-stream) * @self: a `GtkMediaFile` - * @stream: (allow-none): the stream to play from + * @stream: (nullable): the stream to play from * * Sets the `GtkMediaFile` to play the given stream. * diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index c7dfd33007..1ff504dcf6 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -478,11 +478,11 @@ gtk_message_dialog_init (GtkMessageDialog *dialog) /** * gtk_message_dialog_new: - * @parent: (allow-none): transient parent, or %NULL for none + * @parent: (nullable): transient parent, or %NULL for none * @flags: flags * @type: type of message * @buttons: set of buttons to use - * @message_format: (allow-none): printf()-style format string, or %NULL + * @message_format: (nullable): printf()-style format string, or %NULL * @...: 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: (allow-none): transient parent, or %NULL for none + * @parent: (nullable): transient parent, or %NULL for none * @flags: flags * @type: type of message * @buttons: set of buttons to use - * @message_format: (allow-none): printf()-style format string, or %NULL + * @message_format: (nullable): printf()-style format string, or %NULL * @...: 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: (allow-none): printf()-style format string, or %NULL + * @message_format: (nullable): printf()-style format string, or %NULL * @...: arguments for @message_format * * Sets the secondary text of the message dialog. diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 37d81caaea..7ea76bb56d 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -1790,7 +1790,7 @@ gtk_mount_operation_aborted (GMountOperation *op) /** * gtk_mount_operation_new: - * @parent: (allow-none): transient parent of the window, or %NULL + * @parent: (nullable): transient parent of the window, or %NULL * * 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: (allow-none): transient parent of the window, or %NULL + * @parent: (nullable): transient parent of the window, or %NULL * * Sets the transient parent for windows shown by the * `GtkMountOperation`. diff --git a/gtk/gtkmultiselection.c b/gtk/gtkmultiselection.c index 3df394d1d1..04ee89d7f5 100644 --- a/gtk/gtkmultiselection.c +++ b/gtk/gtkmultiselection.c @@ -367,7 +367,7 @@ gtk_multi_selection_init (GtkMultiSelection *self) /** * gtk_multi_selection_new: - * @model: (allow-none) (transfer full): the `GListModel` to manage, or %NULL + * @model: (nullable) (transfer full): the `GListModel` to manage, or %NULL * * Creates a new selection to handle @model. * @@ -409,7 +409,7 @@ gtk_multi_selection_get_model (GtkMultiSelection *self) /** * gtk_multi_selection_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkMultiSelection` - * @model: (allow-none): A `GListModel` to wrap + * @model: (nullable): A `GListModel` to wrap * * Sets the model that @self should wrap. * diff --git a/gtk/gtknativedialog.c b/gtk/gtknativedialog.c index 972616905a..308d6fe460 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: (allow-none): parent window, or %NULL + * @parent: (nullable): parent window, or %NULL * * 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 bc7363bbb8..2184ea275a 100644 --- a/gtk/gtknoselection.c +++ b/gtk/gtknoselection.c @@ -213,7 +213,7 @@ gtk_no_selection_init (GtkNoSelection *self) /** * gtk_no_selection_new: - * @model: (allow-none) (transfer full): the `GListModel` to manage, or %NULL + * @model: (nullable) (transfer full): the `GListModel` to manage, or %NULL * * Creates a new selection to handle @model. * @@ -255,7 +255,7 @@ gtk_no_selection_get_model (GtkNoSelection *self) /** * gtk_no_selection_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkNoSelection` - * @model: (allow-none): A `GListModel` to wrap + * @model: (nullable): A `GListModel` to wrap * * Sets the model that @self should wrap. * diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 2b61e49c38..7cd69ca87a 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -5677,7 +5677,7 @@ gtk_notebook_menu_label_unparent (GtkWidget *widget) * gtk_notebook_append_page: * @notebook: a `GtkNotebook` * @child: the `GtkWidget` to use as the contents of the page - * @tab_label: (allow-none): the `GtkWidget` to be used as the label + * @tab_label: (nullable): the `GtkWidget` to be used as the label * for the page, or %NULL to use the default label, “page N” * * Appends a page to @notebook. @@ -5701,9 +5701,9 @@ gtk_notebook_append_page (GtkNotebook *notebook, * gtk_notebook_append_page_menu: * @notebook: a `GtkNotebook` * @child: the `GtkWidget` to use as the contents of the page - * @tab_label: (allow-none): the `GtkWidget` to be used as the label + * @tab_label: (nullable): the `GtkWidget` to be used as the label * for the page, or %NULL to use the default label, “page N” - * @menu_label: (allow-none): the widget to use as a label for the + * @menu_label: (nullable): the widget to use as a label for the * page-switch menu, if that is enabled. If %NULL, and @tab_label * is a #GtkLabel or %NULL, then the menu label will be a newly * created label with the same text as @tab_label; if @tab_label @@ -5734,7 +5734,7 @@ gtk_notebook_append_page_menu (GtkNotebook *notebook, * gtk_notebook_prepend_page: * @notebook: a `GtkNotebook` * @child: the `GtkWidget` to use as the contents of the page - * @tab_label: (allow-none): the #GtkWidget to be used as the label + * @tab_label: (nullable): the #GtkWidget to be used as the label * for the page, or %NULL to use the default label, “page N” * * Prepends a page to @notebook. @@ -5758,9 +5758,9 @@ gtk_notebook_prepend_page (GtkNotebook *notebook, * gtk_notebook_prepend_page_menu: * @notebook: a `GtkNotebook` * @child: the `GtkWidget` to use as the contents of the page - * @tab_label: (allow-none): the `GtkWidget` to be used as the label + * @tab_label: (nullable): the `GtkWidget` to be used as the label * for the page, or %NULL to use the default label, “page N” - * @menu_label: (allow-none): the widget to use as a label for the + * @menu_label: (nullable): the widget to use as a label for the * page-switch menu, if that is enabled. If %NULL, and @tab_label * is a #GtkLabel or %NULL, then the menu label will be a newly * created label with the same text as @tab_label; if @tab_label @@ -5791,7 +5791,7 @@ gtk_notebook_prepend_page_menu (GtkNotebook *notebook, * gtk_notebook_insert_page: * @notebook: a `GtkNotebook` * @child: the `GtkWidget` to use as the contents of the page - * @tab_label: (allow-none): the `GtkWidget` to be used as the label + * @tab_label: (nullable): the `GtkWidget` to be used as the label * for the page, or %NULL to use the default label, “page N” * @position: the index (starting at 0) at which to insert the page, * or -1 to append the page after all other pages @@ -5848,9 +5848,9 @@ gtk_notebook_mnemonic_activate_switch_page (GtkWidget *child, * gtk_notebook_insert_page_menu: * @notebook: a `GtkNotebook` * @child: the `GtkWidget` to use as the contents of the page - * @tab_label: (allow-none): the `GtkWidget` to be used as the label + * @tab_label: (nullable): the `GtkWidget` to be used as the label * for the page, or %NULL to use the default label, “page N” - * @menu_label: (allow-none): the widget to use as a label for the + * @menu_label: (nullable): the widget to use as a label for the * page-switch menu, if that is enabled. If %NULL, and @tab_label * is a #GtkLabel or %NULL, then the menu label will be a newly * created label with the same text as @tab_label; if @tab_label @@ -6528,7 +6528,7 @@ gtk_notebook_get_tab_label (GtkNotebook *notebook, * gtk_notebook_set_tab_label: * @notebook: a `GtkNotebook` * @child: the page - * @tab_label: (allow-none): the tab label widget to use, or %NULL + * @tab_label: (nullable): the tab label widget to use, or %NULL * for default tab label * * Changes the tab label for @child. @@ -6688,7 +6688,7 @@ gtk_notebook_get_menu_label (GtkNotebook *notebook, * gtk_notebook_set_menu_label: * @notebook: a `GtkNotebook` * @child: the child widget - * @menu_label: (allow-none): the menu label, or %NULL for default + * @menu_label: (nullable): the menu label, or %NULL for default * * Changes the menu label for the page containing @child. */ @@ -6883,7 +6883,7 @@ gtk_notebook_reorder_child (GtkNotebook *notebook, /** * gtk_notebook_set_group_name: (attributes org.gtk.Method.set_property=group-name) * @notebook: a `GtkNotebook` - * @group_name: (allow-none): the name of the notebook group, + * @group_name: (nullable): the name of the notebook group, * or %NULL to unset it * * Sets a group name for @notebook. diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index 9b127333e8..04ec0093a6 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -564,7 +564,7 @@ gtk_overlay_get_clip_overlay (GtkOverlay *overlay, /** * gtk_overlay_set_child: * @overlay: a `GtkOverlay` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @overlay. */ diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c index 7466a1b063..18d1c4c4b3 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): 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, or %NULL * to use the default name “Page Setup” - * @error: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): 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, or %NULL * to use the default name “Page Setup” - * @error: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * 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: (allow-none): return location for errors, or %NULL + * @error: (nullable): return location for errors, or %NULL * * This function saves the information from @setup to @file_name. * diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index be41499886..593be8d678 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: (allow-none): the title of the dialog, or %NULL - * @parent: (allow-none): transient parent of the dialog, or %NULL + * @title: (nullable): the title of the dialog, or %NULL + * @parent: (nullable): transient parent of the dialog, or %NULL * * Creates a new page setup dialog. * diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 783065b6d4..8f94dc4075 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: (allow-none): a paper size name, or %NULL + * @name: (nullable): a paper size name, or %NULL * * 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,7 +910,7 @@ 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: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * Reads a paper size from the group @group_name in the key file * @key_file. diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c index 32eacc865b..1ea23a9704 100644 --- a/gtk/gtkpasswordentry.c +++ b/gtk/gtkpasswordentry.c @@ -649,7 +649,7 @@ gtk_password_entry_get_show_peek_icon (GtkPasswordEntry *entry) /** * gtk_password_entry_set_extra_menu: (attributes org.gtk.Method.set_property=extra-menu) * @entry: a `GtkPasswordEntry` - * @model: (allow-none): a `GMenuModel` + * @model: (nullable): a `GMenuModel` * * Sets a menu model to add when constructing * the context menu for @entry. diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 0b93073daa..df3cda3bb6 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -1914,7 +1914,7 @@ gtk_popover_new (void) /** * gtk_popover_set_child: (attributes org.gtk.Method.set_property=child) * @popover: a `GtkPopover` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @popover. */ @@ -1963,7 +1963,7 @@ gtk_popover_get_child (GtkPopover *popover) /** * gtk_popover_set_default_widget: (attributes org.gtk.Method.set_property=default-widget) * @popover: a `GtkPopover` - * @widget: (allow-none): a child widget of @popover to set as + * @widget: (nullable): a child widget of @popover to set as * the default, or %NULL to unset the default widget for the popover * * Sets the default widget of a `GtkPopover`. diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c index e3ca05cd0e..2610bf9cf3 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: (allow-none): a `GMenuModel`, or %NULL + * @model: (nullable): a `GMenuModel`, or %NULL * * Creates a `GtkPopoverMenu` and populates it according to @model. * diff --git a/gtk/gtkpopovermenubar.c b/gtk/gtkpopovermenubar.c index 4c5088c734..2881b687d5 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: (allow-none): a `GMenuModel`, or %NULL + * @model: (nullable): a `GMenuModel`, or %NULL * * 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: (allow-none): a `GMenuModel`, or %NULL + * @model: (nullable): a `GMenuModel`, or %NULL * * Sets a menu model from which @bar should take * its contents. diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 5106397c26..530ffe09b0 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: (allow-none): return location for errors, or %NULL + * @error: (nullable): return location for errors, or %NULL * * 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 3c7f4041ba..7dd2894698 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -961,8 +961,8 @@ get_page_setup_dialog (GtkWindow *parent, /** * gtk_print_run_page_setup_dialog: - * @parent: (allow-none): transient parent - * @page_setup: (allow-none): an existing #GtkPageSetup + * @parent: (nullable): transient parent + * @page_setup: (nullable): an existing #GtkPageSetup * @settings: a #GtkPrintSettings * * Runs a page setup dialog, letting the user modify the values from @@ -1012,8 +1012,8 @@ gtk_print_run_page_setup_dialog (GtkWindow *parent, /** * gtk_print_run_page_setup_dialog_async: - * @parent: (allow-none): transient parent, or %NULL - * @page_setup: (allow-none): an existing #GtkPageSetup, or %NULL + * @parent: (nullable): transient parent, or %NULL + * @page_setup: (nullable): an existing #GtkPageSetup, or %NULL * @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 c9773aa6f4..f37b161fc8 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -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: (allow-none): the `GtkWindow` to use as window parent, or %NULL + * @parent: (nullable): the `GtkWindow` to use as window parent, or %NULL * * 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: (allow-none): a `GtkPageSetup`, or %NULL + * @default_page_setup: (nullable): a `GtkPageSetup`, or %NULL * * Makes @default_page_setup the default page setup for @op. * @@ -1474,7 +1474,7 @@ gtk_print_operation_get_default_page_setup (GtkPrintOperation *op) /** * gtk_print_operation_set_print_settings: (attributes org.gtk.Method.set_property=print-settings) * @op: a `GtkPrintOperation` - * @print_settings: (allow-none): `GtkPrintSettings` + * @print_settings: (nullable): `GtkPrintSettings` * * Sets the print settings for @op. * @@ -1878,7 +1878,7 @@ gtk_print_operation_set_allow_async (GtkPrintOperation *op, /** * gtk_print_operation_set_custom_tab_label: (attributes org.gtk.Method.set_property=custom-tab-label) * @op: a `GtkPrintOperation` - * @label: (allow-none): the label to use, or %NULL to use the default label + * @label: (nullable): the label to use, or %NULL to use the default label * * Sets the label for the tab holding custom widgets. */ @@ -3011,8 +3011,8 @@ gtk_print_operation_get_error (GtkPrintOperation *op, * gtk_print_operation_run: * @op: a `GtkPrintOperation` * @action: the action to start - * @parent: (allow-none): Transient parent of the dialog - * @error: (allow-none): Return location for errors, or %NULL + * @parent: (nullable): Transient parent of the dialog + * @error: (nullable): Return location for errors, or %NULL * * Runs the print operation. * diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c index 48363596ce..113e3be13f 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: (allow-none): a string value, or %NULL + * @value: (nullable): a string value, or %NULL * * 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: (allow-none): return location for errors, or %NULL + * @error: (nullable): return location for errors, or %NULL * * 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: (allow-none): return location for errors, or %NULL + * @error: (nullable): return location for errors, or %NULL * * Reads the print settings from @file_name. * @@ -1624,9 +1624,9 @@ gtk_print_settings_new_from_file (const char *file_name, * gtk_print_settings_load_key_file: * @settings: a `GtkPrintSettings` * @key_file: the `GKeyFile` to retrieve the settings from - * @group_name: (allow-none): the name of the group to use, or %NULL + * @group_name: (nullable): the name of the group to use, or %NULL * to use the default “Print Settings” - * @error: (allow-none): return location for errors, or %NULL + * @error: (nullable): return location for errors, or %NULL * * Reads the print settings from the group @group_name in @key_file. * @@ -1684,9 +1684,9 @@ gtk_print_settings_load_key_file (GtkPrintSettings *settings, /** * gtk_print_settings_new_from_key_file: * @key_file: the `GKeyFile` to retrieve the settings from - * @group_name: (allow-none): the name of the group to use, or %NULL to use + * @group_name: (nullable): the name of the group to use, or %NULL to use * the default “Print Settings” - * @error: (allow-none): return location for errors, or %NULL + * @error: (nullable): return location for errors, or %NULL * * 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: (allow-none): return location for errors, or %NULL + * @error: (nullable): return location for errors, or %NULL * * This function saves the print settings from @settings to @file_name. * diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 395ea381f3..8b5ea2d8f3 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: (allow-none): Title of the dialog, or %NULL - * @parent: (allow-none): Transient parent of the dialog, or %NULL + * @title: (nullable): Title of the dialog, or %NULL + * @parent: (nullable): Transient parent of the dialog, or %NULL * * 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: (allow-none): a `GtkPrintSettings`, or %NULL + * @settings: (nullable): a `GtkPrintSettings`, or %NULL * * Sets the `GtkPrintSettings` for the `GtkPrintUnixDialog`. * diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 4517a85ba5..aaf0c06271 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: (allow-none): a UTF-8 string, or %NULL + * @text: (nullable): a UTF-8 string, or %NULL * * Causes the given @text to appear next to the progress bar. * diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 106ebd4cf2..82d008f7a0 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -964,8 +964,8 @@ gtk_range_get_range_rect (GtkRange *range, /** * gtk_range_get_slider_range: * @range: a `GtkRange` - * @slider_start: (out) (allow-none): return location for the slider's start - * @slider_end: (out) (allow-none): return location for the slider's end + * @slider_start: (out) (optional): return location for the slider's start + * @slider_end: (out) (optional): return location for the slider's end * * This function returns sliders range along the long dimension, * in widget->window coordinates. diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 9af8765a5e..2c5315e60e 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: (allow-none): return location for a #GError, or %NULL + * @error: (nullable): return location for a #GError, or %NULL * * 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: (allow-none): a return location for a #GError, or %NULL + * @error: (nullable): a return location for a #GError, or %NULL * * Searches for a URI inside the recently used resources list, and * returns a `GtkRecentInfo` containing information about the resource @@ -1205,9 +1205,9 @@ gtk_recent_manager_lookup_item (GtkRecentManager *manager, * gtk_recent_manager_move_item: * @manager: a `GtkRecentManager` * @uri: the URI of a recently used resource - * @new_uri: (allow-none): the new URI of the recently used resource, or + * @new_uri: (nullable): the new URI of the recently used resource, or * %NULL to remove the item pointed by @uri in the list - * @error: (allow-none): a return location for a #GError, or %NULL + * @error: (nullable): a return location for a #GError, or %NULL * * Changes the location of a recently used resource from @uri to @new_uri. * @@ -1332,7 +1332,7 @@ purge_recent_items_list (GtkRecentManager *manager, /** * gtk_recent_manager_purge_items: * @manager: a `GtkRecentManager` - * @error: (allow-none): a return location for a #GError, or %NULL + * @error: (nullable): a return location for a #GError, or %NULL * * Purges every item from the recently used resources list. * @@ -1778,7 +1778,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo *info, /** * gtk_recent_info_get_applications: * @info: a `GtkRecentInfo` - * @length: (out) (allow-none): return location for the length of the returned list + * @length: (out) (optional): return location for the length of the returned list * * Retrieves the list of applications that have registered this resource. * @@ -2197,7 +2197,7 @@ gtk_recent_info_get_age (GtkRecentInfo *info) /** * gtk_recent_info_get_groups: * @info: a `GtkRecentInfo` - * @length: (out) (allow-none): return location for the number of groups returned + * @length: (out) (optional): return location for the number of groups returned * * Returns all groups registered for the recently used item @info. * @@ -2276,10 +2276,10 @@ gtk_recent_info_has_group (GtkRecentInfo *info, /** * gtk_recent_info_create_app_info: * @info: a `GtkRecentInfo` - * @app_name: (allow-none): the name of the application that should + * @app_name: (nullable): the name of the application that should * be mapped to a `GAppInfo`; if %NULL is used then the default * application for the MIME type is used - * @error: (allow-none): return location for a #GError, or %NULL + * @error: (nullable): return location for a #GError, or %NULL * * Creates a `GAppInfo` for the specified `GtkRecentInfo` * diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c index 5bb0506da5..25148b907c 100644 --- a/gtk/gtkrevealer.c +++ b/gtk/gtkrevealer.c @@ -866,7 +866,7 @@ gtk_revealer_set_transition_type (GtkRevealer *revealer, /** * gtk_revealer_set_child: (attributes org.gtk.Method.set_property=child) * @revealer: a `GtkRevealer` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @revealer. */ diff --git a/gtk/gtkroot.c b/gtk/gtkroot.c index b77d7d7a99..576b939a74 100644 --- a/gtk/gtkroot.c +++ b/gtk/gtkroot.c @@ -118,7 +118,7 @@ gtk_root_get_constraint_solver (GtkRoot *self) /** * gtk_root_set_focus: * @self: a `GtkRoot` - * @focus: (allow-none): widget to be the new focus widget, or %NULL + * @focus: (nullable): widget to be the new focus widget, or %NULL * to unset the focus widget * * If @focus is not the current focus widget, and is focusable, sets diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 5323a95def..c05ccb9760 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) (allow-none): location to store X offset of layout, or %NULL - * @y: (out) (allow-none): location to store Y offset of layout, or %NULL + * @x: (out) (optional): location to store X offset of layout, or %NULL + * @y: (out) (optional): location to store Y offset of layout, or %NULL * * Obtains the coordinates where the scale will draw the * `PangoLayout` representing the text in the scale. @@ -1678,7 +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: (allow-none): Text to be shown at the mark, using + * @markup: (nullable): Text to be shown at the mark, using * Pango markup, or %NULL * * Adds a mark at @value. diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 456863eff1..0bcb97f459 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -538,7 +538,7 @@ gtk_scale_button_dispose (GObject *object) * @max: the maximum value of the scale (usually 100) * @step: the stepping of value when a scroll-wheel event, * or up/down arrow event occurs (usually 2) - * @icons: (allow-none) (array zero-terminated=1): a %NULL-terminated + * @icons: (nullable) (array zero-terminated=1): a %NULL-terminated * array of icon names, or %NULL if you want to set the list * later with gtk_scale_button_set_icons() * diff --git a/gtk/gtkscrollable.c b/gtk/gtkscrollable.c index 5fbc41c2ac..0d4a2d51af 100644 --- a/gtk/gtkscrollable.c +++ b/gtk/gtkscrollable.c @@ -154,7 +154,7 @@ gtk_scrollable_get_hadjustment (GtkScrollable *scrollable) /** * gtk_scrollable_set_hadjustment: (attributes org.gtk.Method.set_property=hadjustment) * @scrollable: a `GtkScrollable` - * @hadjustment: (allow-none): a `GtkAdjustment` + * @hadjustment: (nullable): a `GtkAdjustment` * * Sets the horizontal adjustment of the `GtkScrollable`. */ @@ -198,7 +198,7 @@ gtk_scrollable_get_vadjustment (GtkScrollable *scrollable) /** * gtk_scrollable_set_vadjustment: (attributes org.gtk.Method.set_property=vadjustment) * @scrollable: a `GtkScrollable` - * @vadjustment: (allow-none): a `GtkAdjustment` + * @vadjustment: (nullable): a `GtkAdjustment` * * Sets the vertical adjustment of the `GtkScrollable`. */ diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index f4d28ca831..bdd6d21eab 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -252,7 +252,7 @@ gtk_scrollbar_init (GtkScrollbar *self) /** * gtk_scrollbar_new: * @orientation: the scrollbar’s orientation. - * @adjustment: (allow-none): the [class@Gtk.Adjustment] to use, or %NULL + * @adjustment: (nullable): the [class@Gtk.Adjustment] to use, or %NULL * to create a new adjustment. * * Creates a new scrollbar with the given orientation. diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index c96b7ad941..058cff7921 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -4167,7 +4167,7 @@ gtk_scrolled_window_get_propagate_natural_height (GtkScrolledWindow *scrolled_wi /** * gtk_scrolled_window_set_child: (attributes org.gtk.Method.set_property=child) * @scrolled_window: a `GtkScrolledWindow` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @scrolled_window. */ diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c index 5de0c00f01..0d6f036148 100644 --- a/gtk/gtksearchbar.c +++ b/gtk/gtksearchbar.c @@ -675,7 +675,7 @@ gtk_search_bar_get_key_capture_widget (GtkSearchBar *bar) /** * gtk_search_bar_set_child: (attributes org.gtk.Method.set_property=child) * @bar: a `GtkSearchBar` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @bar. */ diff --git a/gtk/gtkselectionfiltermodel.c b/gtk/gtkselectionfiltermodel.c index 84d7faa489..52459b9761 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: (allow-none) (transfer none): the selection model to filter, or %NULL + * @model: (nullable) (transfer none): the selection model to filter, or %NULL * * Creates a new `GtkSelectionFilterModel` that will include the * selected items from the underlying selection model. @@ -254,7 +254,7 @@ gtk_selection_filter_model_new (GtkSelectionModel *model) /** * gtk_selection_filter_model_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkSelectionFilterModel` - * @model: (allow-none): The model to be filtered + * @model: (nullable): The model to be filtered * * Sets the model to be filtered. * diff --git a/gtk/gtkshortcut.c b/gtk/gtkshortcut.c index 51982e63ef..c2bbabf80f 100644 --- a/gtk/gtkshortcut.c +++ b/gtk/gtkshortcut.c @@ -232,7 +232,7 @@ gtk_shortcut_new (GtkShortcutTrigger *trigger, * @trigger: (transfer full) (nullable): The trigger that will trigger the shortcut * @action: (transfer full) (nullable): The action that will be activated upon * triggering - * @format_string: (allow-none): GVariant format string for arguments or %NULL for + * @format_string: (nullable): GVariant format string for arguments or %NULL for * no arguments * @...: arguments, as given by format string. * diff --git a/gtk/gtkshortcutaction.c b/gtk/gtkshortcutaction.c index 249bd437eb..969cdba46d 100644 --- a/gtk/gtkshortcutaction.c +++ b/gtk/gtkshortcutaction.c @@ -140,7 +140,7 @@ gtk_shortcut_action_print (GtkShortcutAction *self, * @self: a `GtkShortcutAction` * @flags: flags to activate with * @widget: Target of the activation - * @args: (allow-none): arguments to pass + * @args: (nullable): arguments to pass * * Activates the action on the @widget with the given @args. * diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c index 1cedcb46c8..9577901118 100644 --- a/gtk/gtkshow.c +++ b/gtk/gtkshow.c @@ -189,7 +189,7 @@ show_uri_done (GObject *object, /** * gtk_show_uri: - * @parent: (allow-none): parent window + * @parent: (nullable): parent window * @uri: the uri to show * @timestamp: timestamp from the event that triggered this call, or %GDK_CURRENT_TIME * diff --git a/gtk/gtksingleselection.c b/gtk/gtksingleselection.c index fcdd911503..f8c8be3639 100644 --- a/gtk/gtksingleselection.c +++ b/gtk/gtksingleselection.c @@ -449,7 +449,7 @@ gtk_single_selection_init (GtkSingleSelection *self) /** * gtk_single_selection_new: - * @model: (allow-none) (transfer full): the `GListModel` to manage, or %NULL + * @model: (nullable) (transfer full): the `GListModel` to manage, or %NULL * * Creates a new selection to handle @model. * @@ -491,7 +491,7 @@ gtk_single_selection_get_model (GtkSingleSelection *self) /** * gtk_single_selection_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkSingleSelection` - * @model: (allow-none): A `GListModel` to wrap + * @model: (nullable): A `GListModel` to wrap * * Sets the model that @self should wrap. * diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index 23cd11931b..bcac4d6626 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -577,8 +577,8 @@ gtk_widget_get_request_mode (GtkWidget *widget) /** * gtk_widget_get_preferred_size: * @widget: a `GtkWidget` instance - * @minimum_size: (out) (allow-none): location for storing the minimum size, or %NULL - * @natural_size: (out) (allow-none): location for storing the natural size, or %NULL + * @minimum_size: (out) (optional): location for storing the minimum size, or %NULL + * @natural_size: (out) (optional): location for storing the natural size, or %NULL * * 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 63ea6654e8..9c3d798af1 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) (allow-none): The model to use, or %NULL + * @model: (transfer full) (nullable): The model to use, or %NULL * @offset: the offset of the slice * @size: maximum size of the slice * @@ -332,7 +332,7 @@ gtk_slice_list_model_new (GListModel *model, /** * gtk_slice_list_model_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkSliceListModel` - * @model: (allow-none): The model to be sliced + * @model: (nullable): The model to be sliced * * Sets the model to show a slice of. * diff --git a/gtk/gtksnapshot.c b/gtk/gtksnapshot.c index b2fd486ec3..261c41860f 100644 --- a/gtk/gtksnapshot.c +++ b/gtk/gtksnapshot.c @@ -316,7 +316,7 @@ gtk_snapshot_free_to_node (GtkSnapshot *snapshot) /** * gtk_snapshot_free_to_paintable: (skip) * @snapshot: (transfer full): a `GtkSnapshot` - * @size: (allow-none): The size of the resulting paintable + * @size: (nullable): The size of the resulting paintable * or %NULL to use the bounds of the snapshot * * Returns a paintable for the node that was @@ -1513,7 +1513,7 @@ gtk_snapshot_to_node (GtkSnapshot *snapshot) /** * gtk_snapshot_to_paintable: * @snapshot: a `GtkSnapshot` - * @size: (allow-none): The size of the resulting paintable + * @size: (nullable): The size of the resulting paintable * or %NULL to use the bounds of the snapshot * * Returns a paintable encapsulating the render node @@ -1655,7 +1655,7 @@ gtk_snapshot_restore (GtkSnapshot *snapshot) /** * gtk_snapshot_transform: * @snapshot: a `GtkSnapshot` - * @transform: (allow-none): the transform to apply + * @transform: (nullable): the transform to apply * * Transforms @snapshot's coordinate system with the given @transform. */ diff --git a/gtk/gtksortlistmodel.c b/gtk/gtksortlistmodel.c index d3a0125cb8..8f8091cb1b 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: (allow-none) (transfer full): the model to sort, or %NULL - * @sorter: (allow-none) (transfer full): the `GtkSorter` to sort @model with, or %NULL + * @model: (nullable) (transfer full): the model to sort, or %NULL + * @sorter: (nullable) (transfer full): the `GtkSorter` to sort @model with, or %NULL * * Creates a new sort list model that uses the @sorter to sort @model. * @@ -860,7 +860,7 @@ gtk_sort_list_model_new (GListModel *model, /** * gtk_sort_list_model_set_model: (attributes org.gtk.Method.set_property=model) * @self: a `GtkSortListModel` - * @model: (allow-none): The model to be sorted + * @model: (nullable): The model to be sorted * * Sets the model to be sorted. * @@ -922,7 +922,7 @@ gtk_sort_list_model_get_model (GtkSortListModel *self) /** * gtk_sort_list_model_set_sorter: (attributes org.gtk.Method.set_property=sorter) * @self: a `GtkSortListModel` - * @sorter: (allow-none): the `GtkSorter` to sort @model with + * @sorter: (nullable): the `GtkSorter` to sort @model with * * Sets a new sorter on @self. */ diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 12846ab98a..d90a178c52 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -1773,7 +1773,7 @@ gtk_spin_button_configure (GtkSpinButton *spin_button, /** * gtk_spin_button_new: - * @adjustment: (allow-none): the `GtkAdjustment` that this spin + * @adjustment: (nullable): the `GtkAdjustment` that this spin * button should use, or %NULL * @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 @@ -1964,8 +1964,8 @@ gtk_spin_button_set_increments (GtkSpinButton *spin_button, /** * gtk_spin_button_get_increments: * @spin_button: a `GtkSpinButton` - * @step: (out) (allow-none): location to store step increment, or %NULL - * @page: (out) (allow-none): location to store page increment, or %NULL + * @step: (out) (optional): location to store step increment, or %NULL + * @page: (out) (optional): location to store page increment, or %NULL * * Gets the current step and page the increments * used by @spin_button. diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index 7ce0efb109..a56d81a44a 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -397,7 +397,7 @@ unset_stack (GtkStackSwitcher *switcher) /** * gtk_stack_switcher_set_stack: (attributes org.gtk.Method.set_property=stack) * @switcher: a `GtkStackSwitcher` - * @stack: (allow-none): a `GtkStack` + * @stack: (nullable): a `GtkStack` * * Sets the stack to control. */ diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 14c948093c..3537b6e0dc 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -6931,7 +6931,7 @@ gtk_text_get_key_controller (GtkText *self) /** * gtk_text_set_extra_menu: (attributes org.gtk.Method.set_property=extra-menu) * @self: a `GtkText` - * @model: (allow-none): a `GMenuModel` + * @model: (nullable): a `GMenuModel` * * Sets a menu model to add when constructing * the context menu for @self. diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 40faef526d..d6394df923 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -1055,7 +1055,7 @@ gtk_text_buffer_get_property (GObject *object, /** * gtk_text_buffer_new: - * @table: (allow-none): a tag table, or %NULL to create a new one + * @table: (nullable): a tag table, or %NULL to create a new one * * Creates a new text buffer. * @@ -2445,7 +2445,7 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer, /** * gtk_text_buffer_create_mark: * @buffer: a `GtkTextBuffer` - * @mark_name: (allow-none): name for mark, or %NULL + * @mark_name: (nullable): name for mark, or %NULL * @where: location to place mark * @left_gravity: whether the mark has left gravity * @@ -2826,8 +2826,8 @@ gtk_text_buffer_select_range (GtkTextBuffer *buffer, /** * gtk_text_buffer_create_tag: * @buffer: a `GtkTextBuffer` - * @tag_name: (allow-none): name of the new tag, or %NULL - * @first_property_name: (allow-none): name of first property to set, or %NULL + * @tag_name: (nullable): name of the new tag, or %NULL + * @first_property_name: (nullable): name of first property to set, or %NULL * @...: %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: (allow-none): location to insert pasted text, or %NULL + * @override_location: (nullable): location to insert pasted text, or %NULL * @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 dad790f3ff..823cc915a5 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -1235,7 +1235,7 @@ gtk_text_iter_starts_tag (const GtkTextIter *iter, /** * gtk_text_iter_ends_tag: * @iter: an iterator - * @tag: (allow-none): a `GtkTextTag`, or %NULL + * @tag: (nullable): a `GtkTextTag`, or %NULL * * 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: (allow-none): a `GtkTextTag`, or %NULL + * @tag: (nullable): a `GtkTextTag`, or %NULL * * 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: (allow-none): a `GtkTextTag`, or %NULL + * @tag: (nullable): a `GtkTextTag`, or %NULL * * 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: (allow-none): a `GtkTextTag`, or %NULL + * @tag: (nullable): a `GtkTextTag`, or %NULL * * 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: (allow-none): search limit, or %NULL for none + * @limit: (nullable): search limit, or %NULL for none * * 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: (allow-none): search limit, or %NULL for none + * @limit: (nullable): search limit, or %NULL for none * * Same as gtk_text_iter_forward_find_char(), * but goes backward from @iter. @@ -4955,9 +4955,9 @@ 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) (allow-none): return location for start of match, or %NULL - * @match_end: (out caller-allocates) (allow-none): return location for end of match, or %NULL - * @limit: (allow-none): location of last possible @match_end, or %NULL for the end of the buffer + * @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 + * @limit: (nullable): location of last possible @match_end, or %NULL for the end of the buffer * * Searches forward for @str. * @@ -5285,9 +5285,9 @@ 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) (allow-none): return location for start of match, or %NULL - * @match_end: (out caller-allocates) (allow-none): return location for end of match, or %NULL - * @limit: (allow-none): location of last possible @match_start, or %NULL for start of buffer + * @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 + * @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 ffc6795484..cd600a9bed 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -301,7 +301,7 @@ free_style_cache (GtkTextLayout *text_layout) /* * gtk_text_layout_set_buffer: - * @buffer: (allow-none): + * @buffer: (nullable): */ void gtk_text_layout_set_buffer (GtkTextLayout *layout, diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c index 4c05bdca29..39a264b955 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: (allow-none): mark name or %NULL + * @name: (nullable): mark name or %NULL * @left_gravity: whether the mark should have left gravity * * Creates a text mark. diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 2bbb827300..ac92f49eec 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: (allow-none): tag name, or %NULL + * @name: (nullable): tag name, or %NULL * * Creates a `GtkTextTag`. * diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 7c6e22a248..f86fbcff26 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -2117,7 +2117,7 @@ gtk_text_view_new_with_buffer (GtkTextBuffer *buffer) /** * gtk_text_view_set_buffer: (attributes org.gtk.Method.set_property=buffer) * @text_view: a `GtkTextView` - * @buffer: (allow-none): a `GtkTextBuffer` + * @buffer: (nullable): a `GtkTextBuffer` * * Sets @buffer as the buffer being displayed by @text_view. * @@ -2279,9 +2279,9 @@ gtk_text_view_get_buffer (GtkTextView *text_view) /** * gtk_text_view_get_cursor_locations: * @text_view: a `GtkTextView` - * @iter: (allow-none): a `GtkTextIter` - * @strong: (out) (allow-none): location to store the strong cursor position - * @weak: (out) (allow-none): location to store the weak cursor position + * @iter: (nullable): a `GtkTextIter` + * @strong: (out) (optional): location to store the strong cursor position + * @weak: (out) (optional): location to store the weak cursor position * * Determine the positions of the strong and weak cursors if the * insertion point is at @iter. @@ -2362,7 +2362,7 @@ gtk_text_view_get_iter_at_location (GtkTextView *text_view, * gtk_text_view_get_iter_at_position: * @text_view: a `GtkTextView` * @iter: (out): a `GtkTextIter` - * @trailing: (out) (allow-none): if non-%NULL, location to store + * @trailing: (out) (optional): if non-%NULL, location to store * an integer indicating where in the grapheme the user clicked. * It will either be zero, or the number of characters in the grapheme. * 0 represents the trailing edge of the grapheme. @@ -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) (allow-none): window x coordinate return location or %NULL - * @window_y: (out) (allow-none): window y coordinate return location or %NULL + * @window_x: (out) (optional): window x coordinate return location or %NULL + * @window_y: (out) (optional): window y coordinate return location or %NULL * * 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) (allow-none): buffer x coordinate return location or %NULL - * @buffer_y: (out) (allow-none): buffer y coordinate return location or %NULL + * @buffer_x: (out) (optional): buffer x coordinate return location or %NULL + * @buffer_y: (out) (optional): buffer y coordinate return location or %NULL * * Converts coordinates on the window identified by @win to buffer * coordinates. @@ -9879,7 +9879,7 @@ gtk_text_view_insert_emoji (GtkTextView *text_view) /** * gtk_text_view_set_extra_menu: (attributes org.gtk.Method.set_property=extra-menu) * @text_view: a `GtkTextView` - * @model: (allow-none): a `GMenuModel` + * @model: (nullable): a `GMenuModel` * * Sets a menu model to add when constructing the context * menu for @text_view. diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 9e7daca39f..1a364f1df6 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -203,7 +203,7 @@ gtk_tooltip_dispose (GObject *object) /** * gtk_tooltip_set_markup: * @tooltip: a `GtkTooltip` - * @markup: (allow-none): a string with Pango markup or %NLL + * @markup: (nullable): a string with Pango markup or %NLL * * Sets the text of the tooltip to be @markup. * @@ -222,7 +222,7 @@ gtk_tooltip_set_markup (GtkTooltip *tooltip, /** * gtk_tooltip_set_text: * @tooltip: a `GtkTooltip` - * @text: (allow-none): a text string or %NULL + * @text: (nullable): a text string or %NULL * * 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: (allow-none): a #GdkPaintable, or %NULL + * @paintable: (nullable): a #GdkPaintable, or %NULL * * 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: (allow-none): an icon name, or %NULL + * @icon_name: (nullable): an icon name, or %NULL * * 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: (allow-none): a #GIcon representing the icon, or %NULL + * @gicon: (nullable): a #GIcon representing the icon, or %NULL * * Sets the icon of the tooltip (which is in front of the text) * to be the icon indicated by @gicon with the size indicated @@ -297,7 +297,7 @@ gtk_tooltip_set_icon_from_gicon (GtkTooltip *tooltip, /** * gtk_tooltip_set_custom: * @tooltip: a #GtkTooltip - * @custom_widget: (allow-none): a #GtkWidget, or %NULL to unset the old custom widget. + * @custom_widget: (nullable): a #GtkWidget, or %NULL to unset the old custom widget. * * Replaces the widget packed into the tooltip with * @custom_widget. @custom_widget does not get destroyed when the tooltip goes diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index df2d712868..d201fef3d6 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -881,7 +881,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) (allow-none): return location for number of elements + * @depth: (out) (optional): return location for number of elements * returned in the integer array, or %NULL * * Returns the current indices of @path. @@ -907,7 +907,7 @@ gtk_tree_path_get_indices_with_depth (GtkTreePath *path, /** * gtk_tree_path_free: - * @path: (allow-none): a #GtkTreePath-struct + * @path: (nullable): a #GtkTreePath-struct * * Frees @path. If @path is %NULL, it simply returns. */ @@ -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: (allow-none): the #GtkTreeIter-struct, or %NULL + * @parent: (nullable): the #GtkTreeIter-struct, or %NULL * * 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: (allow-none): the #GtkTreeIter-struct, or %NULL + * @iter: (nullable): the #GtkTreeIter-struct, or %NULL * * Returns the number of children that @iter has. * @@ -1593,7 +1593,7 @@ 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: (allow-none): the #GtkTreeIter-struct to get the child from, or %NULL. + * @parent: (nullable): the #GtkTreeIter-struct to get the child from, or %NULL. * @n: the index of the desired child * * Sets @iter to be the child of @parent, using the given index. @@ -1934,7 +1934,7 @@ gtk_tree_model_rows_reordered (GtkTreeModel *tree_model, * @tree_model: a `GtkTreeModel` * @path: a `GtkTreePath` pointing to the tree node whose children * have been reordered - * @iter: (allow-none): a valid #GtkTreeIter-struct pointing to the node + * @iter: (nullable): a valid #GtkTreeIter-struct pointing to the node * whose children have been reordered, or %NULL if the depth * of @path is 0 * @new_order: (array length=length): an array of integers @@ -2434,7 +2434,7 @@ gtk_tree_row_reference_get_model (GtkTreeRowReference *reference) /** * gtk_tree_row_reference_valid: - * @reference: (allow-none): a #GtkTreeRowReference, or %NULL + * @reference: (nullable): a #GtkTreeRowReference, or %NULL * * 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: (allow-none): a #GtkTreeRowReference, or %NULL + * @reference: (nullable): a #GtkTreeRowReference, or %NULL * * Free’s @reference. @reference may be %NULL */ diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index db2a8e9075..a4a00a4c54 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: (allow-none): A #GtkTreePath or %NULL. + * @root: (nullable): A #GtkTreePath or %NULL. * * 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: (allow-none): User data to pass to the visible function, or %NULL - * @destroy: (allow-none): Destroy notifier of @data, or %NULL + * @data: (nullable): User data to pass to the visible function, or %NULL + * @destroy: (nullable): Destroy notifier of @data, or %NULL * * 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: (allow-none): User data to pass to the modify function, or %NULL. - * @destroy: (allow-none): Destroy notifier of @data, or %NULL. + * @data: (nullable): User data to pass to the modify function, or %NULL. + * @destroy: (nullable): Destroy notifier of @data, or %NULL. * * 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). diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index e2482d083c..b4a25df924 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: (allow-none): A #GtkTreeModel, or %NULL. + * @child_model: (nullable): A #GtkTreeModel, or %NULL. * * 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 diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index b0d9606122..9d64374f18 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -451,8 +451,8 @@ gtk_tree_selection_get_tree_view (GtkTreeSelection *selection) /** * gtk_tree_selection_get_selected: * @selection: A #GtkTreeSelection. - * @model: (out) (allow-none) (transfer none): A pointer to set to the #GtkTreeModel, or NULL. - * @iter: (out) (allow-none): The #GtkTreeIter, or NULL. + * @model: (out) (optional) (transfer none): A pointer to set to the #GtkTreeModel, or NULL. + * @iter: (out) (optional): The #GtkTreeIter, or NULL. * * Sets @iter to the currently selected node if @selection is set to * #GTK_SELECTION_SINGLE or #GTK_SELECTION_BROWSE. @iter may be NULL if you @@ -521,7 +521,7 @@ gtk_tree_selection_get_selected (GtkTreeSelection *selection, /** * gtk_tree_selection_get_selected_rows: * @selection: A #GtkTreeSelection. - * @model: (out) (allow-none) (transfer none): A pointer to set to the #GtkTreeModel, or %NULL. + * @model: (out) (optional) (transfer none): A pointer to set to the #GtkTreeModel, or %NULL. * * 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 e7a5a7575e..cdcbf1b568 100644 --- a/gtk/gtktreesortable.c +++ b/gtk/gtktreesortable.c @@ -175,7 +175,7 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable *sortable, * @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: (allow-none): Destroy notifier of @user_data, or %NULL + * @destroy: (nullable): Destroy notifier of @user_data, or %NULL * * 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 @@ -207,7 +207,7 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable, * @sortable: A #GtkTreeSortable * @sort_func: The comparison function * @user_data: (closure): User data to pass to @sort_func, or %NULL - * @destroy: (allow-none): Destroy notifier of @user_data, or %NULL + * @destroy: (nullable): Destroy notifier of @user_data, or %NULL * * 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 002cc9fa36..7d5b081ee1 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: (allow-none): A valid #GtkTreeIter, or %NULL + * @parent: (nullable): A valid #GtkTreeIter, or %NULL * @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: (allow-none): A valid #GtkTreeIter, or %NULL - * @sibling: (allow-none): A valid #GtkTreeIter, or %NULL + * @parent: (nullable): A valid #GtkTreeIter, or %NULL + * @sibling: (nullable): A valid #GtkTreeIter, or %NULL * * 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: (allow-none): A valid #GtkTreeIter, or %NULL - * @sibling: (allow-none): A valid #GtkTreeIter, or %NULL + * @parent: (nullable): A valid #GtkTreeIter, or %NULL + * @sibling: (nullable): A valid #GtkTreeIter, or %NULL * * 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) (allow-none): An unset #GtkTreeIter to set the new row, or %NULL. - * @parent: (allow-none): A valid #GtkTreeIter, or %NULL + * @iter: (out) (optional): An unset #GtkTreeIter to set the new row, or %NULL. + * @parent: (nullable): A valid #GtkTreeIter, or %NULL * @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) (allow-none): An unset #GtkTreeIter to set the new row, or %NULL. - * @parent: (allow-none): A valid #GtkTreeIter, or %NULL + * @iter: (out) (optional): An unset #GtkTreeIter to set the new row, or %NULL. + * @parent: (nullable): A valid #GtkTreeIter, or %NULL * @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: (allow-none): A valid #GtkTreeIter, or %NULL + * @parent: (nullable): A valid #GtkTreeIter, or %NULL * * 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: (allow-none): A valid #GtkTreeIter, or %NULL + * @parent: (nullable): A valid #GtkTreeIter, or %NULL * * 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 @@ -2785,7 +2785,7 @@ free_paths_and_out: * gtk_tree_store_move_before: * @tree_store: A #GtkTreeStore. * @iter: A #GtkTreeIter. - * @position: (allow-none): A #GtkTreeIter or %NULL. + * @position: (nullable): A #GtkTreeIter or %NULL. * * Moves @iter in @tree_store to the position before @position. @iter and * @position should be in the same level. Note that this function only @@ -2804,7 +2804,7 @@ gtk_tree_store_move_before (GtkTreeStore *tree_store, * gtk_tree_store_move_after: * @tree_store: A #GtkTreeStore. * @iter: A #GtkTreeIter. - * @position: (allow-none): A #GtkTreeIter. + * @position: (nullable): A #GtkTreeIter. * * Moves @iter in @tree_store to the position after @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 a5d50a2cbd..b274262195 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -10233,7 +10233,7 @@ gtk_tree_view_get_model (GtkTreeView *tree_view) /** * gtk_tree_view_set_model: * @tree_view: A #GtkTreeView. - * @model: (allow-none): The model. + * @model: (nullable): The model. * * Sets the model for a #GtkTreeView. If the @tree_view already has a model * set, it will remove it before setting the new model. If @model is %NULL, @@ -10983,7 +10983,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: (allow-none): The #GtkTreeViewColumn to be moved relative to, or %NULL. + * @base_column: (nullable): The #GtkTreeViewColumn to be moved relative to, or %NULL. * * Moves @column to be after to @base_column. If @base_column is %NULL, then * @column is placed in the first position. @@ -11092,9 +11092,9 @@ gtk_tree_view_get_expander_column (GtkTreeView *tree_view) /** * gtk_tree_view_set_column_drag_function: * @tree_view: A #GtkTreeView. - * @func: (allow-none): A function to determine which columns are reorderable, or %NULL. + * @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: (allow-none): Destroy notifier for @user_data, or %NULL + * @destroy: (nullable): Destroy notifier for @user_data, or %NULL * * 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 +11162,8 @@ gtk_tree_view_scroll_to_point (GtkTreeView *tree_view, /** * gtk_tree_view_scroll_to_cell: * @tree_view: A #GtkTreeView. - * @path: (allow-none): The path of the row to move to, or %NULL. - * @column: (allow-none): The #GtkTreeViewColumn to move horizontally to, or %NULL. + * @path: (nullable): The path of the row to move to, or %NULL. + * @column: (nullable): The #GtkTreeViewColumn to move horizontally to, or %NULL. * @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. @@ -11972,7 +11972,7 @@ gtk_tree_view_get_cursor (GtkTreeView *tree_view, * gtk_tree_view_set_cursor: * @tree_view: A #GtkTreeView * @path: A #GtkTreePath - * @focus_column: (allow-none): A #GtkTreeViewColumn, or %NULL + * @focus_column: (nullable): A #GtkTreeViewColumn, or %NULL * @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 +12001,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: (allow-none): A #GtkTreeViewColumn, or %NULL - * @focus_cell: (allow-none): A #GtkCellRenderer, or %NULL + * @focus_column: (nullable): A #GtkTreeViewColumn, or %NULL + * @focus_cell: (nullable): A #GtkCellRenderer, or %NULL * @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 @@ -12247,8 +12247,8 @@ gtk_tree_view_get_cell_area_y_offset (GtkTreeView *tree_view, /** * gtk_tree_view_get_cell_area: * @tree_view: a #GtkTreeView - * @path: (allow-none): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates - * @column: (allow-none): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordinates + * @path: (nullable): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates + * @column: (nullable): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordinates * @rect: (out): rectangle to fill with cell rect * * Fills the bounding rectangle in bin_window coordinates for the cell at the @@ -12373,8 +12373,8 @@ gtk_tree_view_get_row_y_offset (GtkTreeView *tree_view, /** * gtk_tree_view_get_background_area: * @tree_view: a #GtkTreeView - * @path: (allow-none): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates - * @column: (allow-none): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordinates + * @path: (nullable): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates + * @column: (nullable): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordinates * @rect: (out): rectangle to fill with cell background rect * * Fills the bounding rectangle in bin_window coordinates for the cell at the @@ -12635,8 +12635,8 @@ gtk_tree_view_convert_bin_window_to_tree_coords (GtkTreeView *tree_view, /** * gtk_tree_view_get_visible_range: * @tree_view: A `GtkTreeView` - * @start_path: (out) (allow-none): Return location for start of region - * @end_path: (out) (allow-none): Return location for end of region + * @start_path: (out) (optional): Return location for start of region + * @end_path: (out) (optional): Return location for end of region * * Sets @start_path and @end_path to be the first and last visible path. * Note that there may be invisible paths in between. @@ -12955,7 +12955,7 @@ gtk_tree_view_unset_rows_drag_dest (GtkTreeView *tree_view) /** * gtk_tree_view_set_drag_dest_row: * @tree_view: a #GtkTreeView - * @path: (allow-none): The path of the row to highlight, or %NULL + * @path: (nullable): The path of the row to highlight, or %NULL * @pos: Specifies whether to drop before, after or into the row * * Sets the row that is highlighted for feedback. @@ -13446,8 +13446,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: (allow-none): user data to pass to @search_equal_func, or %NULL - * @search_destroy: (allow-none): Destroy notifier for @search_user_data, or %NULL + * @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 * * Sets the compare function for the interactive search capabilities; note * that somewhat like strcmp() returning 0 for equality @@ -13500,7 +13500,7 @@ gtk_tree_view_get_search_entry (GtkTreeView *tree_view) /** * gtk_tree_view_set_search_entry: * @tree_view: A #GtkTreeView - * @entry: (allow-none): 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 or %NULL * * 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 @@ -14342,9 +14342,9 @@ gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view) /** * gtk_tree_view_set_row_separator_func: * @tree_view: a #GtkTreeView - * @func: (allow-none): a #GtkTreeViewRowSeparatorFunc - * @data: (allow-none): user data to pass to @func, or %NULL - * @destroy: (allow-none): destroy notifier for @data, or %NULL + * @func: (nullable): a #GtkTreeViewRowSeparatorFunc + * @data: (nullable): user data to pass to @func, or %NULL + * @destroy: (nullable): destroy notifier for @data, or %NULL * * 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 +14586,9 @@ gtk_tree_view_set_tooltip_row (GtkTreeView *tree_view, * gtk_tree_view_set_tooltip_cell: * @tree_view: a #GtkTreeView * @tooltip: a #GtkTooltip - * @path: (allow-none): a #GtkTreePath or %NULL - * @column: (allow-none): a #GtkTreeViewColumn or %NULL - * @cell: (allow-none): a #GtkCellRenderer or %NULL + * @path: (nullable): a #GtkTreePath or %NULL + * @column: (nullable): a #GtkTreeViewColumn or %NULL + * @cell: (nullable): a #GtkCellRenderer or %NULL * * 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 34383145e1..64fd28f8be 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1695,7 +1695,7 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column, * gtk_tree_view_column_set_cell_data_func: * @tree_column: A #GtkTreeViewColumn * @cell_renderer: A #GtkCellRenderer - * @func: (allow-none): The #GtkTreeCellDataFunc to use. + * @func: (nullable): The #GtkTreeCellDataFunc to use. * @func_data: (closure): The user data for @func. * @destroy: The destroy notification for @func_data * @@ -2393,7 +2393,7 @@ gtk_tree_view_column_get_clickable (GtkTreeViewColumn *tree_column) /** * gtk_tree_view_column_set_widget: * @tree_column: A #GtkTreeViewColumn. - * @widget: (allow-none): A child #GtkWidget, or %NULL. + * @widget: (nullable): A child #GtkWidget, or %NULL. * * 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. @@ -2927,9 +2927,9 @@ _gtk_tree_view_column_cell_get_dirty (GtkTreeViewColumn *tree_column) * gtk_tree_view_column_cell_get_position: * @tree_column: a `GtkTreeViewColumn` * @cell_renderer: a `GtkCellRenderer` - * @x_offset: (out) (allow-none): return location for the horizontal + * @x_offset: (out) (optional): return location for the horizontal * position of @cell within @tree_column - * @width: (out) (allow-none): return location for the width of @cell + * @width: (out) (optional): return location for the width of @cell * * Obtains the horizontal position and size of a cell in a column. * diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c index 6c87ef6366..2343a3aba9 100644 --- a/gtk/gtkvideo.c +++ b/gtk/gtkvideo.c @@ -379,7 +379,7 @@ gtk_video_new (void) /** * gtk_video_new_for_media_stream: - * @stream: (allow-none): a `GtkMediaStream` + * @stream: (nullable): a `GtkMediaStream` * * Creates a `GtkVideo` to play back the given @stream. * @@ -397,7 +397,7 @@ gtk_video_new_for_media_stream (GtkMediaStream *stream) /** * gtk_video_new_for_file: - * @file: (allow-none): a `GFile` + * @file: (nullable): a `GFile` * * Creates a `GtkVideo` to play back the given @file. * @@ -415,7 +415,7 @@ gtk_video_new_for_file (GFile *file) /** * gtk_video_new_for_filename: - * @filename: (allow-none) (type filename): filename to play back + * @filename: (nullable) (type filename): filename to play back * * Creates a `GtkVideo` to play back the given @filename. * @@ -445,7 +445,7 @@ gtk_video_new_for_filename (const char *filename) /** * gtk_video_new_for_resource: - * @resource_path: (allow-none): resource path to play back + * @resource_path: (nullable): resource path to play back * * Creates a `GtkVideo` to play back the resource at the * given @resource_path. @@ -579,7 +579,7 @@ gtk_video_notify_cb (GtkMediaStream *stream, /** * gtk_video_set_media_stream: (attributes org.gtk.Method.set_property=media-stream) * @self: a `GtkVideo` - * @stream: (allow-none): The media stream to play or %NULL to unset + * @stream: (nullable): The media stream to play or %NULL to unset * * Sets the media stream to be played back. * @@ -667,7 +667,7 @@ gtk_video_get_file (GtkVideo *self) /** * gtk_video_set_file: (attributes org.gtk.Method.set_property=file) * @self: a `GtkVideo` - * @file: (allow-none): the file to play + * @file: (nullable): the file to play * * Makes @self play the given @file. */ @@ -714,7 +714,7 @@ gtk_video_set_file (GtkVideo *self, /** * gtk_video_set_filename: * @self: a `GtkVideo` - * @filename: (allow-none): the filename to play + * @filename: (nullable): the filename to play * * Makes @self play the given @filename. * @@ -742,7 +742,7 @@ gtk_video_set_filename (GtkVideo *self, /** * gtk_video_set_resource: * @self: a `GtkVideo` - * @resource_path: (allow-none): the resource to set + * @resource_path: (nullable): the resource to set * * Makes @self play the resource at the given @resource_path. * diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 1e9e4e1235..998874561e 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -490,8 +490,8 @@ gtk_viewport_init (GtkViewport *viewport) /** * gtk_viewport_new: - * @hadjustment: (allow-none): horizontal adjustment - * @vadjustment: (allow-none): vertical adjustment + * @hadjustment: (nullable): horizontal adjustment + * @vadjustment: (nullable): vertical adjustment * * Creates a new `GtkViewport`. * @@ -702,7 +702,7 @@ clear_focus_change_handler (GtkViewport *viewport) /** * gtk_viewport_set_child: (attributes org.gtk.Method.set_property=child) * @viewport: a `GtkViewport` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @viewport. */ diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 3f02b02736..86cae84d9f 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3898,7 +3898,7 @@ gtk_widget_adjust_size_allocation (GtkWidget *widget, * @width: New width of @widget * @height: New height of @widget * @baseline: New baseline of @widget, or -1 - * @transform: (transfer full) (allow-none): Transformation to be applied to @widget + * @transform: (transfer full) (nullable): Transformation to be applied to @widget * * This function is only used by `GtkWidget` subclasses, to * assign a size, position and (optionally) baseline to their @@ -6480,7 +6480,7 @@ gtk_widget_update_pango_context (GtkWidget *widget) /** * gtk_widget_set_font_options: * @widget: a `GtkWidget` - * @options: (allow-none): a #cairo_font_options_t, or %NULL + * @options: (nullable): a #cairo_font_options_t, or %NULL * to unset any previously set default font options * * Sets the `cairo_font_options_t` used for Pango rendering @@ -6542,7 +6542,7 @@ gtk_widget_set_font_map_recurse (GtkWidget *widget, gpointer user_data) /** * gtk_widget_set_font_map: * @widget: a `GtkWidget` - * @font_map: (allow-none): a `PangoFontMap`, or %NULL to unset any + * @font_map: (nullable): a `PangoFontMap`, or %NULL to unset any * previously set font map * * Sets the font map to use for Pango rendering. @@ -7063,8 +7063,8 @@ gtk_widget_set_size_request (GtkWidget *widget, /** * gtk_widget_get_size_request: * @widget: a `GtkWidget` - * @width: (out) (allow-none): return location for width - * @height: (out) (allow-none): return location for height + * @width: (out) (optional): return location for width + * @height: (out) (optional): return location for height * * Gets the size request that was explicitly set for the widget using * gtk_widget_set_size_request(). @@ -10836,7 +10836,7 @@ _gtk_widget_get_action_muxer (GtkWidget *widget, * gtk_widget_insert_action_group: * @widget: a `GtkWidget` * @name: the prefix for actions in @group - * @group: (allow-none): a `GActionGroup`, or %NULL to remove + * @group: (nullable): a `GActionGroup`, or %NULL to remove * the previously inserted group for @name * * Inserts @group into @widget. @@ -11296,7 +11296,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: (allow-none): parameters to use, or %NULL + * @args: (nullable): parameters to use, or %NULL * * Looks up the action in the action groups associated with * @widget and its ancestors, and activates it. @@ -12107,7 +12107,7 @@ gtk_widget_get_focus_child (GtkWidget *widget) /** * gtk_widget_set_cursor: (attributes org.gtk.Method.set_property=cursor) * @widget: a `GtkWidget` - * @cursor: (allow-none): the new cursor + * @cursor: (nullable): the new cursor * * Sets the cursor to be shown when pointer devices point * towards @widget. diff --git a/gtk/gtkwidgetpaintable.c b/gtk/gtkwidgetpaintable.c index dbea4abe15..0f2f4a345f 100644 --- a/gtk/gtkwidgetpaintable.c +++ b/gtk/gtkwidgetpaintable.c @@ -260,7 +260,7 @@ gtk_widget_paintable_init (GtkWidgetPaintable *self) /** * gtk_widget_paintable_new: - * @widget: (allow-none) (transfer none): a `GtkWidget` or %NULL + * @widget: (nullable) (transfer none): a `GtkWidget` or %NULL * * 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: (allow-none): the widget to observe or %NULL + * @widget: (nullable): the widget to observe or %NULL * * Sets the widget that should be observed. */ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 7b7e94d6f6..3bb24ab30e 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2284,7 +2284,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: (allow-none): widget to be the default, or %NULL + * @default_widget: (nullable): widget to be the default, or %NULL * to unset the default widget for the toplevel * * Sets the default widget. @@ -2650,7 +2650,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: (allow-none): parent window, or %NULL + * @parent: (nullable): parent window, or %NULL * * Dialog windows should be set transient for the main application * window they were spawned from. This allows window managers to e.g. @@ -2778,7 +2778,7 @@ gtk_window_release_application (GtkWindow *window) /** * gtk_window_set_application: (attributes org.gtk.Method.set_property=application) * @window: a `GtkWindow` - * @application: (allow-none): a `GtkApplication`, or %NULL to unset + * @application: (nullable): a `GtkApplication`, or %NULL to unset * * Sets or unsets the `GtkApplication` associated with the window. * @@ -2998,7 +2998,7 @@ gtk_window_enable_csd (GtkWindow *window) /** * gtk_window_set_titlebar: * @window: a `GtkWindow` - * @titlebar: (allow-none): the widget to use as titlebar + * @titlebar: (nullable): the widget to use as titlebar * * Sets a custom titlebar for @window. * @@ -3421,7 +3421,7 @@ update_themed_icon (GtkWindow *window) /** * gtk_window_set_icon_name: (attributes org.gtk.Method.set_property=icon-name) * @window: a `GtkWindow` - * @name: (allow-none): the name of the themed icon + * @name: (nullable): the name of the themed icon * * Sets the icon for the window from a named themed icon. * @@ -3646,8 +3646,8 @@ gtk_window_set_default_size (GtkWindow *window, /** * gtk_window_get_default_size: * @window: a `GtkWindow` - * @width: (out) (allow-none): location to store the default width, or %NULL - * @height: (out) (allow-none): location to store the default height, or %NULL + * @width: (out) (optional): location to store the default width, or %NULL + * @height: (out) (optional): location to store the default height, or %NULL * * Gets the default size of the window. * @@ -5108,7 +5108,7 @@ synthesize_focus_change_events (GtkWindow *window, /** * gtk_window_set_focus: (attributes org.gtk.Method.set_property=focus-widget) * @window: a `GtkWindow` - * @focus: (allow-none): widget to be the new focus widget, or %NULL to unset + * @focus: (nullable): widget to be the new focus widget, or %NULL to unset * any focus widget for the toplevel window. * * Sets the focus widget. @@ -5719,7 +5719,7 @@ gtk_window_is_active (GtkWindow *window) /** * gtk_window_get_group: - * @window: (allow-none): a `GtkWindow`, or %NULL + * @window: (nullable): a `GtkWindow`, or %NULL * * Returns the group for @window. * @@ -6598,7 +6598,7 @@ gtk_window_maybe_update_cursor (GtkWindow *window, /** * gtk_window_set_child: (attributes org.gtk.Method.set_property=child) * @window: a `GtkWindow` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @window. */ diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c index 6b49fcb2d2..1cf9067405 100644 --- a/gtk/gtkwindowhandle.c +++ b/gtk/gtkwindowhandle.c @@ -583,7 +583,7 @@ gtk_window_handle_get_child (GtkWindowHandle *self) /** * gtk_window_handle_set_child: (attributes org.gtk.Method.set_property=child) * @self: a `GtkWindowHandle` - * @child: (allow-none): the child widget + * @child: (nullable): the child widget * * Sets the child widget of @self. */ |