introspection: rename some "data" arguments to "user_data"

GObject Introspection will automatically treat "user_data" arguments
as closure data.
This commit is contained in:
Evan Nemerson 2012-06-19 16:09:10 -07:00
parent 4e89ecd4d1
commit 8620b30df9
6 changed files with 14 additions and 14 deletions

View file

@ -72,7 +72,7 @@ typedef enum
* GstBusSyncHandler: * GstBusSyncHandler:
* @bus: the #GstBus that sent the message * @bus: the #GstBus that sent the message
* @message: the #GstMessage * @message: the #GstMessage
* @data: user data that has been given, when registering the handler * @user_data: user data that has been given, when registering the handler
* *
* Handler will be invoked synchronously, when a new message has been injected * Handler will be invoked synchronously, when a new message has been injected
* into the bus. This function is mostly used internally. Only one sync handler * into the bus. This function is mostly used internally. Only one sync handler
@ -83,13 +83,13 @@ typedef enum
* *
* Returns: #GstBusSyncReply stating what to do with the message * Returns: #GstBusSyncReply stating what to do with the message
*/ */
typedef GstBusSyncReply (*GstBusSyncHandler) (GstBus * bus, GstMessage * message, gpointer data); typedef GstBusSyncReply (*GstBusSyncHandler) (GstBus * bus, GstMessage * message, gpointer user_data);
/** /**
* GstBusFunc: * GstBusFunc:
* @bus: the #GstBus that sent the message * @bus: the #GstBus that sent the message
* @message: the #GstMessage * @message: the #GstMessage
* @data: user data that has been given, when registering the handler * @user_data: user data that has been given, when registering the handler
* *
* Specifies the type of function passed to gst_bus_add_watch() or * Specifies the type of function passed to gst_bus_add_watch() or
* gst_bus_add_watch_full(), which is called from the mainloop when a message * gst_bus_add_watch_full(), which is called from the mainloop when a message
@ -103,7 +103,7 @@ typedef GstBusSyncReply (*GstBusSyncHandler) (GstBus * bus, GstMessage * mess
* *
* Returns: %FALSE if the event source should be removed. * Returns: %FALSE if the event source should be removed.
*/ */
typedef gboolean (*GstBusFunc) (GstBus * bus, GstMessage * message, gpointer data); typedef gboolean (*GstBusFunc) (GstBus * bus, GstMessage * message, gpointer user_data);
/** /**
* GstBus: * GstBus:

View file

@ -241,7 +241,7 @@ typedef struct _GstDebugMessage GstDebugMessage;
* @line: line number * @line: line number
* @object: a #GObject * @object: a #GObject
* @message: the message * @message: the message
* @data: user data for the log function * @user_data: user data for the log function
* *
* Function prototype for a logging function that can be registered with * Function prototype for a logging function that can be registered with
* gst_debug_add_log_function(). * gst_debug_add_log_function().
@ -254,7 +254,7 @@ typedef void (*GstLogFunction) (GstDebugCategory * category,
gint line, gint line,
GObject * object, GObject * object,
GstDebugMessage * message, GstDebugMessage * message,
gpointer data); gpointer user_data);
#ifdef GST_USING_PRINTF_EXTENSION #ifdef GST_USING_PRINTF_EXTENSION

View file

@ -69,7 +69,7 @@ typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj);
/** /**
* GstMiniObjectWeakNotify: * GstMiniObjectWeakNotify:
* @data: data that was provided when the weak reference was established * @user_data: data that was provided when the weak reference was established
* @where_the_mini_object_was: the mini object being finalized * @where_the_mini_object_was: the mini object being finalized
* *
* A #GstMiniObjectWeakNotify function can be added to a mini object as a * A #GstMiniObjectWeakNotify function can be added to a mini object as a
@ -80,7 +80,7 @@ typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj);
* *
* Since: 0.10.35 * Since: 0.10.35
*/ */
typedef void (*GstMiniObjectWeakNotify) (gpointer data, typedef void (*GstMiniObjectWeakNotify) (gpointer user_data,
GstMiniObject * where_the_mini_object_was); GstMiniObject * where_the_mini_object_was);
/** /**

View file

@ -30,12 +30,12 @@ G_BEGIN_DECLS
/** /**
* GstTaskFunction: * GstTaskFunction:
* @data: user data passed to the function * @user_data: user data passed to the function
* *
* A function that will repeatedly be called in the thread created by * A function that will repeatedly be called in the thread created by
* a #GstTask. * a #GstTask.
*/ */
typedef void (*GstTaskFunction) (void *data); typedef void (*GstTaskFunction) (void *user_data);
/* --- standard type macros --- */ /* --- standard type macros --- */
#define GST_TYPE_TASK (gst_task_get_type ()) #define GST_TYPE_TASK (gst_task_get_type ())

View file

@ -40,13 +40,13 @@ typedef struct _GstTaskPoolClass GstTaskPoolClass;
/** /**
* GstTaskPoolFunction: * GstTaskPoolFunction:
* @data: user data for the task function * @user_data: user data for the task function
* *
* Task function, see gst_task_pool_push(). * Task function, see gst_task_pool_push().
* *
* Since: 0.10.24 * Since: 0.10.24
*/ */
typedef void (*GstTaskPoolFunction) (void *data); typedef void (*GstTaskPoolFunction) (void *user_data);
/** /**
* GstTaskPool: * GstTaskPool:

View file

@ -36,11 +36,11 @@ typedef struct _GstTypeFind GstTypeFind;
/** /**
* GstTypeFindFunction: * GstTypeFindFunction:
* @find: A #GstTypeFind structure * @find: A #GstTypeFind structure
* @data: optionnal data to pass to the function * @user_data: optionnal data to pass to the function
* *
* A function that will be called by typefinding. * A function that will be called by typefinding.
*/ */
typedef void (* GstTypeFindFunction) (GstTypeFind *find, gpointer data); typedef void (* GstTypeFindFunction) (GstTypeFind *find, gpointer user_data);
/** /**
* GstTypeFindProbability: * GstTypeFindProbability: