diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 688617d11..7ddb7f050 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -16,8 +16,8 @@ INCLUDES = \ -I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter/$(CLUTTER_WINSYS) \ -I$(top_srcdir)/clutter/$(CLUTTER_WINSYS_BASE) \ + -I$(top_srcdir)/clutter/deprecated \ -I$(top_srcdir)/clutter/cally \ - -I$(top_srcdir)/clutter/evdev \ -I$(top_builddir) \ -I$(top_builddir)/clutter \ $(NULL) @@ -44,6 +44,7 @@ INTROSPECTION_GIRS = # the base include path for headers clutter_base_includedir = $(includedir)/clutter-$(CLUTTER_API_VERSION) clutter_includedir = $(clutter_base_includedir)/clutter +clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated # pkg-config files pc_files = @@ -93,8 +94,7 @@ source_h = \ $(srcdir)/clutter-fixed.h \ $(srcdir)/clutter-fixed-layout.h \ $(srcdir)/clutter-flow-layout.h \ - $(srcdir)/clutter-frame-source.h \ - $(srcdir)/clutter-gesture-action.h \ + $(srcdir)/clutter-gesture-action.h \ $(srcdir)/clutter-group.h \ $(srcdir)/clutter-input-device.h \ $(srcdir)/clutter-interval.h \ @@ -179,8 +179,7 @@ source_c = \ $(srcdir)/clutter-fixed-layout.c \ $(srcdir)/clutter-flatten-effect.c \ $(srcdir)/clutter-flow-layout.c \ - $(srcdir)/clutter-frame-source.c \ - $(srcdir)/clutter-gesture-action.c \ + $(srcdir)/clutter-gesture-action.c \ $(srcdir)/clutter-group.c \ $(srcdir)/clutter-input-device.c \ $(srcdir)/clutter-interval.c \ @@ -255,6 +254,24 @@ source_c_priv = \ $(srcdir)/clutter-timeout-interval.c \ $(NULL) +# deprecated installed headers +deprecated_h = \ + $(srcdir)/deprecated/clutter-frame-source.h \ + $(NULL) + +# deprecated source code +deprecated_c = \ + $(srcdir)/deprecated/clutter-frame-source.c \ + $(NULL) + +# deprecated private headers; these should not be installed +deprecated_h_priv = \ + $(NULL) + +# deprecated private source code; these should not be introspected +deprecated_c_priv = \ + $(NULL) + # built sources built_source_c = \ clutter-enum-types.c \ @@ -612,6 +629,8 @@ nodist_clutter_include_HEADERS = \ $(top_builddir)/clutter/clutter-version.h \ $(built_source_h) +clutter_deprecated_HEADERS = $(deprecated_h) + lib_LTLIBRARIES += libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la libclutter_@CLUTTER_SONAME_INFIX@_@CLUTTER_API_VERSION@_la_LIBADD = \ @@ -631,6 +650,10 @@ libclutter_@CLUTTER_SONAME_INFIX@_@CLUTTER_API_VERSION@_la_SOURCES = \ $(source_h) \ $(source_c_priv) \ $(source_h_priv) \ + $(deprecated_c) \ + $(deprecated_h) \ + $(deprecated_c_priv) \ + $(deprecated_h_priv) \ $(cally_sources_c) \ $(cally_sources_h) \ $(cally_sources_private) \ @@ -660,7 +683,13 @@ Clutter-@CLUTTER_API_VERSION@.gir: libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_AP Clutter_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Clutter Clutter_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@ Clutter_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la -Clutter_@CLUTTER_API_VERSION_AM@_gir_FILES = $(clutter_include_HEADERS) $(nodist_clutter_include_HEADERS) $(source_c) $(built_source_c) +Clutter_@CLUTTER_API_VERSION_AM@_gir_FILES = \ + $(clutter_include_HEADERS) \ + $(clutter_deprecated_HEADERS) \ + $(nodist_clutter_include_HEADERS) \ + $(source_c) \ + $(deprecated_c) \ + $(built_source_c) Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) -UCLUTTER_DISABLE_DEPRECATED Clutter_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-1.0 CoglPango-1.0 Atk-1.0 Json-1.0 Clutter_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 890ff385e..0d0c5adf5 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -1,205 +1,10 @@ -#ifndef _CLUTTER_DEPRECATED_H -#define _CLUTTER_DEPRECATED_H +#ifndef __CLUTTER_DEPRECATED_H__ +#define __CLUTTER_DEPRECATED_H__ -/* This header contains defines that makes the compiler provide useful - * direction for resolving compile problems when code is using old APIs - * When using a function name that no longer applies the compiler will - * tell the developer the name of the new function call. - * - * Functions that are simply renamed should give errors containing - * _REPLACED_BY_ whilst functions that are deprecated by new functions with - * new functionality should giver errors containing _DEPRECATED_BY_. - */ +#define __CLUTTER_DEPRECATED_H_INSIDE__ -#define clutter_group_find_child_by_id clutter_group_find_child_by_id_REPLACED_BY_clutter_container_find_child_by_name +#include "deprecated/clutter-frame-source.h" -#define clutter_behaviour_ellipse_set_angle_begin clutter_behaviour_ellipse_set_angle_begin_REPLACED_BY_clutter_behaviour_set_angle_start -#define clutter_behaviour_ellipse_set_angle_beginx clutter_behaviour_ellipse_set_angle_beginx_REPLACED_BY_clutter_behaviour_set_angle_startx -#define clutter_behaviour_ellipse_get_angle_begin clutter_behaviour_ellipse_get_angle_begin_REPLACED_BY_clutter_behaviour_get_angle_start -#define clutter_behaviour_ellipse_get_angle_beginx clutter_behaviour_ellipse_get_angle_beginx_REPLACED_BY_clutter_behaviour_get_angle_startx -#define clutter_behaviour_bspline_append clutter_behaviour_bspline_append_REPLACED_BY_clutter_behaviour_bspline_append_knots +#undef __CLUTTER_DEPRECATED_H_INSIDE__ -#define clutter_actor_get_id clutter_actor_get_id_REPLACED_BY_clutter_actor_get_gid - -#define clutter_actor_rotate_x clutter_actor_rotate_x_DEPRECATED_BY_clutter_actor_set_rotation -#define clutter_actor_rotate_y clutter_actor_rotate_y_DEPRECATED_BY_clutter_actor_set_rotation -#define clutter_actor_rotate_z clutter_actor_rotate_z_DEPRECATED_BY_clutter_actor_set_rotation -#define clutter_actor_rotate_xx clutter_actor_rotate_xx_DEPRECATED_BY_clutter_actor_set_rotationx -#define clutter_actor_rotate_yx clutter_actor_rotate_yx_DEPRECATED_BY_clutter_actor_set_rotationx -#define clutter_actor_rotate_zx clutter_actor_rotate_zx_DEPRECATED_BY_clutter_actor_set_rotationx -#define clutter_actor_get_rxang clutter_actor_get_rxang_DEPRECATED_BY_clutter_actor_get_rotation -#define clutter_actor_get_ryang clutter_actor_get_ryang_DEPRECATED_BY_clutter_actor_get_rotation -#define clutter_actor_get_rzang clutter_actor_get_rzang_DEPRECATED_BY_clutter_actor_get_rotation -#define clutter_actor_get_rxangx clutter_actor_get_rxangx_DEPRECATED_BY_clutter_actor_get_rotationx -#define clutter_actor_get_ryangx clutter_actor_get_ryangx_DEPRECATED_BY_clutter_actor_get_rotationx -#define clutter_actor_get_rzangx clutter_actor_get_rzangx_DEPRECATED_BY_clutter_actor_get_rotationx -#define clutter_actor_set_scale_with_gravityx clutter_actor_set_scale_with_gravityx_DEPRECATED_BY_clutter_actor_set_scale_with_gravity - -#define clutter_entry_set_position clutter_entry_set_position_REPLACED_BY_clutter_entry_set_cursor_position -#define clutter_entry_get_position clutter_entry_get_position_REPLACED_BY_clutter_entry_get_cursor_position - -#define clutter_shader_bind clutter_shader_bind_REPLACED_BY_clutter_shader_compile -#define clutter_shader_is_bound clutter_shader_is_bound_REPLACED_BY_clutter_shader_is_compiled - -#define clutter_texture_new_from_pixbuf clutter_texture_new_from_pixbuf_DEPRECATED_BY_clutter_texture_new_from_file_OR_clutter_texture_new_AND_clutter_texture_set_from_rgb_data -#define clutter_texture_set_pixbuf clutter_texture_set_pixbuf_DEPRECATED_BY_clutter_texture_set_from_rgb_data - -#define clutter_actor_query_coords clutter_actor_query_coords_REPLACED_BY_clutter_actor_get_preferred_size_OR_clutter_actor_get_allocation_box -#define clutter_actor_request_coords clutter_actor_request_coords_REPLACED_BY_clutter_actor_allocate - -#define clutter_actor_get_abs_position clutter_actor_get_abs_position_REPLACED_BY_clutter_actor_get_transformed_position -#define clutter_actor_get_abs_size clutter_actor_get_abs_size_REPLACED_BY_clutter_actor_get_transformed_size -#define clutter_actor_get_abs_opacity clutter_actor_get_abs_opacity_REPLACED_BY_clutter_actor_get_paint_opacity - -#define clutter_stage_get_resolution clutter_backend_get_resolution -#define clutter_stage_get_resolutionx clutter_backend_get_resolution - -#define clutter_set_use_mipmapped_text clutter_actor_set_use_mipmapped_text_REPLACED_BY_clutter_set_font_flags -#define clutter_get_use_mipmapped_text clutter_actor_get_use_mipmapped_text_REPLACED_BY_clutter_get_font_flags - -#define clutter_color_parse clutter_color_parse_REPLACED_BY_clutter_color_from_string -#define clutter_color_from_hlsx clutter_color_from_hlsx_DEPRECATED_BY_clutter_color_from_hls -#define clutter_color_to_hlsx clutter_color_to_hlsx_DEPRECATED_BY_clutter_color_to_hls -#define clutter_color_shadex clutter_color_shadex_DEPRECATED_BY_clutter_color_shade - -#define clutter_stage_set_perspectivex clutter_stage_set_perspectivex_DEPRECATED_BY_clutter_stage_set_perspective -#define clutter_stage_set_fogx clutter_stage_set_fogx_DEPRECATED_BY_clutter_stage_set_fog - -#define clutter_actor_set_rotationx clutter_actor_set_rotationx_DEPRECATED_BY_clutter_actor_set_rotation -#define clutter_actor_get_rotationx clutter_actor_get_rotationx_DEPRECATED_BY_clutter_actor_get_rotation -#define clutter_actor_set_scalex clutter_actor_set_scalex_DEPRECATED_BY_clutter_actor_set_scale -#define clutter_actor_get_scalex clutter_actor_get_scalex_DEPRECATED_BY_clutter_actor_get_scale - -#define CLUTTER_ALPHA_RAMP_INC clutter_ramp_inc_func -#define CLUTTER_ALPHA_RAMP_DEC clutter_ramp_dec_func -#define CLUTTER_ALPHA_RAMP clutter_ramp_func -#define CLUTTER_ALPHA_SINE clutter_sine_func -#define CLUTTER_ALPHA_SINE_INC clutter_sine_inc_func -#define CLUTTER_ALPHA_SINE_DEC clutter_sine_dec_func -#define CLUTTER_ALPHA_SINE_HALF clutter_sine_half_func -#define CLUTTER_ALPHA_SQUARE clutter_square_func -#define CLUTTER_ALPHA_SMOOTHSTEP_INC clutter_smoothstep_inc_func -#define CLUTTER_ALPHA_SMOOTHSTEP_DEC clutter_smoothstep_dec_func -#define CLUTTER_ALPHA_EXP_INC clutter_exp_inc_func -#define CLUTTER_ALPHA_EXP_DEC clutter_exp_dec_func - -#define clutter_ramp_inc_func clutter_ramp_inc_func_DEPRECATED_BY_CLUTTER_LINEAR -#define clutter_ramp_dec_func clutter_ramp_dec_func_DEPRECATED_BY_CLUTTER_LINEAR -#define clutter_ramp_func clutter_ramp_func_DEPRECATED_BY_CLUTTER_LINEAR -#define clutter_sine_inc_func clutter_sine_inc_func_DEPRECATED_BY_CLUTTER_EASE_OUT_SINE -#define clutter_sine_dec_func clutter_sine_dec_func_DEPRECATED_BY_CLUTTER_EASE_IN_SINE -#define clutter_sine_half_func clutter_sine_half_func_DEPRECATED_BY_CLUTTER_EASE_IN_OUT_SINE -#define clutter_sine_func clutter_sine_func_DEPRECATED_BY_CLUTTER_EASE_IN_OUT_SINE -#define clutter_square_func clutter_square_func_REMOVED -#define clutter_smoothstep_inc_func clutter_smoothstep_inc_func_DEPRECATED_BY_CLUTTER_EASE_IN_CUBIC -#define clutter_smoothstep_dec_func clutter_smoothstep_dec_func_DEPRECATED_BY_CLUTTER_EASE_OUT_CUBIC -#define clutter_exp_inc_func clutter_exp_inc_func_DEPRECATED_BY_CLUTTER_EASE_IN_EXPO -#define clutter_exp_dec_func clutter_exp_dec_func_DEPRECATED_BY_CLUTTER_EASE_OUT_EXPO - -#define clutter_behaviour_path_get_knots clutter_behaviour_path_get_knots_REPLACED_BY_clutter_path_get_nodes -#define clutter_behaviour_path_append_knots clutter_behaviour_path_append_knots_REPLACED_BY_clutter_path_add_string -#define clutter_behaviour_path_append_knot clutter_behaviour_path_append_knot_REPLACED_BY_clutter_path_add_string -#define clutter_behaviour_path_insert_knot clutter_behaviour_path_insert_knot_REPLACED_BY_clutter_path_insert_node -#define clutter_behaviour_path_remove_knot clutter_behaviour_path_remove_knot_REPLACED_BY_clutter_path_remove_node -#define clutter_behaviour_path_clear clutter_behaviour_path_clear_REPLACED_BY_clutter_path_clear - -#define ClutterFixed ClutterFixed_REPLACED_BY_CoglFixed -#define ClutterAngle ClutterAngle_REPLACED_BY_CoglAngle - -#define CFX_ONE CFX_ONE_REPLACED_BY_COGL_FIXED_1 -#define CFX_HALF CFX_HALF_REPLACED_BY_COGL_FIXED_0_5 -#define CFX_PI CFX_PI_REPLACED_BY_COGL_FIXED_PI -#define CFX_2PI CFX_2PI_REPLACED_BY_COGL_FIXED_2_PI - -#define CLUTTER_INT_TO_FIXED CLUTTER_INT_TO_FIXED_REPLACED_BY_COGL_FIXED_FROM_INT -#define CLUTTER_FIXED_TO_INT CLUTTER_FIXED_TO_INT_REPLACED_BY_COGL_FIXED_TO_INT -#define CLUTTER_FLOAT_TO_FIXED CLUTTER_FLOAT_TO_FIXED_REPLACED_BY_COGL_FIXED_FROM_FLOAT -#define CLUTTER_FIXED_TO_FLOAT CLUTTER_FIXED_TO_FLOAT_REPLACED_BY_COGL_FIXED_TO_FLOAT - -#define CLUTTER_FIXED_MUL CLUTTER_FIXED_MUL_REPLACED_BY_COGL_FIXED_FAST_MUL -#define CLUTTER_FIXED_DIV CLUTTER_FIXED_DIV_REPLACED_BY_COGL_FIXED_FAST_DIV - -#define clutter_qmulx clutter_qmulx_REPLACED_BY_COGL_FIXED_MUL -#define clutter_qdivx clutter_qdivx_REPLACED_BY_COGL_FIXED_DIV -#define clutter_sinx clutter_sinx_REPLACED_BY_cogl_fixed_sin -#define clutter_cosx clutter_cosx_REPLACED_BY_cogl_fixed_cos - -#define clutter_media_set_position clutter_media_set_position_DEPRECATED_BY_clutter_media_set_progress -#define clutter_media_get_position clutter_media_get_position_DEPRECATED_BY_clutter_media_get_progress -#define clutter_media_set_volume clutter_media_set_volume_DEPRECATED_BY_clutter_media_set_audio_volume -#define clutter_media_get_volume clutter_media_get_volume_DEPRECATED_BY_clutter_media_get_audio_volume -#define clutter_media_get_buffer_percent clutter_media_get_buffer_percent_DEPRECATED_BY_clutter_media_get_buffer_fill - -#define CLUTTER_TYPE_LABEL CLUTTER_TYPE_LABEL_DEPRECATED_BY_CLUTTER_TYPE_TEXT -#define CLUTTER_TYPE_ENTRY CLUTTER_TYPE_ENTRY_DEPRECATED_BY_CLUTTER_TYPE_TEXT -#define clutter_label_new clutter_label_new_DEPRECATED_BY_clutter_text_new -#define clutter_entry_new clutter_entry_new_DEPRECATED_BY_clutter_text_new - -#define CLUTTER_TYPE_TEXTURE_HANDLE CLUTTER_TYPE_TEXTURE_HANDLE_REPLACED_BY_COGL_TYPE_HANDLE - -#define ClutterEffectTemplate ClutterEffectTemplate_DEPRECATED_BY_ClutterAnimation -#define clutter_effect_template_new clutter_effect_template_new_DEPRECATED_BY_clutter_animation_new -#define clutter_effect_template_new_for_duration clutter_effect_template_new_for_duration_DEPRECATED_BY_clutter_animation_new -#define clutter_effect_move clutter_effect_move_DEPRECATED_BY_clutter_actor_animate -#define clutter_effect_path clutter_effect_path_DEPRECATED_BY_clutter_actor_animate -#define clutter_effect_depth clutter_effect_depth_DEPRECATED_BY_clutter_actor_animate -#define clutter_effect_scale clutter_effect_scale_DEPRECATED_BY_clutter_actor_animate -#define clutter_effect_rotate clutter_effect_rotate_DEPRECATED_BY_clutter_actor_animate - -#define clutter_shader_set_uniform_1f clutter_shader_set_uniform_1f_REPLACED_BY_clutter_shader_set_uniform - -#define clutter_actor_set_xu clutter_actor_set_xu_DEPRECATED_BY_clutter_actor_set_x -#define clutter_actor_set_yu clutter_actor_set_yu_DEPRECATED_BY_clutter_actor_set_y -#define clutter_actor_set_widthu clutter_actor_set_widthu_DEPRECATED_BY_clutter_actor_set_width -#define clutter_actor_set_heightu clutter_actor_set_heightu_DEPRECATED_BY_clutter_actor_set_height -#define clutter_actor_set_depthu clutter_actor_set_depthu_DEPRECATED_BY_clutter_actor_set_depth -#define clutter_actor_set_positionu clutter_actor_set_positionu_DEPRECATED_BY_clutter_actor_set_position -#define clutter_actor_set_sizeu clutter_actor_set_sizeu_DEPRECATED_BY_clutter_actor_set_size - -#define clutter_actor_set_anchor_pointu clutter_actor_set_anchor_pointu_DEPRECATED_BY_clutter_actor_set_anchor_point -#define clutter_actor_get_anchor_pointu clutter_actor_get_anchor_pointu_DEPRECATED_BY_clutter_actor_get_anchor_point -#define clutter_actor_move_byu clutter_actor_move_byu_DEPRECATED_BY_clutter_actor_move_by - -#define clutter_actor_get_xu clutter_actor_get_xu_DEPRECATED_BY_clutter_actor_get_x -#define clutter_actor_get_yu clutter_actor_get_yu_DEPRECATED_BY_clutter_actor_get_y -#define clutter_actor_get_widthu clutter_actor_get_widthu_DEPRECATED_BY_clutter_actor_get_width -#define clutter_actor_get_heightu clutter_actor_get_heightu_DEPRECATED_BY_clutter_actor_get_height -#define clutter_actor_get_depthu clutter_actor_get_depthu_DEPRECATED_BY_clutter_actor_get_depth -#define clutter_actor_get_positionu clutter_actor_get_positionu_DEPRECATED_BY_clutter_actor_get_position -#define clutter_actor_get_sizeu clutter_actor_get_sizeu_DEPRECATED_BY_clutter_actor_get_size - -#define clutter_key_event_symbol clutter_key_event_symbol_REPLACED_BY_clutter_event_get_key_symbol -#define clutter_key_event_code clutter_key_event_code_REPLACED_BY_clutter_event_get_key_code -#define clutter_key_event_unicode clutter_key_event_unicode_REPLACED_BY_clutter_event_get_key_unicode -#define clutter_button_event_button clutter_button_event_button_REPLACED_BY_clutter_event_get_button - -#define clutter_stage_fullscreen clutter_stage_fullscreen_REPLACED_BY_clutter_stage_set_fullscreen -#define clutter_stage_unfullscreen clutter_stage_unfullscreen_REPLACED_BY_clutter_stage_set_fullscreen - -#define clutter_actor_get_box_from_vertices clutter_actor_get_box_from_vertices_REPLACED_BY_clutter_actor_box_from_vertices - -#define clutter_behaviour_ellipse_newx clutter_behaviour_ellipse_newx_DEPRECATED_BY_clutter_behaviour_ellipse_new -#define clutter_behaviour_ellipse_set_angle_startx clutter_behaviour_ellipse_set_angle_startx_DEPRECATED_BY_clutter_behaviour_ellipse_set_angle_start -#define clutter_behaviour_ellipse_get_angle_startx clutter_behaviour_ellipse_get_angle_startx_DEPRECATED_BY_clutter_behaviour_ellipse_get_angle_start -#define clutter_behaviour_ellipse_set_angle_endx clutter_behaviour_ellipse_set_angle_endx_DEPRECATED_BY_clutter_behaviour_ellipse_set_angle_end -#define clutter_behaviour_ellipse_get_angle_endx clutter_behaviour_ellipse_get_angle_endx_DEPRECATED_BY_clutter_behaviour_ellipse_get_angle_end -#define clutter_behaviour_ellipse_set_angle_tiltx clutter_behaviour_ellipse_set_angle_tiltx_DEPRECATED_BY_clutter_behaviour_ellipse_set_angle_tilt -#define clutter_behaviour_ellipse_get_angle_tiltx clutter_behaviour_ellipse_get_angle_tiltx_DEPRECATED_BY_clutter_behaviour_ellipse_get_angle_tilt -#define clutter_behaviour_ellipse_set_tiltx clutter_behaviour_ellipse_set_tiltx_DEPRECATED_BY_clutter_behaviour_ellipse_set_tilt -#define clutter_behaviour_ellipse_get_tiltx clutter_behaviour_ellipse_get_tiltx_DEPRECATED_BY_clutter_behaviour_ellipse_get_tilt - -#define clutter_behaviour_rotate_newx clutter_behaviour_rotate_newx_DEPRECATED_BY_clutter_behaviour_rotate_new -#define clutter_behaviour_rotate_get_boundsx clutter_behaviour_rotate_get_boundsx_DEPRECATED_BY_clutter_behaviour_rotate_get_bounds -#define clutter_behaviour_rotate_set_boundsx clutter_behaviour_rotate_set_boundsx_DEPRECATED_BY_clutter_behaviour_rotate_set_bounds - -#define clutter_behaviour_scale_newx clutter_behaviour_scale_newx_DEPRECATED_BY_clutter_behaviour_scale_new -#define clutter_behaviour_scale_set_boundsx clutter_behaviour_scale_set_boundsx_DEPRECATED_BY_clutter_behaviour_scale_set_bounds -#define clutter_behaviour_scale_get_boundsx clutter_behaviour_scale_get_boundsx_DEPRECATED_BY_clutter_behaviour_scale_get_bounds - -#define clutter_timeline_get_progressx clutter_timeline_get_progressx_DEPRECATED_BY_clutter_timeline_get_progress - -#define clutter_actor_pick clutter_actor_pick_DEPRECATED_BY_clutter_actor_paint - -#define clutter_actor_get_allocation_coords clutter_actor_get_allocation_coords_DEPRECATED_BY_clutter_actor_get_allocation_box - -#endif /* CLUTTER_DEPRECATED_H */ +#endif /* __CLUTTER_DEPRECATED_H__ */ diff --git a/clutter/clutter.h b/clutter/clutter.h index 8753466bf..e9c731a6d 100644 --- a/clutter/clutter.h +++ b/clutter/clutter.h @@ -73,7 +73,6 @@ #include "clutter-feature.h" #include "clutter-fixed-layout.h" #include "clutter-flow-layout.h" -#include "clutter-frame-source.h" #include "clutter-gesture-action.h" #include "clutter-group.h" #include "clutter-input-device.h" diff --git a/clutter/clutter-frame-source.c b/clutter/deprecated/clutter-frame-source.c similarity index 100% rename from clutter/clutter-frame-source.c rename to clutter/deprecated/clutter-frame-source.c diff --git a/clutter/clutter-frame-source.h b/clutter/deprecated/clutter-frame-source.h similarity index 100% rename from clutter/clutter-frame-source.h rename to clutter/deprecated/clutter-frame-source.h