Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/estyle
Dir : e17/libs/estyle/src
Modified Files:
Estyle.h Estyle_private.h Makefile.am estyle_color.c
estyle_heap.c estyle_heap.h estyle_style.c
Log Message:
Move the ewd dependant code to the ecore equivalents.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Estyle.h 18 Oct 2003 16:22:46 -0000 1.17
+++ Estyle.h 24 Mar 2004 04:53:51 -0000 1.18
@@ -1,7 +1,6 @@
#ifndef _ESTYLE_H
#define _ESTYLE_H
-#include <Ewd.h>
#include <Edb.h>
#include <Evas.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Estyle_private.h 18 Oct 2003 16:22:46 -0000 1.15
+++ Estyle_private.h 24 Mar 2004 04:53:51 -0000 1.16
@@ -1,6 +1,7 @@
#ifndef _ESTYLE_PRIVATE_H
#define _ESTYLE_PRIVATE_H
+#include <Ecore.h>
#include "Estyle.h"
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 2 Apr 2002 01:30:53 -0000 1.3
+++ Makefile.am 24 Mar 2004 04:53:51 -0000 1.4
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = @evas_cflags@ @ewd_cflags@
+INCLUDES = @evas_cflags@
lib_LTLIBRARIES = libestyle.la
@@ -17,6 +17,6 @@
estyle_heap.c
-libestyle_la_LIBADD = @evas_libs@ @ewd_libs@
+libestyle_la_LIBADD = @evas_libs@
libestyle_la_DEPENDENCIES = $(top_builddir)/estyle-config.h
libestyle_la_LDFLAGS = -version-info 0:1:0
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- estyle_color.c 14 Jan 2003 18:50:52 -0000 1.7
+++ estyle_color.c 24 Mar 2004 04:53:51 -0000 1.8
@@ -1,7 +1,7 @@
#include "estyle-config.h"
#include "Estyle_private.h"
-static Ewd_Hash *color_table = NULL;
+static Ecore_Hash *color_table = NULL;
static E_DB_File *sys_colors = NULL;
static E_DB_File *user_colors = NULL;
@@ -24,14 +24,14 @@
* Check the hash table for a previous malloc of the color
*/
value = ESTYLE_HASH_COLOR(r, g, b, a);
- ret = (Estyle_Color *) ewd_hash_get(color_table, (void *) value);
+ ret = (Estyle_Color *) ecore_hash_get(color_table, (void *) value);
if (!ret) {
ret = (Estyle_Color *) malloc(sizeof(Estyle_Color));
ret->r = r;
ret->g = g;
ret->b = b;
ret->a = a;
- ewd_hash_set(color_table, (void *) value, ret);
+ ecore_hash_set(color_table, (void *) value, ret);
}
return ret;
@@ -88,14 +88,14 @@
/*
* Check for a previous allocation for this color.
*/
- found = (Estyle_Color *) ewd_hash_get(color_table, (void *) value);
+ found = (Estyle_Color *) ecore_hash_get(color_table, (void *) value);
if (!found) {
found = (Estyle_Color *) malloc(sizeof(Estyle_Color));
found->r = r;
found->g = g;
found->b = b;
found->a = a;
- ewd_hash_set(color_table, (void *) value, found);
+ ecore_hash_set(color_table, (void *) value, found);
}
return found;
@@ -120,5 +120,5 @@
sys_colors = e_db_open_read(user_path);
}
- color_table = ewd_hash_new(NULL, NULL);
+ color_table = ecore_hash_new(NULL, NULL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_heap.c 19 May 2002 07:19:42 -0000 1.4
+++ estyle_heap.c 24 Mar 2004 04:53:51 -0000 1.5
@@ -11,7 +11,7 @@
* Returns a pointer to the newly allocated binary heap on success, NULL on
* failure.
*/
-Estyle_Heap *_estyle_heap_new(Ewd_Compare_Cb compare, int size)
+Estyle_Heap *_estyle_heap_new(Ecore_Compare_Cb compare, int size)
{
Estyle_Heap *heap = NULL;
@@ -36,14 +36,14 @@
*
* Returns TRUE on success, FALSE on failure
*/
-int _estyle_heap_init(Estyle_Heap * heap, Ewd_Compare_Cb compare, int size)
+int _estyle_heap_init(Estyle_Heap * heap, Ecore_Compare_Cb compare, int size)
{
heap->space = size;
if (!compare)
- heap->compare = ewd_direct_compare;
+ heap->compare = ecore_direct_compare;
else
heap->compare = compare;
- heap->order = EWD_SHEAP_MIN;
+ heap->order = ECORE_SHEAP_MIN;
heap->data = (void **) malloc(heap->space * sizeof(void *));
if (!heap->data)
@@ -109,7 +109,7 @@
* data. The loop is placed inside the if statement to reduce the
* number of branching decisions that must be predicted.
*/
- if (heap->order == EWD_SHEAP_MIN) {
+ if (heap->order == ECORE_SHEAP_MIN) {
while ((position > 0) && heap->compare(heap->data[parent],
heap->
data[position]) >
@@ -237,10 +237,10 @@
* Returns TRUE on success, FALSE on failure. The comparison function is
* changed to @compare and the heap is heapified by the new comparison.
*/
-int _estyle_heap_set_compare(Estyle_Heap * heap, Ewd_Compare_Cb compare)
+int _estyle_heap_set_compare(Estyle_Heap * heap, Ecore_Compare_Cb compare)
{
if (!compare)
- heap->compare = ewd_direct_compare;
+ heap->compare = ecore_direct_compare;
else
heap->compare = compare;
@@ -329,7 +329,7 @@
int left = LEFT(i);
int right = RIGHT(i);
- if (heap->order == EWD_SHEAP_MIN) {
+ if (heap->order == ECORE_SHEAP_MIN) {
if (left <= heap->size
&& heap->compare(heap->data[left - 1],
heap->data[i - 1]) < 0)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_heap.h 19 May 2002 07:19:42 -0000 1.4
+++ estyle_heap.h 24 Mar 2004 04:53:51 -0000 1.5
@@ -20,12 +20,12 @@
char order, sorted;
- Ewd_Compare_Cb compare;
+ Ecore_Compare_Cb compare;
};
-Estyle_Heap *_estyle_heap_new(Ewd_Compare_Cb compare, int size);
+Estyle_Heap *_estyle_heap_new(Ecore_Compare_Cb compare, int size);
void _estyle_heap_destroy(Estyle_Heap * heap);
-int _estyle_heap_init(Estyle_Heap * heap, Ewd_Compare_Cb compare,
+int _estyle_heap_init(Estyle_Heap * heap, Ecore_Compare_Cb compare,
int size);
int _estyle_heap_insert(Estyle_Heap * heap, void *data);
void *_estyle_heap_extract(Estyle_Heap * heap);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- estyle_style.c 11 Mar 2004 00:18:51 -0000 1.16
+++ estyle_style.c 24 Mar 2004 04:53:51 -0000 1.17
@@ -3,7 +3,7 @@
#define SET_REL_COLOR(a, b) ((a + b) > 255 ? 255 : ((a + b) < 0 ? 0 : a + b))
-static Ewd_Hash *styles = NULL;
+static Ecore_Hash *styles = NULL;
static int style_path = 0;
static void __estyle_style_read(Estyle_Style_Info * info);
@@ -145,9 +145,9 @@
void _estyle_style_add_path(char *path)
{
if (!style_path)
- style_path = ewd_path_group_new("/estyle/styles");
+ style_path = ecore_path_group_new("/estyle/styles");
- ewd_path_group_add(style_path, path);
+ ecore_path_group_add(style_path, path);
}
/**
@@ -162,7 +162,7 @@
if (!style_path)
return;
- ewd_path_group_remove(style_path, path);
+ ecore_path_group_remove(style_path, path);
}
/*
@@ -544,12 +544,12 @@
Estyle_Style_Info *found;
if (!styles)
- styles = ewd_hash_new(ewd_str_hash, ewd_str_compare);
+ styles = ecore_hash_new(ecore_str_hash, ecore_str_compare);
/*
* Look for a previous instance of the info in the hash table.
*/
- found = ewd_hash_get(styles, name);
+ found = ecore_hash_get(styles, name);
if (!found) {
/*
@@ -564,9 +564,9 @@
/*
* Load the information for this style info
*/
- found->name = ewd_string_instance(name);
+ found->name = ecore_string_instance(name);
__estyle_style_info_load(found);
- ewd_hash_set(styles, name, found);
+ ecore_hash_set(styles, name, found);
}
found->references++;
@@ -588,10 +588,10 @@
*/
if (info->references < 1) {
- ewd_hash_remove(styles, info->name);
+ ecore_hash_remove(styles, info->name);
if (info->layers)
_estyle_heap_destroy(info->layers);
- ewd_string_release(info->name);
+ ecore_string_release(info->name);
FREE(info);
}
@@ -667,7 +667,7 @@
* paths.
*/
if (style_path && *info->name != '/')
- real_path = ewd_path_group_find(style_path, file_name);
+ real_path = ecore_path_group_find(style_path, file_name);
else
real_path = strdup(file_name);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
