isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Move deprecated symbols into separate headers

Browse Source 
The clutter-actor.h header is already pretty big, so let's try to keep
the deprecated symbols out of it.
This commit is contained in:
Emmanuele Bassi 2011-11-02 12:47:46 +00:00
parent 40d703a005
commit b19c919645
5 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/Makefile.am
View File

@ -233,6 +233,7 @@ source_c_priv = \
# deprecated installed headers # deprecated installed headers
deprecated_h = \ deprecated_h = \
$(srcdir)/deprecated/clutter-actor-deprecated.h \
$(srcdir)/deprecated/clutter-backend-deprecated.h \ $(srcdir)/deprecated/clutter-backend-deprecated.h \
$(srcdir)/deprecated/clutter-behaviour.h \ $(srcdir)/deprecated/clutter-behaviour.h \
$(srcdir)/deprecated/clutter-behaviour-depth.h \ $(srcdir)/deprecated/clutter-behaviour-depth.h \

34
clutter/clutter-actor.h
View File

@ -397,11 +397,6 @@ void clutter_actor_set_name (ClutterActor
const gchar *name); const gchar *name);
const gchar * clutter_actor_get_name (ClutterActor *self); const gchar * clutter_actor_get_name (ClutterActor *self);
#ifndef CLUTTER_DISABLE_DEPRECATED
CLUTTER_DEPRECATED
guint32 clutter_actor_get_gid (ClutterActor *self);
#endif
void clutter_actor_set_clip (ClutterActor *self, void clutter_actor_set_clip (ClutterActor *self,
gfloat xoff, gfloat xoff,
gfloat yoff, gfloat yoff,
@ -470,35 +465,6 @@ gboolean clutter_actor_event (ClutterActor
ClutterEvent *event, ClutterEvent *event,
gboolean capture); gboolean capture);
#ifndef CLUTTER_DISABLE_DEPRECATED
CLUTTER_DEPRECATED
ClutterActor * clutter_get_actor_by_gid (guint32 id_);
#endif
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
CLUTTER_DEPRECATED_FOR(clutter_actor_add_effect)
gboolean clutter_actor_set_shader (ClutterActor *self,
ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(clutter_actor_get_effect)
ClutterShader * clutter_actor_get_shader (ClutterActor *self);
CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform_value)
void clutter_actor_set_shader_param (ClutterActor *self,
const gchar *param,
const GValue *value);
CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
void clutter_actor_set_shader_param_int (ClutterActor *self,
const gchar *param,
gint value);
CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
void clutter_actor_set_shader_param_float (ClutterActor *self,
const gchar *param,
gfloat value);
#endif /* CLUTTER_DISABLE_DEPRECATED */
void clutter_actor_set_anchor_point (ClutterActor *self, void clutter_actor_set_anchor_point (ClutterActor *self,
gfloat anchor_x, gfloat anchor_x,
gfloat anchor_y); gfloat anchor_y);

1
clutter/clutter-deprecated.h
View File

@ -3,6 +3,7 @@
#define __CLUTTER_DEPRECATED_H_INSIDE__ #define __CLUTTER_DEPRECATED_H_INSIDE__
#include "deprecated/clutter-actor-deprecated.h"
#include "deprecated/clutter-backend-deprecated.h" #include "deprecated/clutter-backend-deprecated.h"
#include "deprecated/clutter-behaviour.h" #include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-behaviour-depth.h" #include "deprecated/clutter-behaviour-depth.h"

17
clutter/deprecated/clutter-actor-deprecated.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef __CLUTTER_ACTOR_DEPRECATED_H__
#define __CLUTTER_ACTOR_DEPRECATED_H__
#include <clutter/clutter-types.h>
G_BEGIN_DECLS
CLUTTER_DEPRECATED
guint32 clutter_actor_get_gid (ClutterActor *self);
CLUTTER_DEPRECATED
ClutterActor * clutter_get_actor_by_gid (guint32 id_);
G_END_DECLS
#endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */

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

@ -150,6 +150,30 @@ CoglHandle clutter_shader_get_cogl_fragment_shader (ClutterShader
CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
CoglHandle clutter_shader_get_cogl_vertex_shader (ClutterShader *shader); CoglHandle clutter_shader_get_cogl_vertex_shader (ClutterShader *shader);
/* ClutterActor methods */
CLUTTER_DEPRECATED_FOR(clutter_actor_add_effect)
gboolean clutter_actor_set_shader (ClutterActor *self,
ClutterShader *shader);
CLUTTER_DEPRECATED_FOR(clutter_actor_get_effect)
ClutterShader * clutter_actor_get_shader (ClutterActor *self);
CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform_value)
void clutter_actor_set_shader_param (ClutterActor *self,
const gchar *param,
const GValue *value);
CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
void clutter_actor_set_shader_param_int (ClutterActor *self,
const gchar *param,
gint value);
CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
void clutter_actor_set_shader_param_float (ClutterActor *self,
const gchar *param,
gfloat value);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_SHADER_H__ */ #endif /* __CLUTTER_SHADER_H__ */