introspection: use (nullable) or (optional) instead of (allow-none)

If we have an input parameter (or return value) we need to use (nullable).
However, if it is an (inout) or (out) parameter, (optional) is sufficient.

It looks like (nullable) could be used for everything according to the
Annotation documentation, but (optional) is more specific.
This commit is contained in:
Christian Hergert
2016-10-28 18:29:02 -07:00
parent a4012abbdf
commit 18a33f72db
151 changed files with 986 additions and 987 deletions

View File

@@ -573,7 +573,7 @@ g_action_group_change_action_state (GActionGroup *action_group,
* g_action_group_activate_action:
* @action_group: a #GActionGroup
* @action_name: the name of the action to activate
* @parameter: (allow-none): parameters to the activation
* @parameter: (nullable): parameters to the activation
*
* Activate the named action within @action_group.
*
@@ -705,10 +705,10 @@ g_action_group_action_state_changed (GActionGroup *action_group,
* @action_group: a #GActionGroup
* @action_name: the name of an action in the group
* @enabled: (out): if the action is presently enabled
* @parameter_type: (out) (allow-none): the parameter type, or %NULL if none needed
* @state_type: (out) (allow-none): the state type, or %NULL if stateless
* @state_hint: (out) (allow-none): the state hint, or %NULL if none
* @state: (out) (allow-none): the current state, or %NULL if stateless
* @parameter_type: (out) (optional): the parameter type, or %NULL if none needed
* @state_type: (out) (optional): the state type, or %NULL if stateless
* @state_hint: (out) (optional): the state hint, or %NULL if none
* @state: (out) (optional): the current state, or %NULL if stateless
*
* Queries all aspects of the named action within an @action_group.
*