isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Content: Use G_DECLARE_INTERFACE()

Browse Source 
It cuts away a bit of the GObject boilerplate, gives us support for
`g_autoptr`, and removes the typedef hack inside clutter-content.c.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/380
This commit is contained in:
Niels De Graef 2019-01-08 15:16:47 +01:00 committed by Jonas Ådahl
parent b67394dcd1
commit b77e6f0c98
7 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/clutter-autocleanups.h
View File

@ -49,7 +49,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColorizeEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColorizeEffect, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterConstraint, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterConstraint, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContainer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContainer, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContent, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeformEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeformEffect, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeviceManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeviceManager, g_object_unref)

4
clutter/clutter/clutter-canvas.c
View File

@ -97,7 +97,7 @@ enum
static guint canvas_signals[LAST_SIGNAL] = { 0, }; static guint canvas_signals[LAST_SIGNAL] = { 0, };
static void clutter_content_iface_init (ClutterContentIface *iface); static void clutter_content_iface_init (ClutterContentInterface *iface);
G_DEFINE_TYPE_WITH_CODE (ClutterCanvas, clutter_canvas, G_TYPE_OBJECT, G_DEFINE_TYPE_WITH_CODE (ClutterCanvas, clutter_canvas, G_TYPE_OBJECT,
G_ADD_PRIVATE (ClutterCanvas) G_ADD_PRIVATE (ClutterCanvas)
@ -457,7 +457,7 @@ clutter_canvas_get_preferred_size (ClutterContent *content,
} }
static void static void
clutter_content_iface_init (ClutterContentIface *iface) clutter_content_iface_init (ClutterContentInterface *iface)
{ {
iface->invalidate = clutter_canvas_invalidate; iface->invalidate = clutter_canvas_invalidate;
iface->paint_content = clutter_canvas_paint_content; iface->paint_content = clutter_canvas_paint_content;

12
clutter/clutter/clutter-content.c
View File

@ -45,8 +45,6 @@
#include "clutter-marshal.h" #include "clutter-marshal.h"
#include "clutter-private.h" #include "clutter-private.h"
typedef struct _ClutterContentIface ClutterContentInterface;
enum enum
{ {
ATTACHED, ATTACHED,
@ -130,7 +128,7 @@ clutter_content_default_init (ClutterContentInterface *iface)
g_signal_new (I_("attached"), g_signal_new (I_("attached"),
G_TYPE_FROM_INTERFACE (iface), G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterContentIface, attached), G_STRUCT_OFFSET (ClutterContentInterface, attached),
NULL, NULL, NULL, NULL,
_clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
@ -150,7 +148,7 @@ clutter_content_default_init (ClutterContentInterface *iface)
g_signal_new (I_("detached"), g_signal_new (I_("detached"),
G_TYPE_FROM_INTERFACE (iface), G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterContentIface, detached), G_STRUCT_OFFSET (ClutterContentInterface, detached),
NULL, NULL, NULL, NULL,
_clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
@ -245,7 +243,7 @@ clutter_content_invalidate_size (ClutterContent *content)
* is associated to a #ClutterContent, to set up a backpointer from * is associated to a #ClutterContent, to set up a backpointer from
* the @content to the @actor. * the @content to the @actor.
* *
* This function will invoke the #ClutterContentIface.attached() virtual * This function will invoke the #ClutterContentInterface.attached() virtual
* function. * function.
*/ */
void void
@ -279,7 +277,7 @@ _clutter_content_attached (ClutterContent *content,
* This function should be used internally every time a #ClutterActor * This function should be used internally every time a #ClutterActor
* removes the association with a #ClutterContent. * removes the association with a #ClutterContent.
* *
* This function will invoke the #ClutterContentIface.detached() virtual * This function will invoke the #ClutterContentInterface.detached() virtual
* function. * function.
*/ */
void void
@ -308,7 +306,7 @@ _clutter_content_detached (ClutterContent *content,
* *
* Creates the render tree for the @content and @actor. * Creates the render tree for the @content and @actor.
* *
* This function will invoke the #ClutterContentIface.paint_content() * This function will invoke the #ClutterContentInterface.paint_content()
* virtual function. * virtual function.
*/ */
void void

24
clutter/clutter/clutter-content.h
View File

@ -34,23 +34,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_CONTENT (clutter_content_get_type ()) #define CLUTTER_TYPE_CONTENT (clutter_content_get_type ())
#define CLUTTER_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CONTENT, ClutterContent))
#define CLUTTER_IS_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CONTENT))
#define CLUTTER_CONTENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_CONTENT, ClutterContentIface))
typedef struct _ClutterContentIface ClutterContentIface; CLUTTER_EXPORT
G_DECLARE_INTERFACE (ClutterContent, clutter_content, CLUTTER, CONTENT, GObject)
/** /**
* ClutterContent: * ClutterContentInterface:
*
* The #ClutterContent structure is an opaque type
* whose members cannot be acccessed directly.
*
* Since: 1.10
*/
/**
* ClutterContentIface:
* @get_preferred_size: virtual function; should be overridden by subclasses * @get_preferred_size: virtual function; should be overridden by subclasses
* of #ClutterContent that have a natural size * of #ClutterContent that have a natural size
* @paint_content: virtual function; called each time the content needs to * @paint_content: virtual function; called each time the content needs to
@ -62,12 +51,12 @@ typedef struct _ClutterContentIface ClutterContentIface;
* @invalidate: virtual function; called each time a #ClutterContent state * @invalidate: virtual function; called each time a #ClutterContent state
* is changed. * is changed.
* *
* The #ClutterContentIface structure contains only * The #ClutterContentInterface structure contains only
* private data. * private data.
* *
* Since: 1.10 * Since: 1.10
*/ */
struct _ClutterContentIface struct _ClutterContentInterface
{ {
/*< private >*/ /*< private >*/
GTypeInterface g_iface; GTypeInterface g_iface;
@ -90,9 +79,6 @@ struct _ClutterContentIface
void (* invalidate_size) (ClutterContent *content); void (* invalidate_size) (ClutterContent *content);
}; };
CLUTTER_EXPORT
GType clutter_content_get_type (void) G_GNUC_CONST;
CLUTTER_EXPORT CLUTTER_EXPORT
gboolean clutter_content_get_preferred_size (ClutterContent *content, gboolean clutter_content_get_preferred_size (ClutterContent *content,
gfloat *width, gfloat *width,

4
clutter/clutter/clutter-image.c
View File

@ -57,7 +57,7 @@ struct _ClutterImagePrivate
gint height; gint height;
}; };
static void clutter_content_iface_init (ClutterContentIface *iface); static void clutter_content_iface_init (ClutterContentInterface *iface);
G_DEFINE_TYPE_WITH_CODE (ClutterImage, clutter_image, G_TYPE_OBJECT, G_DEFINE_TYPE_WITH_CODE (ClutterImage, clutter_image, G_TYPE_OBJECT,
G_ADD_PRIVATE (ClutterImage) G_ADD_PRIVATE (ClutterImage)
@ -154,7 +154,7 @@ clutter_image_get_preferred_size (ClutterContent *content,
} }
static void static void
clutter_content_iface_init (ClutterContentIface *iface) clutter_content_iface_init (ClutterContentInterface *iface)
{ {
iface->get_preferred_size = clutter_image_get_preferred_size; iface->get_preferred_size = clutter_image_get_preferred_size;
iface->paint_content = clutter_image_paint_content; iface->paint_content = clutter_image_paint_content;

4
clutter/tests/interactive/test-content.c
View File

@ -17,7 +17,7 @@ typedef struct _ColorContentClass {
GObjectClass parent_class; GObjectClass parent_class;
} ColorContentClass; } ColorContentClass;
static void clutter_content_iface_init (ClutterContentIface *iface); static void clutter_content_iface_init (ClutterContentInterface *iface);
GType color_content_get_type (void); GType color_content_get_type (void);
@ -135,7 +135,7 @@ color_content_paint_content (ClutterContent *content,
} }
static void static void
clutter_content_iface_init (ClutterContentIface *iface) clutter_content_iface_init (ClutterContentInterface *iface)
{ {
iface->paint_content = color_content_paint_content; iface->paint_content = color_content_paint_content;
} }

4
clutter/tests/interactive/test-image.c
View File

@ -18,7 +18,7 @@ typedef struct _SolidContentClass {
GObjectClass parent_class; GObjectClass parent_class;
} SolidContentClass; } SolidContentClass;
static void clutter_content_iface_init (ClutterContentIface *iface); static void clutter_content_iface_init (ClutterContentInterface *iface);
GType solid_content_get_type (void); GType solid_content_get_type (void);
@ -136,7 +136,7 @@ solid_content_paint_content (ClutterContent *content,
} }
static void static void
clutter_content_iface_init (ClutterContentIface *iface) clutter_content_iface_init (ClutterContentInterface *iface)
{ {
iface->paint_content = solid_content_paint_content; iface->paint_content = solid_content_paint_content;
} }