brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor header surgery to ClutterBehaviour

Browse Source 
This moves a couple of definitions to the common types header, and makes
sure that ClutterBehaviour subclasses include clutter-behaviour.h first,
so that their types can be fully expanded without necessarily have the
ClutterBehaviour header header included by their public headers. This is
the necessary prelude to have clutter-behaviour.[ch] moved to the
deprecated section.
This commit is contained in:
Emmanuele Bassi 2011-10-04 11:52:47 +01:00
parent bcd7845d91
commit e268201221
15 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-behaviour.h
View File

@ -30,8 +30,6 @@
#ifndef __CLUTTER_BEHAVIOUR_H__
#define __CLUTTER_BEHAVIOUR_H__
#include <glib-object.h>
#include <clutter/clutter-alpha.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS
@ -60,7 +58,6 @@ G_BEGIN_DECLS
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_BEHAVIOUR, ClutterBehaviourClass))
typedef struct _ClutterBehaviour ClutterBehaviour;
typedef struct _ClutterBehaviourPrivate ClutterBehaviourPrivate;
typedef struct _ClutterBehaviourClass ClutterBehaviourClass;

4
clutter/clutter-path.h
View File

@ -28,9 +28,8 @@
#ifndef __CLUTTER_PATH_H__
#define __CLUTTER_PATH_H__
#include <glib-object.h>
#include <clutter/clutter-types.h>
#include <cairo.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS
@ -75,7 +74,6 @@ typedef enum {
CLUTTER_PATH_REL_CURVE_TO = CLUTTER_PATH_CURVE_TO | CLUTTER_PATH_RELATIVE
} ClutterPathNodeType;
typedef struct _ClutterPath ClutterPath;
typedef struct _ClutterPathClass ClutterPathClass;
typedef struct _ClutterPathPrivate ClutterPathPrivate;
typedef struct _ClutterPathNode ClutterPathNode;

12
clutter/clutter-types.h
View File

@ -47,20 +47,24 @@ typedef struct _ClutterChildMeta ClutterChildMeta;
typedef struct _ClutterLayoutMeta ClutterLayoutMeta;
typedef struct _ClutterActorMeta ClutterActorMeta;
typedef struct _ClutterAlpha ClutterAlpha;
typedef struct _ClutterAnimator ClutterAnimator;
typedef struct _ClutterPath ClutterPath;
typedef struct _ClutterAction ClutterAction;
typedef struct _ClutterConstraint ClutterConstraint;
typedef struct _ClutterEffect ClutterEffect;
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
typedef struct _ClutterShader ClutterShader;
#endif
typedef struct _ClutterColor ClutterColor;
typedef union _ClutterEvent ClutterEvent;
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
typedef struct _ClutterBehaviour ClutterBehaviour;
typedef struct _ClutterShader ClutterShader;
#endif /* DISABLE_DEPRECATED */
/**
* ClutterGravity:
* @CLUTTER_GRAVITY_NONE: Do not apply any gravity

2
clutter/deprecated/clutter-behaviour-depth.c
View File

@ -27,8 +27,8 @@
#include "config.h"
#endif
#include "clutter-behaviour.h"
#include "clutter-behaviour-depth.h"
#include "clutter-enum-types.h"
#include "clutter-main.h"
#include "clutter-debug.h"

3
clutter/deprecated/clutter-behaviour-depth.h
View File

@ -30,8 +30,7 @@
#ifndef __CLUTTER_BEHAVIOUR_DEPTH__
#define __CLUTTER_BEHAVIOUR_DEPTH__
#include <clutter/clutter-actor.h>
#include <clutter/clutter-behaviour.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS

2
clutter/deprecated/clutter-behaviour-ellipse.c
View File

@ -50,8 +50,8 @@
#include <math.h>
#include <stdlib.h>
#include "clutter-behaviour.h"
#include "clutter-behaviour-ellipse.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-private.h"

3
clutter/deprecated/clutter-behaviour-ellipse.h
View File

@ -28,9 +28,6 @@
#ifndef __CLUTTER_BEHAVIOUR_ELLIPSE_H__
#define __CLUTTER_BEHAVIOUR_ELLIPSE_H__
#include <clutter/clutter-alpha.h>
#include <clutter/clutter-actor.h>
#include <clutter/clutter-behaviour.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS

2
clutter/deprecated/clutter-behaviour-opacity.c
View File

@ -42,8 +42,8 @@
#include <math.h>
#include "clutter-behaviour.h"
#include "clutter-behaviour-opacity.h"
#include "clutter-private.h"
#include "clutter-debug.h"

3
clutter/deprecated/clutter-behaviour-opacity.h
View File

@ -30,8 +30,7 @@
#ifndef __CLUTTER_BEHAVIOUR_OPACITY_H__
#define __CLUTTER_BEHAVIOUR_OPACITY_H__
#include <clutter/clutter-alpha.h>
#include <clutter/clutter-behaviour.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS

2
clutter/deprecated/clutter-behaviour-path.c
View File

@ -67,8 +67,8 @@
#include "config.h"
#endif
#include "clutter-behaviour.h"
#include "clutter-behaviour-path.h"
#include "clutter-bezier.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"

3
clutter/deprecated/clutter-behaviour-path.h
View File

@ -30,8 +30,7 @@
#ifndef __CLUTTER_BEHAVIOUR_PATH_H__
#define __CLUTTER_BEHAVIOUR_PATH_H__
#include <clutter/clutter-alpha.h>
#include <clutter/clutter-behaviour.h>
#include <clutter/clutter-types.h>
#include <clutter/clutter-path.h>
G_BEGIN_DECLS

4
clutter/deprecated/clutter-behaviour-rotate.c
View File

@ -39,10 +39,10 @@
#include "config.h"
#endif
#include "clutter-behaviour-rotate.h"
#include <math.h>
#include "clutter-behaviour.h"
#include "clutter-behaviour-rotate.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-main.h"

2
clutter/deprecated/clutter-behaviour-rotate.h
View File

@ -28,8 +28,6 @@
#ifndef __CLUTTER_BEHAVIOUR_ROTATE_H__
#define __CLUTTER_BEHAVIOUR_ROTATE_H__
#include <clutter/clutter-alpha.h>
#include <clutter/clutter-behaviour.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS

2
clutter/deprecated/clutter-behaviour-scale.c
View File

@ -41,8 +41,8 @@
#include <math.h>
#include "clutter-behaviour.h"
#include "clutter-behaviour-scale.h"
#include "clutter-debug.h"
#include "clutter-main.h"
#include "clutter-private.h"

2
clutter/deprecated/clutter-behaviour-scale.h
View File

@ -30,7 +30,7 @@
#ifndef __CLUTTER_BEHAVIOUR_SCALE_H__
#define __CLUTTER_BEHAVIOUR_SCALE_H__
#include <clutter/clutter-behaviour.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS