[cluttermm] Animation: Deprecate this.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cluttermm] Animation: Deprecate this.
- Date: Tue, 25 Mar 2014 10:39:50 +0000 (UTC)
commit f0fd3eada68e8126699b0b764cc34fb8ecb079fa
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Mar 25 10:48:00 2014 +0100
Animation: Deprecate this.
clutter/src/actor.hg | 11 +-------
clutter/src/animation.hg | 59 +++++++++++++++++++++++++--------------------
2 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index c6b8d64..c402ebc 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -305,15 +305,8 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(void remove_child(const Glib::RefPtr<Actor>& child), clutter_actor_remove_child )
_WRAP_METHOD(void remove_all_children(), clutter_actor_remove_all_children )
-// Animation API
- // Hand coded to use std::map instead of the 3 arguments used by C API
- _IGNORE(clutter_actor_animatev, clutter_actor_animate_with_timelinev, clutter_actor_animate_with_alphav)
-
- //TODO: Documentation.
- // FIXME: The std::map with a Glib::ValueBase does not work.
- // Glib::RefPtr<Animation> animate(gulong mode, guint duration, const std::map<std::string,
Glib::ValueBase>& properties);
- // Glib::RefPtr<Animation> animate(gulong mode, const Glib::RefPtr<Timeline>& timeline, const
std::map<std::string, Glib::ValueBase>& properties);
- // Glib::RefPtr<Animation> animate(const Glib::RefPtr<Alpha>& alpha, const std::map<std::string,
Glib::ValueBase>& properties);
+ //deprecated
+ _IGNORE(clutter_actor_animate, clutter_actor_animatev, clutter_actor_animate_with_timelinev,
clutter_actor_animate_with_alphav)
_WRAP_METHOD(Glib::RefPtr<Animation> get_animation(), clutter_actor_get_animation, refreturn, deprecated
"Use the implicit transition for animatable properties in ClutterActor instead, and
clutter_actor_get_transition() to retrieve the transition.")
_WRAP_METHOD(Glib::RefPtr<const Animation> get_animation() const, clutter_actor_get_animation, refreturn,
constversion, deprecated "Use the implicit transition for animatable properties in ClutterActor instead, and
clutter_actor_get_transition() to retrieve the transition.")
diff --git a/clutter/src/animation.hg b/clutter/src/animation.hg
index b3ea9a3..4abe71d 100644
--- a/clutter/src/animation.hg
+++ b/clutter/src/animation.hg
@@ -24,13 +24,20 @@
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/object_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
namespace Clutter
{
+/**
+ * @deprecated Use PropertyTransition instead.
+ */
class Animation : public Glib::Object
{
-
_CLASS_GOBJECT(Animation, ClutterAnimation, CLUTTER_ANIMATION, Glib::Object, GObject)
+ _IS_DEPRECATED
protected:
_CTOR_DEFAULT()
@@ -38,39 +45,39 @@ protected:
public:
_WRAP_CREATE()
- _WRAP_METHOD(void set_object(const Glib::RefPtr<Glib::Object>& object), clutter_animation_set_object)
- _WRAP_METHOD(Glib::RefPtr<Glib::Object> get_object(), clutter_animation_get_object)
- _WRAP_METHOD(Glib::RefPtr<const Glib::Object> get_object() const, clutter_animation_get_object)
- _WRAP_METHOD(void set_mode(gulong mode), clutter_animation_set_mode)
- _WRAP_METHOD(gulong get_mode() const, clutter_animation_get_mode)
-
- _WRAP_METHOD(void set_duration(guint msecs), clutter_animation_set_duration)
- _WRAP_METHOD(guint get_duration() const, clutter_animation_get_duration)
-
- _WRAP_METHOD(void set_loop(bool loop=true), clutter_animation_set_loop)
- _WRAP_METHOD(bool get_loop() const, clutter_animation_get_loop)
- _WRAP_METHOD(void set_timeline(const Glib::RefPtr<Timeline>& timeline), clutter_animation_set_timeline)
- _WRAP_METHOD(Glib::RefPtr<Timeline> get_timeline() const, clutter_animation_get_timeline)
- _WRAP_METHOD(void set_alpha(const Glib::RefPtr<Alpha>& alpha), clutter_animation_set_alpha)
- _WRAP_METHOD(Glib::RefPtr<Alpha> get_alpha() const, clutter_animation_get_alpha)
- _WRAP_METHOD(void completed(), clutter_animation_completed)
- _WRAP_METHOD(Glib::RefPtr<Animation> bind(const std::string& property_name, const Glib::ValueBase& final),
clutter_animation_bind)
+ _WRAP_METHOD(void set_object(const Glib::RefPtr<Glib::Object>& object), clutter_animation_set_object,
deprecated "Use PropertyTransition instead.")
+ _WRAP_METHOD(Glib::RefPtr<Glib::Object> get_object(), clutter_animation_get_objec, deprecated "Use
PropertyTransition instead.")
+ _WRAP_METHOD(Glib::RefPtr<const Glib::Object> get_object() const, clutter_animation_get_object, deprecated
"Use PropertyTransition instead.")
+ _WRAP_METHOD(void set_mode(gulong mode), clutter_animation_set_mode, deprecated "Use PropertyTransition
instead.")
+ _WRAP_METHOD(gulong get_mode() const, clutter_animation_get_mode, deprecated "Use PropertyTransition
instead.")
+
+ _WRAP_METHOD(void set_duration(guint msecs), clutter_animation_set_duration, deprecated "Use
PropertyTransition instead.")
+ _WRAP_METHOD(guint get_duration() const, clutter_animation_get_duration, deprecated "Use
PropertyTransition instead.")
+
+ _WRAP_METHOD(void set_loop(bool loop = true), clutter_animation_set_loop, deprecated "Use
PropertyTransition instead.")
+ _WRAP_METHOD(bool get_loop() const, clutter_animation_get_loop, deprecated "Use PropertyTransition
instead.")
+ _WRAP_METHOD(void set_timeline(const Glib::RefPtr<Timeline>& timeline), clutter_animation_set_timeline,
deprecated "Use PropertyTransition instead.")
+ _WRAP_METHOD(Glib::RefPtr<Timeline> get_timeline() const, clutter_animation_get_timeline, deprecated "Use
PropertyTransition instead.")
+ _WRAP_METHOD(void set_alpha(const Glib::RefPtr<Alpha>& alpha), clutter_animation_set_alpha, deprecated
"Use get_timeline() and set_progress_mode() instead.")
+ _WRAP_METHOD(Glib::RefPtr<Alpha> get_alpha() const, clutter_animation_get_alpha, deprecated "Use
get_timeline() and set_progress_mode() instead.")
+ _WRAP_METHOD(void completed(), clutter_animation_completed, deprecated "Use PropertyTransition instead.")
+ _WRAP_METHOD(Glib::RefPtr<Animation> bind(const std::string& property_name, const Glib::ValueBase& final),
clutter_animation_bind, deprecated "Use PropertyTransition instead.")
//TODO: Add templated bind().
- _WRAP_METHOD(void bind_interval(const std::string& property_name, const Glib::RefPtr<Interval>& interval),
clutter_animation_bind_interval)
- _WRAP_METHOD(void update_interval(const std::string& property_name, const Glib::RefPtr<Interval>&
interval), clutter_animation_update_interval)
- _WRAP_METHOD(bool has_property(const std::string& property_name) const, clutter_animation_has_property)
+ _WRAP_METHOD(void bind_interval(const std::string& property_name, const Glib::RefPtr<Interval>& interval),
clutter_animation_bind_interval, deprecated "Use PropertyTransition instead.")
+ _WRAP_METHOD(void update_interval(const std::string& property_name, const Glib::RefPtr<Interval>&
interval), clutter_animation_update_interval, deprecated "Use PropertyTransition instead.")
+ _WRAP_METHOD(bool has_property(const std::string& property_name) const, clutter_animation_has_property,
deprecated "Use PropertyTransition instead.")
- _WRAP_METHOD(Glib::RefPtr<Animation> update(const std::string& property_name, const Glib::ValueBase&
final), clutter_animation_update)
+ _WRAP_METHOD(Glib::RefPtr<Animation> update(const std::string& property_name, const Glib::ValueBase&
final), clutter_animation_update, deprecated "Use PropertyTransition instead.")
//TODO: Add templated update().
- _WRAP_METHOD(void unbind_property(const std::string& property_name), clutter_animation_unbind_property)
+ _WRAP_METHOD(void unbind_property(const std::string& property_name), clutter_animation_unbind_property,
deprecated "Use PropertyTransition instead.")
//This needs at least a comment about the constness, though this is deprecated anyway.
- _WRAP_METHOD(Glib::RefPtr<Interval> get_interval(const std::string& property_name) const,
clutter_animation_get_interval)
+ _WRAP_METHOD(Glib::RefPtr<Interval> get_interval(const std::string& property_name) const,
clutter_animation_get_interval, deprecated "Use PropertyTransition instead.")
- _WRAP_SIGNAL(void started(), "started")
- _WRAP_SIGNAL(void completed(), "completed")
+ _WRAP_SIGNAL(void started(), "started", deprecated "Use PropertyTransition instead.")
+ _WRAP_SIGNAL(void completed(), "completed", deprecated "Use PropertyTransition instead.")
_WRAP_PROPERTY("object", Glib::RefPtr<Glib::Object>)
_WRAP_PROPERTY("mode", gulong)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]