Do not include clutter.h from a Clutter header file
Clutter header files should just include the needed headers.
This commit is contained in:
parent
1dc8c0ff05
commit
5c74f990d6
@ -33,12 +33,18 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "clutter-private.h"
|
||||
#include "clutter-state.h"
|
||||
#include "clutter-marshal.h"
|
||||
|
||||
#include <gobject/gvaluecollector.h>
|
||||
#include <string.h>
|
||||
|
||||
#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 {
|
||||
|
@ -24,31 +24,17 @@
|
||||
#ifndef __CLUTTER_STATE_H__
|
||||
#define __CLUTTER_STATE_H__
|
||||
|
||||
#include <clutter/clutter.h>
|
||||
#include <clutter/clutter-types.h>
|
||||
#include <clutter/clutter-timeline.h>
|
||||
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user