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

Remove CLUTTER_DISABLE_DEPRECATED guard

Browse Source 
Except for macros, we now entirely depend on the deprecation warnings
instead of a guard.
This commit is contained in:
Emmanuele Bassi 2011-11-03 15:32:04 +00:00
parent 9ea2bb694e
commit 2403d4875b
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/clutter-types.h
View File

@ -72,18 +72,15 @@ typedef struct _ClutterEffect ClutterEffect;
typedef struct _ClutterPath ClutterPath; typedef struct _ClutterPath ClutterPath;
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
typedef struct _ClutterBehaviour ClutterBehaviour;
typedef struct _ClutterShader ClutterShader;
#endif /* DISABLE_DEPRECATED */
typedef struct _ClutterActorBox ClutterActorBox; typedef struct _ClutterActorBox ClutterActorBox;
typedef struct _ClutterColor ClutterColor; typedef struct _ClutterColor ClutterColor;
typedef struct _ClutterGeometry ClutterGeometry; typedef struct _ClutterGeometry ClutterGeometry;
typedef struct _ClutterKnot ClutterKnot; typedef struct _ClutterKnot ClutterKnot;
typedef struct _ClutterVertex ClutterVertex; typedef struct _ClutterVertex ClutterVertex;
typedef struct _ClutterBehaviour ClutterBehaviour;
typedef struct _ClutterShader ClutterShader;
typedef union _ClutterEvent ClutterEvent; typedef union _ClutterEvent ClutterEvent;
/** /**

2
clutter/clutter.h
View File

@ -103,9 +103,7 @@
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#ifndef CLUTTER_DISABLE_DEPRECATED
#include "clutter-deprecated.h" #include "clutter-deprecated.h"
#endif
#undef __CLUTTER_H_INSIDE__ #undef __CLUTTER_H_INSIDE__

1
clutter/deprecated/clutter-actor.h
View File

@ -11,7 +11,6 @@ guint32 clutter_actor_get_gid (ClutterActor *self);
CLUTTER_DEPRECATED CLUTTER_DEPRECATED
ClutterActor * clutter_get_actor_by_gid (guint32 id_); ClutterActor * clutter_get_actor_by_gid (guint32 id_);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */ #endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */

4
clutter/deprecated/clutter-keysyms.h
View File

@ -29,6 +29,8 @@
#ifndef __CLUTTER_KEYSYMS_DEPRECATED_H__ #ifndef __CLUTTER_KEYSYMS_DEPRECATED_H__
#define __CLUTTER_KEYSYMS_DEPRECATED_H__ #define __CLUTTER_KEYSYMS_DEPRECATED_H__
#ifndef CLUTTER_DISABLE_DEPRECATED
#define CLUTTER_VoidSymbol 0xffffff #define CLUTTER_VoidSymbol 0xffffff
#define CLUTTER_BackSpace 0xff08 #define CLUTTER_BackSpace 0xff08
#define CLUTTER_Tab 0xff09 #define CLUTTER_Tab 0xff09
@ -2295,4 +2297,6 @@
#define CLUTTER_LogWindowTree 0x1008fe24 #define CLUTTER_LogWindowTree 0x1008fe24
#define CLUTTER_LogGrabInfo 0x1008fe25 #define CLUTTER_LogGrabInfo 0x1008fe25
#endif /* CLUTTER_DISABLE_DEPRECATED */
#endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */ #endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */