[mutter] clutter: Remove unused deprecated/clutter-animatable.h
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter: Remove unused deprecated/clutter-animatable.h
- Date: Tue, 19 Nov 2019 21:57:06 +0000 (UTC)
commit 375d35be60bb0dd1ef820b1dce846f60b3f84c1d
Author: Adam Jackson <ajax redhat com>
Date: Tue Nov 5 11:46:42 2019 -0500
clutter: Remove unused deprecated/clutter-animatable.h
https://gitlab.gnome.org/GNOME/mutter/merge_requests/921
clutter/clutter/clutter-animatable.c | 75 -------------------------
clutter/clutter/clutter-deprecated.h | 1 -
clutter/clutter/deprecated/clutter-animatable.h | 47 ----------------
clutter/clutter/meson.build | 1 -
4 files changed, 124 deletions(-)
---
diff --git a/clutter/clutter/clutter-animatable.c b/clutter/clutter/clutter-animatable.c
index 0bb3409ca..e8c951110 100644
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -54,7 +54,6 @@
#include "clutter-debug.h"
#include "clutter-private.h"
-#include "deprecated/clutter-animatable.h"
#include "deprecated/clutter-animation.h"
G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
@@ -64,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)
-{
- ClutterAnimatableInterface *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
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index b043139a8..0bdd51904 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -5,7 +5,6 @@
#include "deprecated/clutter-actor.h"
#include "deprecated/clutter-alpha.h"
-#include "deprecated/clutter-animatable.h"
#include "deprecated/clutter-animation.h"
#include "deprecated/clutter-bin-layout.h"
#include "deprecated/clutter-box.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index b3fb0ed7c..1b30a7b00 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -219,7 +219,6 @@ clutter_nonintrospected_sources = [
clutter_deprecated_headers = [
'deprecated/clutter-actor.h',
'deprecated/clutter-alpha.h',
- 'deprecated/clutter-animatable.h',
'deprecated/clutter-animation.h',
'deprecated/clutter-bin-layout.h',
'deprecated/clutter-box.h',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]