From 5c74f990d6e388aaa7041469dbed7b4cd80242c3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 20 May 2010 17:34:02 +0100 Subject: [PATCH] Do not include clutter.h from a Clutter header file Clutter header files should just include the needed headers. --- clutter/clutter-state.c | 10 ++++++++-- clutter/clutter-state.h | 30 ++++++++---------------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c index 7bda07e28..554ab965f 100644 --- a/clutter/clutter-state.c +++ b/clutter/clutter-state.c @@ -33,12 +33,18 @@ #include "config.h" #endif -#include "clutter-private.h" #include "clutter-state.h" -#include "clutter-marshal.h" + #include #include +#include "clutter-alpha.h" +#include "clutter-animator.h" +#include "clutter-enum-types.h" +#include "clutter-interval.h" +#include "clutter-marshal.h" +#include "clutter-private.h" + G_DEFINE_TYPE (ClutterState, clutter_state, G_TYPE_OBJECT); typedef struct StateAnimator { diff --git a/clutter/clutter-state.h b/clutter/clutter-state.h index a647b9437..dee4c8f16 100644 --- a/clutter/clutter-state.h +++ b/clutter/clutter-state.h @@ -24,31 +24,17 @@ #ifndef __CLUTTER_STATE_H__ #define __CLUTTER_STATE_H__ -#include +#include +#include G_BEGIN_DECLS -#define CLUTTER_TYPE_STATE (clutter_state_get_type ()) - -#define CLUTTER_STATE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - CLUTTER_TYPE_STATE, ClutterState)) - -#define CLUTTER_STATE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - CLUTTER_TYPE_STATE, ClutterStateClass)) - -#define CLUTTER_IS_STATE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - 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_TYPE_STATE (clutter_state_get_type ()) +#define CLUTTER_STATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STATE, ClutterState)) +#define CLUTTER_STATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STATE, ClutterStateClass)) +#define CLUTTER_IS_STATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 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)) typedef struct _ClutterState ClutterState; typedef struct _ClutterStatePrivate ClutterStatePrivate;