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

Remove Evas list from elementary. 

SVN revision: 36979
This commit is contained in:
Cedric BAIL 2008-10-22 14:11:59 +00:00
parent 5963897c67
commit 2d9ac9118b
7 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/src/lib/elm_entry.c
View File

@ -309,7 +309,7 @@ elm_entry_entry_set(Evas_Object *obj, const char *entry)
// debug
{
Evas_List *l, *an;
Eina_List *l, *an;
an = edje_object_part_text_anchor_list_get(wd->ent, "elm.text");
for (l = an; l; l = l->next)
printf("ANCHOR: %s\n", l->data);

18
legacy/elementary/src/lib/elm_hover.c
View File

@ -10,7 +10,7 @@ struct _Widget_Data
Evas_Object *cov;
Evas_Object *offset, *size;
Evas_Object *parent, *target;
Evas_List *subs;
Eina_List *subs;
};
struct _Subinfo
@ -33,7 +33,7 @@ _del_hook(Evas_Object *obj)
while (wd->subs)
{
Subinfo *si = wd->subs->data;
wd->subs = evas_list_remove_list(wd->subs, wd->subs);
wd->subs = eina_list_remove_list(wd->subs, wd->subs);
evas_stringshare_del(si->swallow);
free(si);
}
@ -60,7 +60,7 @@ static void
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_List *l;
Eina_List *l;
for (l = wd->subs; l; l = l->next)
{
Subinfo *si = l->data;
@ -77,7 +77,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *sub = event_info;
Evas_List *l;
Eina_List *l;
for (l = wd->subs; l; l = l->next)
{
@ -86,7 +86,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
{
evas_object_event_callback_del
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints);
wd->subs = evas_list_remove_list(wd->subs, l);
wd->subs = eina_list_remove_list(wd->subs, l);
evas_stringshare_del(si->swallow);
free(si);
break;
@ -110,7 +110,7 @@ static void
_hov_show(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_List *l;
Eina_List *l;
// FIXME: use signals for show for hov
evas_object_show(wd->cov);
edje_object_signal_emit(wd->cov, "elm,action,show", "elm");
@ -131,7 +131,7 @@ static void
_hov_hide(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_List *l;
Eina_List *l;
// FIXME: use signals for hide for hov
edje_object_signal_emit(wd->cov, "elm,action,hide", "elm");
evas_object_hide(wd->cov);
@ -289,7 +289,7 @@ elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conten
{
Widget_Data *wd = elm_widget_data_get(obj);
Subinfo *si;
Evas_List *l;
Eina_List *l;
char buf[1024];
snprintf(buf, sizeof(buf), "elm.swallow.slot.%s", swallow);
@ -312,7 +312,7 @@ elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conten
si = ELM_NEW(Subinfo);
si->swallow = evas_stringshare_add(buf);
si->obj = content;
wd->subs = evas_list_append(wd->subs, si);
wd->subs = eina_list_append(wd->subs, si);
_sizing_eval(obj);
}
}

14
legacy/elementary/src/lib/elm_layout.c
View File

@ -7,7 +7,7 @@ typedef struct _Subinfo Subinfo;
struct _Widget_Data
{
Evas_Object *lay;
Evas_List *subs;
Eina_List *subs;
};
struct _Subinfo
@ -28,7 +28,7 @@ _del_hook(Evas_Object *obj)
while (wd->subs)
{
Subinfo *si = wd->subs->data;
wd->subs = evas_list_remove_list(wd->subs, wd->subs);
wd->subs = eina_list_remove_list(wd->subs, wd->subs);
evas_stringshare_del(si->swallow);
free(si);
}
@ -50,7 +50,7 @@ static void
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_List *l;
Eina_List *l;
for (l = wd->subs; l; l = l->next)
{
Subinfo *si = l->data;
@ -68,7 +68,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *sub = event_info;
Evas_List *l;
Eina_List *l;
for (l = wd->subs; l; l = l->next)
{
@ -77,7 +77,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
{
evas_object_event_callback_del
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints);
wd->subs = evas_list_remove_list(wd->subs, l);
wd->subs = eina_list_remove_list(wd->subs, l);
evas_stringshare_del(si->swallow);
free(si);
break;
@ -120,7 +120,7 @@ elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conte
{
Widget_Data *wd = elm_widget_data_get(obj);
Subinfo *si;
Evas_List *l;
Eina_List *l;
for (l = wd->subs; l; l = l->next)
{
@ -141,7 +141,7 @@ elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conte
si = ELM_NEW(Subinfo);
si->swallow = evas_stringshare_add(swallow);
si->obj = content;
wd->subs = evas_list_append(wd->subs, si);
wd->subs = eina_list_append(wd->subs, si);
_sizing_eval(obj);
}
}

22
legacy/elementary/src/lib/elm_widget.c
View File

@ -11,7 +11,7 @@ struct _Smart_Data
Evas_Object *obj;
Evas_Object *parent_obj;
Evas_Coord x, y, w, h;
Evas_List *subobjs;
Eina_List *subobjs;
Evas_Object *resize_obj;
Evas_Object *hover_obj;
void (*del_func) (Evas_Object *obj);
@ -54,7 +54,7 @@ _sub_obj_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
Smart_Data *sd = data;
if (obj == sd->resize_obj) sd->resize_obj = NULL;
else if (obj == sd->hover_obj) sd->hover_obj = NULL;
else sd->subobjs = evas_list_remove(sd->subobjs, obj);
else sd->subobjs = eina_list_remove(sd->subobjs, obj);
}
static void
@ -144,7 +144,7 @@ EAPI void
elm_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj)
{
API_ENTRY return;
sd->subobjs = evas_list_append(sd->subobjs, sobj);
sd->subobjs = eina_list_append(sd->subobjs, sobj);
if (!sd->child_can_focus)
{
if (elm_widget_can_focus_get(sobj)) sd->child_can_focus = 1;
@ -165,7 +165,7 @@ EAPI void
elm_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj)
{
API_ENTRY return;
sd->subobjs = evas_list_remove(sd->subobjs, sobj);
sd->subobjs = eina_list_remove(sd->subobjs, sobj);
if (!sd->child_can_focus)
{
if (elm_widget_can_focus_get(sobj)) sd->child_can_focus = 0;
@ -236,7 +236,7 @@ elm_widget_focus_get(Evas_Object *obj)
EAPI Evas_Object *
elm_widget_focused_object_get(Evas_Object *obj)
{
Evas_List *l;
Eina_List *l;
API_ENTRY return NULL;
if (!sd->focused) return NULL;
for (l = sd->subobjs; l; l = l->next)
@ -267,7 +267,7 @@ elm_widget_focus_jump(Evas_Object *obj, int forward)
/* its some container */
else
{
Evas_List *l;
Eina_List *l;
int focus_next;
focus_next = 0;
@ -309,7 +309,7 @@ elm_widget_focus_jump(Evas_Object *obj, int forward)
}
else
{
for (l = evas_list_last(sd->subobjs); l; l = l->prev)
for (l = eina_list_last(sd->subobjs); l; l = l->prev)
{
if (elm_widget_can_focus_get(l->data))
{
@ -357,7 +357,7 @@ elm_widget_focus_set(Evas_Object *obj, int first)
}
else
{
Evas_List *l;
Eina_List *l;
if (first)
{
@ -373,7 +373,7 @@ elm_widget_focus_set(Evas_Object *obj, int first)
}
else
{
for (l = evas_list_last(sd->subobjs); l; l = l->prev)
for (l = eina_list_last(sd->subobjs); l; l = l->prev)
{
if ((elm_widget_can_focus_get(l->data)) &&
(!elm_widget_disabled_get(l->data)))
@ -396,7 +396,7 @@ elm_widget_parent_get(Evas_Object *obj)
EAPI void
elm_widget_focused_object_clear(Evas_Object *obj)
{
Evas_List *l;
Eina_List *l;
API_ENTRY return;
if (!sd->focused) return;
sd->focused = 0;
@ -563,7 +563,7 @@ _smart_del(Evas_Object *obj)
while (sd->subobjs)
{
sobj = sd->subobjs->data;
sd->subobjs = evas_list_remove_list(sd->subobjs, sd->subobjs);
sd->subobjs = eina_list_remove_list(sd->subobjs, sd->subobjs);
evas_object_event_callback_del(sobj, EVAS_CALLBACK_DEL, _sub_obj_del);
evas_object_del(sobj);
}

16
legacy/elementary/src/lib/elm_win.c
View File

@ -9,7 +9,7 @@ struct _Elm_Win
Evas *evas;
Evas_Object *parent;
Evas_Object *win_obj;
Evas_List *subobjs;
Eina_List *subobjs;
Ecore_X_Window xwin;
Ecore_Job *deferred_resize_job;
Ecore_Job *deferred_child_eval_job;
@ -37,7 +37,7 @@ static void _elm_win_eval_subobjs(Evas_Object *obj);
static void _elm_win_subobj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _elm_win_subobj_callback_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
static Evas_List *_elm_win_list = NULL;
static Eina_List *_elm_win_list = NULL;
static void
_elm_win_resize(Ecore_Evas *ee)
@ -139,7 +139,7 @@ _elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_inf
{
Elm_Win *win = data;
_elm_win_list = evas_list_remove(_elm_win_list, win->win_obj);
_elm_win_list = eina_list_remove(_elm_win_list, win->win_obj);
while (win->subobjs) elm_win_resize_object_del(obj, win->subobjs->data);
evas_object_intercept_show_callback_del(win->win_obj, _elm_win_obj_intercept_show);
evas_object_intercept_hide_callback_del(win->win_obj, _elm_win_obj_intercept_hide);
@ -185,7 +185,7 @@ static void
_elm_win_resize_job(void *data)
{
Elm_Win *win = data;
Evas_List *l;
Eina_List *l;
int w, h;
win->deferred_resize_job = NULL;
@ -257,7 +257,7 @@ _elm_win_xwin_update(Elm_Win *win)
static void
_elm_win_eval_subobjs(Evas_Object *obj)
{
Evas_List *l;
Eina_List *l;
Elm_Win *win = evas_object_data_get(obj, "__Elm");
Evas_Coord w, h, minw = -1, minh = -1, maxw = -1, maxh = -1;
int xx = 1, xy = 1;
@ -401,7 +401,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
_elm_win_xwin_update(win);
_elm_win_list = evas_list_append(_elm_win_list, win->win_obj);
_elm_win_list = eina_list_append(_elm_win_list, win->win_obj);
return win->win_obj;
}
@ -411,7 +411,7 @@ elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj)
{
Elm_Win *win = evas_object_data_get(obj, "__Elm");
if (!win) return;
win->subobjs = evas_list_append(win->subobjs, subobj);
win->subobjs = eina_list_append(win->subobjs, subobj);
elm_widget_sub_object_add(obj, subobj);
evas_object_event_callback_add(subobj, EVAS_CALLBACK_DEL, _elm_win_subobj_callback_del, obj);
evas_object_event_callback_add(subobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _elm_win_subobj_callback_changed_size_hints, obj);
@ -425,7 +425,7 @@ elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj)
if (!win) return;
evas_object_event_callback_del(subobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _elm_win_subobj_callback_changed_size_hints);
evas_object_event_callback_del(subobj, EVAS_CALLBACK_DEL, _elm_win_subobj_callback_del);
win->subobjs = evas_list_remove(win->subobjs, subobj);
win->subobjs = eina_list_remove(win->subobjs, subobj);
elm_widget_sub_object_del(obj, subobj);
_elm_win_eval_subobjs(obj);
}

30
legacy/elementary/src/lib/els_box.c
View File

@ -12,7 +12,7 @@ struct _Smart_Data
unsigned char changed : 1;
unsigned char horizontal : 1;
unsigned char homogenous : 1;
Evas_List *items;
Eina_List *items;
};
/* local subsystem functions */
@ -88,7 +88,7 @@ _els_smart_box_pack_start(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_smart_adopt(sd, child);
sd->items = evas_list_prepend(sd->items, child);
sd->items = eina_list_prepend(sd->items, child);
_smart_reconfigure(sd);
return 0;
}
@ -102,9 +102,9 @@ _els_smart_box_pack_end(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_smart_adopt(sd, child);
sd->items = evas_list_append(sd->items, child);
sd->items = eina_list_append(sd->items, child);
_smart_reconfigure(sd);
return evas_list_count(sd->items) - 1;
return eina_list_count(sd->items) - 1;
}
int
@ -112,13 +112,13 @@ _els_smart_box_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *be
{
Smart_Data *sd;
int i = 0;
Evas_List *l;
Eina_List *l;
if (!child) return 0;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_smart_adopt(sd, child);
sd->items = evas_list_prepend_relative(sd->items, child, before);
sd->items = eina_list_prepend_relative(sd->items, child, before);
for (i = 0, l = sd->items; l; l = l->next, i++)
{
if (l->data == child) break;
@ -132,13 +132,13 @@ _els_smart_box_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *aft
{
Smart_Data *sd;
int i = 0;
Evas_List *l;
Eina_List *l;
if (!child) return 0;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_smart_adopt(sd, child);
sd->items = evas_list_append_relative(sd->items, child, after);
sd->items = eina_list_append_relative(sd->items, child, after);
for (i = 0, l = sd->items; l; l = l->next, i++)
{
if (l->data == child) break;
@ -155,7 +155,7 @@ _els_smart_box_unpack(Evas_Object *obj)
if (!obj) return;
sd = evas_object_smart_data_get(evas_object_smart_parent_get(obj));
if (!sd) return;
sd->items = evas_list_remove(sd->items, obj);
sd->items = eina_list_remove(sd->items, obj);
_smart_disown(obj);
_smart_reconfigure(sd);
}
@ -214,7 +214,7 @@ static void
_smart_reconfigure(Smart_Data *sd)
{
Evas_Coord x, y, w, h, xx, yy;
Evas_List *l;
Eina_List *l;
Evas_Coord minw, minh, wdif, hdif, mnw, mnh, mxw, mxh;
int count, expand, fw, fh, xw, xh;
double ax, ay, wx, wy;
@ -228,7 +228,7 @@ _smart_reconfigure(Smart_Data *sd)
evas_object_size_hint_min_get(sd->obj, &minw, &minh);
evas_object_size_hint_align_get(sd->obj, &ax, &ay);
count = evas_list_count(sd->items);
count = eina_list_count(sd->items);
expand = 0;
if (w < minw)
{
@ -385,7 +385,7 @@ _smart_reconfigure(Smart_Data *sd)
static void
_smart_extents_calculate(Smart_Data *sd)
{
Evas_List *l;
Eina_List *l;
Evas_Coord minw, minh, maxw, maxh, mnw, mnh;
/* FIXME: need to calc max */
@ -402,9 +402,9 @@ _smart_extents_calculate(Smart_Data *sd)
if (minw < mnw) minw = mnw;
}
if (sd->horizontal)
minw *= evas_list_count(sd->items);
minw *= eina_list_count(sd->items);
else
minh *= evas_list_count(sd->items);
minh *= eina_list_count(sd->items);
}
else
{
@ -489,7 +489,7 @@ static void
_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Smart_Data *sd;
Evas_List *l;
Eina_List *l;
Evas_Coord dx, dy;
sd = evas_object_smart_data_get(obj);

12
legacy/elementary/src/lib/els_table.c
View File

@ -10,7 +10,7 @@ struct _Smart_Data
Evas_Object *obj;
Evas_Object *clip;
unsigned char homogenous : 1;
Evas_List *items;
Eina_List *items;
struct {
int cols, rows;
} size;
@ -72,7 +72,7 @@ _els_smart_table_pack(Evas_Object *obj, Evas_Object *child, int col, int row, in
sd = evas_object_smart_data_get(obj);
_smart_adopt(sd, child);
sd->items = evas_list_append(sd->items, child);
sd->items = eina_list_append(sd->items, child);
ti = evas_object_data_get(child, "e_table_data");
if (ti)
{
@ -95,7 +95,7 @@ _els_smart_table_unpack(Evas_Object *obj)
ti = evas_object_data_get(obj, "e_table_data");
if (!ti) return;
sd = ti->sd;
sd->items = evas_list_remove(sd->items, obj);
sd->items = eina_list_remove(sd->items, obj);
_smart_disown(obj);
_smart_reconfigure(sd);
}
@ -180,7 +180,7 @@ static void
_smart_reconfigure(Smart_Data *sd)
{
Evas_Coord x, y, w, h, xx, yy;
Evas_List *l;
Eina_List *l;
Evas_Coord minw, minh;
int expandw, expandh;
double ax, ay;
@ -550,7 +550,7 @@ _smart_reconfigure(Smart_Data *sd)
static void
_smart_extents_calcuate(Smart_Data *sd)
{
Evas_List *l;
Eina_List *l;
Evas_Coord minw, minh, maxw, maxh;
minw = 0;
@ -825,7 +825,7 @@ static void
_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Smart_Data *sd;
Evas_List *l;
Eina_List *l;
Evas_Coord dx, dy;
sd = evas_object_smart_data_get(obj);