mirror of
https://github.com/brl/mutter.git
synced 2025-03-13 06:45:03 +00:00
clutter: Remove class paddings
mutter-clutter is a private library that is only used by the shell and not meant to be ABI/API compatible in between versions, so there's no need to add padding to classes. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2903>
This commit is contained in:
parent
7f18cae282
commit
17414fd242
@ -103,10 +103,6 @@ struct _CallyActorClass
|
||||
gint (*remove_actor) (ClutterActor *container,
|
||||
ClutterActor *actor,
|
||||
gpointer data);
|
||||
|
||||
/*< private >*/
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[32];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -59,9 +59,6 @@ struct _CallyCloneClass
|
||||
{
|
||||
/*< private >*/
|
||||
CallyActorClass parent_class;
|
||||
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -59,9 +59,6 @@ struct _CallyRootClass
|
||||
{
|
||||
/*< private >*/
|
||||
AtkGObjectAccessibleClass parent_class;
|
||||
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[16];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -59,9 +59,6 @@ struct _CallyStageClass
|
||||
{
|
||||
/*< private >*/
|
||||
CallyActorClass parent_class;
|
||||
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[16];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -59,9 +59,6 @@ struct _CallyTextClass
|
||||
{
|
||||
/*< private >*/
|
||||
CallyActorClass parent_class;
|
||||
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -59,9 +59,6 @@ struct _CallyUtilClass
|
||||
{
|
||||
/*< private >*/
|
||||
AtkUtilClass parent_class;
|
||||
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -55,15 +55,6 @@ struct _ClutterActionClass
|
||||
void (* sequence_cancelled) (ClutterAction *action,
|
||||
ClutterInputDevice *device,
|
||||
ClutterEventSequence *sequence);
|
||||
|
||||
void (* _clutter_action1) (void);
|
||||
void (* _clutter_action2) (void);
|
||||
void (* _clutter_action3) (void);
|
||||
void (* _clutter_action4) (void);
|
||||
void (* _clutter_action5) (void);
|
||||
void (* _clutter_action6) (void);
|
||||
void (* _clutter_action7) (void);
|
||||
void (* _clutter_action8) (void);
|
||||
};
|
||||
|
||||
/* ClutterActor API */
|
||||
|
@ -69,14 +69,6 @@ struct _ClutterActorMetaClass
|
||||
|
||||
void (* set_enabled) (ClutterActorMeta *meta,
|
||||
gboolean is_enabled);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_meta1) (void);
|
||||
void (* _clutter_meta2) (void);
|
||||
void (* _clutter_meta3) (void);
|
||||
void (* _clutter_meta4) (void);
|
||||
void (* _clutter_meta5) (void);
|
||||
void (* _clutter_meta6) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -292,10 +292,6 @@ struct _ClutterActorClass
|
||||
void (* resource_scale_changed) (ClutterActor *self);
|
||||
float (* calculate_resource_scale) (ClutterActor *self,
|
||||
int phase);
|
||||
|
||||
/*< private >*/
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[25];
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -69,9 +69,6 @@ struct _ClutterCanvasClass
|
||||
cairo_t *cr,
|
||||
int width,
|
||||
int height);
|
||||
|
||||
/*< private >*/
|
||||
gpointer _padding[16];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -65,15 +65,6 @@ struct _ClutterClickActionClass
|
||||
gboolean (* long_press) (ClutterClickAction *action,
|
||||
ClutterActor *actor,
|
||||
ClutterLongPressState state);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_click_action1) (void);
|
||||
void (* _clutter_click_action2) (void);
|
||||
void (* _clutter_click_action3) (void);
|
||||
void (* _clutter_click_action4) (void);
|
||||
void (* _clutter_click_action5) (void);
|
||||
void (* _clutter_click_action6) (void);
|
||||
void (* _clutter_click_action7) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -60,12 +60,6 @@ struct _ClutterCloneClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterActorClass parent_class;
|
||||
|
||||
/* padding for future expansion */
|
||||
void (*_clutter_actor_clone1) (void);
|
||||
void (*_clutter_actor_clone2) (void);
|
||||
void (*_clutter_actor_clone3) (void);
|
||||
void (*_clutter_actor_clone4) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -75,15 +75,6 @@ struct _ClutterConstraintClass
|
||||
float for_size,
|
||||
float *minimum_size,
|
||||
float *natural_size);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_constraint1) (void);
|
||||
void (* _clutter_constraint2) (void);
|
||||
void (* _clutter_constraint3) (void);
|
||||
void (* _clutter_constraint4) (void);
|
||||
void (* _clutter_constraint5) (void);
|
||||
void (* _clutter_constraint6) (void);
|
||||
void (* _clutter_constraint7) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -71,15 +71,6 @@ struct _ClutterDeformEffectClass
|
||||
gfloat width,
|
||||
gfloat height,
|
||||
CoglTextureVertex *vertex);
|
||||
|
||||
/*< private >*/
|
||||
void (*_clutter_deform1) (void);
|
||||
void (*_clutter_deform2) (void);
|
||||
void (*_clutter_deform3) (void);
|
||||
void (*_clutter_deform4) (void);
|
||||
void (*_clutter_deform5) (void);
|
||||
void (*_clutter_deform6) (void);
|
||||
void (*_clutter_deform7) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -86,11 +86,6 @@ struct _ClutterEffectClass
|
||||
ClutterEffectPaintFlags flags);
|
||||
void (* pick) (ClutterEffect *effect,
|
||||
ClutterPickContext *pick_context);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_effect4) (void);
|
||||
void (* _clutter_effect5) (void);
|
||||
void (* _clutter_effect6) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -70,14 +70,6 @@ struct _ClutterGestureActionClass
|
||||
ClutterActor *actor);
|
||||
gboolean (* gesture_prepare) (ClutterGestureAction *action,
|
||||
ClutterActor *actor);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_gesture_action1) (void);
|
||||
void (* _clutter_gesture_action2) (void);
|
||||
void (* _clutter_gesture_action3) (void);
|
||||
void (* _clutter_gesture_action4) (void);
|
||||
void (* _clutter_gesture_action5) (void);
|
||||
void (* _clutter_gesture_action6) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -66,8 +66,6 @@ struct _ClutterGridLayoutClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterLayoutManagerClass parent_class;
|
||||
|
||||
gpointer _padding[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -49,8 +49,6 @@ struct _ClutterImageClass
|
||||
{
|
||||
/*< private >*/
|
||||
GObjectClass parent_class;
|
||||
|
||||
gpointer _padding[16];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -71,15 +71,6 @@ struct _ClutterIntervalClass
|
||||
gboolean (* compute_value) (ClutterInterval *interval,
|
||||
gdouble factor,
|
||||
GValue *value);
|
||||
|
||||
/*< private >*/
|
||||
/* padding for future expansion */
|
||||
void (*_clutter_reserved1) (void);
|
||||
void (*_clutter_reserved2) (void);
|
||||
void (*_clutter_reserved3) (void);
|
||||
void (*_clutter_reserved4) (void);
|
||||
void (*_clutter_reserved5) (void);
|
||||
void (*_clutter_reserved6) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -61,8 +61,6 @@ struct _ClutterKeyframeTransitionClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterPropertyTransitionClass parent_class;
|
||||
|
||||
gpointer _padding[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -116,17 +116,6 @@ struct _ClutterLayoutManagerClass
|
||||
ClutterActor *actor);
|
||||
|
||||
void (* layout_changed) (ClutterLayoutManager *manager);
|
||||
|
||||
/*< private >*/
|
||||
/* padding for future expansion */
|
||||
void (* _clutter_padding_1) (void);
|
||||
void (* _clutter_padding_2) (void);
|
||||
void (* _clutter_padding_3) (void);
|
||||
void (* _clutter_padding_4) (void);
|
||||
void (* _clutter_padding_5) (void);
|
||||
void (* _clutter_padding_6) (void);
|
||||
void (* _clutter_padding_7) (void);
|
||||
void (* _clutter_padding_8) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -70,12 +70,6 @@ struct _ClutterLayoutMetaClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterChildMetaClass parent_class;
|
||||
|
||||
/* padding, for expansion */
|
||||
void (*_clutter_padding1) (void);
|
||||
void (*_clutter_padding2) (void);
|
||||
void (*_clutter_padding3) (void);
|
||||
void (*_clutter_padding4) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -74,15 +74,6 @@ struct _ClutterOffscreenEffectClass
|
||||
void (* paint_target) (ClutterOffscreenEffect *effect,
|
||||
ClutterPaintNode *node,
|
||||
ClutterPaintContext *paint_context);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_offscreen1) (void);
|
||||
void (* _clutter_offscreen2) (void);
|
||||
void (* _clutter_offscreen3) (void);
|
||||
void (* _clutter_offscreen4) (void);
|
||||
void (* _clutter_offscreen5) (void);
|
||||
void (* _clutter_offscreen6) (void);
|
||||
void (* _clutter_offscreen7) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -76,14 +76,6 @@ struct _ClutterPanActionClass
|
||||
/*< public >*/
|
||||
void (* pan_stopped) (ClutterPanAction *action,
|
||||
ClutterActor *actor);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_pan_action1) (void);
|
||||
void (* _clutter_pan_action2) (void);
|
||||
void (* _clutter_pan_action3) (void);
|
||||
void (* _clutter_pan_action4) (void);
|
||||
void (* _clutter_pan_action5) (void);
|
||||
void (* _clutter_pan_action6) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -61,8 +61,6 @@ struct _ClutterPropertyTransitionClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterTransitionClass parent_class;
|
||||
|
||||
gpointer _padding[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -63,14 +63,6 @@ struct _ClutterRotateActionClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterGestureActionClass parent_class;
|
||||
|
||||
void (* _clutter_rotate_action1) (void);
|
||||
void (* _clutter_rotate_action2) (void);
|
||||
void (* _clutter_rotate_action3) (void);
|
||||
void (* _clutter_rotate_action4) (void);
|
||||
void (* _clutter_rotate_action5) (void);
|
||||
void (* _clutter_rotate_action6) (void);
|
||||
void (* _clutter_rotate_action7) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -116,17 +116,6 @@ struct _ClutterScriptClass
|
||||
/*< public >*/
|
||||
GType (* get_type_from_name) (ClutterScript *script,
|
||||
const gchar *type_name);
|
||||
|
||||
/*< private >*/
|
||||
/* padding, for future expansion */
|
||||
void (*_clutter_reserved1) (void);
|
||||
void (*_clutter_reserved2) (void);
|
||||
void (*_clutter_reserved3) (void);
|
||||
void (*_clutter_reserved4) (void);
|
||||
void (*_clutter_reserved5) (void);
|
||||
void (*_clutter_reserved6) (void);
|
||||
void (*_clutter_reserved7) (void);
|
||||
void (*_clutter_reserved8) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -59,8 +59,6 @@ struct _ClutterScrollActorClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterActorClass parent_instance;
|
||||
|
||||
gpointer _padding[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -70,14 +70,6 @@ struct _ClutterShaderEffectClass
|
||||
|
||||
/*< public >*/
|
||||
gchar * (* get_static_shader_source) (ClutterShaderEffect *effect);
|
||||
|
||||
/*< private >*/
|
||||
/* padding */
|
||||
void (*_clutter_shader1) (void);
|
||||
void (*_clutter_shader2) (void);
|
||||
void (*_clutter_shader3) (void);
|
||||
void (*_clutter_shader4) (void);
|
||||
void (*_clutter_shader5) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -79,10 +79,6 @@ struct _ClutterStageClass
|
||||
ClutterStageView *view,
|
||||
const cairo_region_t *redraw_clip,
|
||||
ClutterFrame *frame);
|
||||
|
||||
/*< private >*/
|
||||
/* padding for future expansion */
|
||||
gpointer _padding_dummy[31];
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -74,14 +74,6 @@ struct _ClutterSwipeActionClass
|
||||
void (* swept) (ClutterSwipeAction *action,
|
||||
ClutterActor *actor,
|
||||
ClutterSwipeDirection direction);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_swipe_action1) (void);
|
||||
void (* _clutter_swipe_action2) (void);
|
||||
void (* _clutter_swipe_action3) (void);
|
||||
void (* _clutter_swipe_action4) (void);
|
||||
void (* _clutter_swipe_action5) (void);
|
||||
void (* _clutter_swipe_action6) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -74,14 +74,6 @@ struct _ClutterTapActionClass
|
||||
/*< public >*/
|
||||
gboolean (* tap) (ClutterTapAction *action,
|
||||
ClutterActor *actor);
|
||||
|
||||
/*< private >*/
|
||||
void (* _clutter_tap_action1) (void);
|
||||
void (* _clutter_tap_action2) (void);
|
||||
void (* _clutter_tap_action3) (void);
|
||||
void (* _clutter_tap_action4) (void);
|
||||
void (* _clutter_tap_action5) (void);
|
||||
void (* _clutter_tap_action6) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -98,17 +98,6 @@ struct _ClutterTextBufferClass
|
||||
guint (*delete_text) (ClutterTextBuffer *buffer,
|
||||
guint position,
|
||||
guint n_chars);
|
||||
|
||||
/*< private >*/
|
||||
/* Padding for future expansion */
|
||||
void (*_clutter_reserved1) (void);
|
||||
void (*_clutter_reserved2) (void);
|
||||
void (*_clutter_reserved3) (void);
|
||||
void (*_clutter_reserved4) (void);
|
||||
void (*_clutter_reserved5) (void);
|
||||
void (*_clutter_reserved6) (void);
|
||||
void (*_clutter_reserved7) (void);
|
||||
void (*_clutter_reserved8) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -75,16 +75,6 @@ struct _ClutterTextClass
|
||||
void (* cursor_event) (ClutterText *self,
|
||||
const graphene_rect_t *rect);
|
||||
void (* cursor_changed) (ClutterText *self);
|
||||
|
||||
/*< private >*/
|
||||
/* padding for future expansion */
|
||||
void (* _clutter_reserved1) (void);
|
||||
void (* _clutter_reserved2) (void);
|
||||
void (* _clutter_reserved3) (void);
|
||||
void (* _clutter_reserved4) (void);
|
||||
void (* _clutter_reserved5) (void);
|
||||
void (* _clutter_reserved6) (void);
|
||||
void (* _clutter_reserved7) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -95,12 +95,6 @@ struct _ClutterTimelineClass
|
||||
gint msecs);
|
||||
void (*stopped) (ClutterTimeline *timeline,
|
||||
gboolean is_finished);
|
||||
|
||||
/*< private >*/
|
||||
void (*_clutter_timeline_1) (void);
|
||||
void (*_clutter_timeline_2) (void);
|
||||
void (*_clutter_timeline_3) (void);
|
||||
void (*_clutter_timeline_4) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -61,8 +61,6 @@ struct _ClutterTransitionGroupClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterTransitionClass parent_class;
|
||||
|
||||
gpointer _padding[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -78,9 +78,6 @@ struct _ClutterTransitionClass
|
||||
ClutterAnimatable *animatable,
|
||||
ClutterInterval *interval,
|
||||
gdouble progress);
|
||||
|
||||
/*< private >*/
|
||||
gpointer _padding[8];
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -56,10 +56,6 @@ struct _ClutterUnits
|
||||
|
||||
/* the serial coming from the backend, used to evict the cache */
|
||||
gint32 serial;
|
||||
|
||||
/* padding for eventual expansion */
|
||||
gint32 __padding_1;
|
||||
gint64 __padding_2;
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
@ -65,12 +65,6 @@ struct _ClutterZoomActionClass
|
||||
{
|
||||
/*< private >*/
|
||||
ClutterGestureActionClass parent_class;
|
||||
|
||||
void (* _clutter_zoom_action1) (void);
|
||||
void (* _clutter_zoom_action2) (void);
|
||||
void (* _clutter_zoom_action3) (void);
|
||||
void (* _clutter_zoom_action4) (void);
|
||||
void (* _clutter_zoom_action5) (void);
|
||||
};
|
||||
|
||||
CLUTTER_EXPORT
|
||||
|
Loading…
x
Reference in New Issue
Block a user