diff --git a/clutter/clutter-box-layout.h b/clutter/clutter-box-layout.h index 32daca861..abd88dcc4 100644 --- a/clutter/clutter-box-layout.h +++ b/clutter/clutter-box-layout.h @@ -97,63 +97,6 @@ void clutter_box_layout_set_pack_start (ClutterBoxLayou gboolean pack_start); gboolean clutter_box_layout_get_pack_start (ClutterBoxLayout *layout); -CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_set_orientation) -void clutter_box_layout_set_vertical (ClutterBoxLayout *layout, - gboolean vertical); -CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_get_orientation) -gboolean clutter_box_layout_get_vertical (ClutterBoxLayout *layout); - -void clutter_box_layout_pack (ClutterBoxLayout *layout, - ClutterActor *actor, - gboolean expand, - gboolean x_fill, - gboolean y_fill, - ClutterBoxAlignment x_align, - ClutterBoxAlignment y_align); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_set_alignment (ClutterBoxLayout *layout, - ClutterActor *actor, - ClutterBoxAlignment x_align, - ClutterBoxAlignment y_align); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_get_alignment (ClutterBoxLayout *layout, - ClutterActor *actor, - ClutterBoxAlignment *x_align, - ClutterBoxAlignment *y_align); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_set_fill (ClutterBoxLayout *layout, - ClutterActor *actor, - gboolean x_fill, - gboolean y_fill); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_get_fill (ClutterBoxLayout *layout, - ClutterActor *actor, - gboolean *x_fill, - gboolean *y_fill); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_set_expand (ClutterBoxLayout *layout, - ClutterActor *actor, - gboolean expand); -CLUTTER_DEPRECATED_IN_1_12 -gboolean clutter_box_layout_get_expand (ClutterBoxLayout *layout, - ClutterActor *actor); - -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_set_use_animations (ClutterBoxLayout *layout, - gboolean animate); -CLUTTER_DEPRECATED_IN_1_12 -gboolean clutter_box_layout_get_use_animations (ClutterBoxLayout *layout); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_set_easing_mode (ClutterBoxLayout *layout, - gulong mode); -CLUTTER_DEPRECATED_IN_1_12 -gulong clutter_box_layout_get_easing_mode (ClutterBoxLayout *layout); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_box_layout_set_easing_duration (ClutterBoxLayout *layout, - guint msecs); -CLUTTER_DEPRECATED_IN_1_12 -guint clutter_box_layout_get_easing_duration (ClutterBoxLayout *layout); - G_END_DECLS #endif /* __CLUTTER_BOX_LAYOUT_H__ */ diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 1f400299f..2ddd4f33f 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -3,41 +3,6 @@ #define __CLUTTER_DEPRECATED_H_INSIDE__ -#include "deprecated/clutter-actor.h" -#include "deprecated/clutter-alpha.h" -#include "deprecated/clutter-animatable.h" -#include "deprecated/clutter-animation.h" -#include "deprecated/clutter-animator.h" -#include "deprecated/clutter-backend.h" -#include "deprecated/clutter-behaviour.h" -#include "deprecated/clutter-behaviour-depth.h" -#include "deprecated/clutter-behaviour-ellipse.h" -#include "deprecated/clutter-behaviour-opacity.h" -#include "deprecated/clutter-behaviour-path.h" -#include "deprecated/clutter-behaviour-rotate.h" -#include "deprecated/clutter-behaviour-scale.h" -#include "deprecated/clutter-bin-layout.h" -#include "deprecated/clutter-box.h" -#include "deprecated/clutter-cairo-texture.h" -#include "deprecated/clutter-container.h" -#include "deprecated/clutter-fixed.h" -#include "deprecated/clutter-frame-source.h" -#include "deprecated/clutter-group.h" -#include "deprecated/clutter-input-device.h" -#include "deprecated/clutter-keysyms.h" -#include "deprecated/clutter-main.h" -#include "deprecated/clutter-media.h" -#include "deprecated/clutter-rectangle.h" -#include "deprecated/clutter-score.h" -#include "deprecated/clutter-shader.h" -#include "deprecated/clutter-stage-manager.h" -#include "deprecated/clutter-stage.h" -#include "deprecated/clutter-state.h" -#include "deprecated/clutter-texture.h" -#include "deprecated/clutter-timeline.h" -#include "deprecated/clutter-timeout-pool.h" -#include "deprecated/clutter-util.h" - #undef __CLUTTER_DEPRECATED_H_INSIDE__ #endif /* __CLUTTER_DEPRECATED_H__ */ diff --git a/clutter/clutter-enums.h b/clutter/clutter-enums.h index f2a666285..a22ce8ebf 100644 --- a/clutter/clutter-enums.h +++ b/clutter/clutter-enums.h @@ -483,34 +483,6 @@ typedef enum { CLUTTER_INTERPOLATION_CUBIC } ClutterInterpolation; -/** - * ClutterBinAlignment: - * @CLUTTER_BIN_ALIGNMENT_FIXED: Fixed position alignment; the - * #ClutterBinLayout will honour the fixed position provided - * by the actors themselves when allocating them - * @CLUTTER_BIN_ALIGNMENT_FILL: Fill the allocation size - * @CLUTTER_BIN_ALIGNMENT_START: Position the actors at the top - * or left side of the container, depending on the axis - * @CLUTTER_BIN_ALIGNMENT_END: Position the actors at the bottom - * or right side of the container, depending on the axis - * @CLUTTER_BIN_ALIGNMENT_CENTER: Position the actors at the - * center of the container, depending on the axis - * - * The alignment policies available on each axis for #ClutterBinLayout - * - * Since: 1.2 - * - * Deprecated: 1.12: Use #ClutterActorAlign and the #ClutterActor - * API instead - */ -typedef enum { - CLUTTER_BIN_ALIGNMENT_FIXED, - CLUTTER_BIN_ALIGNMENT_FILL, - CLUTTER_BIN_ALIGNMENT_START, - CLUTTER_BIN_ALIGNMENT_END, - CLUTTER_BIN_ALIGNMENT_CENTER -} ClutterBinAlignment; - /** * ClutterBindCoordinate: * @CLUTTER_BIND_X: Bind the X coordinate @@ -1020,66 +992,6 @@ typedef enum { /*< prefix=CLUTTER_PAN >*/ CLUTTER_PAN_Y_AXIS } ClutterPanAxis; - -/** - * ClutterTableAlignment: - * @CLUTTER_TABLE_ALIGNMENT_START: Align the child to the top or to the - * left of a cell in the table, depending on the axis - * @CLUTTER_TABLE_ALIGNMENT_CENTER: Align the child to the center of - * a cell in the table - * @CLUTTER_TABLE_ALIGNMENT_END: Align the child to the bottom or to the - * right of a cell in the table, depending on the axis - * - * The alignment policies available on each axis of the #ClutterTableLayout - * - * Since: 1.4 - */ -typedef enum { - CLUTTER_TABLE_ALIGNMENT_START, - CLUTTER_TABLE_ALIGNMENT_CENTER, - CLUTTER_TABLE_ALIGNMENT_END -} ClutterTableAlignment; - -/** - * ClutterTextureFlags: - * @CLUTTER_TEXTURE_NONE: No flags - * @CLUTTER_TEXTURE_RGB_FLAG_BGR: FIXME - * @CLUTTER_TEXTURE_RGB_FLAG_PREMULT: FIXME - * @CLUTTER_TEXTURE_YUV_FLAG_YUV2: FIXME - * - * Flags for clutter_texture_set_from_rgb_data() and - * clutter_texture_set_from_yuv_data(). - * - * Since: 0.4 - */ -typedef enum { /*< prefix=CLUTTER_TEXTURE >*/ - CLUTTER_TEXTURE_NONE = 0, - CLUTTER_TEXTURE_RGB_FLAG_BGR = 1 << 1, - CLUTTER_TEXTURE_RGB_FLAG_PREMULT = 1 << 2, /* FIXME: not handled */ - CLUTTER_TEXTURE_YUV_FLAG_YUV2 = 1 << 3 - - /* FIXME: add compressed types ? */ -} ClutterTextureFlags; - -/** - * ClutterTextureQuality: - * @CLUTTER_TEXTURE_QUALITY_LOW: fastest rendering will use nearest neighbour - * interpolation when rendering. good setting. - * @CLUTTER_TEXTURE_QUALITY_MEDIUM: higher quality rendering without using - * extra resources. - * @CLUTTER_TEXTURE_QUALITY_HIGH: render the texture with the best quality - * available using extra memory. - * - * Enumaration controlling the texture quality. - * - * Since: 0.8 - */ -typedef enum { /*< prefix=CLUTTER_TEXTURE_QUALITY >*/ - CLUTTER_TEXTURE_QUALITY_LOW, - CLUTTER_TEXTURE_QUALITY_MEDIUM, - CLUTTER_TEXTURE_QUALITY_HIGH -} ClutterTextureQuality; - /** * ClutterTimelineDirection: * @CLUTTER_TIMELINE_FORWARD: forward direction for a timeline diff --git a/clutter/clutter-layout-manager.h b/clutter/clutter-layout-manager.h index 8c40f1d57..8234763e5 100644 --- a/clutter/clutter-layout-manager.h +++ b/clutter/clutter-layout-manager.h @@ -181,15 +181,6 @@ void clutter_layout_manager_child_get_property (ClutterLayoutMa const gchar *property_name, GValue *value); -CLUTTER_DEPRECATED_IN_1_12 -ClutterAlpha * clutter_layout_manager_begin_animation (ClutterLayoutManager *manager, - guint duration, - gulong mode); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_layout_manager_end_animation (ClutterLayoutManager *manager); -CLUTTER_DEPRECATED_IN_1_12 -gdouble clutter_layout_manager_get_animation_progress (ClutterLayoutManager *manager); - G_END_DECLS #endif /* __CLUTTER_LAYOUT_MANAGER_H__ */ diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h index f2b6222c6..5cf2062fa 100644 --- a/clutter/clutter-script.h +++ b/clutter/clutter-script.h @@ -168,15 +168,6 @@ void clutter_script_unmerge_objects (ClutterScript guint merge_id); void clutter_script_ensure_objects (ClutterScript *script); -CLUTTER_DEPRECATED_IN_1_12 -void clutter_script_add_states (ClutterScript *script, - const gchar *name, - ClutterState *state); - -CLUTTER_DEPRECATED_IN_1_12 -ClutterState * clutter_script_get_states (ClutterScript *script, - const gchar *name); - void clutter_script_connect_signals (ClutterScript *script, gpointer user_data); void clutter_script_connect_signals_full (ClutterScript *script,