diff --git a/clutter/clutter/clutter-actor-meta-private.h b/clutter/clutter/clutter-actor-meta-private.h index 0bdba023c..477dd466e 100644 --- a/clutter/clutter/clutter-actor-meta-private.h +++ b/clutter/clutter/clutter-actor-meta-private.h @@ -29,11 +29,7 @@ G_BEGIN_DECLS #define CLUTTER_TYPE_META_GROUP (_clutter_meta_group_get_type ()) -#define CLUTTER_META_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_META_GROUP, ClutterMetaGroup)) -#define CLUTTER_IS_META_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_META_GROUP)) -typedef struct _ClutterMetaGroup ClutterMetaGroup; -typedef struct _ClutterMetaGroupClass ClutterMetaGroupClass; struct _ClutterMetaGroup { @@ -44,10 +40,10 @@ struct _ClutterMetaGroup GList *meta; }; -struct _ClutterMetaGroupClass -{ - GObjectClass parent_class; -}; +G_DECLARE_FINAL_TYPE (ClutterMetaGroup, + _clutter_meta_group, + CLUTTER, META_GROUP, + GObject) /* Each actor meta has a priority with zero as a default. A higher number means higher priority. Higher priority metas stay at the @@ -63,8 +59,6 @@ struct _ClutterMetaGroupClass #define CLUTTER_ACTOR_META_PRIORITY_INTERNAL_HIGH (G_MAXINT / 2) #define CLUTTER_ACTOR_META_PRIORITY_INTERNAL_LOW (G_MININT / 2) -GType _clutter_meta_group_get_type (void) G_GNUC_CONST; - void _clutter_meta_group_add_meta (ClutterMetaGroup *group, ClutterActorMeta *meta); void _clutter_meta_group_remove_meta (ClutterMetaGroup *group, diff --git a/clutter/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c index 8dec6c0cf..f34292859 100644 --- a/clutter/clutter/clutter-actor-meta.c +++ b/clutter/clutter/clutter-actor-meta.c @@ -433,7 +433,7 @@ _clutter_actor_meta_is_internal (ClutterActorMeta *meta) * ClutterMetaGroup: a collection of ClutterActorMeta instances */ -G_DEFINE_TYPE (ClutterMetaGroup, _clutter_meta_group, G_TYPE_OBJECT); +G_DEFINE_FINAL_TYPE (ClutterMetaGroup, _clutter_meta_group, G_TYPE_OBJECT); static void _clutter_meta_group_dispose (GObject *gobject)