diff options
author | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-10-04 14:21:32 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-10-11 17:59:50 +0100 |
commit | 809298b5a2ab77ac2e24e91759eec2af6f43bffd (patch) | |
tree | ff7a3e5b49272218d36edf75812f1f3907fb60a3 | |
parent | d28e04be72d0a8c4408e07f468698d61ef312091 (diff) | |
download | clutter-809298b5a2ab77ac2e24e91759eec2af6f43bffd.tar.gz |
Move more typedefs into clutter-types.h
-rw-r--r-- | clutter/clutter-animatable.h | 1 | ||||
-rw-r--r-- | clutter/clutter-script.h | 1 | ||||
-rw-r--r-- | clutter/clutter-state.h | 2 | ||||
-rw-r--r-- | clutter/clutter-timeline.h | 1 | ||||
-rw-r--r-- | clutter/clutter-types.h | 12 |
5 files changed, 7 insertions, 10 deletions
diff --git a/clutter/clutter-animatable.h b/clutter/clutter-animatable.h index 13690f9fc..e310fe665 100644 --- a/clutter/clutter-animatable.h +++ b/clutter/clutter-animatable.h @@ -38,7 +38,6 @@ G_BEGIN_DECLS #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)) -typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy typedef */ typedef struct _ClutterAnimatableIface ClutterAnimatableIface; /** diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h index 68eb61dce..1da98709a 100644 --- a/clutter/clutter-script.h +++ b/clutter/clutter-script.h @@ -29,7 +29,6 @@ #define __CLUTTER_SCRIPT_H__ #include <clutter/clutter-types.h> -#include <clutter/clutter-state.h> G_BEGIN_DECLS diff --git a/clutter/clutter-state.h b/clutter/clutter-state.h index 79342c767..2bbc7392b 100644 --- a/clutter/clutter-state.h +++ b/clutter/clutter-state.h @@ -25,7 +25,6 @@ #define __CLUTTER_STATE_H__ #include <clutter/clutter-types.h> -#include <clutter/clutter-timeline.h> 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_STATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STATE, ClutterStateClass)) -typedef struct _ClutterState ClutterState; typedef struct _ClutterStatePrivate ClutterStatePrivate; typedef struct _ClutterStateClass ClutterStateClass; diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h index 20f7725e9..ce642f3e1 100644 --- a/clutter/clutter-timeline.h +++ b/clutter/clutter-timeline.h @@ -39,7 +39,6 @@ G_BEGIN_DECLS #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)) -typedef struct _ClutterTimeline ClutterTimeline; typedef struct _ClutterTimelineClass ClutterTimelineClass; typedef struct _ClutterTimelinePrivate ClutterTimelinePrivate; diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h index 75e24f445..eda51860d 100644 --- a/clutter/clutter-types.h +++ b/clutter/clutter-types.h @@ -38,7 +38,6 @@ G_BEGIN_DECLS #define CLUTTER_TYPE_PAINT_VOLUME (clutter_paint_volume_get_type ()) #define CLUTTER_TYPE_VERTEX (clutter_vertex_get_type ()) -/* Forward delarations to avoid header catch 22's */ typedef struct _ClutterActor ClutterActor; typedef struct _ClutterStage ClutterStage; @@ -48,16 +47,16 @@ typedef struct _ClutterLayoutMeta ClutterLayoutMeta; typedef struct _ClutterActorMeta ClutterActorMeta; typedef struct _ClutterAlpha ClutterAlpha; +typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy */ typedef struct _ClutterAnimator ClutterAnimator; -typedef struct _ClutterPath ClutterPath; +typedef struct _ClutterState ClutterState; +typedef struct _ClutterTimeline ClutterTimeline; typedef struct _ClutterAction ClutterAction; typedef struct _ClutterConstraint ClutterConstraint; typedef struct _ClutterEffect ClutterEffect; -typedef struct _ClutterColor ClutterColor; - -typedef union _ClutterEvent ClutterEvent; +typedef struct _ClutterPath ClutterPath; #if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) typedef struct _ClutterBehaviour ClutterBehaviour; @@ -66,10 +65,13 @@ typedef struct _ClutterShader ClutterShader; #endif /* DISABLE_DEPRECATED */ typedef struct _ClutterActorBox ClutterActorBox; +typedef struct _ClutterColor ClutterColor; typedef struct _ClutterGeometry ClutterGeometry; typedef struct _ClutterKnot ClutterKnot; typedef struct _ClutterVertex ClutterVertex; +typedef union _ClutterEvent ClutterEvent; + /** * ClutterPaintVolume: * |