mirror of
https://github.com/brl/mutter.git
synced 2025-02-16 21:34:09 +00:00
build: Re-arrange headers
Try to minimize the included headers, especially in clutter-actor.h.
This commit is contained in:
parent
63cef64d17
commit
694632ce95
@ -303,6 +303,7 @@
|
||||
#include "clutter-profile.h"
|
||||
#include "clutter-scriptable.h"
|
||||
#include "clutter-script-private.h"
|
||||
#include "clutter-shader.h"
|
||||
#include "clutter-stage-private.h"
|
||||
#include "clutter-units.h"
|
||||
|
||||
|
@ -34,12 +34,10 @@
|
||||
#include <pango/pango.h>
|
||||
#include <atk/atk.h>
|
||||
|
||||
#include <clutter/clutter-types.h>
|
||||
#include <cogl/cogl.h>
|
||||
|
||||
#include <clutter/clutter-color.h>
|
||||
#include <clutter/clutter-effect.h>
|
||||
#include <clutter/clutter-types.h>
|
||||
#include <clutter/clutter-event.h>
|
||||
#include <clutter/clutter-shader.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
@ -30,15 +30,12 @@
|
||||
#ifndef __CLUTTER_COLOR_H__
|
||||
#define __CLUTTER_COLOR_H__
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <clutter/clutter-fixed.h>
|
||||
#include <clutter/clutter-types.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define CLUTTER_TYPE_COLOR (clutter_color_get_type ())
|
||||
|
||||
typedef struct _ClutterColor ClutterColor;
|
||||
|
||||
/**
|
||||
* ClutterColor:
|
||||
* @red: red component, between 0 and 255
|
||||
|
@ -29,7 +29,7 @@
|
||||
#ifndef __CLUTTER_DEFORM_EFFECT_H__
|
||||
#define __CLUTTER_DEFORM_EFFECT_H__
|
||||
|
||||
#include <clutter/clutter-color.h>
|
||||
#include <cogl/cogl.h>
|
||||
#include <clutter/clutter-offscreen-effect.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
@ -40,7 +40,6 @@ G_BEGIN_DECLS
|
||||
#define CLUTTER_IS_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_EFFECT))
|
||||
#define CLUTTER_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_EFFECT, ClutterEffectClass))
|
||||
|
||||
typedef struct _ClutterEffect ClutterEffect;
|
||||
typedef struct _ClutterEffectClass ClutterEffectClass;
|
||||
|
||||
/**
|
||||
|
@ -29,6 +29,7 @@
|
||||
#ifndef __CLUTTER_OFFSCREEN_EFFECT_H__
|
||||
#define __CLUTTER_OFFSCREEN_EFFECT_H__
|
||||
|
||||
#include <cogl/cogl.h>
|
||||
#include <clutter/clutter-effect.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
@ -65,7 +65,6 @@ typedef enum {
|
||||
CLUTTER_SHADER_ERROR_COMPILE
|
||||
} ClutterShaderError;
|
||||
|
||||
typedef struct _ClutterShader ClutterShader;
|
||||
typedef struct _ClutterShaderPrivate ClutterShaderPrivate;
|
||||
typedef struct _ClutterShaderClass ClutterShaderClass;
|
||||
|
||||
|
@ -44,20 +44,19 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "clutter-actor-private.h"
|
||||
#include "clutter-texture.h"
|
||||
|
||||
#include "clutter-actor-private.h"
|
||||
#include "clutter-debug.h"
|
||||
#include "clutter-enum-types.h"
|
||||
#include "clutter-feature.h"
|
||||
#include "clutter-main.h"
|
||||
#include "clutter-marshal.h"
|
||||
#include "clutter-feature.h"
|
||||
#include "clutter-util.h"
|
||||
#include "clutter-private.h"
|
||||
#include "clutter-scriptable.h"
|
||||
#include "clutter-debug.h"
|
||||
#include "clutter-fixed.h"
|
||||
#include "clutter-enum-types.h"
|
||||
#include "clutter-shader.h"
|
||||
#include "clutter-stage-private.h"
|
||||
|
||||
#include "cogl/cogl.h"
|
||||
#include "clutter-util.h"
|
||||
|
||||
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
|
||||
|
||||
|
@ -28,8 +28,8 @@
|
||||
#ifndef __CLUTTER_TEXTURE_H__
|
||||
#define __CLUTTER_TEXTURE_H__
|
||||
|
||||
#include <clutter/clutter-actor.h>
|
||||
#include <cogl/cogl.h>
|
||||
#include <clutter/clutter-actor.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
@ -29,7 +29,6 @@
|
||||
#define __CLUTTER_TYPES_H__
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <clutter/clutter-units.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
@ -52,6 +51,11 @@ typedef struct _ClutterAnimator ClutterAnimator;
|
||||
|
||||
typedef struct _ClutterAction ClutterAction;
|
||||
typedef struct _ClutterConstraint ClutterConstraint;
|
||||
typedef struct _ClutterEffect ClutterEffect;
|
||||
|
||||
typedef struct _ClutterShader ClutterShader;
|
||||
|
||||
typedef struct _ClutterColor ClutterColor;
|
||||
|
||||
typedef union _ClutterEvent ClutterEvent;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user