brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tag all deprecated symbols using CLUTTER_DEPRECATED

Browse Source 
This requires some minor surgery in the build to disable the deprecation
warnings in the deprecated classes.
This commit is contained in:
Emmanuele Bassi 2011-10-14 11:34:38 +01:00
parent d93e6ef6b9
commit 7f3363e1db
27 changed files with 209 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-actor.c
View File

@ -284,6 +284,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "cogl/cogl.h" #include "cogl/cogl.h"
#include "clutter-actor-private.h" #include "clutter-actor-private.h"

62
clutter/clutter-path.c
View File

@ -1582,3 +1582,65 @@ clutter_path_node_equal (const ClutterPathNode *node_a,
return TRUE; return TRUE;
} }
G_DEFINE_BOXED_TYPE (ClutterKnot, clutter_knot,
clutter_knot_copy,
clutter_knot_free);
/**
* clutter_knot_copy:
* @knot: a #ClutterKnot
*
* Makes an allocated copy of a knot.
*
* Return value: the copied knot.
*
* Since: 0.2
*/
ClutterKnot *
clutter_knot_copy (const ClutterKnot *knot)
{
if (G_UNLIKELY (knot == NULL))
return NULL;
return g_slice_dup (ClutterKnot, knot);
}
/**
* clutter_knot_free:
* @knot: a #ClutterKnot
*
* Frees the memory of an allocated knot.
*
* Since: 0.2
*/
void
clutter_knot_free (ClutterKnot *knot)
{
if (G_LIKELY (knot != NULL))
g_slice_free (ClutterKnot, knot);
}
/**
* clutter_knot_equal:
* @knot_a: First knot
* @knot_b: Second knot
*
* Compares to knot and checks if the point to the same location.
*
* Return value: %TRUE if the knots point to the same location.
*
* Since: 0.2
*/
gboolean
clutter_knot_equal (const ClutterKnot *knot_a,
const ClutterKnot *knot_b)
{
g_return_val_if_fail (knot_a != NULL, FALSE);
g_return_val_if_fail (knot_b != NULL, FALSE);
if (knot_a == knot_b)
return TRUE;
return knot_a->x == knot_b->x && knot_a->y == knot_b->y;
}

2
clutter/deprecated/clutter-behaviour-depth.c
View File

@ -27,6 +27,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-behaviour-depth.h" #include "clutter-behaviour-depth.h"
#include "clutter-enum-types.h" #include "clutter-enum-types.h"

8
clutter/deprecated/clutter-behaviour-depth.h
View File

@ -34,8 +34,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_BEHAVIOUR_DEPTH (clutter_behaviour_depth_get_type ()) #define CLUTTER_TYPE_BEHAVIOUR_DEPTH (clutter_behaviour_depth_get_type ())
#define CLUTTER_BEHAVIOUR_DEPTH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH, ClutterBehaviourDepth)) #define CLUTTER_BEHAVIOUR_DEPTH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH, ClutterBehaviourDepth))
#define CLUTTER_IS_BEHAVIOUR_DEPTH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH)) #define CLUTTER_IS_BEHAVIOUR_DEPTH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH))
@ -82,19 +80,21 @@ struct _ClutterBehaviourDepthClass
}; };
GType clutter_behaviour_depth_get_type (void) G_GNUC_CONST; GType clutter_behaviour_depth_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:depth)
ClutterBehaviour *clutter_behaviour_depth_new (ClutterAlpha *alpha, ClutterBehaviour *clutter_behaviour_depth_new (ClutterAlpha *alpha,
gint depth_start, gint depth_start,
gint depth_end); gint depth_end);
CLUTTER_DEPRECATED
void clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour, void clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour,
gint depth_start, gint depth_start,
gint depth_end); gint depth_end);
CLUTTER_DEPRECATED
void clutter_behaviour_depth_get_bounds (ClutterBehaviourDepth *behaviour, void clutter_behaviour_depth_get_bounds (ClutterBehaviourDepth *behaviour,
gint *depth_start, gint *depth_start,
gint *depth_end); gint *depth_end);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_BEHAVIOUR_DEPTH__ */ #endif /* __CLUTTER_BEHAVIOUR_DEPTH__ */

2
clutter/deprecated/clutter-behaviour-ellipse.c
View File

@ -50,6 +50,8 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-behaviour-ellipse.h" #include "clutter-behaviour-ellipse.h"
#include "clutter-debug.h" #include "clutter-debug.h"

22
clutter/deprecated/clutter-behaviour-ellipse.h
View File

@ -32,8 +32,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ()) #define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ())
#define CLUTTER_BEHAVIOUR_ELLIPSE(obj) \ #define CLUTTER_BEHAVIOUR_ELLIPSE(obj) \
@ -94,6 +92,7 @@ struct _ClutterBehaviourEllipseClass
GType clutter_behaviour_ellipse_get_type (void) G_GNUC_CONST; GType clutter_behaviour_ellipse_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
ClutterBehaviour * clutter_behaviour_ellipse_new (ClutterAlpha *alpha, ClutterBehaviour * clutter_behaviour_ellipse_new (ClutterAlpha *alpha,
gint x, gint x,
gint y, gint y,
@ -102,43 +101,58 @@ ClutterBehaviour * clutter_behaviour_ellipse_new (ClutterAlpha
ClutterRotateDirection direction, ClutterRotateDirection direction,
gdouble start, gdouble start,
gdouble end); gdouble end);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_center (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_center (ClutterBehaviourEllipse *self,
gint x, gint x,
gint y); gint y);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_get_center (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_get_center (ClutterBehaviourEllipse *self,
gint *x, gint *x,
gint *y); gint *y);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_width (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_width (ClutterBehaviourEllipse *self,
gint width); gint width);
CLUTTER_DEPRECATED
gint clutter_behaviour_ellipse_get_width (ClutterBehaviourEllipse *self); gint clutter_behaviour_ellipse_get_width (ClutterBehaviourEllipse *self);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_height (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_height (ClutterBehaviourEllipse *self,
gint height); gint height);
CLUTTER_DEPRECATED
gint clutter_behaviour_ellipse_get_height (ClutterBehaviourEllipse *self); gint clutter_behaviour_ellipse_get_height (ClutterBehaviourEllipse *self);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
gdouble angle_start); gdouble angle_start);
CLUTTER_DEPRECATED
gdouble clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self); gdouble clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self,
gdouble angle_end); gdouble angle_end);
CLUTTER_DEPRECATED
gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self); gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis, ClutterRotateAxis axis,
gdouble angle_tilt); gdouble angle_tilt);
CLUTTER_DEPRECATED
gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self, gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis); ClutterRotateAxis axis);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
gdouble angle_tilt_x, gdouble angle_tilt_x,
gdouble angle_tilt_y, gdouble angle_tilt_y,
gdouble angle_tilt_z); gdouble angle_tilt_z);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self,
gdouble *angle_tilt_x, gdouble *angle_tilt_x,
gdouble *angle_tilt_y, gdouble *angle_tilt_y,
gdouble *angle_tilt_z); gdouble *angle_tilt_z);
CLUTTER_DEPRECATED
ClutterRotateDirection clutter_behaviour_ellipse_get_direction (ClutterBehaviourEllipse *self); ClutterRotateDirection clutter_behaviour_ellipse_get_direction (ClutterBehaviourEllipse *self);
CLUTTER_DEPRECATED
void clutter_behaviour_ellipse_set_direction (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_direction (ClutterBehaviourEllipse *self,
ClutterRotateDirection direction); ClutterRotateDirection direction);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_BEHAVIOUR_ELLIPSE_H__ */ #endif /* __CLUTTER_BEHAVIOUR_ELLIPSE_H__ */

2
clutter/deprecated/clutter-behaviour-opacity.c
View File

@ -42,6 +42,8 @@
#include <math.h> #include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-behaviour-opacity.h" #include "clutter-behaviour-opacity.h"
#include "clutter-private.h" #include "clutter-private.h"

7
clutter/deprecated/clutter-behaviour-opacity.h
View File

@ -34,8 +34,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_BEHAVIOUR_OPACITY (clutter_behaviour_opacity_get_type ()) #define CLUTTER_TYPE_BEHAVIOUR_OPACITY (clutter_behaviour_opacity_get_type ())
#define CLUTTER_BEHAVIOUR_OPACITY(obj) \ #define CLUTTER_BEHAVIOUR_OPACITY(obj) \
@ -97,19 +95,20 @@ struct _ClutterBehaviourOpacityClass
GType clutter_behaviour_opacity_get_type (void) G_GNUC_CONST; GType clutter_behaviour_opacity_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:opacity)
ClutterBehaviour *clutter_behaviour_opacity_new (ClutterAlpha *alpha, ClutterBehaviour *clutter_behaviour_opacity_new (ClutterAlpha *alpha,
guint8 opacity_start, guint8 opacity_start,
guint8 opacity_end); guint8 opacity_end);
CLUTTER_DEPRECATED
void clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour, void clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour,
guint8 opacity_start, guint8 opacity_start,
guint8 opacity_end); guint8 opacity_end);
CLUTTER_DEPRECATED
void clutter_behaviour_opacity_get_bounds (ClutterBehaviourOpacity *behaviour, void clutter_behaviour_opacity_get_bounds (ClutterBehaviourOpacity *behaviour,
guint8 *opacity_start, guint8 *opacity_start,
guint8 *opacity_end); guint8 *opacity_end);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_BEHAVIOUR_OPACITY_H__ */ #endif /* __CLUTTER_BEHAVIOUR_OPACITY_H__ */

2
clutter/deprecated/clutter-behaviour-path.c
View File

@ -67,6 +67,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-behaviour-path.h" #include "clutter-behaviour-path.h"
#include "clutter-bezier.h" #include "clutter-bezier.h"

10
clutter/deprecated/clutter-behaviour-path.h
View File

@ -35,8 +35,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ()) #define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ())
#define CLUTTER_BEHAVIOUR_PATH(obj) \ #define CLUTTER_BEHAVIOUR_PATH(obj) \
@ -110,25 +108,27 @@ struct _ClutterBehaviourPathClass
GType clutter_behaviour_path_get_type (void) G_GNUC_CONST; GType clutter_behaviour_path_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
ClutterBehaviour *clutter_behaviour_path_new (ClutterAlpha *alpha, ClutterBehaviour *clutter_behaviour_path_new (ClutterAlpha *alpha,
ClutterPath *path); ClutterPath *path);
CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
ClutterBehaviour *clutter_behaviour_path_new_with_description ClutterBehaviour *clutter_behaviour_path_new_with_description
(ClutterAlpha *alpha, (ClutterAlpha *alpha,
const gchar *desc); const gchar *desc);
CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
ClutterBehaviour *clutter_behaviour_path_new_with_knots ClutterBehaviour *clutter_behaviour_path_new_with_knots
(ClutterAlpha *alpha, (ClutterAlpha *alpha,
const ClutterKnot *knots, const ClutterKnot *knots,
guint n_knots); guint n_knots);
CLUTTER_DEPRECATED
void clutter_behaviour_path_set_path (ClutterBehaviourPath *pathb, void clutter_behaviour_path_set_path (ClutterBehaviourPath *pathb,
ClutterPath *path); ClutterPath *path);
CLUTTER_DEPRECATED
ClutterPath * clutter_behaviour_path_get_path (ClutterBehaviourPath *pathb); ClutterPath * clutter_behaviour_path_get_path (ClutterBehaviourPath *pathb);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_BEHAVIOUR_PATH_H__ */ #endif /* __CLUTTER_BEHAVIOUR_PATH_H__ */

2
clutter/deprecated/clutter-behaviour-rotate.c
View File

@ -41,6 +41,8 @@
#include <math.h> #include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-behaviour-rotate.h" #include "clutter-behaviour-rotate.h"
#include "clutter-debug.h" #include "clutter-debug.h"

13
clutter/deprecated/clutter-behaviour-rotate.h
View File

@ -32,8 +32,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_BEHAVIOUR_ROTATE (clutter_behaviour_rotate_get_type ()) #define CLUTTER_TYPE_BEHAVIOUR_ROTATE (clutter_behaviour_rotate_get_type ())
#define CLUTTER_BEHAVIOUR_ROTATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotate)) #define CLUTTER_BEHAVIOUR_ROTATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotate))
#define CLUTTER_IS_BEHAVIOUR_ROTATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE)) #define CLUTTER_IS_BEHAVIOUR_ROTATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE))
@ -80,34 +78,41 @@ struct _ClutterBehaviourRotateClass
GType clutter_behaviour_rotate_get_type (void) G_GNUC_CONST; GType clutter_behaviour_rotate_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
ClutterBehaviour * clutter_behaviour_rotate_new (ClutterAlpha *alpha, ClutterBehaviour * clutter_behaviour_rotate_new (ClutterAlpha *alpha,
ClutterRotateAxis axis, ClutterRotateAxis axis,
ClutterRotateDirection direction, ClutterRotateDirection direction,
gdouble angle_start, gdouble angle_start,
gdouble angle_end); gdouble angle_end);
CLUTTER_DEPRECATED
void clutter_behaviour_rotate_get_center (ClutterBehaviourRotate *rotate, void clutter_behaviour_rotate_get_center (ClutterBehaviourRotate *rotate,
gint *x, gint *x,
gint *y, gint *y,
gint *z); gint *z);
CLUTTER_DEPRECATED
void clutter_behaviour_rotate_set_center (ClutterBehaviourRotate *rotate, void clutter_behaviour_rotate_set_center (ClutterBehaviourRotate *rotate,
gint x, gint x,
gint y, gint y,
gint z); gint z);
CLUTTER_DEPRECATED
ClutterRotateAxis clutter_behaviour_rotate_get_axis (ClutterBehaviourRotate *rotate); ClutterRotateAxis clutter_behaviour_rotate_get_axis (ClutterBehaviourRotate *rotate);
CLUTTER_DEPRECATED
void clutter_behaviour_rotate_set_axis (ClutterBehaviourRotate *rotate, void clutter_behaviour_rotate_set_axis (ClutterBehaviourRotate *rotate,
ClutterRotateAxis axis); ClutterRotateAxis axis);
CLUTTER_DEPRECATED
ClutterRotateDirection clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate); ClutterRotateDirection clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate);
CLUTTER_DEPRECATED
void clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate, void clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate,
ClutterRotateDirection direction); ClutterRotateDirection direction);
CLUTTER_DEPRECATED
void clutter_behaviour_rotate_get_bounds (ClutterBehaviourRotate *rotate, void clutter_behaviour_rotate_get_bounds (ClutterBehaviourRotate *rotate,
gdouble *angle_start, gdouble *angle_start,
gdouble *angle_end); gdouble *angle_end);
CLUTTER_DEPRECATED
void clutter_behaviour_rotate_set_bounds (ClutterBehaviourRotate *rotate, void clutter_behaviour_rotate_set_bounds (ClutterBehaviourRotate *rotate,
gdouble angle_start, gdouble angle_start,
gdouble angle_end); gdouble angle_end);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_BEHAVIOUR_ROTATE_H__ */ #endif /* __CLUTTER_BEHAVIOUR_ROTATE_H__ */

2
clutter/deprecated/clutter-behaviour-scale.c
View File

@ -41,6 +41,8 @@
#include <math.h> #include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-behaviour-scale.h" #include "clutter-behaviour-scale.h"
#include "clutter-debug.h" #include "clutter-debug.h"

8
clutter/deprecated/clutter-behaviour-scale.h
View File

@ -34,8 +34,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_BEHAVIOUR_SCALE (clutter_behaviour_scale_get_type ()) #define CLUTTER_TYPE_BEHAVIOUR_SCALE (clutter_behaviour_scale_get_type ())
#define CLUTTER_BEHAVIOUR_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale)) #define CLUTTER_BEHAVIOUR_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale))
#define CLUTTER_BEHAVIOUR_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass)) #define CLUTTER_BEHAVIOUR_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass))
@ -83,24 +81,26 @@ struct _ClutterBehaviourScaleClass
GType clutter_behaviour_scale_get_type (void) G_GNUC_CONST; GType clutter_behaviour_scale_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(clutter_actor_animate with ClutterActor:scale-x and ClutterActor:scale-y)
ClutterBehaviour *clutter_behaviour_scale_new (ClutterAlpha *alpha, ClutterBehaviour *clutter_behaviour_scale_new (ClutterAlpha *alpha,
gdouble x_scale_start, gdouble x_scale_start,
gdouble y_scale_start, gdouble y_scale_start,
gdouble x_scale_end, gdouble x_scale_end,
gdouble y_scale_end); gdouble y_scale_end);
CLUTTER_DEPRECATED
void clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale, void clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale,
gdouble x_scale_start, gdouble x_scale_start,
gdouble y_scale_start, gdouble y_scale_start,
gdouble x_scale_end, gdouble x_scale_end,
gdouble y_scale_end); gdouble y_scale_end);
CLUTTER_DEPRECATED
void clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale, void clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,
gdouble *x_scale_start, gdouble *x_scale_start,
gdouble *y_scale_start, gdouble *y_scale_start,
gdouble *x_scale_end, gdouble *x_scale_end,
gdouble *y_scale_end); gdouble *y_scale_end);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_BEHAVIOUR_SCALE_H__ */ #endif /* __CLUTTER_BEHAVIOUR_SCALE_H__ */

96
clutter/deprecated/clutter-behaviour.c
View File

@ -77,6 +77,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-debug.h" #include "clutter-debug.h"
@ -86,73 +87,6 @@
#include "clutter-scriptable.h" #include "clutter-scriptable.h"
#include "clutter-script-private.h" #include "clutter-script-private.h"
/**
* clutter_knot_copy:
* @knot: a #ClutterKnot
*
* Makes an allocated copy of a knot.
*
* Return value: the copied knot.
*
* Since: 0.2
*/
ClutterKnot *
clutter_knot_copy (const ClutterKnot *knot)
{
ClutterKnot *copy;
copy = g_slice_new0 (ClutterKnot);
*copy = *knot;
return copy;
}
/**
* clutter_knot_free:
* @knot: a #ClutterKnot
*
* Frees the memory of an allocated knot.
*
* Since: 0.2
*/
void
clutter_knot_free (ClutterKnot *knot)
{
if (G_LIKELY (knot))
{
g_slice_free (ClutterKnot, knot);
}
}
/**
* clutter_knot_equal:
* @knot_a: First knot
* @knot_b: Second knot
*
* Compares to knot and checks if the point to the same location.
*
* Return value: %TRUE if the knots point to the same location.
*
* Since: 0.2
*/
gboolean
clutter_knot_equal (const ClutterKnot *knot_a,
const ClutterKnot *knot_b)
{
g_return_val_if_fail (knot_a != NULL, FALSE);
g_return_val_if_fail (knot_b != NULL, FALSE);
if (knot_a == knot_b)
return TRUE;
return knot_a->x == knot_b->x && knot_a->y == knot_b->y;
}
G_DEFINE_BOXED_TYPE (ClutterKnot, clutter_knot,
clutter_knot_copy,
clutter_knot_free);
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface); static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterBehaviour, G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterBehaviour,
@ -298,6 +232,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
* the alpha-notify virtual function is called. * the alpha-notify virtual function is called.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
obj_props[PROP_ALPHA] = obj_props[PROP_ALPHA] =
g_param_spec_object ("alpha", g_param_spec_object ("alpha",
@ -321,6 +257,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
* to an actor. * to an actor.
* *
* Since: 0.4 * Since: 0.4
*
* Deprecated: 1.6
*/ */
behave_signals[APPLIED] = behave_signals[APPLIED] =
g_signal_new ("applied", g_signal_new ("applied",
@ -340,6 +278,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
* to an actor anymore. * to an actor anymore.
* *
* Since: 0.4 * Since: 0.4
*
* Deprecated: 1.6
*/ */
behave_signals[REMOVED] = behave_signals[REMOVED] =
g_signal_new ("removed", g_signal_new ("removed",
@ -376,6 +316,8 @@ remove_actor_on_destroy (ClutterActor *actor,
* the actor. * the actor.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
void void
clutter_behaviour_apply (ClutterBehaviour *behave, clutter_behaviour_apply (ClutterBehaviour *behave,
@ -415,6 +357,8 @@ clutter_behaviour_apply (ClutterBehaviour *behave,
* Return value: TRUE if actor has behaviour. FALSE otherwise. * Return value: TRUE if actor has behaviour. FALSE otherwise.
* *
* Since: 0.4 * Since: 0.4
*
* Deprecated: 1.6
*/ */
gboolean gboolean
clutter_behaviour_is_applied (ClutterBehaviour *behave, clutter_behaviour_is_applied (ClutterBehaviour *behave,
@ -435,6 +379,8 @@ clutter_behaviour_is_applied (ClutterBehaviour *behave,
* @behave applies. This function removes a reference on the actor. * @behave applies. This function removes a reference on the actor.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
void void
clutter_behaviour_remove (ClutterBehaviour *behave, clutter_behaviour_remove (ClutterBehaviour *behave,
@ -476,6 +422,8 @@ clutter_behaviour_remove (ClutterBehaviour *behave,
* Return value: The number of applied actors * Return value: The number of applied actors
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
gint gint
clutter_behaviour_get_n_actors (ClutterBehaviour *behave) clutter_behaviour_get_n_actors (ClutterBehaviour *behave)
@ -495,8 +443,10 @@ clutter_behaviour_get_n_actors (ClutterBehaviour *behave)
* Return value: (transfer none): A Clutter actor or NULL if @index_ is invalid. * Return value: (transfer none): A Clutter actor or NULL if @index_ is invalid.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
ClutterActor* ClutterActor *
clutter_behaviour_get_nth_actor (ClutterBehaviour *behave, clutter_behaviour_get_nth_actor (ClutterBehaviour *behave,
gint index_) gint index_)
{ {
@ -515,6 +465,8 @@ clutter_behaviour_get_nth_actor (ClutterBehaviour *behave,
* Calls @func for every actor driven by @behave. * Calls @func for every actor driven by @behave.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
void void
clutter_behaviour_actors_foreach (ClutterBehaviour *behave, clutter_behaviour_actors_foreach (ClutterBehaviour *behave,
@ -546,6 +498,8 @@ clutter_behaviour_actors_foreach (ClutterBehaviour *behave,
* object has been bound to this behaviour. * object has been bound to this behaviour.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
ClutterAlpha * ClutterAlpha *
clutter_behaviour_get_alpha (ClutterBehaviour *behave) clutter_behaviour_get_alpha (ClutterBehaviour *behave)
@ -598,6 +552,8 @@ notify_cb (GObject *object,
* of the #ClutterAlpha instance. * of the #ClutterAlpha instance.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
void void
clutter_behaviour_set_alpha (ClutterBehaviour *behave, clutter_behaviour_set_alpha (ClutterBehaviour *behave,
@ -658,6 +614,8 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
* finished using it. * finished using it.
* *
* Since: 0.2 * Since: 0.2
*
* Deprecated: 1.6
*/ */
GSList * GSList *
clutter_behaviour_get_actors (ClutterBehaviour *behave) clutter_behaviour_get_actors (ClutterBehaviour *behave)
@ -682,6 +640,8 @@ clutter_behaviour_get_actors (ClutterBehaviour *behave)
* Removes every actor from the list that @behave holds. * Removes every actor from the list that @behave holds.
* *
* Since: 0.4 * Since: 0.4
*
* Deprecated: 1.6
*/ */
void void
clutter_behaviour_remove_all (ClutterBehaviour *behave) clutter_behaviour_remove_all (ClutterBehaviour *behave)

14
clutter/deprecated/clutter-behaviour.h
View File

@ -34,8 +34,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_BEHAVIOUR clutter_behaviour_get_type() #define CLUTTER_TYPE_BEHAVIOUR clutter_behaviour_get_type()
#define CLUTTER_BEHAVIOUR(obj) \ #define CLUTTER_BEHAVIOUR(obj) \
@ -138,26 +136,34 @@ struct _ClutterBehaviourClass
GType clutter_behaviour_get_type (void) G_GNUC_CONST; GType clutter_behaviour_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED
void clutter_behaviour_apply (ClutterBehaviour *behave, void clutter_behaviour_apply (ClutterBehaviour *behave,
ClutterActor *actor); ClutterActor *actor);
CLUTTER_DEPRECATED
void clutter_behaviour_remove (ClutterBehaviour *behave, void clutter_behaviour_remove (ClutterBehaviour *behave,
ClutterActor *actor); ClutterActor *actor);
CLUTTER_DEPRECATED
void clutter_behaviour_remove_all (ClutterBehaviour *behave); void clutter_behaviour_remove_all (ClutterBehaviour *behave);
CLUTTER_DEPRECATED
void clutter_behaviour_actors_foreach (ClutterBehaviour *behave, void clutter_behaviour_actors_foreach (ClutterBehaviour *behave,
ClutterBehaviourForeachFunc func, ClutterBehaviourForeachFunc func,
gpointer data); gpointer data);
CLUTTER_DEPRECATED
gint clutter_behaviour_get_n_actors (ClutterBehaviour *behave); gint clutter_behaviour_get_n_actors (ClutterBehaviour *behave);
CLUTTER_DEPRECATED
ClutterActor *clutter_behaviour_get_nth_actor (ClutterBehaviour *behave, ClutterActor *clutter_behaviour_get_nth_actor (ClutterBehaviour *behave,
gint index_); gint index_);
CLUTTER_DEPRECATED
GSList * clutter_behaviour_get_actors (ClutterBehaviour *behave); GSList * clutter_behaviour_get_actors (ClutterBehaviour *behave);
CLUTTER_DEPRECATED
ClutterAlpha *clutter_behaviour_get_alpha (ClutterBehaviour *behave); ClutterAlpha *clutter_behaviour_get_alpha (ClutterBehaviour *behave);
CLUTTER_DEPRECATED
void clutter_behaviour_set_alpha (ClutterBehaviour *behave, void clutter_behaviour_set_alpha (ClutterBehaviour *behave,
ClutterAlpha *alpha); ClutterAlpha *alpha);
CLUTTER_DEPRECATED
gboolean clutter_behaviour_is_applied (ClutterBehaviour *behave, gboolean clutter_behaviour_is_applied (ClutterBehaviour *behave,
ClutterActor *actor); ClutterActor *actor);
#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_BEHAVIOUR_H__ */ #endif /* __CLUTTER_BEHAVIOUR_H__ */

2
clutter/deprecated/clutter-fixed.c
View File

@ -29,6 +29,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <glib-object.h> #include <glib-object.h>

10
clutter/deprecated/clutter-fixed.h
View File

@ -29,13 +29,11 @@
#ifndef __CLUTTER_FIXED_H__ #ifndef __CLUTTER_FIXED_H__
#define __CLUTTER_FIXED_H__ #define __CLUTTER_FIXED_H__
#include <glib-object.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_PARAM_FIXED (clutter_param_fixed_get_type ()) #define CLUTTER_TYPE_PARAM_FIXED (clutter_param_fixed_get_type ())
#define CLUTTER_PARAM_SPEC_FIXED(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_FIXED, ClutterParamSpecFixed)) #define CLUTTER_PARAM_SPEC_FIXED(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_FIXED, ClutterParamSpecFixed))
#define CLUTTER_IS_PARAM_SPEC_FIXED(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_FIXED)) #define CLUTTER_IS_PARAM_SPEC_FIXED(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_FIXED))
@ -79,10 +77,13 @@ struct _ClutterParamSpecFixed
GType clutter_param_fixed_get_type (void) G_GNUC_CONST; GType clutter_param_fixed_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(g_value_set_int)
void clutter_value_set_fixed (GValue *value, void clutter_value_set_fixed (GValue *value,
CoglFixed fixed_); CoglFixed fixed_);
CLUTTER_DEPRECATED_FOR(g_value_get_int)
CoglFixed clutter_value_get_fixed (const GValue *value); CoglFixed clutter_value_get_fixed (const GValue *value);
CLUTTER_DEPRECATED_FOR(g_param_spec_int)
GParamSpec * clutter_param_spec_fixed (const gchar *name, GParamSpec * clutter_param_spec_fixed (const gchar *name,
const gchar *nick, const gchar *nick,
const gchar *blurb, const gchar *blurb,
@ -91,9 +92,6 @@ GParamSpec * clutter_param_spec_fixed (const gchar *name,
CoglFixed default_value, CoglFixed default_value,
GParamFlags flags); GParamFlags flags);
#endif /* DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_FIXED_H__ */ #endif /* __CLUTTER_FIXED_H__ */

2
clutter/deprecated/clutter-frame-source.c
View File

@ -27,6 +27,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-frame-source.h" #include "clutter-frame-source.h"
#include "clutter-timeout-interval.h" #include "clutter-timeout-interval.h"
#include "clutter-private.h" #include "clutter-private.h"

8
clutter/deprecated/clutter-frame-source.h
View File

@ -28,24 +28,22 @@
#ifndef __CLUTTER_FRAME_SOURCE_H__ #ifndef __CLUTTER_FRAME_SOURCE_H__
#define __CLUTTER_FRAME_SOURCE_H__ #define __CLUTTER_FRAME_SOURCE_H__
#include <glib.h> #include <clutter/clutter-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) CLUTTER_DEPRECATED
guint clutter_frame_source_add (guint fps, guint clutter_frame_source_add (guint fps,
GSourceFunc func, GSourceFunc func,
gpointer data); gpointer data);
CLUTTER_DEPRECATED
guint clutter_frame_source_add_full (gint priority, guint clutter_frame_source_add_full (gint priority,
guint fps, guint fps,
GSourceFunc func, GSourceFunc func,
gpointer data, gpointer data,
GDestroyNotify notify); GDestroyNotify notify);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_FRAME_SOURCE_H__ */ #endif /* __CLUTTER_FRAME_SOURCE_H__ */

2
clutter/deprecated/clutter-score.c
View File

@ -83,6 +83,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-score.h" #include "clutter-score.h"
#include "clutter-main.h" #include "clutter-main.h"
#include "clutter-marshal.h" #include "clutter-marshal.h"

18
clutter/deprecated/clutter-score.h
View File

@ -32,8 +32,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_SCORE (clutter_score_get_type ()) #define CLUTTER_TYPE_SCORE (clutter_score_get_type ())
#define CLUTTER_SCORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_SCORE, ClutterScore)) #define CLUTTER_SCORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_SCORE, ClutterScore))
@ -100,34 +98,46 @@ struct _ClutterScoreClass
GType clutter_score_get_type (void) G_GNUC_CONST; GType clutter_score_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED
ClutterScore * clutter_score_new (void); ClutterScore * clutter_score_new (void);
CLUTTER_DEPRECATED
void clutter_score_set_loop (ClutterScore *score, void clutter_score_set_loop (ClutterScore *score,
gboolean loop); gboolean loop);
CLUTTER_DEPRECATED
gboolean clutter_score_get_loop (ClutterScore *score); gboolean clutter_score_get_loop (ClutterScore *score);
CLUTTER_DEPRECATED
gulong clutter_score_append (ClutterScore *score, gulong clutter_score_append (ClutterScore *score,
ClutterTimeline *parent, ClutterTimeline *parent,
ClutterTimeline *timeline); ClutterTimeline *timeline);
CLUTTER_DEPRECATED
gulong clutter_score_append_at_marker (ClutterScore *score, gulong clutter_score_append_at_marker (ClutterScore *score,
ClutterTimeline *parent, ClutterTimeline *parent,
const gchar *marker_name, const gchar *marker_name,
ClutterTimeline *timeline); ClutterTimeline *timeline);
CLUTTER_DEPRECATED
void clutter_score_remove (ClutterScore *score, void clutter_score_remove (ClutterScore *score,
gulong id_); gulong id_);
CLUTTER_DEPRECATED
void clutter_score_remove_all (ClutterScore *score); void clutter_score_remove_all (ClutterScore *score);
CLUTTER_DEPRECATED
ClutterTimeline *clutter_score_get_timeline (ClutterScore *score, ClutterTimeline *clutter_score_get_timeline (ClutterScore *score,
gulong id_); gulong id_);
CLUTTER_DEPRECATED
GSList * clutter_score_list_timelines (ClutterScore *score); GSList * clutter_score_list_timelines (ClutterScore *score);
CLUTTER_DEPRECATED
void clutter_score_start (ClutterScore *score); void clutter_score_start (ClutterScore *score);
CLUTTER_DEPRECATED
void clutter_score_stop (ClutterScore *score); void clutter_score_stop (ClutterScore *score);
CLUTTER_DEPRECATED
void clutter_score_pause (ClutterScore *score); void clutter_score_pause (ClutterScore *score);
CLUTTER_DEPRECATED
void clutter_score_rewind (ClutterScore *score); void clutter_score_rewind (ClutterScore *score);
CLUTTER_DEPRECATED
gboolean clutter_score_is_playing (ClutterScore *score); gboolean clutter_score_is_playing (ClutterScore *score);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_SCORE_H__ */ #endif /* __CLUTTER_SCORE_H__ */

2
clutter/deprecated/clutter-shader.c
View File

@ -52,6 +52,8 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include <glib.h> #include <glib.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>

19
clutter/deprecated/clutter-shader.h
View File

@ -34,8 +34,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
#define CLUTTER_TYPE_SHADER (clutter_shader_get_type ()) #define CLUTTER_TYPE_SHADER (clutter_shader_get_type ())
#define CLUTTER_SHADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CLUTTER_TYPE_SHADER, ClutterShader)) #define CLUTTER_SHADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CLUTTER_TYPE_SHADER, ClutterShader))
#define CLUTTER_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CLUTTER_TYPE_SHADER, ClutterShaderClass)) #define CLUTTER_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CLUTTER_TYPE_SHADER, ClutterShaderClass))
@ -110,37 +108,48 @@ struct _ClutterShaderClass
GQuark clutter_shader_error_quark (void); GQuark clutter_shader_error_quark (void);
GType clutter_shader_get_type (void) G_GNUC_CONST; GType clutter_shader_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
ClutterShader * clutter_shader_new (void); ClutterShader * clutter_shader_new (void);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
void clutter_shader_set_is_enabled (ClutterShader *shader, void clutter_shader_set_is_enabled (ClutterShader *shader,
gboolean enabled); gboolean enabled);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
gboolean clutter_shader_get_is_enabled (ClutterShader *shader); gboolean clutter_shader_get_is_enabled (ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
gboolean clutter_shader_compile (ClutterShader *shader, gboolean clutter_shader_compile (ClutterShader *shader,
GError **error); GError **error);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
void clutter_shader_release (ClutterShader *shader); void clutter_shader_release (ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
gboolean clutter_shader_is_compiled (ClutterShader *shader); gboolean clutter_shader_is_compiled (ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
void clutter_shader_set_vertex_source (ClutterShader *shader, void clutter_shader_set_vertex_source (ClutterShader *shader,
const gchar *data, const gchar *data,
gssize length); gssize length);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
void clutter_shader_set_fragment_source (ClutterShader *shader, void clutter_shader_set_fragment_source (ClutterShader *shader,
const gchar *data, const gchar *data,
gssize length); gssize length);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
const gchar * clutter_shader_get_vertex_source (ClutterShader *shader); const gchar * clutter_shader_get_vertex_source (ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
const gchar * clutter_shader_get_fragment_source (ClutterShader *shader); const gchar * clutter_shader_get_fragment_source (ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
void clutter_shader_set_uniform (ClutterShader *shader, void clutter_shader_set_uniform (ClutterShader *shader,
const gchar *name, const gchar *name,
const GValue *value); const GValue *value);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
CoglHandle clutter_shader_get_cogl_program (ClutterShader *shader); CoglHandle clutter_shader_get_cogl_program (ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
CoglHandle clutter_shader_get_cogl_fragment_shader (ClutterShader *shader); CoglHandle clutter_shader_get_cogl_fragment_shader (ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
CoglHandle clutter_shader_get_cogl_vertex_shader (ClutterShader *shader); CoglHandle clutter_shader_get_cogl_vertex_shader (ClutterShader *shader);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_SHADER_H__ */ #endif /* __CLUTTER_SHADER_H__ */

2
clutter/deprecated/clutter-timeout-interval.c
View File

@ -25,6 +25,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
/* This file contains the common code to check whether an interval has /* This file contains the common code to check whether an interval has
expired used in clutter-frame-source and clutter-timeout-pool. */ expired used in clutter-frame-source and clutter-timeout-pool. */

2
clutter/deprecated/clutter-timeout-pool.c
View File

@ -34,6 +34,8 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-timeout-pool.h" #include "clutter-timeout-pool.h"
#include "clutter-debug.h" #include "clutter-debug.h"

10
clutter/deprecated/clutter-timeout-pool.h
View File

@ -35,12 +35,10 @@
#ifndef __CLUTTER_TIMEOUT_POOL_H__ #ifndef __CLUTTER_TIMEOUT_POOL_H__
#define __CLUTTER_TIMEOUT_POOL_H__ #define __CLUTTER_TIMEOUT_POOL_H__
#include <glib.h> #include <clutter/clutter-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
/** /**
* ClutterTimeoutPool: (skip) * ClutterTimeoutPool: (skip)
* *
@ -53,17 +51,19 @@ G_BEGIN_DECLS
*/ */
typedef struct _ClutterTimeoutPool ClutterTimeoutPool; typedef struct _ClutterTimeoutPool ClutterTimeoutPool;
CLUTTER_DEPRECATED
ClutterTimeoutPool *clutter_timeout_pool_new (gint priority); ClutterTimeoutPool *clutter_timeout_pool_new (gint priority);
CLUTTER_DEPRECATED
guint clutter_timeout_pool_add (ClutterTimeoutPool *pool, guint clutter_timeout_pool_add (ClutterTimeoutPool *pool,
guint fps, guint fps,
GSourceFunc func, GSourceFunc func,
gpointer data, gpointer data,
GDestroyNotify notify); GDestroyNotify notify);
CLUTTER_DEPRECATED
void clutter_timeout_pool_remove (ClutterTimeoutPool *pool, void clutter_timeout_pool_remove (ClutterTimeoutPool *pool,
guint id_); guint id_);
#endif /* CLUTTER_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_TIMEOUT_POOL_H__ */ #endif /* __CLUTTER_TIMEOUT_POOL_H__ */