Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
aclass.c backgrounds.c borders.c buttons.c comms.c container.c
cursors.c dialog.c e16-ecore_list.c e16-ecore_list.h fonts.c
groups.c iclass.c menus.c pager.c snaps.c sound.c timers.c
windowmatch.c
Log Message:
Follow ecore_list name changes.
===================================================================
RCS file: /cvs/e/e16/e/src/aclass.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- aclass.c 18 May 2007 08:25:01 -0000 1.42
+++ aclass.c 25 Jul 2007 20:02:56 -0000 1.43
@@ -207,7 +207,7 @@
return;
}
- ecore_list_remove_node(aclass_list, ac);
+ ecore_list_node_remove(aclass_list, ac);
for (i = 0; i < ac->num; i++)
ActionDestroy(ac->list[i]);
@@ -333,10 +333,10 @@
case CONFIG_CLASSNAME:
case ACLASS_NAME:
- ac = (ActionClass *) ecore_list_remove_node(aclass_list,
+ ac = (ActionClass *) ecore_list_node_remove(aclass_list,
ActionclassFind(s2));
if (!ac)
- ac = (ActionClass *) ecore_list_remove_node(aclass_list_global,
+ ac = (ActionClass *) ecore_list_node_remove(aclass_list_global,
ActionclassFindGlobal
(s2));
if (ac)
@@ -351,7 +351,7 @@
case ACLASS_TYPE:
if (atoi(s2) == ACLASS_TYPE_ACLASS)
break;
- ecore_list_remove_node(aclass_list, ActionclassFind(s2));
+ ecore_list_node_remove(aclass_list, ActionclassFind(s2));
ecore_list_prepend(aclass_list_global, ac);
global = 1;
@@ -751,12 +751,12 @@
}
else
{
- ac = (ActionClass *) ecore_list_remove_node(aclass_list,
+ ac = (ActionClass *) ecore_list_node_remove(aclass_list,
ActionclassFind
(prm2));
if (!ac)
ac = (ActionClass *)
- ecore_list_remove_node(aclass_list_global,
+ ecore_list_node_remove(aclass_list_global,
ActionclassFindGlobal(prm2));
if (ac)
ActionclassDestroy(ac);
@@ -1345,7 +1345,7 @@
Mode.keybinds_changed = 1;
- ac = (ActionClass *) ecore_list_remove_node(aclass_list_global,
+ ac = (ActionClass *) ecore_list_node_remove(aclass_list_global,
ActionclassFindGlobal
("KEYBINDINGS"));
if (ac)
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- backgrounds.c 11 Jul 2007 09:35:01 -0000 1.97
+++ backgrounds.c 25 Jul 2007 20:02:56 -0000 1.98
@@ -244,7 +244,7 @@
return -1;
}
- ecore_list_remove_node(bg_list, bg);
+ ecore_list_node_remove(bg_list, bg);
BackgroundFilesRemove(bg);
BackgroundPixmapFree(bg);
@@ -1064,11 +1064,11 @@
int num;
unsigned int rnd;
- num = ecore_list_nodes(bg_list);
+ num = ecore_list_count(bg_list);
for (;;)
{
rnd = rand();
- bg = (Background *) ecore_list_goto_index(bg_list, rnd % num);
+ bg = (Background *) ecore_list_index_goto(bg_list, rnd % num);
if (num <= 1 || !BackgroundIsNone(bg))
break;
}
@@ -1331,7 +1331,7 @@
unsigned int j;
int i, num, r, g, b;
- num = ecore_list_nodes(bg_list);
+ num = ecore_list_count(bg_list);
if (num <= 0)
return;
@@ -1342,7 +1342,7 @@
for (i = num - 1; i >= 0; i--)
{
- bg = (Background *) ecore_list_goto_index(bg_list, i);
+ bg = (Background *) ecore_list_index_goto(bg_list, i);
if (!bg)
continue;
@@ -1422,7 +1422,7 @@
for (ix = 0;; ix++)
{
- ecore_list_goto_index(bg_list, ix);
+ ecore_list_index_goto(bg_list, ix);
bg = (Background *) ecore_list_next(bg_list);
if (!bg)
break;
@@ -1722,7 +1722,7 @@
int i, num;
int slider, lower, upper;
- num = ecore_list_nodes(bg_list);
+ num = ecore_list_count(bg_list);
if (num <= 1)
return;
@@ -1732,7 +1732,7 @@
i = ecore_list_index(bg_list);
bg =
- (Background *) ecore_list_goto_index(bg_list,
+ (Background *) ecore_list_index_goto(bg_list,
(i < num - 1) ? i + 1 : i - 1);
DeskBackgroundSet(DesksGetCurrent(), bg);
@@ -1760,7 +1760,7 @@
CB_ConfigureFrontBG(Dialog * d __UNUSED__, int val __UNUSED__,
void *data __UNUSED__)
{
- ecore_list_prepend(bg_list, ecore_list_remove_node(bg_list, tmp_bg));
+ ecore_list_prepend(bg_list, ecore_list_node_remove(bg_list, tmp_bg));
BGSettingsGoTo(tmp_bg);
BG_RedrawView();
autosave();
@@ -1777,7 +1777,7 @@
GC gc;
ImageClass *ic_button;
- num = ecore_list_nodes(bg_list);
+ num = ecore_list_count(bg_list);
if (num <= 0)
return;
@@ -1880,10 +1880,10 @@
switch (ev->xbutton.button)
{
case 1:
- num = ecore_list_nodes(bg_list);
+ num = ecore_list_count(bg_list);
x = (num * (64 + 8) - w) * tmp_bg_sel_sliderval / (4 * num) +
ev->xbutton.x;
- bg = (Background *) ecore_list_goto_index(bg_list, x / (64 + 8));
+ bg = (Background *) ecore_list_index_goto(bg_list, x / (64 + 8));
if (!bg || bg == DeskBackgroundGet(DesksGetCurrent()))
break;
BgDialogSetNewCurrent(bg);
@@ -1933,7 +1933,7 @@
return;
i = ecore_list_index(bg_list);
- num = ecore_list_nodes(bg_list);
+ num = ecore_list_count(bg_list);
i = ((4 * num + 20) * i) / num - 8;
if (i < 0)
i = 0;
@@ -1954,7 +1954,7 @@
return;
bg =
- (Background *) ecore_list_goto_index(bg_list,
+ (Background *) ecore_list_index_goto(bg_list,
ecore_list_index(bg_list) + val);
if (!bg)
return;
@@ -1997,7 +1997,7 @@
/* remove them all from the list */
for (i = 0; i < num; i++)
- ecore_list_remove_node(bg_list, bglist[i]);
+ ecore_list_node_remove(bg_list, bglist[i]);
Quicksort((void **)bglist, 0, num - 2, BG_SortFileCompare);
for (i = 0; i < num; i++)
ecore_list_append(bg_list, bglist[i]);
@@ -2021,7 +2021,7 @@
/* remove them all from the list */
for (i = 0; i < num; i++)
- ecore_list_remove_node(bg_list, bglist[i]);
+ ecore_list_node_remove(bg_list, bglist[i]);
for (i = 0; i < num; i++)
{
Background *bg;
@@ -2065,7 +2065,7 @@
/* remove them all from the list */
for (i = 0; i < num; i++)
- ecore_list_remove_node(bg_list, bglist[i]);
+ ecore_list_node_remove(bg_list, bglist[i]);
for (i = 0; i < num; i++)
ecore_list_prepend(bg_list, bglist[i]);
Efree(bglist);
@@ -2314,7 +2314,7 @@
DialogItemAreaSetEventFunc(di, CB_BGAreaEvent);
DialogItemAreaSetInitFunc(di, CB_InitView);
- num = ecore_list_nodes(bg_list);
+ num = ecore_list_count(bg_list);
di = bg_sel_slider = DialogAddItem(table, DITEM_SLIDER);
DialogItemSliderSetBounds(di, 0, num * 4);
DialogItemSliderSetUnits(di, 1);
===================================================================
RCS file: /cvs/e/e16/e/src/borders.c,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -3 -r1.297 -r1.298
--- borders.c 23 Jul 2007 19:02:15 -0000 1.297
+++ borders.c 25 Jul 2007 20:02:56 -0000 1.298
@@ -652,7 +652,7 @@
return;
}
- ecore_list_remove_node(border_list, b);
+ ecore_list_node_remove(border_list, b);
for (i = 0; i < b->num_winparts; i++)
{
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- buttons.c 23 Jul 2007 19:02:15 -0000 1.103
+++ buttons.c 25 Jul 2007 20:02:57 -0000 1.104
@@ -194,7 +194,7 @@
return;
}
- ecore_list_remove_node(button_list, b);
+ ecore_list_node_remove(button_list, b);
EoFini(b);
@@ -906,7 +906,7 @@
Button *b;
int flags;
- if (ecore_list_nodes(button_list) <= 0)
+ if (ecore_list_count(button_list) <= 0)
return;
Etmp(st);
===================================================================
RCS file: /cvs/e/e16/e/src/comms.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- comms.c 18 May 2007 08:25:02 -0000 1.82
+++ comms.c 25 Jul 2007 20:02:57 -0000 1.83
@@ -81,7 +81,7 @@
if (!c)
return;
- ecore_list_remove_node(client_list, c);
+ ecore_list_node_remove(client_list, c);
EventCallbackUnregister(c->win, 0, ClientHandleEvents, c);
EUnregisterWindow(c->win);
===================================================================
RCS file: /cvs/e/e16/e/src/container.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- container.c 18 May 2007 21:18:24 -0000 1.13
+++ container.c 25 Jul 2007 20:02:57 -0000 1.14
@@ -169,7 +169,7 @@
static void
ContainerDestroy(Container * ct, int exiting)
{
- ecore_list_remove_node(container_list, ct);
+ ecore_list_node_remove(container_list, ct);
ct->ops->Exit(ct, exiting);
@@ -1248,7 +1248,7 @@
{
Container *ct;
- if (ecore_list_nodes(container_list) > 0)
+ if (ecore_list_count(container_list) > 0)
{
ECORE_LIST_FOR_EACH(container_list, ct) ContainerShow(ct);
}
@@ -1993,7 +1993,7 @@
if (!prm[0])
{
- num = ecore_list_nodes(container_list);
+ num = ecore_list_count(container_list);
Esnprintf(prm, sizeof(prm), "_IB_%i", num);
}
ct = ContainerCreate(prm);
===================================================================
RCS file: /cvs/e/e16/e/src/cursors.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- cursors.c 18 May 2007 08:25:02 -0000 1.42
+++ cursors.c 25 Jul 2007 20:02:57 -0000 1.43
@@ -128,7 +128,7 @@
return;
}
- ecore_list_remove_node(cursor_list, ec);
+ ecore_list_node_remove(cursor_list, ec);
if (ec->name)
Efree(ec->name);
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -3 -r1.187 -r1.188
--- dialog.c 11 Jul 2007 09:32:31 -0000 1.187
+++ dialog.c 25 Jul 2007 20:02:57 -0000 1.188
@@ -270,7 +270,7 @@
static void
DialogDestroy(Dialog * d)
{
- ecore_list_remove_node(dialog_list, d);
+ ecore_list_node_remove(dialog_list, d);
if (d->name)
Efree(d->name);
===================================================================
RCS file: /cvs/e/e16/e/src/e16-ecore_list.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e16-ecore_list.c 17 Jan 2007 01:10:42 -0000 1.9
+++ e16-ecore_list.c 25 Jul 2007 20:02:57 -0000 1.10
@@ -91,15 +91,15 @@
/* Remove functions */
static void *_ecore_list_remove_0(Ecore_List * list);
-static void *_ecore_list_remove_first(Ecore_List * list);
-static void *_ecore_list_remove_last(Ecore_List * list);
+static void *_ecore_list_first_remove(Ecore_List * list);
+static void *_ecore_list_last_remove(Ecore_List * list);
/* Basic traversal functions */
static void *_ecore_list_next(Ecore_List * list);
-static void *_ecore_list_goto_last(Ecore_List * list);
-static void *_ecore_list_goto_first(Ecore_List * list);
-static void *_ecore_list_goto(Ecore_List * list, void *data);
-static void *_ecore_list_goto_index(Ecore_List * list, int indx);
+static void *_ecore_list_last_goto(Ecore_List * list);
+static void *_ecore_list_first_goto(Ecore_List * list);
+static void *_ecore_list_goto(Ecore_List * list, const void *data);
+static void *_ecore_list_index_goto(Ecore_List * list, int indx);
/* Iterative function */
static int _ecore_list_for_each(Ecore_List * list,
@@ -168,7 +168,7 @@
while (list->first)
{
- data = _ecore_list_remove_first(list);
+ data = _ecore_list_first_remove(list);
if (list->free_func)
list->free_func(data);
}
@@ -184,7 +184,7 @@
* @return @c TRUE on successful set, @c FALSE otherwise.
*/
EAPI int
-ecore_list_set_free_cb(Ecore_List * list, Ecore_Free_Cb free_func)
+ecore_list_free_cb_set(Ecore_List * list, Ecore_Free_Cb free_func)
{
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@@ -199,7 +199,7 @@
* @return @c TRUE if no nodes in list, @c FALSE if the list contains nodes
*/
EAPI int
-ecore_list_is_empty(Ecore_List * list)
+ecore_list_empty_is(Ecore_List * list)
{
int ret = TRUE;
@@ -234,7 +234,7 @@
* @return The number of nodes in the list.
*/
EAPI int
-ecore_list_nodes(Ecore_List * list)
+ecore_list_count(Ecore_List * list)
{
int ret = 0;
@@ -388,7 +388,7 @@
new_node->next = list->current;
/* And hook the node into the list */
- _ecore_list_goto_index(list, ecore_list_index(list) - 1);
+ _ecore_list_index_goto(list, ecore_list_index(list) - 1);
list->current->next = new_node;
@@ -434,21 +434,21 @@
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
return NULL;
if (!list->current)
return NULL;
if (list->current == list->first)
- return _ecore_list_remove_first(list);
+ return _ecore_list_first_remove(list);
if (list->current == list->last)
- return _ecore_list_remove_last(list);
+ return _ecore_list_last_remove(list);
old = list->current;
- _ecore_list_goto_index(list, list->index - 1);
+ _ecore_list_index_goto(list, list->index - 1);
list->current->next = old->next;
old->next = NULL;
@@ -491,20 +491,20 @@
* @ingroup Ecore_Data_List_Remove_Item_Group
*/
EAPI void *
-ecore_list_remove_first(Ecore_List * list)
+ecore_list_first_remove(Ecore_List * list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_remove_first(list);
+ ret = _ecore_list_first_remove(list);
return ret;
}
/* Remove the first item from the list */
static void *
-_ecore_list_remove_first(Ecore_List * list)
+_ecore_list_first_remove(Ecore_List * list)
{
void *ret = NULL;
Ecore_List_Node *old;
@@ -512,10 +512,7 @@
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
- return NULL;
-
- if (!list->first)
+ if (ecore_list_empty_is(list))
return NULL;
old = list->first;
@@ -546,20 +543,20 @@
* @ingroup Ecore_Data_List_Remove_Item_Group
*/
EAPI void *
-ecore_list_remove_last(Ecore_List * list)
+ecore_list_last_remove(Ecore_List * list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_remove_last(list);
+ ret = _ecore_list_last_remove(list);
return ret;
}
/* Remove the last item from the list */
static void *
-_ecore_list_remove_last(Ecore_List * list)
+_ecore_list_last_remove(Ecore_List * list)
{
void *ret = NULL;
Ecore_List_Node *old, *prev;
@@ -567,10 +564,7 @@
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
- return NULL;
-
- if (!list->last)
+ if (ecore_list_empty_is(list))
return NULL;
old = list->last;
@@ -583,18 +577,11 @@
;
list->last = prev;
if (prev)
- {
- prev->next = NULL;
- if (list->current == old)
- list->current = NULL;
- }
+ prev->next = NULL;
- if (old)
- {
- old->next = NULL;
- ret = old->data;
- old->data = NULL;
- }
+ old->next = NULL;
+ ret = old->data;
+ old->data = NULL;
ecore_list_node_destroy(old, NULL);
list->nodes--;
@@ -616,13 +603,13 @@
* @ingroup Ecore_Data_List_Traverse_Group
*/
EAPI void *
-ecore_list_goto_index(Ecore_List * list, int indx)
+ecore_list_index_goto(Ecore_List * list, int indx)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_index(list, indx);
+ ret = _ecore_list_index_goto(list, indx);
return ret;
}
@@ -630,20 +617,20 @@
/* This is the non-threadsafe version, use this inside internal functions that
* already lock the list */
static void *
-_ecore_list_goto_index(Ecore_List * list, int indx)
+_ecore_list_index_goto(Ecore_List * list, int indx)
{
int i;
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
return NULL;
- if (indx > ecore_list_nodes(list) || indx < 0)
+ if (indx > ecore_list_count(list) || indx < 0)
return NULL;
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
for (i = 0; i < indx && _ecore_list_next(list); i++)
;
@@ -664,7 +651,7 @@
* @ingroup Ecore_Data_List_Traverse_Group
*/
EAPI void *
-ecore_list_goto(Ecore_List * list, void *data)
+ecore_list_goto(Ecore_List * list, const void *data)
{
void *ret;
@@ -677,7 +664,7 @@
/* Set the current position to the node containing data */
static void *
-_ecore_list_goto(Ecore_List * list, void *data)
+_ecore_list_goto(Ecore_List * list, const void *data)
{
int indx;
Ecore_List_Node *node;
@@ -718,20 +705,20 @@
* @ingroup Ecore_Data_List_Traverse_Group
*/
EAPI void *
-ecore_list_goto_first(Ecore_List * list)
+ecore_list_first_goto(Ecore_List * list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_first(list);
+ ret = _ecore_list_first_goto(list);
return ret;
}
/* Set the current position to the start of the list */
static void *
-_ecore_list_goto_first(Ecore_List * list)
+_ecore_list_first_goto(Ecore_List * list)
{
if (!list || !list->first)
return NULL;
@@ -749,20 +736,20 @@
* @ingroup Ecore_Data_List_Traverse_Group
*/
EAPI void *
-ecore_list_goto_last(Ecore_List * list)
+ecore_list_last_goto(Ecore_List * list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_last(list);
+ ret = _ecore_list_last_goto(list);
return ret;
}
/* Set the current position to the end of the list */
static void *
-_ecore_list_goto_last(Ecore_List * list)
+_ecore_list_last_goto(Ecore_List * list)
{
if (!list || !list->last)
return NULL;
@@ -854,8 +841,8 @@
{
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- while (!ecore_list_is_empty(list))
- _ecore_list_remove_first(list);
+ while (!ecore_list_empty_is(list))
+ _ecore_list_first_remove(list);
return TRUE;
}
@@ -889,7 +876,7 @@
if (!list || !function)
return FALSE;
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
while ((value = _ecore_list_next(list)) != NULL)
function(value, user_data);
@@ -922,7 +909,7 @@
if (!list || !function)
return NULL;
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
while ((value = _ecore_list_next(list)) != NULL)
if (!function(value, user_data))
return value;
@@ -997,7 +984,7 @@
*/
EAPI void *
-ecore_list_remove_node(Ecore_List * list, void *_data)
+ecore_list_node_remove(Ecore_List * list, void *_data)
{
void *data;
@@ -1015,7 +1002,7 @@
int i, num;
*pnum = 0;
- num = ecore_list_nodes(list);
+ num = ecore_list_count(list);
if (num <= 0)
return NULL;
@@ -1023,7 +1010,7 @@
if (!lst)
return NULL;
- for (i = 0, ecore_list_goto_first(list);
+ for (i = 0, ecore_list_first_goto(list);
(b = ecore_list_next(list)) != NULL;)
lst[i++] = b;
===================================================================
RCS file: /cvs/e/e16/e/src/e16-ecore_list.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e16-ecore_list.h 17 Jan 2007 01:10:42 -0000 1.6
+++ e16-ecore_list.h 25 Jul 2007 20:02:57 -0000 1.7
@@ -61,22 +61,22 @@
/* Removing items from the list */
EAPI int ecore_list_remove_destroy(Ecore_List * list);
EAPI void *ecore_list_remove(Ecore_List * list);
-EAPI void *ecore_list_remove_first(Ecore_List * list);
-EAPI void *ecore_list_remove_last(Ecore_List * list);
+EAPI void *ecore_list_first_remove(Ecore_List * list);
+EAPI void *ecore_list_last_remove(Ecore_List * list);
/* Retrieve the current position in the list */
EAPI void *ecore_list_current(Ecore_List * list);
EAPI int ecore_list_index(Ecore_List * list);
-EAPI int ecore_list_nodes(Ecore_List * list);
+EAPI int ecore_list_count(Ecore_List * list);
/* Traversing the list */
EAPI int ecore_list_for_each(Ecore_List * list,
Ecore_For_Each function,
void *user_data);
-EAPI void *ecore_list_goto_first(Ecore_List * list);
-EAPI void *ecore_list_goto_last(Ecore_List * list);
-EAPI void *ecore_list_goto_index(Ecore_List * list, int indx);
-EAPI void *ecore_list_goto(Ecore_List * list, void *_data);
+EAPI void *ecore_list_first_goto(Ecore_List * list);
+EAPI void *ecore_list_last_goto(Ecore_List * list);
+EAPI void *ecore_list_index_goto(Ecore_List * list, int index);
+EAPI void *ecore_list_goto(Ecore_List * list, const void *_data);
/* Traversing the list and returning data */
EAPI void *ecore_list_next(Ecore_List * list);
@@ -85,7 +85,7 @@
const void *match);
/* Check to see if there is any data in the list */
-EAPI int ecore_list_is_empty(Ecore_List * list);
+EAPI int ecore_list_empty_is(Ecore_List * list);
/* Remove every node in the list without freeing the list itself */
EAPI int ecore_list_clear(Ecore_List * list);
@@ -101,7 +101,7 @@
EAPI int ecore_list_node_destroy(Ecore_List_Node * _e_node,
Ecore_Free_Cb free_func);
-EAPI int ecore_list_set_free_cb(Ecore_List * list,
+EAPI int ecore_list_free_cb_set(Ecore_List * list,
Ecore_Free_Cb free_func);
#endif /* USE_ECORE */
@@ -109,13 +109,13 @@
/* e16 additions */
#if __cplusplus
#define ECORE_LIST_FOR_EACH(list, p) \
- for (ecore_list_goto_first(list); (p = (typeof(p))ecore_list_next(list)) !=
NULL;)
+ for (ecore_list_first_goto(list); (p = (typeof(p))ecore_list_next(list)) !=
NULL;)
#else
#define ECORE_LIST_FOR_EACH(list, p) \
- for (ecore_list_goto_first(list); (p = ecore_list_next(list)) != NULL;)
+ for (ecore_list_first_goto(list); (p = ecore_list_next(list)) != NULL;)
#endif
-EAPI void *ecore_list_remove_node(Ecore_List * list, void *_data);
+EAPI void *ecore_list_node_remove(Ecore_List * list, void *_data);
EAPI void **ecore_list_items_get(Ecore_List * list, int *pnum);
#endif /* _E16_ECORE_LIST_H_ */
===================================================================
RCS file: /cvs/e/e16/e/src/fonts.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- fonts.c 17 Jan 2007 01:10:43 -0000 1.10
+++ fonts.c 25 Jul 2007 20:02:57 -0000 1.11
@@ -58,7 +58,7 @@
if (!font_list)
{
font_list = ecore_list_new();
- ecore_list_set_free_cb(font_list, _FontAliasDestroy);
+ ecore_list_free_cb_set(font_list, _FontAliasDestroy);
}
ecore_list_prepend(font_list, fa);
===================================================================
RCS file: /cvs/e/e16/e/src/groups.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- groups.c 18 May 2007 08:25:02 -0000 1.95
+++ groups.c 25 Jul 2007 20:02:57 -0000 1.96
@@ -98,7 +98,7 @@
if (!g)
return;
- ecore_list_remove_node(group_list, g);
+ ecore_list_node_remove(group_list, g);
if (g == Mode_groups.current)
Mode_groups.current = NULL;
@@ -486,7 +486,7 @@
FILE *f;
char s[1024];
- if (ecore_list_nodes(group_list) <= 0)
+ if (ecore_list_count(group_list) <= 0)
return;
Esnprintf(s, sizeof(s), "%s.groups", EGetSavePrefix());
@@ -1119,7 +1119,7 @@
}
else
{
- IpcPrintf("Number of groups: %d\n", ecore_list_nodes(group_list));
+ IpcPrintf("Number of groups: %d\n", ecore_list_count(group_list));
ECORE_LIST_FOR_EACH(group_list, group) GroupShow(group);
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- iclass.c 7 Jun 2007 18:40:04 -0000 1.118
+++ iclass.c 25 Jul 2007 20:02:57 -0000 1.119
@@ -359,7 +359,7 @@
return;
}
- ecore_list_remove_node(iclass_list, ic);
+ ecore_list_node_remove(iclass_list, ic);
if (ic->name)
Efree(ic->name);
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -3 -r1.283 -r1.284
--- menus.c 11 Jul 2007 09:40:47 -0000 1.283
+++ menus.c 25 Jul 2007 20:02:57 -0000 1.284
@@ -571,7 +571,7 @@
if (m->ref_count)
return;
- ecore_list_remove_node(menu_list, m);
+ ecore_list_node_remove(menu_list, m);
if (m->win)
EDestroyWindow(m->win);
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -3 -r1.247 -r1.248
--- pager.c 21 Jul 2007 19:43:43 -0000 1.247
+++ pager.c 25 Jul 2007 20:02:57 -0000 1.248
@@ -156,7 +156,7 @@
static void
PagerDestroy(Pager * p)
{
- ecore_list_remove_node(pager_list, p);
+ ecore_list_node_remove(pager_list, p);
PagerScanCancel(p);
if (p->name)
@@ -811,7 +811,7 @@
{
pager_update_data pud;
- if (ecore_list_nodes(pager_list) <= 0)
+ if (ecore_list_count(pager_list) <= 0)
return;
pud.x1 = x1;
===================================================================
RCS file: /cvs/e/e16/e/src/snaps.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- snaps.c 18 May 2007 08:25:06 -0000 1.132
+++ snaps.c 25 Jul 2007 20:02:57 -0000 1.133
@@ -95,7 +95,7 @@
SnapshotDestroy(Snapshot * sn)
{
/* Just making sure */
- sn = (Snapshot *) ecore_list_remove_node(ss_list, sn);
+ sn = (Snapshot *) ecore_list_node_remove(ss_list, sn);
if (!sn)
return;
@@ -221,7 +221,7 @@
if (ewin->snap)
return ewin->snap;
- if (ecore_list_nodes(ss_list) <= 0)
+ if (ecore_list_count(ss_list) <= 0)
return NULL;
/* If exec'ed by snap try matching command exactly */
@@ -1019,7 +1019,7 @@
DialogItemTableSetOptions(table, 3, 0, 0, 0);
- num = ecore_list_nodes(ss_list);
+ num = ecore_list_count(ss_list);
rd_ewin_list = EMALLOC(RememberWinList, num + 1);
if (num > 0)
@@ -1704,7 +1704,7 @@
p += len;
}
- if (ecore_list_nodes(ss_list) <= 0)
+ if (ecore_list_count(ss_list) <= 0)
{
IpcPrintf("No remembered windows\n");
return;
===================================================================
RCS file: /cvs/e/e16/e/src/sound.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- sound.c 18 May 2007 08:25:06 -0000 1.54
+++ sound.c 25 Jul 2007 20:02:57 -0000 1.55
@@ -228,7 +228,7 @@
{
if (!sclass)
return;
- ecore_list_remove_node(sound_list, sclass);
+ ecore_list_node_remove(sound_list, sclass);
if (sclass->name)
Efree(sclass->name);
if (sclass->file)
===================================================================
RCS file: /cvs/e/e16/e/src/timers.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- timers.c 4 Feb 2007 01:03:06 -0000 1.30
+++ timers.c 25 Jul 2007 20:02:57 -0000 1.31
@@ -213,7 +213,7 @@
void
IdlerDel(Idler * id)
{
- ecore_list_remove_node(idler_list, id);
+ ecore_list_node_remove(idler_list, id);
Efree(id);
}
@@ -259,7 +259,7 @@
AnimatorDel(an);
}
- if (ecore_list_nodes(animator_list))
+ if (ecore_list_count(animator_list))
DoIn("Anim", 1e-3 * Conf.animation.step, AnimatorsRun, 0, NULL);
}
@@ -284,7 +284,7 @@
ecore_list_append(animator_list, an);
- if (ecore_list_nodes(animator_list) == 1)
+ if (ecore_list_count(animator_list) == 1)
{
if (Conf.animation.step <= 0)
Conf.animation.step = 1;
@@ -302,12 +302,12 @@
Eprintf("AnimatorDel %p func=%p data=%p\n", an, an->func, an->data);
#endif
- ecore_list_remove_node(animator_list, an);
+ ecore_list_node_remove(animator_list, an);
if (an->name)
Efree(an->name);
Efree(an);
- if (ecore_list_nodes(animator_list) == 0)
+ if (ecore_list_count(animator_list) == 0)
{
/* Animator list was empty - Add to timer qeueue */
RemoveTimerEvent("Anim");
===================================================================
RCS file: /cvs/e/e16/e/src/windowmatch.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- windowmatch.c 18 May 2007 08:25:06 -0000 1.62
+++ windowmatch.c 25 Jul 2007 20:02:57 -0000 1.63
@@ -121,7 +121,7 @@
if (!wm)
return;
- ecore_list_remove_node(wm_list, wm);
+ ecore_list_node_remove(wm_list, wm);
if (wm->name)
Efree(wm->name);
@@ -435,7 +435,7 @@
}
else
{
- ecore_list_append(wm_list, ecore_list_remove_node(wm_list, wm));
+ ecore_list_append(wm_list, ecore_list_node_remove(wm_list, wm));
}
return wm;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
