Commit 7fe0610b authored by Matthias Clasen's avatar Matthias Clasen
Browse files

introspection: Stop using allow-none

allow-none has been deprecated for a long time
already. Instead use optional and nullable everywhere.
parent 8ba16eb4
......@@ -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.
*
......
......@@ -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.
......
......@@ -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.
*
......
......@@ -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`.
......
......@@ -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
......
......@@ -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.
*
......
......@@ -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
......
......@@ -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.
......
......@@ -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.
*
......
......@@ -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
*
......
......@@ -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.
**/
......
......@@ -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
......
......@@ -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
......
......@@ -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`.
......
......@@ -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
......
......@@ -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.
*
......
......@@ -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.
......
......@@ -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
......
......@@ -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`.
*/
......
......@@ -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.
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment