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

Move more typedefs into clutter-types.h

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-10-04 14:21:32 +01:00
parent d28e04be72
commit 809298b5a2
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter-animatable.h
View File

@ -38,7 +38,6 @@ G_BEGIN_DECLS
#define CLUTTER_IS_ANIMATABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ANIMATABLE)) #define CLUTTER_IS_ANIMATABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ANIMATABLE))
#define CLUTTER_ANIMATABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_ANIMATABLE, ClutterAnimatableIface)) #define CLUTTER_ANIMATABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_ANIMATABLE, ClutterAnimatableIface))
typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy typedef */
typedef struct _ClutterAnimatableIface ClutterAnimatableIface; typedef struct _ClutterAnimatableIface ClutterAnimatableIface;
/** /**

1
clutter/clutter-script.h
View File

@ -29,7 +29,6 @@
#define __CLUTTER_SCRIPT_H__ #define __CLUTTER_SCRIPT_H__
#include <clutter/clutter-types.h> #include <clutter/clutter-types.h>
#include <clutter/clutter-state.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
clutter/clutter-state.h
View File

@ -25,7 +25,6 @@
#define __CLUTTER_STATE_H__ #define __CLUTTER_STATE_H__
#include <clutter/clutter-types.h> #include <clutter/clutter-types.h>
#include <clutter/clutter-timeline.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -37,7 +36,6 @@ G_BEGIN_DECLS
#define CLUTTER_IS_STATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_STATE)) #define CLUTTER_IS_STATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_STATE))
#define CLUTTER_STATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STATE, ClutterStateClass)) #define CLUTTER_STATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STATE, ClutterStateClass))
typedef struct _ClutterState ClutterState;
typedef struct _ClutterStatePrivate ClutterStatePrivate; typedef struct _ClutterStatePrivate ClutterStatePrivate;
typedef struct _ClutterStateClass ClutterStateClass; typedef struct _ClutterStateClass ClutterStateClass;

1
clutter/clutter-timeline.h
View File

@ -39,7 +39,6 @@ G_BEGIN_DECLS
#define CLUTTER_IS_TIMELINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_TIMELINE)) #define CLUTTER_IS_TIMELINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_TIMELINE))
#define CLUTTER_TIMELINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TIMELINE, ClutterTimelineClass)) #define CLUTTER_TIMELINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TIMELINE, ClutterTimelineClass))
typedef struct _ClutterTimeline ClutterTimeline;
typedef struct _ClutterTimelineClass ClutterTimelineClass; typedef struct _ClutterTimelineClass ClutterTimelineClass;
typedef struct _ClutterTimelinePrivate ClutterTimelinePrivate; typedef struct _ClutterTimelinePrivate ClutterTimelinePrivate;

12
clutter/clutter-types.h
View File

@ -38,7 +38,6 @@ G_BEGIN_DECLS
#define CLUTTER_TYPE_PAINT_VOLUME (clutter_paint_volume_get_type ()) #define CLUTTER_TYPE_PAINT_VOLUME (clutter_paint_volume_get_type ())
#define CLUTTER_TYPE_VERTEX (clutter_vertex_get_type ()) #define CLUTTER_TYPE_VERTEX (clutter_vertex_get_type ())
/* Forward delarations to avoid header catch 22's */
typedef struct _ClutterActor ClutterActor; typedef struct _ClutterActor ClutterActor;
typedef struct _ClutterStage ClutterStage; typedef struct _ClutterStage ClutterStage;
@ -48,16 +47,16 @@ typedef struct _ClutterLayoutMeta ClutterLayoutMeta;
typedef struct _ClutterActorMeta ClutterActorMeta; typedef struct _ClutterActorMeta ClutterActorMeta;
typedef struct _ClutterAlpha ClutterAlpha; typedef struct _ClutterAlpha ClutterAlpha;
typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy */
typedef struct _ClutterAnimator ClutterAnimator; typedef struct _ClutterAnimator ClutterAnimator;
typedef struct _ClutterPath ClutterPath; typedef struct _ClutterState ClutterState;
typedef struct _ClutterTimeline ClutterTimeline;
typedef struct _ClutterAction ClutterAction; typedef struct _ClutterAction ClutterAction;
typedef struct _ClutterConstraint ClutterConstraint; typedef struct _ClutterConstraint ClutterConstraint;
typedef struct _ClutterEffect ClutterEffect; typedef struct _ClutterEffect ClutterEffect;
typedef struct _ClutterColor ClutterColor; typedef struct _ClutterPath ClutterPath;
typedef union _ClutterEvent ClutterEvent;
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) #if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
typedef struct _ClutterBehaviour ClutterBehaviour; typedef struct _ClutterBehaviour ClutterBehaviour;
@ -66,10 +65,13 @@ typedef struct _ClutterShader ClutterShader;
#endif /* DISABLE_DEPRECATED */ #endif /* DISABLE_DEPRECATED */
typedef struct _ClutterActorBox ClutterActorBox; typedef struct _ClutterActorBox ClutterActorBox;
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 union _ClutterEvent ClutterEvent;
/** /**
* ClutterPaintVolume: * ClutterPaintVolume:
* *