hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup some headers. 

Remove duplicate typedefs and declerations.


SVN revision: 15407
This commit is contained in:
sebastid 2005-06-18 01:00:32 +00:00 committed by sebastid
parent 26dd936de1
commit 3f776d358a
68 changed files with 58 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/evas/src/bin/evas_gl_x11_main.c
View File

@ -17,7 +17,6 @@ main(int argc, char **argv)
Window win;
XSetWindowAttributes attr;
XClassHint chint;
XSizeHints szhints;
disp = XOpenDisplay(NULL);
if (!disp)

2
legacy/evas/src/bin/evas_software_x11_main.c
View File

@ -1,5 +1,6 @@
#include "evas_test_main.h"
#include <unistd.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@ -14,7 +15,6 @@ main(int argc, char **argv)
Window win;
XSetWindowAttributes attr;
XClassHint chint;
XSizeHints szhints;
disp = XOpenDisplay(NULL);
if (!disp)

4
legacy/evas/src/bin/evas_software_x11_perf_load.c
View File

@ -2,6 +2,7 @@
#include <X11/Xutil.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <math.h>
#include <sys/time.h>
@ -121,9 +122,6 @@ main(int argc, char **argv)
Evas_Performance *perf;
char buf[4096];
char *data, *key;
static mode_t default_mode =
S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH |
S_IXOTH;
FILE *f;
data = NULL;

3
legacy/evas/src/bin/evas_test_main.c
View File

@ -576,7 +576,6 @@ loop(void)
else if (t <= 106.0)
{
Evas_Coord tw, th;
int iw, ih;
evas_object_text_text_set(title, "Test 8: Raise & Lower");
evas_object_geometry_get(title, NULL, NULL, &tw, &th);
@ -610,7 +609,6 @@ loop(void)
else if (t <= 116.0)
{
Evas_Coord tw, th;
int iw, ih;
evas_object_text_text_set(title, "Test 9: Layer Setting");
evas_object_geometry_get(title, NULL, NULL, &tw, &th);
@ -646,7 +644,6 @@ loop(void)
else if (t <= 126.0)
{
Evas_Coord tw, th;
int iw, ih;
evas_object_text_text_set(title, "Test 10: Show & Hide");
evas_object_geometry_get(title, NULL, NULL, &tw, &th);

20
legacy/evas/src/lib/Evas.h
View File

@ -18,9 +18,6 @@
# endif
#endif
#ifndef EVAS_COMMON_H
#ifndef EVAS_PRIVATE_H
/**
* @file
* @brief These routines are used for Evas library interaction.
@ -66,17 +63,10 @@ typedef struct _Evas_Lock Evas_Lock; /**< An Evas Lock */
typedef struct _Evas_Smart Evas_Smart; /**< An Evas Smart Object handle */
typedef unsigned long long Evas_Modifier_Mask; /**< An Evas modifier mask type */
#if 0 /* able to change co-ordinate systems to remove all fp ops */
typedef double Evas_Coord; /**< A unit in canvas space. Normally a double, but may vary on platforms */
typedef double Evas_Font_Size; /**< Units to descript font sizes. Normally a double, but may vary on platforms */
typedef double Evas_Angle; /**< A unit to measure angles (in degrees). Normally a double, but may vary on platforms */
typedef int Evas_Bool; /**< A boolean. 1 = on/true/yes, 0 = off/false/no */
#else
typedef int Evas_Coord;
typedef int Evas_Font_Size;
typedef int Evas_Angle;
typedef char Evas_Bool;
#endif
struct _Evas_List /** A linked list node */
{
@ -117,8 +107,6 @@ struct _Evas_Smart_Class /** a smart object class */
const void *data;
};
#endif
#endif
typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A source description of pixels for importing pixels */
typedef struct _Evas_Engine_Info Evas_Engine_Info; /**< A generic Evas Engine information structure */
@ -599,15 +587,9 @@ extern "C" {
/* this is not complete and should be considered experimental. use at your */
/* own risk */
#ifndef EVAS_COMMON_H
#ifndef EVAS_PRIVATE_H
typedef struct _Evas_Imaging_Image Evas_Imaging_Image;
typedef struct _Evas_Imaging_Font Evas_Imaging_Font;
#endif
#endif
EAPI Evas_Imaging_Image *evas_imaging_image_load (const char *file, const char *key);
EAPI void evas_imaging_image_free (Evas_Imaging_Image *im);
EAPI void evas_imaging_image_size_get (Evas_Imaging_Image *im, int *w, int *h);
@ -636,5 +618,3 @@ extern "C" {
#endif
#endif

6
legacy/evas/src/lib/Makefile.am
View File

@ -4,10 +4,10 @@ SUBDIRS = canvas data file engines imaging include
AUTOMAKE_OPTIONS = 1.4 foreign
INCLUDES = @freetype_cflags@ @x_cflags@ @xcb_cflags@ @qt_cflags@ @DIRECTFB_CFLAGS@ @gl_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@ @xcb_cflags@ @qt_cflags@ @DIRECTFB_CFLAGS@ @gl_cflags@
lib_LTLIBRARIES = libevas.la

1
legacy/evas/src/lib/canvas/evas_callbacks.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
static void evas_object_event_callback_list_free(Evas_Object_List **list);
static void evas_object_event_callback_list_post_free(Evas_Object_List **list);

1
legacy/evas/src/lib/canvas/evas_clip.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
void
evas_object_clip_recalc(Evas_Object *obj)

1
legacy/evas/src/lib/canvas/evas_data.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/**
* @defgroup Evas_Object_Data_Group Object Data Functions

1
legacy/evas/src/lib/canvas/evas_events.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
int
evas_event_passes_through(Evas_Object *obj)

1
legacy/evas/src/lib/canvas/evas_focus.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private calls */

1
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
#ifdef BUILD_FONT_LOADER_EET
#include <Eet.h>
#endif

1
legacy/evas/src/lib/canvas/evas_key.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private calls */

1
legacy/evas/src/lib/canvas/evas_key_grab.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private calls */

1
legacy/evas/src/lib/canvas/evas_layer.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
void
evas_object_inject(Evas_Object *obj, Evas *e)

2
legacy/evas/src/lib/canvas/evas_main.c
View File

@ -28,8 +28,6 @@
#include "evas_engine_api_cairo_x11.h"
#endif
#include "Evas.h"
static int initcount = 0;
int

1
legacy/evas/src/lib/canvas/evas_name.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/**
* @defgroup Evas_Object_Name_Group Object Name Function

1
legacy/evas/src/lib/canvas/evas_object_gradient.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private magic number for gradient objects */
static const char o_type[] = "gradient";

1
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private magic number for image objects */
static const char o_type[] = "image";

1
legacy/evas/src/lib/canvas/evas_object_inform.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* local calls */

1
legacy/evas/src/lib/canvas/evas_object_intercept.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* local calls */

1
legacy/evas/src/lib/canvas/evas_object_line.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private magic number for line objects */
static const char o_type[] = "line";

1
legacy/evas/src/lib/canvas/evas_object_main.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* evas internal stuff */
Evas_Object *

1
legacy/evas/src/lib/canvas/evas_object_polygon.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private magic number for polygon objects */
static const char o_type[] = "polygon";

1
legacy/evas/src/lib/canvas/evas_object_rectangle.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private magic number for rectangle objects */
static const char o_type[] = "rectangle";

1
legacy/evas/src/lib/canvas/evas_object_smart.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
typedef struct _Evas_Object_Smart Evas_Object_Smart;
typedef struct _Evas_Smart_Callback Evas_Smart_Callback;

1
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* private magic number for text objects */
static const char o_type[] = "text";

1
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -4,7 +4,6 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* FIXME:
*

1
legacy/evas/src/lib/canvas/evas_rectangle.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
Evas_List *
evas_rects_return_difference_rects(int x, int y, int w, int h, int xx, int yy, int ww, int hh)

1
legacy/evas/src/lib/canvas/evas_render.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/**
* To be documented.

1
legacy/evas/src/lib/canvas/evas_smart.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
/* all public */

1
legacy/evas/src/lib/canvas/evas_stack.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
static Evas_Object *evas_object_above_get_internal(Evas_Object *obj);
static Evas_Object *evas_object_below_get_internal(Evas_Object *obj);

6
legacy/evas/src/lib/data/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
noinst_LTLIBRARIES = libevas_data.la
libevas_data_la_SOURCES = \

1
legacy/evas/src/lib/data/evas_hash.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
static int evas_hash_gen(const char *key);

1
legacy/evas/src/lib/data/evas_list.c
View File

@ -3,7 +3,6 @@
*/
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
static int _evas_list_alloc_error = 0;

6
legacy/evas/src/lib/engines/buffer/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
if BUILD_ENGINE_BUFFER

5
legacy/evas/src/lib/engines/buffer/evas_engine.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_buffer.h"
#include "Evas.h"
#include "Evas_Engine_Buffer.h"
static void *evas_engine_buffer_info(Evas *e);
@ -1068,8 +1067,6 @@ static void
evas_engine_buffer_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, char *text)
{
Render_Engine *re;
RGBA_Font* newfont;
int render_w, render_h, mult, divv;
re = (Render_Engine *)data;
if ((w == ow) && (h == oh))
@ -1092,7 +1089,7 @@ evas_engine_buffer_font_draw(void *data, void *context, void *surface, void *fon
if (im)
{
int max_ascent;
int i, j;
int j;
im->flags |= RGBA_IMAGE_HAS_ALPHA;
j = (ow+inset) * oh;

6
legacy/evas/src/lib/engines/cairo_common/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @CAIRO_CFLAGS@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @CAIRO_CFLAGS@
if BUILD_ENGINE_CAIRO_COMMON

6
legacy/evas/src/lib/engines/cairo_x11/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @x_cflags@ @CAIRO_CFLAGS@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@ @CAIRO_CFLAGS@
if BUILD_ENGINE_CAIRO_X11

1
legacy/evas/src/lib/engines/cairo_x11/evas_engine.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_cairo_x11.h"
#include "Evas.h"
#include "Evas_Engine_Cairo_X11.h"
#include "evas_cairo_common.h"

1
legacy/evas/src/lib/engines/cairo_x11/evas_x_main.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_cairo_x11.h"
#include "Evas.h"
#include "Evas_Engine_Cairo_X11.h"
#include "evas_cairo_common.h"

4
legacy/evas/src/lib/engines/common/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @VALGRIND_CFLAGS@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @VALGRIND_CFLAGS@ \
@eet_cflags@ @edb_cflags@
noinst_LTLIBRARIES = libevas_engine_common.la

2
legacy/evas/src/lib/engines/common/evas_font_query.c
View File

@ -174,7 +174,6 @@ evas_common_font_query_char_coords(RGBA_Font *fn, const char *text, int pos, int
RGBA_Font_Glyph *fg;
int chr_x, chr_y, chr_w;
int gl, kern;
FT_Vector delta;
pchr = chr;
gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr);
@ -261,7 +260,6 @@ evas_common_font_query_text_at_pos(RGBA_Font *fn, const char *text, int x, int y
RGBA_Font_Glyph *fg;
int chr_x, chr_y, chr_w;
int gl, kern;
FT_Vector delta;
pchr = chr;
gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr);

3
legacy/evas/src/lib/engines/common/evas_image_load.c
View File

@ -564,7 +564,8 @@ static int load_image_file_head_eet(RGBA_Image *im, const char *file, const char
static int
load_image_file_head_eet(RGBA_Image *im, const char *file, const char *key)
{
int w, h, alpha, compression, quality, lossy;
int alpha, compression, quality, lossy;
unsigned int w, h;
Eet_File *ef;
int ok;

5
legacy/evas/src/lib/engines/common/evas_image_main.c
View File

@ -233,8 +233,6 @@ evas_common_image_new(void)
void
evas_common_image_free(RGBA_Image *im)
{
int i;
if (im->image) evas_common_image_surface_free(im->image);
if (im->info.file) free(im->info.file);
if (im->info.real_file) free(im->info.real_file);
@ -478,7 +476,6 @@ int
evas_common_image_ram_usage(RGBA_Image *im)
{
int ram = 0;
int i;
ram += sizeof(struct _RGBA_Image);
if (im->info.file) ram += strlen(im->info.file);
@ -493,8 +490,6 @@ evas_common_image_ram_usage(RGBA_Image *im)
void
evas_common_image_dirty(RGBA_Image *im)
{
int i;
evas_common_image_unstore(im);
im->flags |= RGBA_IMAGE_IS_DIRTY;
}

6
legacy/evas/src/lib/engines/directfb/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @DIRECTFB_CFLAGS@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @DIRECTFB_CFLAGS@
if BUILD_ENGINE_DIRECTFB

6
legacy/evas/src/lib/engines/fb/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
if BUILD_ENGINE_FB

1
legacy/evas/src/lib/engines/fb/evas_engine.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_fb.h"
#include "Evas.h"
#include "Evas_Engine_FB.h"
static void *evas_engine_fb_info(Evas *e);

6
legacy/evas/src/lib/engines/gl_common/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @gl_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @gl_cflags@
if BUILD_ENGINE_GL_COMMON

2
legacy/evas/src/lib/engines/gl_common/evas_gl_context.c
View File

@ -277,8 +277,6 @@ _evas_gl_common_blend_set(Evas_GL_Context *gc)
static void
_evas_gl_common_color_set(Evas_GL_Context *gc)
{
int r, g, b, a;
if (!gc->change.color) return;
glColor4d((double)gc->r / 255.0,
(double)gc->g / 255.0,

3
legacy/evas/src/lib/engines/gl_common/evas_gl_texture.c
View File

@ -142,12 +142,11 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth)
int *im_data;
int im_w, im_h;
int tw, th;
int shift;
GLenum pixfmt, texfmt, target;
if (tex->not_power_of_two)
{
void *tmp = NULL, *data;
void *data;
glEnable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_RECTANGLE_NV);

6
legacy/evas/src/lib/engines/gl_x11/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @x_cflags@ @gl_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@ @gl_cflags@
if BUILD_ENGINE_GL_X11

3
legacy/evas/src/lib/engines/gl_x11/evas_engine.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_gl_x11.h"
#include "Evas.h"
#include "Evas_Engine_GL_X11.h"
#include "evas_gl_common.h"
@ -375,7 +374,6 @@ static void
evas_engine_gl_x11_output_flush(void *data)
{
Render_Engine *re;
static int fr = 0;
re = (Render_Engine *)data;
// printf("GL: flush your mush!\n");
@ -686,7 +684,6 @@ static void *
evas_engine_gl_x11_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
{
Render_Engine *re;
Evas_GL_Image *im;
re = (Render_Engine *)data;
evas_gl_common_image_dirty(image);

1
legacy/evas/src/lib/engines/gl_x11/evas_x_main.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_gl_x11.h"
#include "Evas.h"
#include "Evas_Engine_GL_X11.h"
#include "evas_gl_common.h"

6
legacy/evas/src/lib/engines/software_qtopia/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @qt_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @qt_cflags@
CXXFLAGS = $(CFLAGS) -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -DNO_DEBUG

1
legacy/evas/src/lib/engines/software_qtopia/evas_engine.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_software_qtopia.h"
#include "Evas.h"
#include "Evas_Engine_Software_Qtopia.h"
static void *evas_engine_software_qtopia_info(Evas *e);

1
legacy/evas/src/lib/engines/software_qtopia/evas_outbuf.c
View File

@ -1,7 +1,6 @@
#include "evas_common.h"
#include "evas_engine.h"
#include "evas_private.h"
#include "Evas.h"
#include "Evas_Engine_Software_Qtopia.h"
#include <sys/time.h>
#include <sys/utsname.h>

6
legacy/evas/src/lib/engines/software_x11/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @x_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@
if BUILD_ENGINE_SOFTWARE_X11

4
legacy/evas/src/lib/engines/software_x11/evas_engine.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_software_x11.h"
#include "Evas.h"
#include "Evas_Engine_Software_X11.h"
static void *evas_engine_software_x11_info(Evas *e);
@ -402,7 +401,6 @@ static void
evas_engine_software_x11_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
{
Render_Engine *re;
Evas_Engine_Info_Software_X11 *info;
re = (Render_Engine *)data;
evas_software_x11_outbuf_push_updated_region(re->ob, surface, x, y, w, h);
@ -1085,7 +1083,7 @@ evas_engine_software_x11_font_draw(void *data, void *context, void *surface, voi
if (im)
{
int max_ascent;
int i, j;
int j;
im->flags |= RGBA_IMAGE_HAS_ALPHA;
j = (ow+inset) * oh;

6
legacy/evas/src/lib/engines/software_xcb/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ @xcb_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @xcb_cflags@
if BUILD_ENGINE_SOFTWARE_XCB

1
legacy/evas/src/lib/engines/software_xcb/evas_engine.c
View File

@ -2,7 +2,6 @@
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_software_xcb.h"
#include "Evas.h"
#include "Evas_Engine_Software_Xcb.h"
static void *evas_engine_software_xcb_info(Evas *e);

6
legacy/evas/src/lib/file/Makefile.am
View File

@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
noinst_LTLIBRARIES = libevas_file.la
libevas_file_la_SOURCES = \

2
legacy/evas/src/lib/file/evas_path.c
View File

@ -126,7 +126,9 @@ evas_file_modified_time(const char *file)
char *
evas_file_path_resolve(const char *file)
{
#if 0
char buf[PATH_MAX], *buf2;
#endif
return strdup(file);
#if 0

8
legacy/evas/src/lib/imaging/Makefile.am
View File

@ -5,11 +5,11 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @freetype_cflags@ \
@eet_cflags@ \
-I. \
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ \
@eet_cflags@
noinst_LTLIBRARIES = libevas_imaging.la
libevas_imaging_la_SOURCES = \

2
legacy/evas/src/lib/imaging/evas_imaging.c
View File

@ -1,5 +1,3 @@
#include "config.h"
#include "evas_options.h"
#include "evas_common.h"
#include "evas_private.h"

18
legacy/evas/src/lib/include/evas_common.h
View File

@ -1,6 +1,7 @@
#ifndef EVAS_COMMON_H
#define EVAS_COMMON_H
#include "Evas.h"
#include "config.h"
/*****************************************************************************/
@ -138,16 +139,7 @@ typedef unsigned char DATA8;
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 @@ struct _Evas_Object_List
Evas_Object_List *last;
};
struct _Evas_List
{
void *data;
Evas_List *next, *prev;
Evas_List *last;
int count;
};
struct _Evas_Hash
{
int population;

86
legacy/evas/src/lib/include/evas_private.h
View File

@ -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 @@ typedef enum _Evas_Format_Direction
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_Data_Node Evas_Data_Node;
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_Obj Evas_Intercept_Func_Obj;
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 @@ if (_r) \
(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 @@ struct _Evas_Smart
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 @@ void *evas_font_load(Evas *evas, const char *name, const char *source, int size)
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 @@ struct _Evas_Imaging_Font
#ifdef __cplusplus
}
#endif
#endif

1
legacy/evas/src/lib/main.c
View File

@ -1,6 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
#include "Evas.h"
int _evas_alloc_error = 0;
static int _evas_debug_init = 0;