From 8fcee7a8a5a67acd57bfa065fc7ccc66c4183f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Sun, 7 Aug 2022 19:39:18 +0200 Subject: [PATCH] clutter/stage: Add nullable annotation to get_*_actor methods Allows to know when a NULL ClutterActor is possibly being returned. Part-of: --- clutter/clutter/clutter-stage.c | 6 +++--- clutter/clutter/clutter-stage.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index acc3889ed..714883d3a 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -3296,7 +3296,7 @@ clutter_stage_remove_device_entry (ClutterStage *self, * Retrieves the [class@Clutter.Actor] underneath the pointer or touch point * of @device and @sequence. * - * Return value: (transfer none): a pointer to the #ClutterActor or %NULL + * Returns: (transfer none) (nullable): a pointer to the #ClutterActor or %NULL */ ClutterActor * clutter_stage_get_device_actor (ClutterStage *stage, @@ -3905,7 +3905,7 @@ clutter_grab_get_seat_state (ClutterGrab *grab) * * Gets the actor that currently holds a grab. * - * Returns: (transfer none): The grabbing actor + * Returns: (transfer none) (nullable): The grabbing actor **/ ClutterActor * clutter_stage_get_grab_actor (ClutterStage *stage) @@ -3933,7 +3933,7 @@ clutter_stage_get_grab_actor (ClutterStage *stage) * and may differ from the actor that the stage originally * delivered the event to. * - * Return value: (transfer none): a pointer to the #ClutterActor or %NULL + * Returns: (transfer none) (nullable): a pointer to the #ClutterActor or %NULL **/ ClutterActor * clutter_stage_get_event_actor (ClutterStage *stage, diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h index 61fff4d27..f8a2162a2 100644 --- a/clutter/clutter/clutter-stage.h +++ b/clutter/clutter/clutter-stage.h @@ -168,10 +168,6 @@ void clutter_stage_set_minimum_size (ClutterStage guint width, guint height); CLUTTER_EXPORT -void clutter_stage_get_minimum_size (ClutterStage *stage, - guint *width, - guint *height); -CLUTTER_EXPORT void clutter_stage_set_key_focus (ClutterStage *stage, ClutterActor *actor); CLUTTER_EXPORT