From 220dbfc13ccd09e5c373117f51982f7be5e0bb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 9 Nov 2015 17:59:16 +0000 Subject: [PATCH] docs: remove dummy function declarations with G_INLINE_FUNCTION for gtk-doc gtk-doc can handle static inline functions just fine these days, there's no need for this stuff any more. --- gst/gstbuffer.h | 16 -------------- gst/gstbufferlist.h | 12 ----------- gst/gstcaps.h | 20 ------------------ gst/gstcontext.h | 16 -------------- gst/gstevent.h | 24 --------------------- gst/gstmemory.h | 8 ------- gst/gstmessage.h | 16 -------------- gst/gstquery.h | 16 -------------- gst/gstsample.h | 12 ----------- gst/gsttaglist.h | 12 ----------- gst/gsturi.h | 12 ----------- gst/gstutils.h | 40 ----------------------------------- libs/gst/base/gstbytewriter.h | 6 ------ 13 files changed, 210 deletions(-) diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index 59a1f3964b..dd35db071f 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -345,10 +345,6 @@ void gst_buffer_extract_dup (GstBuffer *buffer, gsize offset, * * Returns: (transfer full): @buf */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstBuffer * gst_buffer_ref (GstBuffer * buf); -#endif - static inline GstBuffer * gst_buffer_ref (GstBuffer * buf) { @@ -362,10 +358,6 @@ gst_buffer_ref (GstBuffer * buf) * Decreases the refcount of the buffer. If the refcount reaches 0, the buffer * with the associated metadata and memory will be freed. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_buffer_unref (GstBuffer * buf); -#endif - static inline void gst_buffer_unref (GstBuffer * buf) { @@ -385,10 +377,6 @@ gst_buffer_unref (GstBuffer * buf) * * Returns: (transfer full): a new copy of @buf. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstBuffer * gst_buffer_copy (const GstBuffer * buf); -#endif - static inline GstBuffer * gst_buffer_copy (const GstBuffer * buf) { @@ -502,10 +490,6 @@ gboolean gst_buffer_copy_into (GstBuffer *dest, GstBuffer *src * * Returns: %TRUE when @obuf was different from @nbuf. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf); -#endif - static inline gboolean gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf) { diff --git a/gst/gstbufferlist.h b/gst/gstbufferlist.h index 96ea72761a..df5c0c4304 100644 --- a/gst/gstbufferlist.h +++ b/gst/gstbufferlist.h @@ -73,10 +73,6 @@ typedef gboolean (*GstBufferListFunc) (GstBuffer **buffer, guint idx, * * Returns: (transfer full): @list */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstBufferList * gst_buffer_list_ref (GstBufferList * list); -#endif - static inline GstBufferList * gst_buffer_list_ref (GstBufferList * list) { @@ -91,10 +87,6 @@ gst_buffer_list_ref (GstBufferList * list) * Decreases the refcount of the buffer list. If the refcount reaches 0, the * buffer list will be freed. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_buffer_list_unref (GstBufferList * list); -#endif - static inline void gst_buffer_list_unref (GstBufferList * list) { @@ -112,10 +104,6 @@ gst_buffer_list_unref (GstBufferList * list) * * Returns: (transfer full): a new copy of @list. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstBufferList * gst_buffer_list_copy (const GstBufferList * list); -#endif - static inline GstBufferList * gst_buffer_list_copy (const GstBufferList * list) { diff --git a/gst/gstcaps.h b/gst/gstcaps.h index 5cd1b781ef..9b25030478 100644 --- a/gst/gstcaps.h +++ b/gst/gstcaps.h @@ -203,10 +203,6 @@ GST_EXPORT GstCaps * _gst_caps_none; * * Returns: the same #GstCaps object. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstCaps * gst_caps_ref (GstCaps * caps); -#endif - static inline GstCaps * gst_caps_ref (GstCaps * caps) { @@ -220,10 +216,6 @@ gst_caps_ref (GstCaps * caps) * Unref a #GstCaps and and free all its structures and the * structures' values when the refcount reaches 0. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_caps_unref (GstCaps * caps); -#endif - static inline void gst_caps_unref (GstCaps * caps) { @@ -246,10 +238,6 @@ gst_caps_unref (GstCaps * caps) * * Returns: the new #GstCaps */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstCaps * gst_caps_copy (const GstCaps * caps); -#endif - static inline GstCaps * gst_caps_copy (const GstCaps * caps) { @@ -302,10 +290,6 @@ gst_caps_copy (const GstCaps * caps) * * Returns: %TRUE if @new_caps was different from @old_caps */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps); -#endif - static inline gboolean gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps) { @@ -325,10 +309,6 @@ gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps) * * Returns: %TRUE if @new_caps was different from @old_caps */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_caps_take (GstCaps **old_caps, GstCaps *new_caps); -#endif - static inline gboolean gst_caps_take (GstCaps **old_caps, GstCaps *new_caps) { diff --git a/gst/gstcontext.h b/gst/gstcontext.h index f1f89f5a73..722bd29d30 100644 --- a/gst/gstcontext.h +++ b/gst/gstcontext.h @@ -54,10 +54,6 @@ GType gst_context_get_type (void); * * Returns: @context (for convenience when doing assignments) */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstContext * gst_context_ref (GstContext * context); -#endif - static inline GstContext * gst_context_ref (GstContext * context) { @@ -71,10 +67,6 @@ gst_context_ref (GstContext * context) * Convenience macro to decrease the reference count of the context, possibly * freeing it. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_context_unref (GstContext * context); -#endif - static inline void gst_context_unref (GstContext * context) { @@ -92,10 +84,6 @@ gst_context_unref (GstContext * context) * * MT safe */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstContext * gst_context_copy (const GstContext * context); -#endif - static inline GstContext * gst_context_copy (const GstContext * context) { @@ -138,10 +126,6 @@ gst_context_copy (const GstContext * context) * * Returns: %TRUE if @new_context was different from @old_context */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_context_replace (GstContext **old_context, GstContext *new_context); -#endif - static inline gboolean gst_context_replace (GstContext **old_context, GstContext *new_context) { diff --git a/gst/gstevent.h b/gst/gstevent.h index 9fe9bcfbaa..4dc4447966 100644 --- a/gst/gstevent.h +++ b/gst/gstevent.h @@ -291,10 +291,6 @@ GST_EXPORT GType _gst_event_type; * * Returns: %TRUE if @new_event was different from @old_event */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_event_replace (GstEvent **old_event, GstEvent *new_event); -#endif - static inline gboolean gst_event_replace (GstEvent **old_event, GstEvent *new_event) { @@ -311,10 +307,6 @@ gst_event_replace (GstEvent **old_event, GstEvent *new_event) * * Returns: the #GstEvent that was in @old_event */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstEvent * gst_event_steal (GstEvent **old_event); -#endif - static inline GstEvent * gst_event_steal (GstEvent **old_event) { @@ -336,10 +328,6 @@ gst_event_steal (GstEvent **old_event) * * Returns: %TRUE if @new_event was different from @old_event */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_event_take (GstEvent **old_event, GstEvent *new_event); -#endif - static inline gboolean gst_event_take (GstEvent **old_event, GstEvent *new_event) { @@ -424,10 +412,6 @@ GstEventTypeFlags * * Returns: (transfer full): @event (for convenience when doing assignments) */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstEvent * gst_event_ref (GstEvent * event); -#endif - static inline GstEvent * gst_event_ref (GstEvent * event) { @@ -440,10 +424,6 @@ gst_event_ref (GstEvent * event) * * Decrease the refcount of an event, freeing it if the refcount reaches 0. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_event_unref (GstEvent * event); -#endif - static inline void gst_event_unref (GstEvent * event) { @@ -459,10 +439,6 @@ gst_event_unref (GstEvent * event) * * Returns: (transfer full): the new event */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstEvent * gst_event_copy (const GstEvent * event); -#endif - static inline GstEvent * gst_event_copy (const GstEvent * event) { diff --git a/gst/gstmemory.h b/gst/gstmemory.h index 1ed7a6bd9b..dc65c78a38 100644 --- a/gst/gstmemory.h +++ b/gst/gstmemory.h @@ -323,10 +323,6 @@ gboolean gst_memory_is_type (GstMemory *mem, const gchar *mem_type); * * Returns: (transfer full): @memory (for convenience when doing assignments) */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstMemory * gst_memory_ref (GstMemory * memory); -#endif - static inline GstMemory * gst_memory_ref (GstMemory * memory) { @@ -339,10 +335,6 @@ gst_memory_ref (GstMemory * memory) * * Decrease the refcount of an memory, freeing it if the refcount reaches 0. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_memory_unref (GstMemory * memory); -#endif - static inline void gst_memory_unref (GstMemory * memory) { diff --git a/gst/gstmessage.h b/gst/gstmessage.h index 133d85966d..7c99be562c 100644 --- a/gst/gstmessage.h +++ b/gst/gstmessage.h @@ -337,10 +337,6 @@ GQuark gst_message_type_to_quark (GstMessageType type); * * Returns: @msg (for convenience when doing assignments) */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstMessage * gst_message_ref (GstMessage * msg); -#endif - static inline GstMessage * gst_message_ref (GstMessage * msg) { @@ -354,10 +350,6 @@ gst_message_ref (GstMessage * msg) * Convenience macro to decrease the reference count of the message, possibly * freeing it. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_message_unref (GstMessage * msg); -#endif - static inline void gst_message_unref (GstMessage * msg) { @@ -375,10 +367,6 @@ gst_message_unref (GstMessage * msg) * * MT safe */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstMessage * gst_message_copy (const GstMessage * msg); -#endif - static inline GstMessage * gst_message_copy (const GstMessage * msg) { @@ -421,10 +409,6 @@ gst_message_copy (const GstMessage * msg) * * Returns: %TRUE if @new_message was different from @old_message */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_message_replace (GstMessage **old_message, GstMessage *new_message); -#endif - static inline gboolean gst_message_replace (GstMessage **old_message, GstMessage *new_message) { diff --git a/gst/gstquery.h b/gst/gstquery.h index 18a075c03d..e015bb0a95 100644 --- a/gst/gstquery.h +++ b/gst/gstquery.h @@ -210,10 +210,6 @@ GType gst_query_get_type (void); * * Returns: @q */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstQuery * gst_query_ref (GstQuery * q); -#endif - static inline GstQuery * gst_query_ref (GstQuery * q) { @@ -227,10 +223,6 @@ gst_query_ref (GstQuery * q) * Decreases the refcount of the query. If the refcount reaches 0, the query * will be freed. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_query_unref (GstQuery * q); -#endif - static inline void gst_query_unref (GstQuery * q) { @@ -248,10 +240,6 @@ gst_query_unref (GstQuery * q) * * Returns: (transfer full): a new copy of @q. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstQuery * gst_query_copy (const GstQuery * q); -#endif - static inline GstQuery * gst_query_copy (const GstQuery * q) { @@ -290,10 +278,6 @@ gst_query_copy (const GstQuery * q) * * Returns: %TRUE if @new_query was different from @old_query */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gboolean gst_query_replace (GstQuery **old_query, GstQuery *new_query); -#endif - static inline gboolean gst_query_replace (GstQuery **old_query, GstQuery *new_query) { diff --git a/gst/gstsample.h b/gst/gstsample.h index 71f48ee7f1..c451a4c48b 100644 --- a/gst/gstsample.h +++ b/gst/gstsample.h @@ -71,10 +71,6 @@ void gst_sample_set_buffer_list (GstSample *sample, GstBufferLis * * Returns: (transfer full): @sample */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstSample * gst_sample_ref (GstSample * sample); -#endif - static inline GstSample * gst_sample_ref (GstSample * sample) { @@ -89,10 +85,6 @@ gst_sample_ref (GstSample * sample) * Decreases the refcount of the sample. If the refcount reaches 0, the * sample will be freed. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_sample_unref (GstSample * sample); -#endif - static inline void gst_sample_unref (GstSample * sample) { @@ -111,10 +103,6 @@ gst_sample_unref (GstSample * sample) * * Since: 1.2 */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstSample * gst_sample_copy (const GstSample * buf); -#endif - static inline GstSample * gst_sample_copy (const GstSample * buf) { diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h index 42f944bb12..3ee9fd8dd5 100644 --- a/gst/gsttaglist.h +++ b/gst/gsttaglist.h @@ -389,10 +389,6 @@ gboolean gst_tag_list_get_sample_index (const GstTagList * list, * * Returns: the same #GstTagList mini object. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstTagList * gst_tag_list_ref (GstTagList * taglist); -#endif - static inline GstTagList * gst_tag_list_ref (GstTagList * taglist) { @@ -405,10 +401,6 @@ gst_tag_list_ref (GstTagList * taglist) * * Unref a #GstTagList, and and free all its memory when the refcount reaches 0. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_tag_list_unref (GstTagList * taglist); -#endif - static inline void gst_tag_list_unref (GstTagList * taglist) { @@ -431,10 +423,6 @@ gst_tag_list_unref (GstTagList * taglist) * * Returns: the new #GstTagList */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstTagList * gst_tag_list_copy (const GstTagList * taglist); -#endif - static inline GstTagList * gst_tag_list_copy (const GstTagList * taglist) { diff --git a/gst/gsturi.h b/gst/gsturi.h index 64dc65ba62..a2d78234f8 100644 --- a/gst/gsturi.h +++ b/gst/gsturi.h @@ -261,10 +261,6 @@ gboolean gst_uri_set_fragment (GstUri * uri, const gchar * fragment); * Returns: (transfer full): A new #GstUri object which is a copy of this * #GstUri or %NULL. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstUri * gst_uri_copy (const GstUri * uri); -#endif - static inline GstUri * gst_uri_copy (const GstUri * uri) { @@ -280,10 +276,6 @@ gst_uri_copy (const GstUri * uri) * * Returns: This object with the reference count incremented. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC GstUri * gst_uri_ref (GstUri * uri); -#endif - static inline GstUri * gst_uri_ref (GstUri * uri) { @@ -300,10 +292,6 @@ gst_uri_ref (GstUri * uri) * * See gst_mini_object_unref() for further info. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void gst_uri_unref (GstUri * uri); -#endif - static inline void gst_uri_unref (GstUri * uri) { diff --git a/gst/gstutils.h b/gst/gstutils.h index 2cbfdc4396..7382e683b5 100644 --- a/gst/gstutils.h +++ b/gst/gstutils.h @@ -451,10 +451,6 @@ static inline guint16 __gst_slow_read16_le (const guint8 * data) { * * Returns: @in byte-swapped. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gfloat GFLOAT_SWAP_LE_BE (gfloat in); -#endif - inline static gfloat GFLOAT_SWAP_LE_BE(gfloat in) { @@ -477,10 +473,6 @@ GFLOAT_SWAP_LE_BE(gfloat in) * * Returns: @in byte-swapped. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gdouble GDOUBLE_SWAP_LE_BE (gdouble in); -#endif - inline static gdouble GDOUBLE_SWAP_LE_BE(gdouble in) { @@ -584,10 +576,6 @@ GDOUBLE_SWAP_LE_BE(gdouble in) * * Returns: The floating point value read from @data */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gfloat GST_READ_FLOAT_LE (const guint8 *data); -#endif - inline static gfloat GST_READ_FLOAT_LE(const guint8 *data) { @@ -609,10 +597,6 @@ GST_READ_FLOAT_LE(const guint8 *data) * * Returns: The floating point value read from @data */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gfloat GST_READ_FLOAT_BE (const guint8 *data); -#endif - inline static gfloat GST_READ_FLOAT_BE(const guint8 *data) { @@ -634,10 +618,6 @@ GST_READ_FLOAT_BE(const guint8 *data) * * Returns: The double-precision floating point value read from @data */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gdouble GST_READ_DOUBLE_LE (const guint8 *data); -#endif - inline static gdouble GST_READ_DOUBLE_LE(const guint8 *data) { @@ -659,10 +639,6 @@ GST_READ_DOUBLE_LE(const guint8 *data) * * Returns: The double-precision floating point value read from @data */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC gdouble GST_READ_DOUBLE_BE (const guint8 *data); -#endif - inline static gdouble GST_READ_DOUBLE_BE(const guint8 *data) { @@ -683,10 +659,6 @@ GST_READ_DOUBLE_BE(const guint8 *data) * * Store a 32 bit float value in little endian format into the memory buffer. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void GST_WRITE_FLOAT_LE (guint8 *data, gfloat num); -#endif - inline static void GST_WRITE_FLOAT_LE(guint8 *data, gfloat num) { @@ -707,10 +679,6 @@ GST_WRITE_FLOAT_LE(guint8 *data, gfloat num) * * Store a 32 bit float value in big endian format into the memory buffer. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void GST_WRITE_FLOAT_BE (guint8 *data, gfloat num); -#endif - inline static void GST_WRITE_FLOAT_BE(guint8 *data, gfloat num) { @@ -731,10 +699,6 @@ GST_WRITE_FLOAT_BE(guint8 *data, gfloat num) * * Store a 64 bit double value in little endian format into the memory buffer. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void GST_WRITE_DOUBLE_LE (guint8 *data, gdouble num); -#endif - inline static void GST_WRITE_DOUBLE_LE(guint8 *data, gdouble num) { @@ -755,10 +719,6 @@ GST_WRITE_DOUBLE_LE(guint8 *data, gdouble num) * * Store a 64 bit double value in big endian format into the memory buffer. */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC void GST_WRITE_DOUBLE_BE (guint8 *data, gdouble num); -#endif - inline static void GST_WRITE_DOUBLE_BE(guint8 *data, gdouble num) { diff --git a/libs/gst/base/gstbytewriter.h b/libs/gst/base/gstbytewriter.h index f5c550248b..c01bfcbc4c 100644 --- a/libs/gst/base/gstbytewriter.h +++ b/libs/gst/base/gstbytewriter.h @@ -90,11 +90,6 @@ GstBuffer * gst_byte_writer_reset_and_get_buffer (GstByteWriter *writer) * * Returns: The current, initialized size of the data */ -#ifdef _FOOL_GTK_DOC_ -G_INLINE_FUNC guint gst_byte_writer_get_pos (const GstByteWriter *writer); -G_INLINE_FUNC gboolean gst_byte_writer_set_pos (GstByteWriter *writer, guint pos); -G_INLINE_FUNC guint gst_byte_writer_get_size (const GstByteWriter *writer); -#else static inline guint gst_byte_writer_get_pos (const GstByteWriter *writer) { @@ -112,7 +107,6 @@ gst_byte_writer_get_size (const GstByteWriter *writer) { return gst_byte_reader_get_size ((const GstByteReader *) writer); } -#endif guint gst_byte_writer_get_remaining (const GstByteWriter *writer); gboolean gst_byte_writer_ensure_free_space (GstByteWriter *writer, guint size);