diff --git a/clutter/clutter/cally/cally-actor.h b/clutter/clutter/cally/cally-actor.h index c6c9937ed..56ac233b3 100644 --- a/clutter/clutter/cally/cally-actor.h +++ b/clutter/clutter/cally/cally-actor.h @@ -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 diff --git a/clutter/clutter/cally/cally-clone.h b/clutter/clutter/cally/cally-clone.h index 348993c1e..56f4666aa 100644 --- a/clutter/clutter/cally/cally-clone.h +++ b/clutter/clutter/cally/cally-clone.h @@ -59,9 +59,6 @@ struct _CallyCloneClass { /*< private >*/ CallyActorClass parent_class; - - /* padding for future expansion */ - gpointer _padding_dummy[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/cally/cally-root.h b/clutter/clutter/cally/cally-root.h index 3ac8413ff..8c5e81b5c 100644 --- a/clutter/clutter/cally/cally-root.h +++ b/clutter/clutter/cally/cally-root.h @@ -59,9 +59,6 @@ struct _CallyRootClass { /*< private >*/ AtkGObjectAccessibleClass parent_class; - - /* padding for future expansion */ - gpointer _padding_dummy[16]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/cally/cally-stage.h b/clutter/clutter/cally/cally-stage.h index 1a96db0eb..95ad89e4d 100644 --- a/clutter/clutter/cally/cally-stage.h +++ b/clutter/clutter/cally/cally-stage.h @@ -59,9 +59,6 @@ struct _CallyStageClass { /*< private >*/ CallyActorClass parent_class; - - /* padding for future expansion */ - gpointer _padding_dummy[16]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/cally/cally-text.h b/clutter/clutter/cally/cally-text.h index 126048eb0..7a4af4d71 100644 --- a/clutter/clutter/cally/cally-text.h +++ b/clutter/clutter/cally/cally-text.h @@ -59,9 +59,6 @@ struct _CallyTextClass { /*< private >*/ CallyActorClass parent_class; - - /* padding for future expansion */ - gpointer _padding_dummy[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/cally/cally-util.h b/clutter/clutter/cally/cally-util.h index 36f940f3f..faa5d8420 100644 --- a/clutter/clutter/cally/cally-util.h +++ b/clutter/clutter/cally/cally-util.h @@ -59,9 +59,6 @@ struct _CallyUtilClass { /*< private >*/ AtkUtilClass parent_class; - - /* padding for future expansion */ - gpointer _padding_dummy[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-action.h b/clutter/clutter/clutter-action.h index 542cd31d9..73e618b40 100644 --- a/clutter/clutter/clutter-action.h +++ b/clutter/clutter/clutter-action.h @@ -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 */ diff --git a/clutter/clutter/clutter-actor-meta.h b/clutter/clutter/clutter-actor-meta.h index a04153892..e02a8ba2f 100644 --- a/clutter/clutter/clutter-actor-meta.h +++ b/clutter/clutter/clutter-actor-meta.h @@ -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 diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h index b7d9fc93d..98deaa4ed 100644 --- a/clutter/clutter/clutter-actor.h +++ b/clutter/clutter/clutter-actor.h @@ -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]; }; /** diff --git a/clutter/clutter/clutter-canvas.h b/clutter/clutter/clutter-canvas.h index 1c8adeb6d..055b1fdd8 100644 --- a/clutter/clutter/clutter-canvas.h +++ b/clutter/clutter/clutter-canvas.h @@ -69,9 +69,6 @@ struct _ClutterCanvasClass cairo_t *cr, int width, int height); - - /*< private >*/ - gpointer _padding[16]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-click-action.h b/clutter/clutter/clutter-click-action.h index b2a680a85..1cf5503b0 100644 --- a/clutter/clutter/clutter-click-action.h +++ b/clutter/clutter/clutter-click-action.h @@ -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 diff --git a/clutter/clutter/clutter-clone.h b/clutter/clutter/clutter-clone.h index 891c04c5a..8ff1020c5 100644 --- a/clutter/clutter/clutter-clone.h +++ b/clutter/clutter/clutter-clone.h @@ -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 diff --git a/clutter/clutter/clutter-constraint.h b/clutter/clutter/clutter-constraint.h index ddb0cc69a..1799795f9 100644 --- a/clutter/clutter/clutter-constraint.h +++ b/clutter/clutter/clutter-constraint.h @@ -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 diff --git a/clutter/clutter/clutter-deform-effect.h b/clutter/clutter/clutter-deform-effect.h index b29d38bb7..74534d979 100644 --- a/clutter/clutter/clutter-deform-effect.h +++ b/clutter/clutter/clutter-deform-effect.h @@ -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 diff --git a/clutter/clutter/clutter-effect.h b/clutter/clutter/clutter-effect.h index fd783b494..f3cbde99f 100644 --- a/clutter/clutter/clutter-effect.h +++ b/clutter/clutter/clutter-effect.h @@ -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 diff --git a/clutter/clutter/clutter-gesture-action.h b/clutter/clutter/clutter-gesture-action.h index 3251adf22..34b94e661 100644 --- a/clutter/clutter/clutter-gesture-action.h +++ b/clutter/clutter/clutter-gesture-action.h @@ -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 diff --git a/clutter/clutter/clutter-grid-layout.h b/clutter/clutter/clutter-grid-layout.h index d7266bd0e..a9a9d7afb 100644 --- a/clutter/clutter/clutter-grid-layout.h +++ b/clutter/clutter/clutter-grid-layout.h @@ -66,8 +66,6 @@ struct _ClutterGridLayoutClass { /*< private >*/ ClutterLayoutManagerClass parent_class; - - gpointer _padding[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-image.h b/clutter/clutter/clutter-image.h index cc9122bd2..ad1d12f21 100644 --- a/clutter/clutter/clutter-image.h +++ b/clutter/clutter/clutter-image.h @@ -49,8 +49,6 @@ struct _ClutterImageClass { /*< private >*/ GObjectClass parent_class; - - gpointer _padding[16]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-interval.h b/clutter/clutter/clutter-interval.h index e26904d64..15c74dc1d 100644 --- a/clutter/clutter/clutter-interval.h +++ b/clutter/clutter/clutter-interval.h @@ -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 diff --git a/clutter/clutter/clutter-keyframe-transition.h b/clutter/clutter/clutter-keyframe-transition.h index bfe575d04..5f514cfa2 100644 --- a/clutter/clutter/clutter-keyframe-transition.h +++ b/clutter/clutter/clutter-keyframe-transition.h @@ -61,8 +61,6 @@ struct _ClutterKeyframeTransitionClass { /*< private >*/ ClutterPropertyTransitionClass parent_class; - - gpointer _padding[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-layout-manager.h b/clutter/clutter/clutter-layout-manager.h index fa935f273..87a8937ee 100644 --- a/clutter/clutter/clutter-layout-manager.h +++ b/clutter/clutter/clutter-layout-manager.h @@ -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 diff --git a/clutter/clutter/clutter-layout-meta.h b/clutter/clutter/clutter-layout-meta.h index 2bd22300a..ee6a6fb95 100644 --- a/clutter/clutter/clutter-layout-meta.h +++ b/clutter/clutter/clutter-layout-meta.h @@ -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 diff --git a/clutter/clutter/clutter-offscreen-effect.h b/clutter/clutter/clutter-offscreen-effect.h index 5881fbf54..dedb9443c 100644 --- a/clutter/clutter/clutter-offscreen-effect.h +++ b/clutter/clutter/clutter-offscreen-effect.h @@ -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 diff --git a/clutter/clutter/clutter-pan-action.h b/clutter/clutter/clutter-pan-action.h index 3f35abb31..106bd6712 100644 --- a/clutter/clutter/clutter-pan-action.h +++ b/clutter/clutter/clutter-pan-action.h @@ -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 diff --git a/clutter/clutter/clutter-property-transition.h b/clutter/clutter/clutter-property-transition.h index c301f59e3..6628328ce 100644 --- a/clutter/clutter/clutter-property-transition.h +++ b/clutter/clutter/clutter-property-transition.h @@ -61,8 +61,6 @@ struct _ClutterPropertyTransitionClass { /*< private >*/ ClutterTransitionClass parent_class; - - gpointer _padding[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-rotate-action.h b/clutter/clutter/clutter-rotate-action.h index a5d307845..cd78b2382 100644 --- a/clutter/clutter/clutter-rotate-action.h +++ b/clutter/clutter/clutter-rotate-action.h @@ -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 diff --git a/clutter/clutter/clutter-script.h b/clutter/clutter/clutter-script.h index af93d95be..881721aeb 100644 --- a/clutter/clutter/clutter-script.h +++ b/clutter/clutter/clutter-script.h @@ -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 diff --git a/clutter/clutter/clutter-scroll-actor.h b/clutter/clutter/clutter-scroll-actor.h index a70f6b2f8..1a6cfa3e4 100644 --- a/clutter/clutter/clutter-scroll-actor.h +++ b/clutter/clutter/clutter-scroll-actor.h @@ -59,8 +59,6 @@ struct _ClutterScrollActorClass { /*< private >*/ ClutterActorClass parent_instance; - - gpointer _padding[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-shader-effect.h b/clutter/clutter/clutter-shader-effect.h index c36d00a66..00079920f 100644 --- a/clutter/clutter/clutter-shader-effect.h +++ b/clutter/clutter/clutter-shader-effect.h @@ -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 diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h index a579003cb..4a82abfb3 100644 --- a/clutter/clutter/clutter-stage.h +++ b/clutter/clutter/clutter-stage.h @@ -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]; }; /** diff --git a/clutter/clutter/clutter-swipe-action.h b/clutter/clutter/clutter-swipe-action.h index 77a48ec98..ddc6699a2 100644 --- a/clutter/clutter/clutter-swipe-action.h +++ b/clutter/clutter/clutter-swipe-action.h @@ -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 diff --git a/clutter/clutter/clutter-tap-action.h b/clutter/clutter/clutter-tap-action.h index f3fb264cf..f478588ea 100644 --- a/clutter/clutter/clutter-tap-action.h +++ b/clutter/clutter/clutter-tap-action.h @@ -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 diff --git a/clutter/clutter/clutter-text-buffer.h b/clutter/clutter/clutter-text-buffer.h index 2dfbbc7a4..6f082168d 100644 --- a/clutter/clutter/clutter-text-buffer.h +++ b/clutter/clutter/clutter-text-buffer.h @@ -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 diff --git a/clutter/clutter/clutter-text.h b/clutter/clutter/clutter-text.h index 38fe2a9a8..ba4c4b865 100644 --- a/clutter/clutter/clutter-text.h +++ b/clutter/clutter/clutter-text.h @@ -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 diff --git a/clutter/clutter/clutter-timeline.h b/clutter/clutter/clutter-timeline.h index cd293911b..684b61ad2 100644 --- a/clutter/clutter/clutter-timeline.h +++ b/clutter/clutter/clutter-timeline.h @@ -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 diff --git a/clutter/clutter/clutter-transition-group.h b/clutter/clutter/clutter-transition-group.h index e4b0c590a..d263600a9 100644 --- a/clutter/clutter/clutter-transition-group.h +++ b/clutter/clutter/clutter-transition-group.h @@ -61,8 +61,6 @@ struct _ClutterTransitionGroupClass { /*< private >*/ ClutterTransitionClass parent_class; - - gpointer _padding[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-transition.h b/clutter/clutter/clutter-transition.h index 72a4e7123..a0d7aba87 100644 --- a/clutter/clutter/clutter-transition.h +++ b/clutter/clutter/clutter-transition.h @@ -78,9 +78,6 @@ struct _ClutterTransitionClass ClutterAnimatable *animatable, ClutterInterval *interval, gdouble progress); - - /*< private >*/ - gpointer _padding[8]; }; CLUTTER_EXPORT diff --git a/clutter/clutter/clutter-units.h b/clutter/clutter/clutter-units.h index 3a3009dd4..9d232021e 100644 --- a/clutter/clutter/clutter-units.h +++ b/clutter/clutter/clutter-units.h @@ -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 diff --git a/clutter/clutter/clutter-zoom-action.h b/clutter/clutter/clutter-zoom-action.h index fb0e93796..04cf5bfb8 100644 --- a/clutter/clutter/clutter-zoom-action.h +++ b/clutter/clutter/clutter-zoom-action.h @@ -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