Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_util.c
Log Message:
Fix formatting ugliness.
Add 'const' to evas_hash_foreach functions as per recent Evas changes.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- edje_util.c 18 Jan 2008 06:34:04 -0000 1.103
+++ edje_util.c 15 Feb 2008 19:30:12 -0000 1.104
@@ -21,8 +21,8 @@
Evas_List *list;
};
-static Evas_Bool _edje_color_class_list_foreach(Evas_Hash *hash, const char
*key, void *data, void *fdata);
-static Evas_Bool _edje_text_class_list_foreach(Evas_Hash *hash, const char
*key, void *data, void *fdata);
+static Evas_Bool _edje_color_class_list_foreach(const Evas_Hash *hash, const
char *key, void *data, void *fdata);
+static Evas_Bool _edje_text_class_list_foreach(const Evas_Hash *hash, const
char *key, void *data, void *fdata);
Edje_Real_Part *_edje_real_part_recursive_get_helper(Edje *ed, char **path);
@@ -211,7 +211,8 @@
free(cc);
return;
}
- _edje_color_class_hash = evas_hash_add(_edje_color_class_hash,
color_class, cc);
+ _edje_color_class_hash =
+ evas_hash_add(_edje_color_class_hash, color_class, cc);
if (evas_hash_alloc_error())
{
evas_stringshare_del(cc->name);
@@ -277,7 +278,8 @@
cc = evas_hash_find(_edje_color_class_hash, color_class);
if (!cc) return;
- _edje_color_class_hash = evas_hash_del(_edje_color_class_hash, color_class,
cc);
+ _edje_color_class_hash =
+ evas_hash_del(_edje_color_class_hash, color_class, cc);
evas_stringshare_del(cc->name);
free(cc);
@@ -305,13 +307,14 @@
Edje_List_Foreach_Data fdata;
memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
- evas_hash_foreach(_edje_color_class_member_hash,
_edje_color_class_list_foreach, &fdata);
+ evas_hash_foreach(_edje_color_class_member_hash,
+ _edje_color_class_list_foreach, &fdata);
return fdata.list;
}
static Evas_Bool
-_edje_color_class_list_foreach(Evas_Hash *hash, const char *key, void *data,
void *fdata)
+_edje_color_class_list_foreach(const Evas_Hash *hash, const char *key, void
*data, void *fdata)
{
Edje_List_Foreach_Data *fd;
@@ -494,7 +497,8 @@
free(tc);
return;
}
- _edje_text_class_hash = evas_hash_add(_edje_text_class_hash,
text_class, tc);
+ _edje_text_class_hash =
+ evas_hash_add(_edje_text_class_hash, text_class, tc);
if (evas_hash_alloc_error())
{
evas_stringshare_del(tc->name);
@@ -516,7 +520,8 @@
tc->font = evas_stringshare_add(font);
if (!tc->font)
{
- _edje_text_class_hash = evas_hash_del(_edje_text_class_hash,
text_class, tc);
+ _edje_text_class_hash =
+ evas_hash_del(_edje_text_class_hash, text_class, tc);
free(tc);
return;
}
@@ -552,7 +557,8 @@
tc = evas_hash_find(_edje_text_class_hash, text_class);
if (!tc) return;
- _edje_text_class_hash = evas_hash_del(_edje_text_class_hash, text_class,
tc);
+ _edje_text_class_hash =
+ evas_hash_del(_edje_text_class_hash, text_class, tc);
evas_stringshare_del(tc->name);
evas_stringshare_del(tc->font);
free(tc);
@@ -582,13 +588,14 @@
Edje_List_Foreach_Data fdata;
memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
- evas_hash_foreach(_edje_text_class_member_hash,
_edje_text_class_list_foreach, &fdata);
+ evas_hash_foreach(_edje_text_class_member_hash,
+ _edje_text_class_list_foreach, &fdata);
return fdata.list;
}
static Evas_Bool
-_edje_text_class_list_foreach(Evas_Hash *hash, const char *key, void *data,
void *fdata)
+_edje_text_class_list_foreach(const Evas_Hash *hash, const char *key, void
*data, void *fdata)
{
Edje_List_Foreach_Data *fd;
@@ -623,15 +630,12 @@
if ((tc->name) && (!strcmp(tc->name, text_class)))
{
/* Match and the same, return */
- if ((tc->font) && (font) &&
- (!strcmp(tc->font, font)) &&
+ if ((tc->font) && (font) && (!strcmp(tc->font, font)) &&
(tc->size == size))
return;
/* No font but size is the same, return */
- if ((!tc->font) && (!font) &&
- (tc->size == size))
- return;
+ if ((!tc->font) && (!font) && (tc->size == size)) return;
/* Update new text class properties */
if (tc->font) evas_stringshare_del(tc->font);
@@ -809,7 +813,8 @@
else rp->text.text = NULL;
rp->edje->dirty = 1;
_edje_recalc(rp->edje);
- if (rp->edje->text_change.func)
rp->edje->text_change.func(rp->edje->text_change.data, obj, part);
+ if (rp->edje->text_change.func)
+ rp->edje->text_change.func(rp->edje->text_change.data, obj, part);
}
/** Returns the text of the object part
@@ -1004,8 +1009,8 @@
{
evas_object_smart_member_del(rp->swallowed_object);
evas_object_event_callback_del(rp->swallowed_object,
- EVAS_CALLBACK_FREE,
- _edje_object_part_swallow_free_cb);
+ EVAS_CALLBACK_FREE,
+ _edje_object_part_swallow_free_cb);
evas_object_clip_unset(rp->swallowed_object);
evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part");
@@ -1310,15 +1315,9 @@
Edje_Real_Part *rp;
ed = _edje_fetch(obj);
- if ((!ed) || (!part))
- {
- return EDJE_DRAG_DIR_NONE;
- }
+ if ((!ed) || (!part)) return EDJE_DRAG_DIR_NONE;
rp = _edje_real_part_recursive_get(ed, (char *)part);
- if (!rp)
- {
- return EDJE_DRAG_DIR_NONE;
- }
+ if (!rp) return EDJE_DRAG_DIR_NONE;
if ((rp->part->dragable.x) && (rp->part->dragable.y)) return
EDJE_DRAG_DIR_XY;
else if (rp->part->dragable.x) return EDJE_DRAG_DIR_X;
else if (rp->part->dragable.y) return EDJE_DRAG_DIR_Y;
@@ -1340,15 +1339,9 @@
Edje_Real_Part *rp;
ed = _edje_fetch(obj);
- if ((!ed) || (!part))
- {
- return;
- }
+ if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(ed, (char *)part);
- if (!rp)
- {
- return;
- }
+ if (!rp) return;
if (rp->drag.down.count > 0) return;
if (rp->part->dragable.confine_id != -1)
{
@@ -1417,15 +1410,9 @@
Edje_Real_Part *rp;
ed = _edje_fetch(obj);
- if ((!ed) || (!part))
- {
- return;
- }
+ if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(ed, (char *)part);
- if (!rp)
- {
- return;
- }
+ if (!rp) return;
if (dw < 0.0) dw = 0.0;
else if (dw > 1.0) dw = 1.0;
if (dh < 0.0) dh = 0.0;
@@ -1484,15 +1471,9 @@
Edje_Real_Part *rp;
ed = _edje_fetch(obj);
- if ((!ed) || (!part))
- {
- return;
- }
+ if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(ed, (char *)part);
- if (!rp)
- {
- return;
- }
+ if (!rp) return;
if (dx < 0.0) dx = 0.0;
else if (dx > 1.0) dx = 1.0;
if (dy < 0.0) dy = 0.0;
@@ -1548,15 +1529,9 @@
Edje_Real_Part *rp;
ed = _edje_fetch(obj);
- if ((!ed) || (!part))
- {
- return;
- }
+ if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(ed, (char *)part);
- if (!rp)
- {
- return;
- }
+ if (!rp) return;
if (dx < 0.0) dx = 0.0;
else if (dx > 1.0) dx = 1.0;
if (dy < 0.0) dy = 0.0;
@@ -1614,15 +1589,9 @@
double px, py;
ed = _edje_fetch(obj);
- if ((!ed) || (!part))
- {
- return;
- }
+ if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(ed, (char *)part);
- if (!rp)
- {
- return;
- }
+ if (!rp) return;
if (rp->drag.down.count > 0) return;
px = rp->drag.val.x;
py = rp->drag.val.y;
@@ -1652,15 +1621,9 @@
double px, py;
ed = _edje_fetch(obj);
- if ((!ed) || (!part))
- {
- return;
- }
+ if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(ed, (char *)part);
- if (!rp)
- {
- return;
- }
+ if (!rp) return;
if (rp->drag.down.count > 0) return;
px = rp->drag.val.x;
py = rp->drag.val.y;
@@ -1695,10 +1658,10 @@
Edje_Real_Part *rp;
//printf(" lookup: %s on %s\n", path[0], ed->parent ? ed->parent : "-");
rp = _edje_real_part_get(ed, path[0]);
- if (path[1] == NULL)
- return rp;
+ if (path[1] == NULL) return rp;
- if (!rp || rp->part->type != EDJE_PART_TYPE_GROUP || !rp->swallowed_object)
return NULL;
+ if ((!rp) || (rp->part->type != EDJE_PART_TYPE_GROUP) ||
+ (!rp->swallowed_object)) return NULL;
ed = _edje_fetch(rp->swallowed_object);
if (!ed) return NULL;
@@ -1761,10 +1724,15 @@
if ((!ed) || (!color_class)) return;
members = evas_hash_find(_edje_color_class_member_hash, color_class);
- if (members) _edje_color_class_member_hash =
evas_hash_del(_edje_color_class_member_hash, color_class, members);
-
+ if (members)
+ {
+ _edje_color_class_member_hash =
+ evas_hash_del(_edje_color_class_member_hash, color_class, members);
+ }
+
members = evas_list_prepend(members, ed);
- _edje_color_class_member_hash =
evas_hash_add(_edje_color_class_member_hash, color_class, members);
+ _edje_color_class_member_hash =
+ evas_hash_add(_edje_color_class_member_hash, color_class, members);
}
void
@@ -1776,56 +1744,54 @@
members = evas_hash_find(_edje_color_class_member_hash, color_class);
if (!members) return;
- _edje_color_class_member_hash =
evas_hash_del(_edje_color_class_member_hash, color_class, members);
+ _edje_color_class_member_hash =
+ evas_hash_del(_edje_color_class_member_hash, color_class, members);
members = evas_list_remove(members, ed);
- if (members) _edje_color_class_member_hash =
evas_hash_add(_edje_color_class_member_hash, color_class, members);
+ if (members)
+ {
+ _edje_color_class_member_hash =
+ evas_hash_add(_edje_color_class_member_hash, color_class, members);
+ }
}
/**
* Used to free the member lists that are stored in the text_class
* and color_class hashtables.
*/
-static Evas_Bool member_list_free(Evas_Hash *hash, const char *key,
- void *data, void *fdata)
+static Evas_Bool
+member_list_free(const Evas_Hash *hash, const char *key, void *data, void
*fdata)
{
- evas_list_free(data);
-
- return 1;
+ evas_list_free(data);
+ return 1;
}
void
_edje_color_class_members_free(void)
{
if (!_edje_color_class_member_hash) return;
-
- evas_hash_foreach(_edje_color_class_member_hash, member_list_free,
- NULL);
+ evas_hash_foreach(_edje_color_class_member_hash, member_list_free, NULL);
evas_hash_free(_edje_color_class_member_hash);
_edje_color_class_member_hash = NULL;
}
-static Evas_Bool color_class_hash_list_free(Evas_Hash *hash,
- const char *key, void *data,
- void *fdata)
-{
- Edje_Color_Class *cc;
-
- cc = data;
- if (cc->name) evas_stringshare_del(cc->name);
- free(cc);
+static Evas_Bool
+color_class_hash_list_free(const Evas_Hash *hash, const char *key, void *data,
void *fdata)
+{
+ Edje_Color_Class *cc;
- return 1;
+ cc = data;
+ if (cc->name) evas_stringshare_del(cc->name);
+ free(cc);
+ return 1;
}
void
_edje_color_class_hash_free(void)
{
- if (!_edje_color_class_hash) return;
-
- evas_hash_foreach(_edje_color_class_hash, color_class_hash_list_free,
- NULL);
- evas_hash_free(_edje_color_class_hash);
- _edje_color_class_hash = NULL;
+ if (!_edje_color_class_hash) return;
+ evas_hash_foreach(_edje_color_class_hash, color_class_hash_list_free, NULL);
+ evas_hash_free(_edje_color_class_hash);
+ _edje_color_class_hash = NULL;
}
void
@@ -1842,9 +1808,7 @@
desc = tmp->data;
if (desc->color_class)
- {
- _edje_color_class_member_del(ed, desc->color_class);
- }
+ _edje_color_class_member_del(ed, desc->color_class);
}
}
@@ -1875,14 +1839,18 @@
members = evas_hash_find(_edje_text_class_member_hash, text_class);
/* Remove members list */
- if (members)
- _edje_text_class_member_hash =
evas_hash_del(_edje_text_class_member_hash, text_class, members);
-
+ if (members)
+ {
+ _edje_text_class_member_hash =
+ evas_hash_del(_edje_text_class_member_hash, text_class, members);
+ }
+
/* Update the member list */
members = evas_list_prepend(members, ed);
/* Add the member list back */
- _edje_text_class_member_hash = evas_hash_add(_edje_text_class_member_hash,
text_class, members);
+ _edje_text_class_member_hash =
+ evas_hash_add(_edje_text_class_member_hash, text_class, members);
}
void
@@ -1894,46 +1862,45 @@
members = evas_hash_find(_edje_text_class_member_hash, text_class);
if (!members) return;
- _edje_text_class_member_hash = evas_hash_del(_edje_text_class_member_hash,
text_class, members);
+ _edje_text_class_member_hash =
+ evas_hash_del(_edje_text_class_member_hash, text_class, members);
members = evas_list_remove(members, ed);
- if (members) _edje_text_class_member_hash =
evas_hash_add(_edje_text_class_member_hash, text_class, members);
+ if (members)
+ {
+ _edje_text_class_member_hash =
+ evas_hash_add(_edje_text_class_member_hash, text_class, members);
+ }
}
void
_edje_text_class_members_free(void)
{
if (!_edje_text_class_member_hash) return;
-
- evas_hash_foreach(_edje_text_class_member_hash, member_list_free,
- NULL);
+ evas_hash_foreach(_edje_text_class_member_hash, member_list_free, NULL);
evas_hash_free(_edje_text_class_member_hash);
_edje_text_class_member_hash = NULL;
}
-static Evas_Bool text_class_hash_list_free(Evas_Hash *hash,
- const char *key, void *data,
- void *fdata)
-{
- Edje_Text_Class *tc;
-
- tc = data;
- if (tc->name) evas_stringshare_del(tc->name);
- if (tc->font) evas_stringshare_del(tc->font);
- free(tc);
+static Evas_Bool
+text_class_hash_list_free(const Evas_Hash *hash, const char *key, void *data,
void *fdata)
+{
+ Edje_Text_Class *tc;
+ tc = data;
+ if (tc->name) evas_stringshare_del(tc->name);
+ if (tc->font) evas_stringshare_del(tc->font);
+ free(tc);
return 1;
}
void
_edje_text_class_hash_free(void)
{
- if (!_edje_text_class_hash) return;
-
- evas_hash_foreach(_edje_text_class_hash, text_class_hash_list_free,
- NULL);
- evas_hash_free(_edje_text_class_hash);
- _edje_text_class_hash = NULL;
+ if (!_edje_text_class_hash) return;
+ evas_hash_foreach(_edje_text_class_hash, text_class_hash_list_free, NULL);
+ evas_hash_free(_edje_text_class_hash);
+ _edje_text_class_hash = NULL;
}
Edje *
@@ -1990,10 +1957,7 @@
if (!ed) return ret;
ed->block--;
- if (ed->block == 0)
- {
- ed->block_break = 0;
- }
+ if (ed->block == 0) ed->block_break = 0;
ret = ed->block;
_edje_unref(ed);
return ret;
@@ -2048,8 +2012,7 @@
evas_object_clip_set(rp->swallowed_object, rp->clip_to->object);
else evas_object_clip_set(rp->swallowed_object, rp->edje->clipper);
evas_object_stack_above(rp->swallowed_object, rp->object);
- evas_object_event_callback_add(rp->swallowed_object,
- EVAS_CALLBACK_FREE,
+ evas_object_event_callback_add(rp->swallowed_object, EVAS_CALLBACK_FREE,
_edje_object_part_swallow_free_cb,
rp->edje->obj);
type = (char *)evas_object_type_get(obj_swallow);
@@ -2068,8 +2031,7 @@
rp->swallow_params.max.w = w;
rp->swallow_params.max.h = h;
}
- else if ((type) && ((!strcmp(type, "text")) ||
- (!strcmp(type, "polygon")) ||
+ else if ((type) && ((!strcmp(type, "text")) || (!strcmp(type, "polygon")) ||
(!strcmp(type, "line"))))
{
Evas_Coord w, h;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
