isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-19 22:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Re-arrange headers

Browse Source 
Try to minimize the included headers, especially in clutter-actor.h.
This commit is contained in:
Emmanuele Bassi 2010-11-18 18:23:49 +00:00
parent 63cef64d17
commit 694632ce95
10 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter-actor.c
View File

@ -303,6 +303,7 @@
#include "clutter-profile.h" #include "clutter-profile.h"
#include "clutter-scriptable.h" #include "clutter-scriptable.h"
#include "clutter-script-private.h" #include "clutter-script-private.h"
#include "clutter-shader.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "clutter-units.h" #include "clutter-units.h"

6
clutter/clutter-actor.h
View File

@ -34,12 +34,10 @@
#include <pango/pango.h> #include <pango/pango.h>
#include <atk/atk.h> #include <atk/atk.h>
#include <clutter/clutter-types.h> #include <cogl/cogl.h>
#include <clutter/clutter-color.h> #include <clutter/clutter-types.h>
#include <clutter/clutter-effect.h>
#include <clutter/clutter-event.h> #include <clutter/clutter-event.h>
#include <clutter/clutter-shader.h>
G_BEGIN_DECLS G_BEGIN_DECLS

5
clutter/clutter-color.h
View File

@ -30,15 +30,12 @@
#ifndef __CLUTTER_COLOR_H__ #ifndef __CLUTTER_COLOR_H__
#define __CLUTTER_COLOR_H__ #define __CLUTTER_COLOR_H__
#include <glib-object.h> #include <clutter/clutter-types.h>
#include <clutter/clutter-fixed.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_COLOR (clutter_color_get_type ()) #define CLUTTER_TYPE_COLOR (clutter_color_get_type ())
typedef struct _ClutterColor ClutterColor;
/** /**
* ClutterColor: * ClutterColor:
* @red: red component, between 0 and 255 * @red: red component, between 0 and 255

2
clutter/clutter-deform-effect.h
View File

@ -29,7 +29,7 @@
#ifndef __CLUTTER_DEFORM_EFFECT_H__ #ifndef __CLUTTER_DEFORM_EFFECT_H__
#define __CLUTTER_DEFORM_EFFECT_H__ #define __CLUTTER_DEFORM_EFFECT_H__
#include <clutter/clutter-color.h> #include <cogl/cogl.h>
#include <clutter/clutter-offscreen-effect.h> #include <clutter/clutter-offscreen-effect.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
clutter/clutter-effect.h
View File

@ -40,7 +40,6 @@ G_BEGIN_DECLS
#define CLUTTER_IS_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_EFFECT)) #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)) #define CLUTTER_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_EFFECT, ClutterEffectClass))
typedef struct _ClutterEffect ClutterEffect;
typedef struct _ClutterEffectClass ClutterEffectClass; typedef struct _ClutterEffectClass ClutterEffectClass;
/** /**

1
clutter/clutter-offscreen-effect.h
View File

@ -29,6 +29,7 @@
#ifndef __CLUTTER_OFFSCREEN_EFFECT_H__ #ifndef __CLUTTER_OFFSCREEN_EFFECT_H__
#define __CLUTTER_OFFSCREEN_EFFECT_H__ #define __CLUTTER_OFFSCREEN_EFFECT_H__
#include <cogl/cogl.h>
#include <clutter/clutter-effect.h> #include <clutter/clutter-effect.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
clutter/clutter-shader.h
View File

@ -65,7 +65,6 @@ typedef enum {
CLUTTER_SHADER_ERROR_COMPILE CLUTTER_SHADER_ERROR_COMPILE
} ClutterShaderError; } ClutterShaderError;
typedef struct _ClutterShader ClutterShader;
typedef struct _ClutterShaderPrivate ClutterShaderPrivate; typedef struct _ClutterShaderPrivate ClutterShaderPrivate;
typedef struct _ClutterShaderClass ClutterShaderClass; typedef struct _ClutterShaderClass ClutterShaderClass;

15
clutter/clutter-texture.c
View File

@ -44,20 +44,19 @@
#include "config.h" #include "config.h"
#endif #endif
#include "clutter-actor-private.h"
#include "clutter-texture.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-main.h"
#include "clutter-marshal.h" #include "clutter-marshal.h"
#include "clutter-feature.h"
#include "clutter-util.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-scriptable.h" #include "clutter-scriptable.h"
#include "clutter-debug.h" #include "clutter-shader.h"
#include "clutter-fixed.h"
#include "clutter-enum-types.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "clutter-util.h"
#include "cogl/cogl.h"
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface); static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);

2
clutter/clutter-texture.h
View File

@ -28,8 +28,8 @@
#ifndef __CLUTTER_TEXTURE_H__ #ifndef __CLUTTER_TEXTURE_H__
#define __CLUTTER_TEXTURE_H__ #define __CLUTTER_TEXTURE_H__
#include <clutter/clutter-actor.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <clutter/clutter-actor.h>
G_BEGIN_DECLS G_BEGIN_DECLS

6
clutter/clutter-types.h
View File

@ -29,7 +29,6 @@
#define __CLUTTER_TYPES_H__ #define __CLUTTER_TYPES_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-units.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -52,6 +51,11 @@ typedef struct _ClutterAnimator ClutterAnimator;
typedef struct _ClutterAction ClutterAction; typedef struct _ClutterAction ClutterAction;
typedef struct _ClutterConstraint ClutterConstraint; typedef struct _ClutterConstraint ClutterConstraint;
typedef struct _ClutterEffect ClutterEffect;
typedef struct _ClutterShader ClutterShader;
typedef struct _ClutterColor ClutterColor;
typedef union _ClutterEvent ClutterEvent; typedef union _ClutterEvent ClutterEvent;