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

Deprecate State and Animator

Browse Source 
The PropertyTransition, KeyframeTransition, and TransitionGroup classes
can effectively replace Animator and State in their common usage.
This commit is contained in:
Emmanuele Bassi 2012-04-11 18:00:23 +01:00
parent 024f6d40d2
commit 63e909576a
9 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/Makefile.am
View File

@ -56,7 +56,6 @@ source_h = \
$(srcdir)/clutter-alpha.h \
$(srcdir)/clutter-animatable.h \
$(srcdir)/clutter-animation.h \
$(srcdir)/clutter-animator.h \
$(srcdir)/clutter-backend.h \
$(srcdir)/clutter-bind-constraint.h \
$(srcdir)/clutter-binding-pool.h \
@ -117,7 +116,6 @@ source_h = \
$(srcdir)/clutter-snap-constraint.h \
$(srcdir)/clutter-stage.h \
$(srcdir)/clutter-stage-manager.h \
$(srcdir)/clutter-state.h \
$(srcdir)/clutter-table-layout.h \
$(srcdir)/clutter-texture.h \
$(srcdir)/clutter-text.h \
@ -138,7 +136,6 @@ source_c = \
$(srcdir)/clutter-alpha.c \
$(srcdir)/clutter-animatable.c \
$(srcdir)/clutter-animation.c \
$(srcdir)/clutter-animator.c \
$(srcdir)/clutter-backend.c \
$(srcdir)/clutter-base-types.c \
$(srcdir)/clutter-bezier.c \
@ -199,7 +196,6 @@ source_c = \
$(srcdir)/clutter-stage.c \
$(srcdir)/clutter-stage-manager.c \
$(srcdir)/clutter-stage-window.c \
$(srcdir)/clutter-state.c \
$(srcdir)/clutter-table-layout.c \
$(srcdir)/clutter-texture.c \
$(srcdir)/clutter-text.c \
@ -254,6 +250,7 @@ deprecated_h = \
$(srcdir)/deprecated/clutter-actor.h \
$(srcdir)/deprecated/clutter-animatable.h \
$(srcdir)/deprecated/clutter-animation.h \
$(srcdir)/deprecated/clutter-animator.h \
$(srcdir)/deprecated/clutter-backend.h \
$(srcdir)/deprecated/clutter-behaviour.h \
$(srcdir)/deprecated/clutter-behaviour-depth.h \
@ -276,6 +273,7 @@ deprecated_h = \
$(srcdir)/deprecated/clutter-shader.h \
$(srcdir)/deprecated/clutter-stage-manager.h \
$(srcdir)/deprecated/clutter-stage.h \
$(srcdir)/deprecated/clutter-state.h \
$(srcdir)/deprecated/clutter-texture.h \
$(srcdir)/deprecated/clutter-timeline.h \
$(srcdir)/deprecated/clutter-timeout-pool.h \
@ -285,6 +283,7 @@ deprecated_h = \
# deprecated source code
deprecated_c = \
$(srcdir)/deprecated/clutter-actor-deprecated.c \
$(srcdir)/deprecated/clutter-animator.c \
$(srcdir)/deprecated/clutter-behaviour.c \
$(srcdir)/deprecated/clutter-behaviour-depth.c \
$(srcdir)/deprecated/clutter-behaviour-ellipse.c \
@ -301,6 +300,7 @@ deprecated_c = \
$(srcdir)/deprecated/clutter-rectangle.c \
$(srcdir)/deprecated/clutter-score.c \
$(srcdir)/deprecated/clutter-shader.c \
$(srcdir)/deprecated/clutter-state.c \
$(srcdir)/deprecated/clutter-timeout-pool.c \
$(NULL)

2
clutter/clutter-deprecated.h
View File

@ -6,6 +6,7 @@
#include "deprecated/clutter-actor.h"
#include "deprecated/clutter-animatable.h"
#include "deprecated/clutter-animation.h"
#include "deprecated/clutter-animator.h"
#include "deprecated/clutter-backend.h"
#include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-behaviour-depth.h"
@ -28,6 +29,7 @@
#include "deprecated/clutter-shader.h"
#include "deprecated/clutter-stage-manager.h"
#include "deprecated/clutter-stage.h"
#include "deprecated/clutter-state.h"
#include "deprecated/clutter-texture.h"
#include "deprecated/clutter-timeline.h"
#include "deprecated/clutter-timeout-pool.h"

16
clutter/clutter-script.c
View File

@ -234,12 +234,11 @@
#include <glib-object.h>
#include <gmodule.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-actor.h"
#include "clutter-alpha.h"
#include "clutter-behaviour.h"
#include "clutter-container.h"
#include "clutter-stage.h"
#include "clutter-state.h"
#include "clutter-texture.h"
#include "clutter-script.h"
@ -250,6 +249,10 @@
#include "clutter-private.h"
#include "clutter-debug.h"
#include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-container.h"
#include "deprecated/clutter-state.h"
enum
{
PROP_0,
@ -263,8 +266,7 @@ enum
static GParamSpec *obj_props[PROP_LAST];
#define CLUTTER_SCRIPT_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_SCRIPT, ClutterScriptPrivate))
#define CLUTTER_SCRIPT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_SCRIPT, ClutterScriptPrivate))
struct _ClutterScriptPrivate
{
@ -1443,6 +1445,8 @@ clutter_script_list_objects (ClutterScript *script)
* passed to this function.
*
* Since: 1.8
*
* Deprecated: 1.12
*/
void
clutter_script_add_states (ClutterScript *script,
@ -1475,6 +1479,8 @@ clutter_script_add_states (ClutterScript *script,
* and it should not be unreferenced
*
* Since: 1.8
*
* Deprecated: 1.12
*/
ClutterState *
clutter_script_get_states (ClutterScript *script,

3
clutter/clutter-script.h
View File

@ -168,9 +168,12 @@ void clutter_script_unmerge_objects (ClutterScript
guint merge_id);
void clutter_script_ensure_objects (ClutterScript *script);
CLUTTER_DEPRECATED_IN_1_12
void clutter_script_add_states (ClutterScript *script,
const gchar *name,
ClutterState *state);
CLUTTER_DEPRECATED_IN_1_12
ClutterState * clutter_script_get_states (ClutterScript *script,
const gchar *name);

2
clutter/clutter.h
View File

@ -38,7 +38,6 @@
#include "clutter-alpha.h"
#include "clutter-animatable.h"
#include "clutter-animation.h"
#include "clutter-animator.h"
#include "clutter-backend.h"
#include "clutter-bind-constraint.h"
#include "clutter-binding-pool.h"
@ -97,7 +96,6 @@
#include "clutter-snap-constraint.h"
#include "clutter-stage.h"
#include "clutter-stage-manager.h"
#include "clutter-state.h"
#include "clutter-table-layout.h"
#include "clutter-texture.h"
#include "clutter-text.h"

0
clutter/clutter-animator.c → clutter/deprecated/clutter-animator.c
View File

0
clutter/clutter-animator.h → clutter/deprecated/clutter-animator.h
View File

0
clutter/clutter-state.c → clutter/deprecated/clutter-state.c
View File

0
clutter/clutter-state.h → clutter/deprecated/clutter-state.h
View File