brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce the amount of g-ir-scanner warnings

Browse Source 
As much as we can; the remaining warnings are mostly valid things that
the introspection scanner still flags as potential issues.
This commit is contained in:
Emmanuele Bassi 2010-12-09 12:36:50 +00:00
parent e1f48b15ee
commit d229036441
8 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clutter/clutter-actor.h
View File

@ -224,15 +224,15 @@ struct _ClutterActorClass
GInitiallyUnownedClass parent_class; GInitiallyUnownedClass parent_class;
/*< public >*/ /*< public >*/
void (* show) (ClutterActor *actor); void (* show) (ClutterActor *self);
void (* show_all) (ClutterActor *actor); void (* show_all) (ClutterActor *self);
void (* hide) (ClutterActor *actor); void (* hide) (ClutterActor *self);
void (* hide_all) (ClutterActor *actor); void (* hide_all) (ClutterActor *self);
void (* realize) (ClutterActor *actor); void (* realize) (ClutterActor *self);
void (* unrealize) (ClutterActor *actor); void (* unrealize) (ClutterActor *self);
void (* map) (ClutterActor *actor); void (* map) (ClutterActor *self);
void (* unmap) (ClutterActor *actor); void (* unmap) (ClutterActor *self);
void (* paint) (ClutterActor *actor); void (* paint) (ClutterActor *self);
void (* parent_set) (ClutterActor *actor, void (* parent_set) (ClutterActor *actor,
ClutterActor *old_parent); ClutterActor *old_parent);
@ -244,15 +244,15 @@ struct _ClutterActorClass
ClutterActor *leaf_that_queued); ClutterActor *leaf_that_queued);
/* size negotiation */ /* size negotiation */
void (* get_preferred_width) (ClutterActor *actor, void (* get_preferred_width) (ClutterActor *self,
gfloat for_height, gfloat for_height,
gfloat *min_width_p, gfloat *min_width_p,
gfloat *natural_width_p); gfloat *natural_width_p);
void (* get_preferred_height) (ClutterActor *actor, void (* get_preferred_height) (ClutterActor *self,
gfloat for_width, gfloat for_width,
gfloat *min_height_p, gfloat *min_height_p,
gfloat *natural_height_p); gfloat *natural_height_p);
void (* allocate) (ClutterActor *actor, void (* allocate) (ClutterActor *self,
const ClutterActorBox *box, const ClutterActorBox *box,
ClutterAllocationFlags flags); ClutterAllocationFlags flags);
@ -287,7 +287,7 @@ struct _ClutterActorClass
void (* queue_relayout) (ClutterActor *actor); void (* queue_relayout) (ClutterActor *actor);
/* accessibility support */ /* accessibility support */
AtkObject * (* get_accessible) (ClutterActor *actor); AtkObject * (* get_accessible) (ClutterActor *self);
gboolean (* get_paint_volume) (ClutterActor *actor, gboolean (* get_paint_volume) (ClutterActor *actor,
ClutterPaintVolume *volume); ClutterPaintVolume *volume);

16
clutter/clutter-container.c
View File

@ -177,7 +177,7 @@ clutter_container_default_init (ClutterContainerInterface *iface)
} }
/** /**
* clutter_container_add: * clutter_container_add: (skip)
* @container: a #ClutterContainer * @container: a #ClutterContainer
* @first_actor: the first #ClutterActor to add * @first_actor: the first #ClutterActor to add
* @Varargs: %NULL terminated list of actors to add * @Varargs: %NULL terminated list of actors to add
@ -214,6 +214,8 @@ clutter_container_add (ClutterContainer *container,
* @container. You cannot add a #ClutterActor to more than one * @container. You cannot add a #ClutterActor to more than one
* #ClutterContainer. * #ClutterContainer.
* *
* Virtual: add
*
* Since: 0.4 * Since: 0.4
*/ */
void void
@ -251,7 +253,7 @@ clutter_container_add_actor (ClutterContainer *container,
} }
/** /**
* clutter_container_add_valist: * clutter_container_add_valist: (skip)
* @container: a #ClutterContainer * @container: a #ClutterContainer
* @first_actor: the first #ClutterActor to add * @first_actor: the first #ClutterActor to add
* @var_args: list of actors to add, followed by %NULL * @var_args: list of actors to add, followed by %NULL
@ -279,7 +281,7 @@ clutter_container_add_valist (ClutterContainer *container,
} }
/** /**
* clutter_container_remove: * clutter_container_remove: (skip)
* @container: a #ClutterContainer * @container: a #ClutterContainer
* @first_actor: first #ClutterActor to remove * @first_actor: first #ClutterActor to remove
* @Varargs: a %NULL-terminated list of actors to remove * @Varargs: a %NULL-terminated list of actors to remove
@ -317,6 +319,8 @@ clutter_container_remove (ClutterContainer *container,
* yourself, using g_object_ref(). When the actor has been removed, * yourself, using g_object_ref(). When the actor has been removed,
* the "actor-removed" signal is emitted by @container. * the "actor-removed" signal is emitted by @container.
* *
* Virtual: remove
*
* Since: 0.4 * Since: 0.4
*/ */
void void
@ -353,7 +357,7 @@ clutter_container_remove_actor (ClutterContainer *container,
} }
/** /**
* clutter_container_remove_valist: * clutter_container_remove_valist: (skip)
* @container: a #ClutterContainer * @container: a #ClutterContainer
* @first_actor: the first #ClutterActor to add * @first_actor: the first #ClutterActor to add
* @var_args: list of actors to remove, followed by %NULL * @var_args: list of actors to remove, followed by %NULL
@ -490,6 +494,8 @@ clutter_container_foreach_with_internals (ClutterContainer *container,
* *
* Raises @actor to @sibling level, in the depth ordering. * Raises @actor to @sibling level, in the depth ordering.
* *
* Virtual: raise
*
* Since: 0.6 * Since: 0.6
*/ */
void void
@ -543,6 +549,8 @@ clutter_container_raise_child (ClutterContainer *container,
* *
* Lowers @actor to @sibling level, in the depth ordering. * Lowers @actor to @sibling level, in the depth ordering.
* *
* Virtual: lower
*
* Since: 0.6 * Since: 0.6
*/ */
void void

10
clutter/clutter-device-manager.h
View File

@ -70,11 +70,11 @@ struct _ClutterDeviceManagerClass
/*< private >*/ /*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
const GSList * (* get_devices) (ClutterDeviceManager *manager); const GSList * (* get_devices) (ClutterDeviceManager *device_manager);
ClutterInputDevice *(* get_core_device) (ClutterDeviceManager *manager, ClutterInputDevice *(* get_core_device) (ClutterDeviceManager *device_manager,
ClutterInputDeviceType type); ClutterInputDeviceType device_type);
ClutterInputDevice *(* get_device) (ClutterDeviceManager *manager, ClutterInputDevice *(* get_device) (ClutterDeviceManager *device_manager,
gint id); gint device_id);
void (* add_device) (ClutterDeviceManager *manager, void (* add_device) (ClutterDeviceManager *manager,
ClutterInputDevice *device); ClutterInputDevice *device);

8
clutter/clutter-layout-manager.h
View File

@ -107,13 +107,13 @@ struct _ClutterLayoutManagerClass
void (* get_preferred_width) (ClutterLayoutManager *manager, void (* get_preferred_width) (ClutterLayoutManager *manager,
ClutterContainer *container, ClutterContainer *container,
gfloat for_height, gfloat for_height,
gfloat *minimum_width_p, gfloat *min_width_p,
gfloat *natural_width_p); gfloat *nat_width_p);
void (* get_preferred_height) (ClutterLayoutManager *manager, void (* get_preferred_height) (ClutterLayoutManager *manager,
ClutterContainer *container, ClutterContainer *container,
gfloat for_width, gfloat for_width,
gfloat *minimum_height_p, gfloat *min_height_p,
gfloat *natural_height_p); gfloat *nat_height_p);
void (* allocate) (ClutterLayoutManager *manager, void (* allocate) (ClutterLayoutManager *manager,
ClutterContainer *container, ClutterContainer *container,
const ClutterActorBox *allocation, const ClutterActorBox *allocation,

6
clutter/clutter-offscreen-effect.h
View File

@ -77,9 +77,9 @@ struct _ClutterOffscreenEffectClass
/*< public >*/ /*< public >*/
CoglHandle (* create_texture) (ClutterOffscreenEffect *effect, CoglHandle (* create_texture) (ClutterOffscreenEffect *effect,
gfloat min_width, gfloat width,
gfloat min_height); gfloat height);
void (* paint_target) (ClutterOffscreenEffect *effect); void (* paint_target) (ClutterOffscreenEffect *effect);
/*< private >*/ /*< private >*/
void (* _clutter_offscreen1) (void); void (* _clutter_offscreen1) (void);

2
clutter/clutter-scriptable.h
View File

@ -73,7 +73,7 @@ struct _ClutterScriptableIface
/*< public >*/ /*< public >*/
void (* set_id) (ClutterScriptable *scriptable, void (* set_id) (ClutterScriptable *scriptable,
const gchar *name); const gchar *id);
const gchar *(* get_id) (ClutterScriptable *scriptable); const gchar *(* get_id) (ClutterScriptable *scriptable);
gboolean (* parse_custom_node) (ClutterScriptable *scriptable, gboolean (* parse_custom_node) (ClutterScriptable *scriptable,

10
clutter/x11/clutter-backend-x11.c
View File

@ -577,7 +577,7 @@ clutter_x11_untrap_x_errors (void)
* *
* Retrieves the pointer to the default display. * Retrieves the pointer to the default display.
* *
* Return value: the default display * Return value: (transfer none): the default display
* *
* Since: 0.6 * Since: 0.6
*/ */
@ -861,9 +861,9 @@ _clutter_x11_get_device_for_xid (XID id)
* *
* Since: 0.8 * Since: 0.8
* *
* Return value: a pointer to the internal list of input devices; the * Return value: (transfer none) (element-type Clutter.InputDevice): a
* returned list is owned by Clutter and should not be modified or * pointer to the internal list of input devices; the returned list is
* freed * owned by Clutter and should not be modified or freed
*/ */
G_CONST_RETURN GSList * G_CONST_RETURN GSList *
clutter_x11_get_input_devices (void) clutter_x11_get_input_devices (void)
@ -1016,7 +1016,7 @@ clutter_backend_x11_get_visual_info (ClutterBackendX11 *backend_x11)
* Retrieves the <structname>XVisualInfo</structname> used by the Clutter X11 * Retrieves the <structname>XVisualInfo</structname> used by the Clutter X11
* backend. * backend.
* *
* Return value: a <structname>XVisualInfo</structname>, or * Return value: (transfer full): a <structname>XVisualInfo</structname>, or
* <varname>None</varname>. The returned value should be freed using XFree() * <varname>None</varname>. The returned value should be freed using XFree()
* when done * when done
* *

7
clutter/x11/clutter-stage-x11.c
View File

@ -741,7 +741,8 @@ clutter_x11_get_stage_window (ClutterStage *stage)
* *
* Gets the stage for a particular X window. * Gets the stage for a particular X window.
* *
* Return value: The stage or NULL if a stage does not exist for the window. * Return value: (transfer none): A #ClutterStage, or% NULL if a stage
* does not exist for the window
* *
* Since: 0.8 * Since: 0.8
*/ */
@ -782,8 +783,8 @@ clutter_x11_get_stage_from_window (Window win)
* along the lines of clutter_backend_x11_get_foreign_visual () or perhaps * along the lines of clutter_backend_x11_get_foreign_visual () or perhaps
* clutter_stage_x11_get_foreign_visual () * clutter_stage_x11_get_foreign_visual ()
* *
* Return value: An XVisualInfo suitable for creating a foreign stage. Use * Return value: (transfer full): An XVisualInfo suitable for creating a
* XFree() to free the returned value instead * foreign stage. Use XFree() to free the returned value instead
* *
* Deprecated: 1.2: Use clutter_x11_get_visual_info() instead * Deprecated: 1.2: Use clutter_x11_get_visual_info() instead
* *