Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_common.h evas_private.h
Log Message:
Cleanup some headers.
Remove duplicate typedefs and declerations.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- evas_common.h 22 May 2005 02:49:50 -0000 1.38
+++ evas_common.h 18 Jun 2005 01:00:32 -0000 1.39
@@ -1,6 +1,7 @@
#ifndef EVAS_COMMON_H
#define EVAS_COMMON_H
+#include "Evas.h"
#include "config.h"
/*****************************************************************************/
@@ -138,16 +139,7 @@
typedef struct _Evas_Object_List Evas_Object_List;
-typedef struct _Evas_List Evas_List;
-typedef struct _Evas_Hash Evas_Hash;
typedef struct _Evas_Hash_El Evas_Hash_El;
-#ifndef EVAS_PRIVATE_H
-#if 1 /* able to change co-ordinate systems to remove all fp ops */
-typedef int Evas_Bool;
-#else
-typedef char Evas_Bool;
-#endif
-#endif
typedef struct _RGBA_Image RGBA_Image;
typedef struct _RGBA_Surface RGBA_Surface;
@@ -229,14 +221,6 @@
Evas_Object_List *last;
};
-struct _Evas_List
-{
- void *data;
- Evas_List *next, *prev;
- Evas_List *last;
- int count;
-};
-
struct _Evas_Hash
{
int population;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_private.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- evas_private.h 22 May 2005 03:02:15 -0000 1.43
+++ evas_private.h 18 Jun 2005 01:00:32 -0000 1.44
@@ -1,11 +1,12 @@
#ifndef EVAS_PRIVATE_H
#define EVAS_PRIVATE_H
-#endif
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
+#include "Evas.h"
+
/* complain when peole pass in wrong object types etc. */
#define MAGIC_DEBUG
@@ -21,33 +22,6 @@
#define RENDER_METHOD_INVALID 0x00000000
-typedef enum _Evas_Callback_Type
-{
- EVAS_CALLBACK_MOUSE_IN,
- EVAS_CALLBACK_MOUSE_OUT,
- EVAS_CALLBACK_MOUSE_DOWN,
- EVAS_CALLBACK_MOUSE_UP,
- EVAS_CALLBACK_MOUSE_MOVE,
- EVAS_CALLBACK_MOUSE_WHEEL,
- EVAS_CALLBACK_FREE,
- EVAS_CALLBACK_KEY_DOWN,
- EVAS_CALLBACK_KEY_UP,
- EVAS_CALLBACK_FOCUS_IN,
- EVAS_CALLBACK_FOCUS_OUT,
- EVAS_CALLBACK_SHOW,
- EVAS_CALLBACK_HIDE,
- EVAS_CALLBACK_MOVE,
- EVAS_CALLBACK_RESIZE,
- EVAS_CALLBACK_RESTACK
-} Evas_Callback_Type;
-
-typedef enum _Evas_Button_Flags
-{
- EVAS_BUTTON_NONE = 0,
- EVAS_BUTTON_DOUBLE_CLICK = (1 << 0),
- EVAS_BUTTON_TRIPLE_CLICK = (1 << 1)
-} Evas_Button_Flags;
-
typedef enum _Evas_Format_Type
{
EVAS_FORMAT_NONE = 0,
@@ -72,11 +46,7 @@
EVAS_FORMAT_DIRECTION_HORIZONTAL = 1
} Evas_Format_Direction;
-typedef struct _Evas_Rectangle Evas_Rectangle;
-
-typedef struct _Evas Evas;
typedef struct _Evas_Layer Evas_Layer;
-typedef struct _Evas_Object Evas_Object;
typedef struct _Evas_Font_Dir Evas_Font_Dir;
typedef struct _Evas_Font Evas_Font;
typedef struct _Evas_Font_Alias Evas_Font_Alias;
@@ -84,11 +54,6 @@
typedef struct _Evas_Func_Node Evas_Func_Node;
typedef struct _Evas_Func Evas_Func;
typedef struct _Evas_Object_Func Evas_Object_Func;
-typedef struct _Evas_Modifier Evas_Modifier;
-typedef struct _Evas_Lock Evas_Lock;
-typedef unsigned long long Evas_Modifier_Mask;
-typedef struct _Evas_Smart Evas_Smart;
-typedef void Evas_Performance;
typedef struct _Evas_Intercept_Func Evas_Intercept_Func;
typedef struct _Evas_Intercept_Func_Basic Evas_Intercept_Func_Basic;
typedef struct _Evas_Intercept_Func_SizePos Evas_Intercept_Func_SizePos;
@@ -96,23 +61,7 @@
typedef struct _Evas_Intercept_Func_Int Evas_Intercept_Func_Int;
typedef struct _Evas_Key_Grab Evas_Key_Grab;
typedef struct _Evas_Callbacks Evas_Callbacks;
-typedef struct _Evas_Smart_Class Evas_Smart_Class;
typedef struct _Evas_Format Evas_Format;
-#if 0 /* able to change co-ordinate systems to remove all fp ops */
-typedef double Evas_Coord;
-typedef double Evas_Font_Size;
-typedef double Evas_Angle;
-#ifndef EVAS_COMMON_H
-typedef int Evas_Bool;
-#endif
-#else
-typedef int Evas_Coord;
-typedef int Evas_Font_Size;
-typedef int Evas_Angle;
-#ifndef EVAS_COMMON_H
-typedef char Evas_Bool;
-#endif
-#endif
#define MAGIC_EVAS 0x70777770
#define MAGIC_OBJ 0x71777770
@@ -180,11 +129,6 @@
(o)->prev.key = NULL; \
}
-struct _Evas_Rectangle
-{
- int x, y, w, h;
-};
-
struct _Evas_Intercept_Func_Basic
{
void (*func) (void *data, Evas_Object *obj);
@@ -245,28 +189,6 @@
Evas_Smart_Class *smart_class;
};
-struct _Evas_Smart_Class /** a smart object class */
-{
- const char *name; /** the string name of the class */
-
- void (*add) (Evas_Object *o);
- void (*del) (Evas_Object *o);
- void (*layer_set) (Evas_Object *o, int l);
- void (*raise) (Evas_Object *o);
- void (*lower) (Evas_Object *o);
- void (*stack_above) (Evas_Object *o, Evas_Object *above);
- void (*stack_below) (Evas_Object *o, Evas_Object *below);
- void (*move) (Evas_Object *o, Evas_Coord x, Evas_Coord y);
- void (*resize) (Evas_Object *o, Evas_Coord w, Evas_Coord h);
- void (*show) (Evas_Object *o);
- void (*hide) (Evas_Object *o);
- void (*color_set) (Evas_Object *o, int r, int g, int b, int a);
- void (*clip_set) (Evas_Object *o, Evas_Object *clip);
- void (*clip_unset) (Evas_Object *o);
-
- const void *data;
-};
-
struct _Evas_Modifier
{
struct {
@@ -699,9 +621,6 @@
extern int _evas_alloc_error;
-typedef struct _Evas_Imaging_Image Evas_Imaging_Image;
-typedef struct _Evas_Imaging_Font Evas_Imaging_Font;
-
struct _Evas_Imaging_Image
{
RGBA_Image *image;
@@ -715,3 +634,4 @@
#ifdef __cplusplus
}
#endif
+#endif
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
