Hello, All.
In some modules deprecated types are still exists, and I removed it.
Sincerely yours, Sergey.
--
Jabber/XMPP: [email protected]
Cellular: +7-909-206-5992
Index: esmart/src/lib/esmart_cairo/esmart_cairo.c
===================================================================
--- esmart/src/lib/esmart_cairo/esmart_cairo.c (revision 41097)
+++ esmart/src/lib/esmart_cairo/esmart_cairo.c (working copy)
@@ -73,7 +73,7 @@
* @see esmart_image_cairo_surface_set()
*/
Evas_Object *
-esmart_image_cairo_new(Evas *evas, Evas_Coord w, Evas_Coord h, Evas_Bool alpha)
+esmart_image_cairo_new(Evas *evas, Evas_Coord w, Evas_Coord h, Eina_Bool alpha)
{
cairo_surface_t *surface;
cairo_format_t format;
@@ -183,7 +183,7 @@
* @param cairo_surface the image surface to associate.
* @return 1 on success, 0 on failure.
*/
-Evas_Bool
+Eina_Bool
esmart_image_cairo_surface_set(Evas_Object *o, cairo_surface_t *cairo_surface)
{
cairo_status_t status;
@@ -280,7 +280,7 @@
* @param enable if true, enable this behavior, false disables it.
*/
void
-esmart_image_cairo_fill_auto_set(Evas_Object *o, Evas_Bool enable)
+esmart_image_cairo_fill_auto_set(Evas_Object *o, Eina_Bool enable)
{
evas_object_event_callback_del(
o, EVAS_CALLBACK_RESIZE, _esmart_image_cairo_resized);
Index: esmart/src/lib/esmart_textarea/esmart_textarea_private.c
===================================================================
--- esmart/src/lib/esmart_textarea/esmart_textarea_private.c (revision 41097)
+++ esmart/src/lib/esmart_textarea/esmart_textarea_private.c (working copy)
@@ -60,7 +60,7 @@
/* focus / unfocus (to accept key strokes) textarea */
void
-_esmart_textarea_focus_set(Esmart_Text_Area *t, Evas_Bool focus)
+_esmart_textarea_focus_set(Esmart_Text_Area *t, Eina_Bool focus)
{
evas_object_focus_set(t->text, focus);
}
@@ -137,14 +137,14 @@
return evas_object_textblock_line_end_pos_get(t->text);
}
-Evas_Bool
+Eina_Bool
_esmart_textarea_line_get(Esmart_Text_Area *t, int line, Evas_Coord *lx,
Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh)
{
return evas_object_textblock_line_get(t->text, line, lx, ly, lw, lh);
}
-Evas_Bool
+Eina_Bool
_esmart_textarea_char_pos_get(Esmart_Text_Area *t, int pos, Evas_Coord *cx,
Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
{
Index: esmart/src/lib/esmart_textarea/esmart_textarea_public.c
===================================================================
--- esmart/src/lib/esmart_textarea/esmart_textarea_public.c (revision 41097)
+++ esmart/src/lib/esmart_textarea/esmart_textarea_public.c (working copy)
@@ -107,7 +107,7 @@
/* focus / unfocus textarea */
EAPI void
-esmart_textarea_focus_set(Evas_Object *o, Evas_Bool focus)
+esmart_textarea_focus_set(Evas_Object *o, Eina_Bool focus)
{
Esmart_Text_Area *t;
@@ -232,7 +232,7 @@
return _esmart_textarea_line_end_pos_get(t);
}
-EAPI Evas_Bool
+EAPI Eina_Bool
esmart_textarea_line_get(Evas_Object *o, int line, Evas_Coord *lx,
Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh)
{
@@ -242,7 +242,7 @@
return _esmart_textarea_line_get(t, line, lx, ly, lw, lh);
}
-EAPI Evas_Bool
+EAPI Eina_Bool
esmart_textarea_char_pos_get(Evas_Object *o, int pos, Evas_Coord *cx,
Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
{
Index: PROTO/extrackt/src/bin/conf.c
===================================================================
--- PROTO/extrackt/src/bin/conf.c (revision 41097)
+++ PROTO/extrackt/src/bin/conf.c (working copy)
@@ -12,9 +12,9 @@
(void *(*) (void *, void *))eina_list_append, \
(void *(*) (void *))eina_list_data_get, \
(void *(*) (void *))eina_list_free, \
- (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))evas_hash_foreach, \
- (void *(*) (void *, const char *, void *))evas_hash_add, \
- (void (*) (void *))evas_hash_free)
+ (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))eina_hash_foreach, \
+ (void *(*) (void *, const char *, void *))eina_hash_add, \
+ (void (*) (void *))eina_hash_free)
#define FREED(eed) \
if (eed) \
Index: E-MODULES-EXTRA/tiling/e_mod_main.c
===================================================================
--- E-MODULES-EXTRA/tiling/e_mod_main.c (revision 41097)
+++ E-MODULES-EXTRA/tiling/e_mod_main.c (working copy)
@@ -38,7 +38,7 @@
static int currently_switching_desktop = 0;
/* This hash holds the Tiling_Info-pointers for each desktop */
-static Evas_Hash *info_hash = NULL;
+static Eina_Hash *info_hash = NULL;
static void _e_mod_action_toggle_tiling_cb(E_Object *obj, const char *params);
static void _e_mod_action_toggle_floating_cb(E_Object *obj, const char *params);
@@ -585,7 +585,7 @@
res->desk = desk;
res->big_perc = tiling_config->big_perc;
res->need_rearrange = 0;
- info_hash = evas_hash_add(info_hash, desk_hash_key(desk), res);
+ info_hash = eina_hash_add(info_hash, desk_hash_key(desk), res);
EINA_LIST_FOREACH(e_border_client_list(), l, lbd)
{
@@ -602,8 +602,8 @@
if (tinfo->desk == desk)
{
DBG("desk before show: %s \n", desk->name);
- if (!evas_hash_modify(info_hash, desk_hash_key(desk), tinfo))
- info_hash = evas_hash_add(info_hash, desk_hash_key(desk), tinfo);
+ if (!eina_hash_modify(info_hash, desk_hash_key(desk), tinfo))
+ info_hash = eina_hash_add(info_hash, desk_hash_key(desk), tinfo);
}
tinfo = NULL;
}
@@ -611,7 +611,7 @@
static void
_desk_show(E_Desk *desk)
{
- tinfo = evas_hash_find(info_hash, desk_hash_key(desk));
+ tinfo = eina_hash_find(info_hash, desk_hash_key(desk));
if (!tinfo)
{
/* We need to add a new Tiling_Info, so we weren't on that desk before.
@@ -825,7 +825,7 @@
for (i = 0; i < (zone->desk_x_count * zone->desk_y_count); i++)
{
desk = zone->desks[i];
- if ((_tinfo = evas_hash_find(info_hash, desk_hash_key(desk))) == NULL)
+ if ((_tinfo = eina_hash_find(info_hash, desk_hash_key(desk))) == NULL)
continue;
if (eina_list_data_find(_tinfo->client_list, ev->border) == ev->border)
_tinfo->client_list = eina_list_remove(_tinfo->client_list, ev->border);
@@ -853,8 +853,8 @@
return 1;
}
-static Evas_Bool
-_clear_bd_from_info_hash(const Evas_Hash *hash, const char *key, void *data, void *fdata)
+static Eina_Bool
+_clear_bd_from_info_hash(const Eina_Hash *hash, const char *key, void *data, void *fdata)
{
Tiling_Info *ti = data;
E_Event_Border_Desk_Set *ev = fdata;
@@ -889,14 +889,14 @@
* a user can move the window to another desk (and events are fired) involving
* zone changes or not (depends on the mouse position) */
E_Event_Border_Desk_Set *ev = event;
- Tiling_Info *_tinfo = evas_hash_find(info_hash, desk_hash_key(ev->desk));
+ Tiling_Info *_tinfo = eina_hash_find(info_hash, desk_hash_key(ev->desk));
if (!_tinfo)
{
DBG("create new info for %s\n", ev->desk->name);
_tinfo = _initialize_tinfo(ev->desk);
}
- evas_hash_foreach(info_hash, _clear_bd_from_info_hash, ev);
+ eina_hash_foreach(info_hash, _clear_bd_from_info_hash, ev);
DBG("desk set\n");
return 1;
@@ -951,8 +951,8 @@
/* Module setup */
/***************************************************************************/
-static Evas_Bool
-_clear_info_hash(const Evas_Hash *hash, const char *key, void *data, void *fdata)
+static Eina_Bool
+_clear_info_hash(const Eina_Hash *hash, const char *key, void *data, void *fdata)
{
Tiling_Info *ti = data;
eina_list_free(ti->floating_windows);
@@ -1095,8 +1095,8 @@
E_CONFIG_DD_FREE(vdesk_edd);
tiling_module = NULL;
- evas_hash_foreach(info_hash, _clear_info_hash, NULL);
- evas_hash_free(info_hash);
+ eina_hash_foreach(info_hash, _clear_info_hash, NULL);
+ eina_hash_free(info_hash);
info_hash = NULL;
tinfo = NULL;
Index: E-MODULES-EXTRA/penguins/e_mod_main.c
===================================================================
--- E-MODULES-EXTRA/penguins/e_mod_main.c (revision 41097)
+++ E-MODULES-EXTRA/penguins/e_mod_main.c (working copy)
@@ -196,8 +196,8 @@
return pop;
}
-Evas_Bool
-_action_free(const Evas_Hash *hash, const char *key, void *data, void *fdata)
+Eina_Bool
+_action_free(const Eina_Hash *hash, const char *key, void *data, void *fdata)
{
Action *a;
a = data;
@@ -236,8 +236,8 @@
cus = NULL;
}
- evas_hash_foreach(pop->actions, _action_free, NULL);
- evas_hash_free(pop->actions);
+ eina_hash_foreach(pop->actions, _action_free, NULL);
+ eina_hash_free(pop->actions);
pop->actions = NULL;
}
@@ -315,7 +315,7 @@
act->speed = act->speed * pop->conf->zoom;
act->id = id;
- pop->actions = evas_hash_add(pop->actions, name, act);
+ pop->actions = eina_hash_add(pop->actions, name, act);
return act;
}
@@ -353,8 +353,8 @@
return c;
}
-Evas_Bool
-hash_fn(const Evas_Hash *hash, const char *key, void *data, void *fdata)
+Eina_Bool
+hash_fn(const Eina_Hash *hash, const char *key, void *data, void *fdata)
{
Action *a = data;
printf("PENGUINS: Load action: '%s' w:%d h:%d speed:%d\n", key, a->w, a->h, a->speed);
@@ -394,7 +394,7 @@
while (_load_custom_action(pop, pop->conf->theme, buf))
snprintf(buf, sizeof(buf), "Custom_%d", i++);
- // evas_hash_foreach(pop->actions, hash_fn, NULL);
+ // eina_hash_foreach(pop->actions, hash_fn, NULL);
// Eina_List *l;
// for (l = pop->customs; l; l = l->next )
// {
@@ -422,7 +422,7 @@
o = edje_object_add(pop->canvas);
edje_object_file_set(o, pop->conf->theme, "anims");
- tux->action = evas_hash_find(pop->actions,"Faller");
+ tux->action = eina_hash_find(pop->actions,"Faller");
evas_object_image_alpha_set(o, 0.5);
evas_object_color_set(o, pop->conf->alpha, pop->conf->alpha,
@@ -722,7 +722,7 @@
_start_walking_at(Penguin *tux, int at_y)
{
//printf("PENGUINS: Start walking...at %d\n", at_y);
- tux->action = evas_hash_find(tux->pop->actions, "Walker");
+ tux->action = eina_hash_find(tux->pop->actions, "Walker");
tux->custom = 0;
tux->y = at_y - tux->action->h;
@@ -738,7 +738,7 @@
_start_climbing_at(Penguin *tux, int at_x)
{
//printf("PENGUINS: Start climbing...at: %d\n", at_x);
- tux->action = evas_hash_find(tux->pop->actions, "Climber");
+ tux->action = eina_hash_find(tux->pop->actions, "Climber");
evas_object_resize(tux->obj, tux->action->w, tux->action->h);
if (tux->reverse)
@@ -759,7 +759,7 @@
if (_RAND(FALLING_PROB))
{
//printf("PENGUINS: Start falling...\n");
- tux->action = evas_hash_find(tux->pop->actions, "Faller");
+ tux->action = eina_hash_find(tux->pop->actions, "Faller");
evas_object_resize(tux->obj, tux->action->w, tux->action->h);
if (tux->reverse)
@@ -776,7 +776,7 @@
else
{
//printf("Start floating...\n");
- tux->action = evas_hash_find(tux->pop->actions, "Floater");
+ tux->action = eina_hash_find(tux->pop->actions, "Floater");
evas_object_resize(tux->obj, tux->action->w, tux->action->h);
if (tux->reverse)
@@ -797,7 +797,7 @@
static void
_start_flying_at(Penguin *tux, int at_y)
{
- tux->action = evas_hash_find(tux->pop->actions, "Flyer");
+ tux->action = eina_hash_find(tux->pop->actions, "Flyer");
evas_object_resize(tux->obj, tux->action->w, tux->action->h);
tux->y = at_y - tux->action->h;
if (tux->reverse)
@@ -810,7 +810,7 @@
_start_angel_at(Penguin *tux, int at_y)
{
tux->x = tux->x + (tux->action->w /2);
- tux->action = evas_hash_find(tux->pop->actions, "Angel");
+ tux->action = eina_hash_find(tux->pop->actions, "Angel");
if (!tux->action)
{
_reborn(tux);
@@ -839,7 +839,7 @@
{
// printf("PENGUINS: Start splatting...\n");
evas_object_hide(tux->obj);
- tux->action = evas_hash_find(tux->pop->actions, "Splatter");
+ tux->action = eina_hash_find(tux->pop->actions, "Splatter");
evas_object_resize(tux->obj, tux->action->w, tux->action->h);
evas_object_image_fill_set(tux->obj, 0, 0, tux->action->w, tux->action->h);
tux->y = at_y - tux->action->h;
@@ -880,7 +880,7 @@
edje_object_signal_emit(tux->obj, "start_bombing_right", "epenguins");
tux->x = tux->x + (tux->action->w /2);
- tux->action = evas_hash_find(tux->pop->actions, "Bomber");
+ tux->action = eina_hash_find(tux->pop->actions, "Bomber");
tux->x = tux->x - (tux->action->w /2);
tux->y = at_y - tux->action->h;
Index: E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.c
===================================================================
--- E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.c (revision 41097)
+++ E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.c (working copy)
@@ -58,7 +58,7 @@
static void _emu_menu_cb_post_deactivate(void *data, E_Menu *m);
static void _emu_menu_cb_action(void *data, E_Menu *m, E_Menu_Item *mi);
-static Evas_Bool _emu_menus_hash_cb_free(const Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Eina_Bool _emu_menus_hash_cb_free(const Eina_Hash *hash, const char *key, void *data, void *fdata);
//static void _emu_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -251,8 +251,8 @@
emu_face = gcc->data;
if (emu_face)
{
- evas_hash_foreach(emu_face->menus, _emu_menus_hash_cb_free, NULL);
- evas_hash_free(emu_face->menus);
+ eina_hash_foreach(emu_face->menus, _emu_menus_hash_cb_free, NULL);
+ eina_hash_free(emu_face->menus);
emu_face->menus = NULL;
if (emu_face->read)
@@ -528,15 +528,15 @@
Easy_Menu *old_menu;
/* Associate this menu with it's category. Only one menu per category. */
- old_menu = evas_hash_find(emu_face->menus, menu->category);
+ old_menu = eina_hash_find(emu_face->menus, menu->category);
if (old_menu)
{ /* Clean up the old one. */
- emu_face->menus = evas_hash_del(emu_face->menus, menu->category, old_menu);
- emu_face->menus = evas_hash_del(emu_face->menus, NULL, old_menu); /* Just to be on the safe side. */
+ emu_face->menus = eina_hash_del(emu_face->menus, menu->category, old_menu);
+ emu_face->menus = eina_hash_del(emu_face->menus, NULL, old_menu); /* Just to be on the safe side. */
e_object_del(E_OBJECT(old_menu->menu->menu));
}
- /* evas_hash_direct_add is used because we allocate the key ourselves and don't deallocate it until after removing it. */
- emu_face->menus = evas_hash_direct_add(emu_face->menus, menu->category, menu);
+ /* eina_hash_direct_add is used because we allocate the key ourselves and don't deallocate it until after removing it. */
+ emu_face->menus = eina_hash_direct_add(emu_face->menus, menu->category, menu);
}
}
}
@@ -830,7 +830,7 @@
y += cy;
/* Find the default menu, if there is one. */
- menu = evas_hash_find(emu_face->menus, "");
+ menu = eina_hash_find(emu_face->menus, "");
if (menu && menu->valid)
{
int dir;
@@ -1012,19 +1012,19 @@
}
/**
- * Handle menu freeing from an Evas_Hash.
+ * Handle menu freeing from an Eina_Hash.
*
- * Just a thin wrapper to cater for evas_hash_foreach().
+ * Just a thin wrapper to cater for eina_hash_foreach().
* It's only used during freeing of a face for mass menu destruction.
*
- * @param hash the Evas_Hash that this menu is in.
+ * @param hash the Eina_Hash that this menu is in.
* @param key the key to the menu in the hash.
* @param data a pointer to the data stored in the hash.
* @param fdata unused.
* @ingroup Emu_Module_Menu_Group
*/
-static Evas_Bool
-_emu_menus_hash_cb_free(const Evas_Hash *hash, const char *key, void *data, void *fdata)
+static Eina_Bool
+_emu_menus_hash_cb_free(const Eina_Hash *hash, const char *key, void *data, void *fdata)
{
Easy_Menu *menu;
Index: e/src/bin/e_fm.c
===================================================================
--- e/src/bin/e_fm.c (revision 41097)
+++ e/src/bin/e_fm.c (working copy)
@@ -932,6 +932,7 @@
e_dialog_button_add(dialog, _("Close"), NULL, NULL, dialog);
e_dialog_button_focus_num(dialog, 0);
e_dialog_title_set(dialog, _("Nonexistent path"));
+ e_dialog_icon_set(dialog, "dialog-error", 64);
snprintf(text, sizeof(text),
_("%s doesn't exist."),
Index: MISC/enna/src/bin/button.c
===================================================================
--- MISC/enna/src/bin/button.c (revision 41097)
+++ MISC/enna/src/bin/button.c (working copy)
@@ -52,7 +52,7 @@
Evas_Object *o_icon;
char *label;
- Evas_Hash *funcs; /* Callback functions hash */
+ Eina_Hash *funcs; /* Callback functions hash */
};
/* local subsystem functions */
Index: MISC/enna/src/bin/image.c
===================================================================
--- MISC/enna/src/bin/image.c (revision 41097)
+++ MISC/enna/src/bin/image.c (working copy)
@@ -206,7 +206,7 @@
return evas_object_image_data_get(sd->obj, 0);
}
-void enna_image_preload(Evas_Object *obj, Evas_Bool cancel)
+void enna_image_preload(Evas_Object *obj, Eina_Bool cancel)
{
E_Smart_Data *sd;
Index: MISC/enna/src/bin/scrollframe.c
===================================================================
--- MISC/enna/src/bin/scrollframe.c (revision 41097)
+++ MISC/enna/src/bin/scrollframe.c (working copy)
@@ -372,14 +372,14 @@
return sd->edje_obj;
}
-void enna_scrollframe_single_dir_set(Evas_Object *obj, Evas_Bool single_dir)
+void enna_scrollframe_single_dir_set(Evas_Object *obj, Eina_Bool single_dir)
{
API_ENTRY
return;
sd->one_dir_at_a_time = single_dir;
}
-Evas_Bool enna_scrollframe_single_dir_get(Evas_Object *obj)
+Eina_Bool enna_scrollframe_single_dir_get(Evas_Object *obj)
{
API_ENTRY
return 0;
Index: MISC/enna/src/bin/enna_config.c
===================================================================
--- MISC/enna/src/bin/enna_config.c (revision 41097)
+++ MISC/enna/src/bin/enna_config.c (working copy)
@@ -111,12 +111,12 @@
-static Evas_Hash *hash_config;
+static Eina_Hash *hash_config;
static Eina_Bool _hash_foreach(const Eina_Hash *hash, const char *key,
void *data, void *fdata);
-static Evas_Hash *_config_load_conf_file(char *filename);
-static Evas_Hash *_config_load_conf(char *conffile, int size);
+static Eina_Hash *_config_load_conf_file(char *filename);
+static Eina_Hash *_config_load_conf(char *conffile, int size);
const char * enna_config_theme_get()
{
@@ -193,7 +193,7 @@
if(!hash_config || !module_name)
return NULL;
- return evas_hash_find(hash_config, module_name);
+ return eina_hash_find(hash_config, module_name);
}
void enna_config_init()
@@ -204,7 +204,7 @@
snprintf(filename, sizeof(filename), "%s/.enna/enna.cfg",
enna_util_user_home_get());
hash_config = _config_load_conf_file(filename);
- evas_hash_foreach(hash_config, _hash_foreach, NULL);
+ eina_hash_foreach(hash_config, _hash_foreach, NULL);
}
void enna_config_shutdown()
@@ -257,7 +257,7 @@
return 1;
}
-static Evas_Hash * _config_load_conf_file(char *filename)
+static Eina_Hash * _config_load_conf_file(char *filename)
{
int fd;
FILE *f;
@@ -316,11 +316,11 @@
return _config_load_conf(conffile, st.st_size);
}
-static Evas_Hash * _config_load_conf(char *conffile, int size)
+static Eina_Hash * _config_load_conf(char *conffile, int size)
{
char *current_section = NULL;
char *current_line = conffile;
- Evas_Hash *config = NULL;
+ Eina_Hash *config = NULL;
Enna_Config_Data *config_data;
while (current_line < conffile + size)
@@ -375,7 +375,7 @@
config_data = calloc(1, sizeof(Enna_Config_Data));
config_data->section = current_section;
config_data->pair = NULL;
- config = evas_hash_add(config, current_section, config_data);
+ config = eina_hash_add(config, current_section, config_data);
current_line = eol + 1;
continue;
@@ -404,12 +404,12 @@
pair = calloc(1, sizeof(Config_Pair));
pair->key = strdup(key);
pair->value = strdup(value);
- config_data = evas_hash_find(config, current_section);
+ config_data = eina_hash_find(config, current_section);
if (config_data)
{
config_data->pair = eina_list_append(config_data->pair, pair);
/* Need this ? */
- /*evas_hash_modify(hash, current_section, config_data);*/
+ /*eina_hash_modify(hash, current_section, config_data);*/
}
current_line = eol + 1;
Index: elitaire/src/eli_hiscore.c
===================================================================
--- elitaire/src/eli_hiscore.c (revision 41097)
+++ elitaire/src/eli_hiscore.c (working copy)
@@ -139,7 +139,7 @@
eet_shutdown();
}
-Evas_Bool eli_highscore_entry_add(const char * game, const char * username,
+Eina_Bool eli_highscore_entry_add(const char * game, const char * username,
float points, pointsType type)
{
Eina_List * l = NULL;
@@ -193,7 +193,7 @@
return 1;
}
-Evas_Bool eli_highscore_accept(const char * game, float points,
+Eina_Bool eli_highscore_accept(const char * game, float points,
pointsType type)
{
Eina_List * l, * list;
Index: esmart/src/lib/esmart_cairo/Esmart_Cairo.h
===================================================================
--- esmart/src/lib/esmart_cairo/Esmart_Cairo.h (revision 41097)
+++ esmart/src/lib/esmart_cairo/Esmart_Cairo.h (working copy)
@@ -8,11 +8,11 @@
extern "C" {
#endif
-EAPI Evas_Object *esmart_image_cairo_new (Evas *evas, Evas_Coord w, Evas_Coord h, Evas_Bool alpha);
+EAPI Evas_Object *esmart_image_cairo_new (Evas *evas, Evas_Coord w, Evas_Coord h, Eina_Bool alpha);
EAPI Evas_Object *esmart_image_cairo_new_from_surface (Evas *evas, cairo_surface_t *cairo_surface);
EAPI cairo_surface_t *esmart_image_cairo_surface_get (Evas_Object *object);
-EAPI Evas_Bool esmart_image_cairo_surface_set (Evas_Object *o, cairo_surface_t *cairo_surface);
-EAPI void esmart_image_cairo_fill_auto_set (Evas_Object *o, Evas_Bool enable);
+EAPI Eina_Bool esmart_image_cairo_surface_set (Evas_Object *o, cairo_surface_t *cairo_surface);
+EAPI void esmart_image_cairo_fill_auto_set (Evas_Object *o, Eina_Bool enable);
#ifdef __cplusplus
}
Index: esmart/src/lib/esmart_textarea/esmart_textarea_private.h
===================================================================
--- esmart/src/lib/esmart_textarea/esmart_textarea_private.h (revision 41097)
+++ esmart/src/lib/esmart_textarea/esmart_textarea_private.h (working copy)
@@ -9,7 +9,7 @@
/* textarea private core functions */
Esmart_Text_Area *_esmart_textarea_init(Evas_Object *o);
-void _esmart_textarea_focus_set(Esmart_Text_Area *t, Evas_Bool focus);
+void _esmart_textarea_focus_set(Esmart_Text_Area *t, Eina_Bool focus);
void _esmart_textarea_bg_set(Esmart_Text_Area *t, Evas_Object *o);
Evas_Object *_esmart_textarea_bg_get(Esmart_Text_Area *t);
void _esmart_textarea_clear(Esmart_Text_Area *t);
@@ -20,8 +20,8 @@
int _esmart_textarea_lines_get(Esmart_Text_Area *t);
int _esmart_textarea_line_start_pos_get(Esmart_Text_Area *t);
int _esmart_textarea_line_end_pos_get(Esmart_Text_Area *t);
-Evas_Bool _esmart_textarea_line_get(Esmart_Text_Area *t, int line, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
-Evas_Bool _esmart_textarea_char_pos_get(Esmart_Text_Area *t, int pos, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
+Eina_Bool _esmart_textarea_line_get(Esmart_Text_Area *t, int line, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
+Eina_Bool _esmart_textarea_char_pos_get(Esmart_Text_Area *t, int pos, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
int _esmart_textarea_char_coords_get(Esmart_Text_Area *t, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
void _esmart_textarea_text_insert(Esmart_Text_Area *t, const char *text);
char *_esmart_textarea_text_get(Esmart_Text_Area *t, int len);
Index: esmart/src/lib/esmart_textarea/Esmart_Textarea.h
===================================================================
--- esmart/src/lib/esmart_textarea/Esmart_Textarea.h (revision 41097)
+++ esmart/src/lib/esmart_textarea/Esmart_Textarea.h (working copy)
@@ -96,7 +96,7 @@
EAPI void esmart_textarea_cursor_move_end(Evas_Object *o);
EAPI void esmart_textarea_cursor_delete_right(Evas_Object *o);
EAPI void esmart_textarea_cursor_delete_left(Evas_Object *o);
-EAPI void esmart_textarea_focus_set(Evas_Object *o, Evas_Bool focus);
+EAPI void esmart_textarea_focus_set(Evas_Object *o, Eina_Bool focus);
EAPI void esmart_textarea_bg_set(Evas_Object *o, Evas_Object *bg);
EAPI Evas_Object *esmart_textarea_bg_get(Evas_Object *o);
EAPI void esmart_textarea_text_insert(Evas_Object *o, const char *text);
@@ -109,8 +109,8 @@
EAPI int esmart_textarea_lines_get(Evas_Object *o);
EAPI int esmart_textarea_line_start_pos_get(Evas_Object *o);
EAPI int esmart_textarea_line_end_pos_get(Evas_Object *o);
-EAPI Evas_Bool esmart_textarea_line_get(Evas_Object *o, int line, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
-EAPI Evas_Bool esmart_textarea_char_pos_get(Evas_Object *o, int pos, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
+EAPI Eina_Bool esmart_textarea_line_get(Evas_Object *o, int line, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
+EAPI Eina_Bool esmart_textarea_char_pos_get(Evas_Object *o, int pos, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
EAPI int esmart_textarea_char_coords_get(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
EAPI void esmart_textarea_text_insert(Evas_Object *o, const char *text);
EAPI char *esmart_textarea_text_get(Evas_Object *o, int len);
Index: E-MODULES-EXTRA/penguins/e_mod_main.h
===================================================================
--- E-MODULES-EXTRA/penguins/e_mod_main.h (revision 41097)
+++ E-MODULES-EXTRA/penguins/e_mod_main.h (working copy)
@@ -39,7 +39,7 @@
Evas *canvas;
Ecore_Animator *animator;
Eina_List *penguins;
- Evas_Hash *actions;
+ Eina_Hash *actions;
Eina_List *customs;
int custom_num;
Eina_List *themes;
Index: E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.h
===================================================================
--- E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.h (revision 41097)
+++ E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.h (working copy)
@@ -45,7 +45,7 @@
/**< the size of this data in bytes */
Ecore_Exe_Event_Data_Line *lines; /**< a NULL terminated array of line data if line buffered */
- Evas_Hash *menus;
+ Eina_Hash *menus;
E_Menu *config_menu;
Index: MISC/enna/src/bin/image.h
===================================================================
--- MISC/enna/src/bin/image.h (revision 41097)
+++ MISC/enna/src/bin/image.h (working copy)
@@ -16,5 +16,5 @@
void enna_image_fill_inside_set(Evas_Object * obj, int fill_inside);
void enna_image_data_set(Evas_Object * obj, void *data, int w, int h);
void *enna_image_data_get(Evas_Object * obj, int *w, int *h);
-void enna_image_preload(Evas_Object *obj, Evas_Bool cancel);
+void enna_image_preload(Evas_Object *obj, Eina_Bool cancel);
#endif
Index: MISC/enna/src/bin/scrollframe.h
===================================================================
--- MISC/enna/src/bin/scrollframe.h (revision 41097)
+++ MISC/enna/src/bin/scrollframe.h (working copy)
@@ -26,7 +26,7 @@
void enna_scrollframe_policy_set (Evas_Object *obj, Enna_Scrollframe_Policy hbar, Enna_Scrollframe_Policy vbar);
void enna_scrollframe_policy_get (Evas_Object *obj, Enna_Scrollframe_Policy *hbar, Enna_Scrollframe_Policy *vbar);
Evas_Object *enna_scrollframe_edje_object_get (Evas_Object *obj);
-void enna_scrollframe_single_dir_set (Evas_Object *obj, Evas_Bool single_dir);
-Evas_Bool enna_scrollframe_single_dir_get (Evas_Object *obj);
+void enna_scrollframe_single_dir_set (Evas_Object *obj, Eina_Bool single_dir);
+Eina_Bool enna_scrollframe_single_dir_get (Evas_Object *obj);
#endif
Index: elitaire/src/Eli_App.h
===================================================================
--- elitaire/src/Eli_App.h (revision 41097)
+++ elitaire/src/Eli_App.h (working copy)
@@ -100,8 +100,8 @@
Ecore_List * eli_theme_names_get();
char ** eli_theme_dir_get();
-Evas_Bool eli_theme_gui_exists(Eli_App * eap, const char * theme);
-Evas_Bool eli_theme_cards_exists(Eli_App * eap, const char * theme);
+Eina_Bool eli_theme_gui_exists(Eli_App * eap, const char * theme);
+Eina_Bool eli_theme_cards_exists(Eli_App * eap, const char * theme);
/*
* frontend
Index: elitaire/src/elitaire_job.h
===================================================================
--- elitaire/src/elitaire_job.h (revision 41097)
+++ elitaire/src/elitaire_job.h (working copy)
@@ -8,12 +8,12 @@
typedef struct _Elitaire_Job_List Elitaire_Job_List;
typedef struct _Elitaire_Job Elitaire_Job;
-typedef Evas_Bool (*Elitaire_Job_Func) (Elitaire_Job_List * list, void * data);
+typedef Eina_Bool (*Elitaire_Job_Func) (Elitaire_Job_List * list, void * data);
struct _Elitaire_Job
{
Elitaire_Job_Sync_Type sync;
- Evas_Bool active;
+ Eina_Bool active;
Elitaire_Job_Func func;
void * data;
};
Index: elitaire/src/Elitaire.h
===================================================================
--- elitaire/src/Elitaire.h (revision 41097)
+++ elitaire/src/Elitaire.h (working copy)
@@ -11,7 +11,7 @@
/* external API */
const char ** elitaire_available_games_get (void);
Evas_Object * elitaire_object_new (Evas* evas);
-Evas_Bool elitaire_object_game_set (Evas_Object * elitaire, const char *game);
+Eina_Bool elitaire_object_game_set (Evas_Object * elitaire, const char *game);
int elitaire_object_file_set (Evas_Object * elitaire, const char *file);
int elitaire_object_file_get (Evas_Object * elitaire, const char **file);
void elitaire_object_deal (Evas_Object * elitaire);
@@ -19,10 +19,10 @@
void elitaire_object_velocity_set (Evas_Object * elitaire, int v);
void elitaire_object_frame_rate_set (Evas_Object * elitaire, int fr);
int elitaire_object_frame_rate_get (Evas_Object * elitaire);
-void elitaire_object_animations_set (Evas_Object * elitaire, Evas_Bool on);
-Evas_Bool elitaire_object_animations_get (Evas_Object * elitaire);
-void elitaire_object_shadows_set (Evas_Object * elitaire, Evas_Bool on);
-Evas_Bool elitaire_object_shadows_get (Evas_Object * elitaire);
+void elitaire_object_animations_set (Evas_Object * elitaire, Eina_Bool on);
+Eina_Bool elitaire_object_animations_get (Evas_Object * elitaire);
+void elitaire_object_shadows_set (Evas_Object * elitaire, Eina_Bool on);
+Eina_Bool elitaire_object_shadows_get (Evas_Object * elitaire);
void elitaire_object_lazy_mode_set (Evas_Object * elitaire, int lm);
int elitaire_object_lazy_mode_get (Evas_Object * elitaire);
void elitaire_object_size_min_get (Evas_Object * elitaire, Evas_Coord *minw, Evas_Coord *minh);
@@ -34,14 +34,14 @@
void elitaire_object_callback_points_add (Evas_Object * elitaire,
void (*func)(float points, pointsType type, void* data),
void* data);
-Evas_Bool elitaire_object_wait_for_end_of_jobs (Evas_Object * elitaire, int (*func)(void * data), void * data);
+Eina_Bool elitaire_object_wait_for_end_of_jobs (Evas_Object * elitaire, int (*func)(void * data), void * data);
void elitaire_object_undo (Evas_Object * elitaire);
void elitaire_object_restart (Evas_Object * elitaire);
-Evas_Bool elitaire_object_giveup (Evas_Object * elitaire);
+Eina_Bool elitaire_object_giveup (Evas_Object * elitaire);
void elitaire_object_pause (Evas_Object * elitaire);
void elitaire_object_hints_show (Evas_Object * elitaire);
void elitaire_object_hints_hide (Evas_Object * elitaire);
-Evas_Bool elitaire_object_hints_visible (Evas_Object * elitaire);
+Eina_Bool elitaire_object_hints_visible (Evas_Object * elitaire);
void elitaire_object_offset_set (Evas_Object * elitaire, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b);
void elitaire_object_offset_get (Evas_Object * elitaire, Evas_Coord * l, Evas_Coord * r, Evas_Coord * t, Evas_Coord * b);
Index: elitaire/src/edje_frontend.h
===================================================================
--- elitaire/src/edje_frontend.h (revision 41097)
+++ elitaire/src/edje_frontend.h (working copy)
@@ -12,8 +12,8 @@
Evas * evas;
Evas_Object * gui;
struct {
- Evas_Bool ctrl_down;
- Evas_Bool alt_down;
+ Eina_Bool ctrl_down;
+ Eina_Bool alt_down;
} key;
Ewl_Widget * conmenu;
};
Index: elitaire/src/elitaire_card_private.h
===================================================================
--- elitaire/src/elitaire_card_private.h (revision 41097)
+++ elitaire/src/elitaire_card_private.h (working copy)
@@ -29,5 +29,5 @@
Evas_Object * elitaire_card_chain_next_get (Evas_Object* o);
/* callbacks */
-Evas_Bool elitaire_card_job_clean_up (Elitaire_Job_List * list, void * data);
-Evas_Bool elitaire_card_job_del_cb (Elitaire_Job_List * list, void * data);
+Eina_Bool elitaire_card_job_clean_up (Elitaire_Job_List * list, void * data);
+Eina_Bool elitaire_card_job_del_cb (Elitaire_Job_List * list, void * data);
Index: elitaire/src/eli_hiscore.h
===================================================================
--- elitaire/src/eli_hiscore.h (revision 41097)
+++ elitaire/src/eli_hiscore.h (working copy)
@@ -14,8 +14,8 @@
void eli_highscore_init(const char * app);
void eli_highscore_shutdown(void);
-Evas_Bool eli_highscore_entry_add(const char * game, const char * username, float points, pointsType type);
-Evas_Bool eli_highscore_accept(const char * game, float points, pointsType type);
+Eina_Bool eli_highscore_entry_add(const char * game, const char * username, float points, pointsType type);
+Eina_Bool eli_highscore_accept(const char * game, float points, pointsType type);
Eina_List * eli_highscore_get(const char * game);
#ifdef __cplusplus
Index: elitaire/src/elitaire_card.h
===================================================================
--- elitaire/src/elitaire_card.h (revision 41097)
+++ elitaire/src/elitaire_card.h (working copy)
@@ -17,12 +17,12 @@
Evas_Object * elitaire_card_next_card_get (Evas_Object * card);
void elitaire_card_playingCard_set (Evas_Object * card, playingCard * pcard);
playingCard * elitaire_card_playingCard_get (Evas_Object * card);
-Evas_Bool elitaire_card_is_flying (Evas_Object * card);
+Eina_Bool elitaire_card_is_flying (Evas_Object * card);
void elitaire_card_callback_add (Evas_Object * card, Evas_Callback_Type type,
void(*func)(void *data, Evas *e, Evas_Object *obj, void *event_info));
void elitaire_card_callback_del (Evas_Object * card, Evas_Callback_Type type,
void(*func)(void *data, Evas *e, Evas_Object *obj, void *event_info));
-Evas_Bool elitaire_card_moveable (Evas_Object * card);
+Eina_Bool elitaire_card_moveable (Evas_Object * card);
void elitaire_card_hint_highlight_show(Evas_Object * card);
void elitaire_card_hint_highlight_hide(Evas_Object * card);
Elitaire * elitaire_card_elitaire_get (Evas_Object * card);
Index: elitaire/src/elitaire_private.h
===================================================================
--- elitaire/src/elitaire_private.h (revision 41097)
+++ elitaire/src/elitaire_private.h (working copy)
@@ -20,10 +20,10 @@
int num_stacks;
int frame_rate; /* pics per sec */
int num_card_jobs;/* the number of cards currently flying, waiting etc. */
- Evas_Bool deal;
- Evas_Bool animate;
- Evas_Bool shadow;
- Evas_Bool hints_on;
+ Eina_Bool deal;
+ Eina_Bool animate;
+ Eina_Bool shadow;
+ Eina_Bool hints_on;
Evas_Coord card_w, card_h;
Evas_Coord card_max_w,card_max_h;
Index: elitaire/src/ewl_dialog_hiscore.cpp
===================================================================
--- elitaire/src/ewl_dialog_hiscore.cpp (revision 41097)
+++ elitaire/src/ewl_dialog_hiscore.cpp (working copy)
@@ -333,18 +333,18 @@
static void * highscore_data_fetch(void * data, unsigned int row,
unsigned int col)
{
- Evas_List * l;
+ Eina_List * l;
- l = (Evas_List *) data;
- return evas_list_nth(l, row);
+ l = (Eina_List *) data;
+ return eina_list_nth(l, row);
}
static unsigned int highscore_data_count(void * data)
{
- Evas_List * l;
+ Eina_List * l;
- l = (Evas_List *) data;
- return evas_list_count(l);
+ l = (Eina_List *) data;
+ return eina_list_count(l);
}
static Ewl_Widget * highscore_widget_constructor(unsigned int col, void *prd)
Index: elitaire/src/elitaire_card.cpp
===================================================================
--- elitaire/src/elitaire_card.cpp (revision 41097)
+++ elitaire/src/elitaire_card.cpp (working copy)
@@ -82,7 +82,7 @@
return NULL;
}
-Evas_Bool elitaire_card_is_flying(Evas_Object * card)
+Eina_Bool elitaire_card_is_flying(Evas_Object * card)
{
Elitaire_Card * data = NULL;
@@ -122,7 +122,7 @@
}
}
-Evas_Bool elitaire_card_moveable(Evas_Object * card)
+Eina_Bool elitaire_card_moveable(Evas_Object * card)
{
Elitaire_Card * data = NULL;
Index: elitaire/src/ewl_dialog_config.cpp
===================================================================
--- elitaire/src/ewl_dialog_config.cpp (revision 41097)
+++ elitaire/src/ewl_dialog_config.cpp (working copy)
@@ -14,9 +14,9 @@
static struct
{
- Evas_Bool shadows;
- Evas_Bool animations;
- Evas_Bool gl;
+ Eina_Bool shadows;
+ Eina_Bool animations;
+ Eina_Bool gl;
int lazy;
Ewl_Widget * vel_label;
Ewl_Widget * frt_label;
Index: elitaire/src/elitaire.cpp
===================================================================
--- elitaire/src/elitaire.cpp (revision 41097)
+++ elitaire/src/elitaire.cpp (working copy)
@@ -92,7 +92,7 @@
return elitaire;
}
-Evas_Bool elitaire_object_game_set(Evas_Object * elitaire, const char * game)
+Eina_Bool elitaire_object_game_set(Evas_Object * elitaire, const char * game)
{
Elitaire * eli;
@@ -165,7 +165,7 @@
Evas_Object * card;
Elitaire * eli;
vector<stackLook>::const_iterator iord, iend;
- Evas_Bool change_file;
+ Eina_Bool change_file;
card_iterator it, it_end;
int num_decks;
@@ -351,7 +351,7 @@
/*
* return if the highlights are visible
*/
-Evas_Bool elitaire_object_hints_visible(Evas_Object * elitaire)
+Eina_Bool elitaire_object_hints_visible(Evas_Object * elitaire)
{
Elitaire * eli;
@@ -463,7 +463,7 @@
return 0;
}
-void elitaire_object_animations_set(Evas_Object * elitaire, Evas_Bool on)
+void elitaire_object_animations_set(Evas_Object * elitaire, Eina_Bool on)
{
Elitaire *eli;
@@ -486,7 +486,7 @@
}
-Evas_Bool elitaire_object_animations_get(Evas_Object * elitaire)
+Eina_Bool elitaire_object_animations_get(Evas_Object * elitaire)
{
Elitaire * eli;
@@ -497,7 +497,7 @@
return 0;
}
-void elitaire_object_shadows_set(Evas_Object * elitaire, Evas_Bool on)
+void elitaire_object_shadows_set(Evas_Object * elitaire, Eina_Bool on)
{
Elitaire * eli;
@@ -508,7 +508,7 @@
}
}
-Evas_Bool elitaire_object_shadows_get(Evas_Object * elitaire)
+Eina_Bool elitaire_object_shadows_get(Evas_Object * elitaire)
{
Elitaire * eli;
@@ -598,7 +598,7 @@
}
}
-Evas_Bool elitaire_object_giveup(Evas_Object * elitaire)
+Eina_Bool elitaire_object_giveup(Evas_Object * elitaire)
{
Elitaire * eli;
@@ -640,7 +640,7 @@
}
}
-Evas_Bool elitaire_object_wait_for_end_of_jobs(Evas_Object * elitaire,
+Eina_Bool elitaire_object_wait_for_end_of_jobs(Evas_Object * elitaire,
int (*func) (void * data), void * data)
{
Elitaire * eli;
Index: elitaire/src/edje_frontend_game.cpp
===================================================================
--- elitaire/src/edje_frontend_game.cpp (revision 41097)
+++ elitaire/src/edje_frontend_game.cpp (working copy)
@@ -198,7 +198,7 @@
Evas_Coord min_w, min_h;
char * card_theme;
int vel;
- Evas_Bool bo;
+ Eina_Bool bo;
eef = eli_app_edje_frontend_get(eap);
@@ -358,7 +358,7 @@
case ANIMATIONS:
if (!eef->elitaire) break;
else {
- Evas_Bool b;
+ Eina_Bool b;
b = ecore_config_boolean_get("/graphic/animations");
elitaire_object_animations_set(eef->elitaire, b);
@@ -368,7 +368,7 @@
case SHADOWS:
if (!eef->elitaire) break;
else {
- Evas_Bool b;
+ Eina_Bool b;
b = ecore_config_boolean_get("/graphic/shadows");
elitaire_object_shadows_set(eef->elitaire, b);
Index: elitaire/src/elitaire_card_jobs.cpp
===================================================================
--- elitaire/src/elitaire_card_jobs.cpp (revision 41097)
+++ elitaire/src/elitaire_card_jobs.cpp (working copy)
@@ -18,24 +18,24 @@
static Elitaire_Card_Job * _elitaire_card_job_new(Evas_Object * card);
static void _elitaire_card_job_timer_add(Elitaire_Job_List * list, void * data, int (*func)(void*));
-static Evas_Bool _elitaire_card_job_slide(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_slide(Elitaire_Job_List * list,
void * data);
-static Evas_Bool _elitaire_card_job_del_chain(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_del_chain(Elitaire_Job_List * list,
void * data);
-static Evas_Bool _elitaire_card_job_flip(Elitaire_Job_List * list, void * data);
-static Evas_Bool _elitaire_card_job_dragged(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_flip(Elitaire_Job_List * list, void * data);
+static Eina_Bool _elitaire_card_job_dragged(Elitaire_Job_List * list,
void * data);
-static Evas_Bool _elitaire_card_job_dragged(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_dragged(Elitaire_Job_List * list,
void * data);
-static Evas_Bool _elitaire_card_job_drag(Elitaire_Job_List * list, void * data);
-static Evas_Bool _elitaire_card_job_drop(Elitaire_Job_List * list, void * data);
-static Evas_Bool _elitaire_card_job_wait_mouse(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_drag(Elitaire_Job_List * list, void * data);
+static Eina_Bool _elitaire_card_job_drop(Elitaire_Job_List * list, void * data);
+static Eina_Bool _elitaire_card_job_wait_mouse(Elitaire_Job_List * list,
void * data);
-static Evas_Bool _elitaire_card_job_wait_time(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_wait_time(Elitaire_Job_List * list,
void * data);
-static Evas_Bool _elitaire_card_job_fade_in(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_fade_in(Elitaire_Job_List * list,
void * data);
-static Evas_Bool _elitaire_card_job_fade_out(Elitaire_Job_List * list,
+static Eina_Bool _elitaire_card_job_fade_out(Elitaire_Job_List * list,
void * data);
/*** callbacks ***/
@@ -193,7 +193,7 @@
return ft;
}
-Evas_Bool
+Eina_Bool
elitaire_card_job_del_cb(Elitaire_Job_List * list, void * data)
{
Elitaire_Card_Job * job;
@@ -211,7 +211,7 @@
return 1;
}
-Evas_Bool
+Eina_Bool
elitaire_card_job_clean_up(Elitaire_Job_List * list, void * data)
{
Elitaire_Card * ecard;
@@ -240,14 +240,14 @@
job->timer = ecore_animator_add(func, data);
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_slide(Elitaire_Job_List * list, void * data)
{
_elitaire_card_job_timer_add(list, data, _elitaire_card_slide_cb);
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_del_chain(Elitaire_Job_List * list, void * data)
{
Elitaire_Card_Job * job;
@@ -258,7 +258,7 @@
return 1;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_flip(Elitaire_Job_List * list, void * data)
{
Elitaire_Card_Job * job;
@@ -276,14 +276,14 @@
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_dragged(Elitaire_Job_List * list, void * data)
{
_elitaire_card_job_timer_add(list, data, _elitaire_card_dragged_cb);
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_drag(Elitaire_Job_List * list, void * data)
{
int fr;
@@ -310,7 +310,7 @@
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_drop(Elitaire_Job_List * list, void * data)
{
int fr;
@@ -333,14 +333,14 @@
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_wait_mouse(Elitaire_Job_List * list, void * data)
{
_elitaire_card_job_timer_add(list, data, _elitaire_card_wait_cb);
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_wait_time(Elitaire_Job_List * list, void * data)
{
int fr;
@@ -358,14 +358,14 @@
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_fade_in(Elitaire_Job_List * list, void * data)
{
_elitaire_card_job_timer_add(list, data, _elitaire_card_fade_in_cb);
return 0;
}
-static Evas_Bool
+static Eina_Bool
_elitaire_card_job_fade_out(Elitaire_Job_List * list, void * data)
{
_elitaire_card_job_timer_add(list, data, _elitaire_card_fade_out_cb);
Index: elitaire/src/eli_app.cpp
===================================================================
--- elitaire/src/eli_app.cpp (revision 41097)
+++ elitaire/src/eli_app.cpp (working copy)
@@ -438,7 +438,7 @@
}
-inline Evas_Bool
+inline Eina_Bool
_eli_theme_exists(Ecore_List * l, const char * theme)
{
char * data;
@@ -456,12 +456,12 @@
return false;
}
-Evas_Bool eli_theme_gui_exists(Eli_App * eap, const char * theme)
+Eina_Bool eli_theme_gui_exists(Eli_App * eap, const char * theme)
{
return _eli_theme_exists(eap->theme.gui.list, theme);
}
-Evas_Bool eli_theme_cards_exists(Eli_App * eap, const char * theme)
+Eina_Bool eli_theme_cards_exists(Eli_App * eap, const char * theme)
{
return _eli_theme_exists(eap->theme.cards.list, theme);
}
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
