[clutter/wip/clutter-1.99: 6/28] 1.99: Remove deprecated API from ClutterAnimatable
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/clutter-1.99: 6/28] 1.99: Remove deprecated API from ClutterAnimatable
- Date: Thu, 21 Jun 2012 20:08:34 +0000 (UTC)
commit 420dcd302be2d8a96ca96276c4f9878d520f475f
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Jun 21 17:04:30 2012 +0100
1.99: Remove deprecated API from ClutterAnimatable
clutter/clutter-animatable.c | 81 ------------------------------------------
clutter/clutter-animatable.h | 9 -----
2 files changed, 0 insertions(+), 90 deletions(-)
---
diff --git a/clutter/clutter-animatable.c b/clutter/clutter-animatable.c
index 85a835d..0e0a97e 100644
--- a/clutter/clutter-animatable.c
+++ b/clutter/clutter-animatable.c
@@ -49,16 +49,11 @@
#include "config.h"
#endif
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
#include "clutter-animatable.h"
#include "clutter-interval.h"
#include "clutter-debug.h"
#include "clutter-private.h"
-#include "deprecated/clutter-animatable.h"
-#include "deprecated/clutter-animation.h"
-
typedef ClutterAnimatableIface ClutterAnimatableInterface;
G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
@@ -68,80 +63,6 @@ clutter_animatable_default_init (ClutterAnimatableInterface *iface)
}
/**
- * clutter_animatable_animate_property:
- * @animatable: a #ClutterAnimatable
- * @animation: a #ClutterAnimation
- * @property_name: the name of the animated property
- * @initial_value: the initial value of the animation interval
- * @final_value: the final value of the animation interval
- * @progress: the progress factor
- * @value: return location for the animation value
- *
- * Calls the animate_property() virtual function for @animatable.
- *
- * The @initial_value and @final_value #GValue<!-- -->s must contain
- * the same type; @value must have been initialized to the same
- * type of @initial_value and @final_value.
- *
- * All implementation of the #ClutterAnimatable interface must
- * implement this function.
- *
- * Return value: %TRUE if the value has been validated and can
- * be applied to the #ClutterAnimatable, and %FALSE otherwise
- *
- * Since: 1.0
- *
- * Deprecated: 1.8: Use clutter_animatable_interpolate_value()
- * instead
- */
-gboolean
-clutter_animatable_animate_property (ClutterAnimatable *animatable,
- ClutterAnimation *animation,
- const gchar *property_name,
- const GValue *initial_value,
- const GValue *final_value,
- gdouble progress,
- GValue *value)
-{
- ClutterAnimatableIface *iface;
- gboolean res;
-
- g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), FALSE);
- g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), FALSE);
- g_return_val_if_fail (property_name != NULL, FALSE);
- g_return_val_if_fail (initial_value != NULL && final_value != NULL, FALSE);
- g_return_val_if_fail (G_VALUE_TYPE (initial_value) != G_TYPE_INVALID, FALSE);
- g_return_val_if_fail (G_VALUE_TYPE (final_value) != G_TYPE_INVALID, FALSE);
- g_return_val_if_fail (value != NULL, FALSE);
- g_return_val_if_fail (G_VALUE_TYPE (value) == G_VALUE_TYPE (initial_value) &&
- G_VALUE_TYPE (value) == G_VALUE_TYPE (final_value),
- FALSE);
-
- iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
- if (iface->animate_property == NULL)
- {
- ClutterInterval *interval;
-
- interval = clutter_animation_get_interval (animation, property_name);
- if (interval == NULL)
- return FALSE;
-
- res = clutter_animatable_interpolate_value (animatable, property_name,
- interval,
- progress,
- value);
- }
- else
- res = iface->animate_property (animatable, animation,
- property_name,
- initial_value, final_value,
- progress,
- value);
-
- return res;
-}
-
-/**
* clutter_animatable_find_property:
* @animatable: a #ClutterAnimatable
* @property_name: the name of the animatable property to find
@@ -248,8 +169,6 @@ clutter_animatable_set_final_state (ClutterAnimatable *animatable,
* This function should be used for every property animation
* involving #ClutterAnimatable<!-- -->s.
*
- * This function replaces clutter_animatable_animate_property().
- *
* Return value: %TRUE if the interpolation was successful,
* and %FALSE otherwise
*
diff --git a/clutter/clutter-animatable.h b/clutter/clutter-animatable.h
index 78a796f..7e51d48 100644
--- a/clutter/clutter-animatable.h
+++ b/clutter/clutter-animatable.h
@@ -51,8 +51,6 @@ typedef struct _ClutterAnimatableIface ClutterAnimatableIface;
/**
* ClutterAnimatableIface:
- * @animate_property: virtual function for custom interpolation of a
- * property. This virtual function is deprecated
* @find_property: virtual function for retrieving the #GParamSpec of
* an animatable property
* @get_initial_state: virtual function for retrieving the initial
@@ -73,13 +71,6 @@ struct _ClutterAnimatableIface
GTypeInterface parent_iface;
/*< public >*/
- gboolean (* animate_property) (ClutterAnimatable *animatable,
- ClutterAnimation *animation,
- const gchar *property_name,
- const GValue *initial_value,
- const GValue *final_value,
- gdouble progress,
- GValue *value);
GParamSpec *(* find_property) (ClutterAnimatable *animatable,
const gchar *property_name);
void (* get_initial_state) (ClutterAnimatable *animatable,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]