clutter: Move autoptr cleanup function defintion

So we can drop the header file

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3387>
This commit is contained in:
Bilal Elmoussaoui 2023-11-11 11:35:34 +01:00
parent 84dabd9f8b
commit 4425636219
6 changed files with 15 additions and 9 deletions

View File

@ -30,7 +30,6 @@
#ifndef __GI_SCANNER__ #ifndef __GI_SCANNER__
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActor, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActor, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBackend, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBrightnessContrastEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBrightnessContrastEffect, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, g_object_unref)
@ -39,11 +38,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScrollActor, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterStage, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterStage, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterText, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterText, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorBox, clutter_actor_box_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColor, clutter_color_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMargin, clutter_margin_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintContext, clutter_paint_context_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintNode, clutter_paint_node_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintVolume, clutter_paint_volume_free)
#endif /* __GI_SCANNER__ */ #endif /* __GI_SCANNER__ */

View File

@ -72,4 +72,6 @@ void clutter_backend_set_input_method (Clutter
CLUTTER_EXPORT CLUTTER_EXPORT
ClutterSeat * clutter_backend_get_default_seat (ClutterBackend *backend); ClutterSeat * clutter_backend_get_default_seat (ClutterBackend *backend);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBackend, g_object_unref)
G_END_DECLS G_END_DECLS

View File

@ -145,6 +145,8 @@ void clutter_color_interpolate (const ClutterColor *initial,
gdouble progress, gdouble progress,
ClutterColor *result); ClutterColor *result);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColor, clutter_color_free)
#define CLUTTER_TYPE_PARAM_COLOR (clutter_param_color_get_type ()) #define CLUTTER_TYPE_PARAM_COLOR (clutter_param_color_get_type ())
#define CLUTTER_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_COLOR, ClutterParamSpecColor)) #define CLUTTER_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_COLOR, ClutterParamSpecColor))
#define CLUTTER_IS_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_COLOR)) #define CLUTTER_IS_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_COLOR))

View File

@ -76,3 +76,5 @@ ClutterPaintFlag clutter_paint_context_get_paint_flags (ClutterPaintContext *pai
CLUTTER_EXPORT CLUTTER_EXPORT
ClutterFrame * clutter_paint_context_get_frame (ClutterPaintContext *paint_context); ClutterFrame * clutter_paint_context_get_frame (ClutterPaintContext *paint_context);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintContext, clutter_paint_context_unref)

View File

@ -95,6 +95,8 @@ CLUTTER_EXPORT
void clutter_paint_node_add_primitive (ClutterPaintNode *node, void clutter_paint_node_add_primitive (ClutterPaintNode *node,
CoglPrimitive *primitive); CoglPrimitive *primitive);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintNode, clutter_paint_node_unref)
/** /**
* CLUTTER_VALUE_HOLDS_PAINT_NODE: * CLUTTER_VALUE_HOLDS_PAINT_NODE:
* @value: a #GValue * @value: a #GValue

View File

@ -253,6 +253,8 @@ void clutter_actor_box_scale (ClutterActorBox *box,
CLUTTER_EXPORT CLUTTER_EXPORT
gboolean clutter_actor_box_is_initialized (ClutterActorBox *box); gboolean clutter_actor_box_is_initialized (ClutterActorBox *box);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorBox, clutter_actor_box_free)
/* /*
* ClutterPaintVolume * ClutterPaintVolume
*/ */
@ -297,6 +299,8 @@ CLUTTER_EXPORT
gboolean clutter_paint_volume_set_from_allocation (ClutterPaintVolume *pv, gboolean clutter_paint_volume_set_from_allocation (ClutterPaintVolume *pv,
ClutterActor *actor); ClutterActor *actor);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintVolume, clutter_paint_volume_free)
/** /**
* ClutterMargin: * ClutterMargin:
* @left: the margin from the left * @left: the margin from the left
@ -324,6 +328,8 @@ ClutterMargin * clutter_margin_copy (const ClutterMargin *margin_);
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_margin_free (ClutterMargin *margin_); void clutter_margin_free (ClutterMargin *margin_);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMargin, clutter_margin_free)
/** /**
* ClutterProgressFunc: * ClutterProgressFunc:
* @a: the initial value of an interval * @a: the initial value of an interval