enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

make clang happy 

SVN revision: 45194
This commit is contained in:
Sebastian Dransfeld 2010-01-15 19:57:17 +00:00
parent 604892a3c4
commit 3a0af1226e
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/edje/src/lib/edje_calc.c
View File

@ -750,7 +750,6 @@ _edje_part_recalc_single_text(FLOAT_T sc,
int *minw, int *minh,
int *maxw, int *maxh)
{
const char *font;
char *sfont = NULL;
int size;
@ -902,7 +901,7 @@ _edje_part_recalc_single_text(FLOAT_T sc,
/* FIXME: Do we really need to call it twice if chosen_desc ? */
sfont = NULL;
font = _edje_text_class_font_get(ed, desc, &size, &sfont);
_edje_text_class_font_get(ed, desc, &size, &sfont);
free(sfont);
params->type.text.size = size;
}

6
legacy/edje/src/lib/edje_callbacks.c
View File

@ -130,9 +130,8 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
rp = events;
{
FLOAT_T dx = ZERO, dy = ZERO;
int dir;
dir = _edje_part_dragable_calc(ed, rp, &dx, &dy);
_edje_part_dragable_calc(ed, rp, &dx, &dy);
if ((dx != rp->drag->val.x) || (dy != rp->drag->val.y))
{
@ -301,9 +300,8 @@ _edje_mouse_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
if (rp->drag->down.count > 0)
{
FLOAT_T dx, dy;
int dir;
dir = _edje_part_dragable_calc(ed, rp, &dx, &dy);
_edje_part_dragable_calc(ed, rp, &dx, &dy);
if ((dx != rp->drag->val.x) || (dy != rp->drag->val.y))
{
rp->drag->val.x = dx;

10
legacy/edje/src/lib/edje_entry.c
View File

@ -1406,7 +1406,6 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
Evas_Event_Mouse_Up *ev = event_info;
Entry *en;
Evas_Coord x, y, w, h;
Eina_Bool multiline;
Evas_Textblock_Cursor *tc;
if (ev->button != 1) return;
if (!rp) return;
@ -1417,7 +1416,6 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
return;
tc = evas_object_textblock_cursor_new(rp->object);
evas_textblock_cursor_copy(en->cursor, tc);
multiline = rp->part->multiline;
evas_object_geometry_get(rp->object, &x, &y, &w, &h);
en->cx = ev->canvas.x - x;
en->cy = ev->canvas.y - y;
@ -1470,7 +1468,6 @@ _edje_part_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
Entry *en;
Evas_Coord x, y, w, h;
Evas_Textblock_Cursor *tc;
Eina_Bool multiline;
if (!rp) return;
en = rp->entry_data;
if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
@ -1480,7 +1477,6 @@ _edje_part_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
{
tc = evas_object_textblock_cursor_new(rp->object);
evas_textblock_cursor_copy(en->cursor, tc);
multiline = rp->part->multiline;
evas_object_geometry_get(rp->object, &x, &y, &w, &h);
en->cx = ev->cur.canvas.x - x;
en->cy = ev->cur.canvas.y - y;
@ -2156,7 +2152,6 @@ _edje_entry_imf_event_changed_cb(void *data, int type __UNUSED__, void *event)
Edje* ed = data;
Edje_Real_Part *rp = ed->focused_part;
Entry *en;
int cursor_pos;
int length;
Ecore_IMF_Event_Commit *ev = event;
int i;
@ -2179,8 +2174,6 @@ _edje_entry_imf_event_changed_cb(void *data, int type __UNUSED__, void *event)
if ( 0 /* check the maximum length of evas_textblock */ )
return 1;
cursor_pos = evas_textblock_cursor_pos_get(en->cursor);
if (en->have_composition)
{
// delete the composing characters
@ -2215,7 +2208,6 @@ _edje_entry_imf_event_delete_surrounding_cb(void *data, int type __UNUSED__, voi
Edje_Real_Part *rp = ed->focused_part;
Entry *en;
Ecore_IMF_Event_Delete_Surrounding *ev = event;
int cursor_pos;
if (!rp) return 1;
en = rp->entry_data;
@ -2225,8 +2217,6 @@ _edje_entry_imf_event_delete_surrounding_cb(void *data, int type __UNUSED__, voi
if (en->imf_context != ev->ctx) return 1;
cursor_pos = evas_textblock_cursor_pos_get(en->cursor);
return 0;
}
#endif

1
legacy/edje/src/lib/edje_lua.c
View File

@ -1605,7 +1605,6 @@ static int
_edje_lua_object_get_evas(lua_State *L)
{
Edje_Lua_Evas_Object *obj = _edje_lua_checkudata(L, 1, &mObject);
Evas *evas = evas_object_evas_get(obj->eo);
lua_pushnil(L);
// FIXME implement Evas class in the first place?
return 1;

1
legacy/edje/src/lib/edje_textblock_styles.c
View File

@ -83,7 +83,6 @@ _edje_format_parse(const char **s)
item = malloc(s2 - s1 + 1);
if (item)
{
ds = item;
for (ds = item, ss = s1; ss < s2; ss++, ds++)
{
if ((*ss == '\\') && (ss < (s2 - 1))) ss++;