Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
Ewl.h Makefile.am ewl_callback.c ewl_theme.c ewl_widget.c
ewl_widget.h
Log Message:
Remove the last remaining dependancies on ewd. Everything in CVS should be
ported to ecore now.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Ewl.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- Ewl.h 27 Feb 2004 00:30:58 -0000 1.48
+++ Ewl.h 24 Mar 2004 05:20:19 -0000 1.49
@@ -264,7 +264,6 @@
#include <Ecore.h>
#include <Edb.h>
#include <Etox.h>
-#include <Ewd.h>
#include <stdio.h>
#include <stdlib.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- Makefile.am 12 Feb 2004 06:34:12 -0000 1.42
+++ Makefile.am 24 Mar 2004 05:20:19 -0000 1.43
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = @edje_cflags@ @ecore_cflags@ @edb_cflags@ @evas_cflags@ @ewd_cflags@
@etox_cflags@
+INCLUDES = @edje_cflags@ @ecore_cflags@ @edb_cflags@ @evas_cflags@ @etox_cflags@
lib_LTLIBRARIES = libewl.la
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_callback.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_callback.c 24 Mar 2004 04:11:09 -0000 1.38
+++ ewl_callback.c 24 Mar 2004 05:20:19 -0000 1.39
@@ -6,7 +6,7 @@
static void ewl_callback_unregister(Ewl_Callback * cb);
static int callback_id = 0;
-static Ewd_Hash *cb_registration = NULL;
+static Ecore_Hash *cb_registration = NULL;
/**
* @return Returns no value.
@@ -24,7 +24,7 @@
*/
void ewl_callbacks_init()
{
- cb_registration = ewd_hash_new(ewl_callback_hash,
+ cb_registration = ecore_hash_new(ewl_callback_hash,
ewl_callback_compare);
}
@@ -37,7 +37,7 @@
*/
void ewl_callbacks_shutdown()
{
- ewd_hash_destroy(cb_registration);
+ ecore_hash_destroy(cb_registration);
}
/*
@@ -57,10 +57,10 @@
DCHECK_PARAM_PTR_RET("cb", cb, NULL);
- found = ewd_hash_get(cb_registration, cb);
+ found = ecore_hash_get(cb_registration, cb);
if (!found) {
cb->id = ++callback_id;
- ewd_hash_set(cb_registration, cb, cb);
+ ecore_hash_set(cb_registration, cb, cb);
found = cb;
} else
FREE(cb);
@@ -85,7 +85,7 @@
cb->references--;
if (cb->references < 1) {
- ewd_hash_remove(cb_registration, cb);
+ ecore_hash_remove(cb_registration, cb);
FREE(cb);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- ewl_theme.c 24 Mar 2004 04:11:09 -0000 1.60
+++ ewl_theme.c 24 Mar 2004 05:20:19 -0000 1.61
@@ -9,8 +9,8 @@
static E_DB_File *theme_db = NULL;
static Ecore_List *font_paths = NULL;
-static Ewd_Hash *cached_theme_data = NULL;
-static Ewd_Hash *def_theme_data = NULL;
+static Ecore_Hash *cached_theme_data = NULL;
+static Ecore_Hash *def_theme_data = NULL;
static void ewl_theme_init_font_path(void);
@@ -34,7 +34,7 @@
/*
* Alloacte and clear the default theme
*/
- def_theme_data = ewd_hash_new(ewd_str_hash, ewd_str_compare);
+ def_theme_data = ecore_hash_new(ecore_str_hash, ecore_str_compare);
if (!def_theme_data)
DRETURN_INT(FALSE, DLEVEL_STABLE);
@@ -158,7 +158,7 @@
}
if (def_theme_data) {
- ewd_hash_destroy(def_theme_data);
+ ecore_hash_destroy(def_theme_data);
def_theme_data = NULL;
}
}
@@ -228,7 +228,7 @@
* We destroy def_theme_data from else where..
*/
if (w->theme && w->theme != def_theme_data)
- ewd_hash_destroy(w->theme);
+ ecore_hash_destroy(w->theme);
else
w->theme = NULL;
@@ -356,13 +356,13 @@
for (temp = key; temp && !ret; temp = strchr(temp, '/')) {
if (w && w->theme)
- ret = ewd_hash_get(w->theme, temp);
+ ret = ecore_hash_get(w->theme, temp);
if (!ret && def_theme_data)
- ret = ewd_hash_get(def_theme_data, temp);
+ ret = ecore_hash_get(def_theme_data, temp);
if (!ret && ewl_config.theme.cache && cached_theme_data)
- ret = ewd_hash_get(cached_theme_data, temp);
+ ret = ecore_hash_get(cached_theme_data, temp);
if (!ret) {
if (theme_db)
@@ -373,9 +373,9 @@
if (ret && ewl_config.theme.cache) {
if (!cached_theme_data)
cached_theme_data =
- ewd_hash_new(ewd_str_hash,
- ewd_str_compare);
- ewd_hash_set(cached_theme_data, temp,
+ ecore_hash_new(ecore_str_hash,
+ ecore_str_compare);
+ ecore_hash_set(cached_theme_data, temp,
strdup(ret));
}
}
@@ -410,9 +410,9 @@
for (temp = key; temp && !ret; temp = strchr(temp, '/')) {
if (w->theme)
- ret = (int) (ewd_hash_get(w->theme, temp));
+ ret = (int) (ecore_hash_get(w->theme, temp));
else
- ret = (int) (ewd_hash_get(def_theme_data, temp));
+ ret = (int) (ecore_hash_get(def_theme_data, temp));
if (!ret) {
if (theme_db)
@@ -451,12 +451,12 @@
DCHECK_PARAM_PTR("k", k);
if (!w->theme || w->theme == def_theme_data)
- w->theme = ewd_hash_new(ewd_str_hash, ewd_str_compare);
+ w->theme = ecore_hash_new(ecore_str_hash, ecore_str_compare);
if (v)
- ewd_hash_set(w->theme, k, strdup(v));
+ ecore_hash_set(w->theme, k, strdup(v));
else
- ewd_hash_set(w->theme, k, v);
+ ecore_hash_set(w->theme, k, v);
if (REALIZED(w)) {
ewl_widget_unrealize(w);
@@ -483,9 +483,9 @@
DCHECK_PARAM_PTR("k", k);
if (!w->theme || w->theme == def_theme_data)
- w->theme = ewd_hash_new(ewd_str_hash, ewd_str_compare);
+ w->theme = ecore_hash_new(ecore_str_hash, ecore_str_compare);
- ewd_hash_set(w->theme, k, (void *) v);
+ ecore_hash_set(w->theme, k, (void *) v);
if (REALIZED(w)) {
ewl_widget_unrealize(w);
@@ -508,7 +508,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
- ewd_hash_set(def_theme_data, k, strdup(v));
+ ecore_hash_set(def_theme_data, k, strdup(v));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -526,7 +526,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
- ewd_hash_set(def_theme_data, k, (void *) v);
+ ecore_hash_set(def_theme_data, k, (void *) v);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- ewl_widget.c 24 Mar 2004 04:11:09 -0000 1.110
+++ ewl_widget.c 24 Mar 2004 05:20:19 -0000 1.111
@@ -325,9 +325,9 @@
DCHECK_PARAM_PTR("k", k);
if (!w->data)
- w->data = ewd_hash_new(ewd_direct_hash, ewd_direct_compare);
+ w->data = ecore_hash_new(ecore_direct_hash, ecore_direct_compare);
- ewd_hash_set(w->data, k, v);
+ ecore_hash_set(w->data, k, v);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -371,7 +371,7 @@
if (!w->data)
DRETURN_PTR(NULL, DLEVEL_STABLE);
- DRETURN_PTR(ewd_hash_get(w->data, k), DLEVEL_STABLE);
+ DRETURN_PTR(ecore_hash_get(w->data, k), DLEVEL_STABLE);
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_widget.h 24 Mar 2004 04:11:09 -0000 1.43
+++ ewl_widget.h 24 Mar 2004 05:20:19 -0000 1.44
@@ -45,8 +45,8 @@
char *inheritance; /**< Key to lookup inhertiance of widget */
int layer; /**< Current layer of widget on canvas */
- Ewd_Hash *theme; /**< Overriding theme settings of this widget */
- Ewd_Hash *data; /**< Arbitrary data attached to this widget */
+ Ecore_Hash *theme; /**< Overriding theme settings of this widget */
+ Ecore_Hash *data; /**< Arbitrary data attached to this widget */
};
/*
-------------------------------------------------------
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
