[clutter] Move Perspective and Fog definitions to clutter-types.h
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Move Perspective and Fog definitions to clutter-types.h
- Date: Tue, 3 Jan 2012 14:01:07 +0000 (UTC)
commit f5fffb355b546cd36621b1de0bf15472da10f782
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Tue Jan 3 13:50:06 2012 +0000
Move Perspective and Fog definitions to clutter-types.h
Since we reference the types from multiple files.
clutter/clutter-stage.h | 7 -------
clutter/clutter-types.h | 4 ++++
2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index 36bb7fc..e75c57e 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -36,8 +36,6 @@
G_BEGIN_DECLS
-#define CLUTTER_TYPE_PERSPECTIVE (clutter_perspective_get_type ())
-#define CLUTTER_TYPE_FOG (clutter_fog_get_type ())
#define CLUTTER_TYPE_STAGE (clutter_stage_get_type())
#define CLUTTER_STAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE, ClutterStage))
@@ -46,9 +44,6 @@ G_BEGIN_DECLS
#define CLUTTER_IS_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_STAGE))
#define CLUTTER_STAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STAGE, ClutterStageClass))
-typedef struct _ClutterPerspective ClutterPerspective;
-typedef struct _ClutterFog ClutterFog;
-
typedef struct _ClutterStageClass ClutterStageClass;
typedef struct _ClutterStagePrivate ClutterStagePrivate;
@@ -100,8 +95,6 @@ struct _ClutterStageClass
gpointer _padding_dummy[31];
};
-
-
/**
* ClutterPerspective:
* @fovy: the field of view angle, in degrees, in the y direction
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index 7d5b513..594832c 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -49,9 +49,11 @@ G_BEGIN_DECLS
#endif
#define CLUTTER_TYPE_ACTOR_BOX (clutter_actor_box_get_type ())
+#define CLUTTER_TYPE_FOG (clutter_fog_get_type ())
#define CLUTTER_TYPE_GEOMETRY (clutter_geometry_get_type ())
#define CLUTTER_TYPE_KNOT (clutter_knot_get_type ())
#define CLUTTER_TYPE_PAINT_VOLUME (clutter_paint_volume_get_type ())
+#define CLUTTER_TYPE_PERSPECTIVE (clutter_perspective_get_type ())
#define CLUTTER_TYPE_VERTEX (clutter_vertex_get_type ())
typedef struct _ClutterActor ClutterActor;
@@ -76,8 +78,10 @@ typedef struct _ClutterPath ClutterPath;
typedef struct _ClutterActorBox ClutterActorBox;
typedef struct _ClutterColor ClutterColor;
+typedef struct _ClutterFog ClutterFog;
typedef struct _ClutterGeometry ClutterGeometry;
typedef struct _ClutterKnot ClutterKnot;
+typedef struct _ClutterPerspective ClutterPerspective;
typedef struct _ClutterVertex ClutterVertex;
typedef struct _ClutterBehaviour ClutterBehaviour;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]