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

Removing warnings in elm_tests. 

Most of the errors referred to the cast from int to void* in x86_64.
This need conversion to long, as intermediate.

Some calls to elm_widget not exposed API were changed to their similar
at elm_object API.

Elm_Photo never call "drop" smart callback, but i leave the callback
in tests.

And others API methods are included in Elementary.h

Now elementary build with -Wall -Werror in x86_64.

SVN revision: 52691
This commit is contained in:
Tiago Rezende Campos Falcao 2010-09-24 14:48:15 +00:00
parent 8730c19ec2
commit 9d310ab6d2
7 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/src/bin/test_floating.c
View File

@ -12,7 +12,7 @@ static Elm_Genlist_Item_Class itc1;
static char *glf_label_get(void *data, Evas_Object *obj, const char *part)
{
char buf[256];
snprintf(buf, sizeof(buf), "Item # %i", (int)data);
snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data);
return strdup(buf);
}
@ -92,11 +92,11 @@ test_floating(void *data, Evas_Object *obj, void *event_info)
for (i = 0; i < 20; i++)
{
gli = elm_genlist_item_append(gl, &itc1,
(void *)i/* item data */,
(void *)(long)i/* item data */,
NULL/* parent */,
ELM_GENLIST_ITEM_NONE,
gl_sel/* func */,
(void *)(i * 10)/* func data */);
(void *)(long)(i * 10)/* func data */);
}
evas_object_resize(win, 480, 800);
evas_object_show(win);

31
legacy/elementary/src/bin/test_genlist.c
View File

@ -21,7 +21,7 @@ static Elm_Genlist_Item_Class itc1;
char *gl_label_get(void *data, Evas_Object *obj, const char *part)
{
char buf[256];
snprintf(buf, sizeof(buf), "Item # %i", (int)data);
snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data);
return strdup(buf);
}
@ -153,11 +153,11 @@ test_genlist(void *data, Evas_Object *obj, void *event_info)
for (i = 0; i < 2000; i++)
{
gli = elm_genlist_item_append(gl, &itc1,
(void *)i/* item data */,
(void *)(long)i/* item data */,
NULL/* parent */,
ELM_GENLIST_ITEM_NONE,
gl_sel/* func */,
(void *)(i * 10)/* func data */);
(void *)(long)(i * 10)/* func data */);
if (i == 50)
evas_object_smart_callback_add(bt_50, "clicked", _bt50_cb, gli);
else if (i == 1500)
@ -190,11 +190,11 @@ my_gl_add(void *data, Evas_Object *obj, void *event_info)
itc1.func.del = gl_del;
gli = elm_genlist_item_append(gl, &itc1,
(void *)i/* item data */,
(void *)(long)i/* item data */,
NULL/* parent */,
ELM_GENLIST_ITEM_NONE,
gl_sel/* func */,
(void *)(i * 10)/* func data */);
(void *)(long)(i * 10)/* func data */);
i++;
}
@ -220,11 +220,11 @@ my_gl_insert_before(void *data, Evas_Object *obj, void *event_info)
}
gli = elm_genlist_item_insert_before(gl, &itc1,
(void *)i/* item data */,
(void *)(long)i/* item data */,
gli_selected /* item before */,
ELM_GENLIST_ITEM_NONE,
gl_sel/* func */,
(void *)(i * 10)/* func data */);
(void *)(long)(i * 10)/* func data */);
i++;
}
@ -250,11 +250,11 @@ my_gl_insert_after(void *data, Evas_Object *obj, void *event_info)
}
gli = elm_genlist_item_insert_after(gl, &itc1,
(void *)i/* item data */,
(void *)(long)i/* item data */,
gli_selected /* item after */,
ELM_GENLIST_ITEM_NONE,
gl_sel/* func */,
(void *)(i * 10)/* func data */);
(void *)(long)(i * 10)/* func data */);
i++;
}
@ -1017,16 +1017,19 @@ gl4_exp(void *data, Evas_Object *obj, void *event_info)
{
Elm_Genlist_Item *it = event_info;
Evas_Object *gl = elm_genlist_item_genlist_get(it);
int val = (int)elm_genlist_item_data_get(it);
int val = (int)(long)elm_genlist_item_data_get(it);
val *= 10;
elm_genlist_item_append(gl, &itc4,
(void *)(val + 1)/* item data */, it/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
(void *)(long)(val + 1)/* item data */, it/* parent */,
ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc4,
(void *)(val + 2)/* item data */, it/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
(void *)(long)(val + 2)/* item data */, it/* parent */,
ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc4,
(void *)(val + 3)/* item data */, it/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
(void *)(long)(val + 3)/* item data */, it/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
NULL/* func data */);
}
static void
@ -1052,7 +1055,7 @@ gl4_con_req(void *data, Evas_Object *obj, void *event_info)
char *gl4_label_get(void *data, Evas_Object *obj, const char *part)
{
char buf[256];
snprintf(buf, sizeof(buf), "Item mode %i", (int)data);
snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data);
return strdup(buf);
}
Evas_Object *gl4_icon_get(void *data, Evas_Object *obj, const char *part)

9
legacy/elementary/src/bin/test_index.c
View File

@ -4,8 +4,8 @@ static Elm_Genlist_Item_Class itci;
char *gli_label_get(void *data, Evas_Object *obj, const char *part)
{
char buf[256];
int j = (int)data;
snprintf(buf, sizeof(buf), "%c%c",
int j = (long)data;
snprintf(buf, sizeof(buf), "%c%c",
'A' + ((j >> 4) & 0xf),
'a' + ((j ) & 0xf)
);
@ -71,8 +71,9 @@ test_index(void *data, Evas_Object *obj, void *event_info)
for (i = 0; i < 100; i++)
{
it = elm_genlist_item_append(gl, &itci,
(void *)j/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, NULL/* func */,
NULL/* func data */);
(void *)(long)j/* item data */,
NULL/* parent */, ELM_GENLIST_ITEM_NONE,
NULL/* func */, NULL/* func data */);
if ((j & 0xf) == 0)
{
char buf[32];

56
legacy/elementary/src/bin/test_launcher.c
View File

@ -70,7 +70,7 @@ tim_cb(void *data)
sc = evas_object_data_get(data, "sc");
mb = evas_object_data_get(data, "mb");
elm_object_scroll_freeze_push(sc);
evas_object_data_set(data, "dragging", (void *)(1));
evas_object_data_set(data, "dragging", (void *)(long)(1));
evas_object_color_set(data, 255, 255, 255, 255);
list = (Eina_List *)evas_object_data_get
(elm_object_top_widget_get(data), "mbs");
@ -108,10 +108,10 @@ ic_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
evas_object_data_set(obj, "timer", tim);
evas_object_geometry_get(data, &x, &y, &w, &h);
evas_object_data_set(obj, "x", (void *)(ev->canvas.x));
evas_object_data_set(obj, "y", (void *)(ev->canvas.y));
evas_object_data_set(obj, "px", (void *)(x));
evas_object_data_set(obj, "py", (void *)(y));
evas_object_data_set(obj, "x", (void *)(long)(ev->canvas.x));
evas_object_data_set(obj, "y", (void *)(long)(ev->canvas.y));
evas_object_data_set(obj, "px", (void *)(long)(x));
evas_object_data_set(obj, "py", (void *)(long)(y));
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
{
@ -144,8 +144,8 @@ ic_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
sc = evas_object_data_get(obj, "sc");
mb = evas_object_data_get(data, "mb");
elm_object_scroll_freeze_pop(sc);
tbx = (int)evas_object_data_get(obj, "tbx");
tby = (int)evas_object_data_get(obj, "tby");
tbx = (int)(long)evas_object_data_get(obj, "tbx");
tby = (int)(long)evas_object_data_get(obj, "tby");
elm_table_pack(tb, obj, tbx, tby, 1, 1);
list = (Eina_List *)evas_object_data_get
(elm_object_top_widget_get(obj), "mbs");
@ -162,10 +162,10 @@ ic_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Coord x, y, px, py;
x = (Evas_Coord)evas_object_data_get(obj, "x");
y = (Evas_Coord)evas_object_data_get(obj, "y");
px = (Evas_Coord)evas_object_data_get(obj, "px");
py = (Evas_Coord)evas_object_data_get(obj, "py");
x = (Evas_Coord)(long)evas_object_data_get(obj, "x");
y = (Evas_Coord)(long)evas_object_data_get(obj, "y");
px = (Evas_Coord)(long)evas_object_data_get(obj, "px");
py = (Evas_Coord)(long)evas_object_data_get(obj, "py");
evas_object_move(obj,
px + ev->cur.canvas.x - x,
py + ev->cur.canvas.y - y);
@ -289,8 +289,8 @@ test_launcher(void *data, Evas_Object *obj, void *event_info)
evas_object_data_set(ic, "sc", sc);
evas_object_data_set(ic, "bx", bx);
evas_object_data_set(ic, "mb", mb);
evas_object_data_set(ic, "tbx", (void *)(1 + i));
evas_object_data_set(ic, "tby", (void *)(1 + (j * 2)));
evas_object_data_set(ic, "tbx", (void *)(long)(1 + i));
evas_object_data_set(ic, "tby", (void *)(long)(1 + (j * 2)));
n++; if (n > 23) n = 0;
m++; if (m > 15) m = 0;
@ -571,14 +571,14 @@ l3_tim_cb(void *data)
sc = evas_object_data_get(data, "sc");
mb = evas_object_data_get(data, "mb");
elm_object_scroll_freeze_push(sc);
evas_object_data_set(data, "dragging", (void *)(1));
evas_object_data_set(data, "dragging", (void *)(long)1);
evas_object_color_set(data, 255, 255, 255, 255);
list = (Eina_List *)evas_object_data_get
(elm_object_top_widget_get(data), "mbs");
EINA_LIST_FOREACH(list, l, mb)
evas_object_color_set(mb, 128, 128, 128, 128);
slx = (int)evas_object_data_get(data, "slx");
sly = (int)evas_object_data_get(data, "sly");
slx = (int)(long)evas_object_data_get(data, "slx");
sly = (int)(long)evas_object_data_get(data, "sly");
snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly);
elm_layout_content_unset(ly, buf);
edje_object_signal_emit(elm_layout_edje_get(ly2), "drag", "app");
@ -613,10 +613,10 @@ l3_ic_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
ly2 = evas_object_data_get(obj, "ly2");
evas_object_geometry_get(ly2, &x, &y, &w, &h);
evas_object_data_set(obj, "x", (void *)(ev->canvas.x));
evas_object_data_set(obj, "y", (void *)(ev->canvas.y));
evas_object_data_set(obj, "px", (void *)(x));
evas_object_data_set(obj, "py", (void *)(y));
evas_object_data_set(obj, "x", (void *)(long)(ev->canvas.x));
evas_object_data_set(obj, "y", (void *)(long)(ev->canvas.y));
evas_object_data_set(obj, "px", (void *)(long)(x));
evas_object_data_set(obj, "py", (void *)(long)(y));
edje_object_signal_emit(elm_layout_edje_get(ly2), "click", "app");
@ -654,8 +654,8 @@ l3_ic_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
sc = evas_object_data_get(obj, "sc");
mb = evas_object_data_get(data, "mb");
elm_object_scroll_freeze_pop(sc);
slx = (int)evas_object_data_get(obj, "slx");
sly = (int)evas_object_data_get(obj, "sly");
slx = (int)(long)evas_object_data_get(obj, "slx");
sly = (int)(long)evas_object_data_get(obj, "sly");
snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly);
elm_layout_content_set(ly, buf, ly2);
list = (Eina_List *)evas_object_data_get
@ -680,10 +680,10 @@ l3_ic_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Coord x, y, px, py;
x = (Evas_Coord)evas_object_data_get(obj, "x");
y = (Evas_Coord)evas_object_data_get(obj, "y");
px = (Evas_Coord)evas_object_data_get(obj, "px");
py = (Evas_Coord)evas_object_data_get(obj, "py");
x = (Evas_Coord)(long)evas_object_data_get(obj, "x");
y = (Evas_Coord)(long)evas_object_data_get(obj, "y");
px = (Evas_Coord)(long)evas_object_data_get(obj, "px");
py = (Evas_Coord)(long)evas_object_data_get(obj, "py");
evas_object_move(ly2,
px + ev->cur.canvas.x - x,
py + ev->cur.canvas.y - y);
@ -812,8 +812,8 @@ test_launcher3(void *data, Evas_Object *obj, void *event_info)
evas_object_data_set(ic, "sc", sc);
evas_object_data_set(ic, "bx", bx);
evas_object_data_set(ic, "mb", mb);
evas_object_data_set(ic, "slx", (void *)(i));
evas_object_data_set(ic, "sly", (void *)(j));
evas_object_data_set(ic, "slx", (void *)(long)(i));
evas_object_data_set(ic, "sly", (void *)(long)(j));
snprintf(buf, sizeof(buf), "slot.%i.%i", i, j);
elm_layout_content_set(ly, buf, ly2);

5
legacy/elementary/src/bin/test_photo.c
View File

@ -62,7 +62,7 @@ test_photo(void *data, Evas_Object *obj, void *event_info)
if(n == 2 || n == 3) {
elm_photo_fill_inside_set(ph, EINA_TRUE);
elm_widget_style_set(ph, "shadow");
elm_object_style_set(ph, "shadow");
}
elm_table_pack(tb, ph, i, j, 1, 1);
evas_object_show(ph);
@ -81,9 +81,10 @@ test_photo(void *data, Evas_Object *obj, void *event_info)
evas_object_show(win);
}
/* Never called, elm_photo never call "drop" smart cb */
static void
drop_cb(void *mydata, Evas_Object *obj, void *evdata){
printf("Drop on obj %p: Image: %s\n",obj,evdata);
printf("Drop on obj %p\n", obj);
}
static void

2
legacy/elementary/src/bin/test_slideshow.c
View File

@ -93,7 +93,7 @@ _get(void *data, Evas_Object *obj)
Evas_Object *photo = elm_photo_add(obj);
elm_photo_file_set(photo, data);
elm_photo_fill_inside_set(photo, EINA_TRUE);
elm_widget_style_set(photo, "shadow");
elm_object_style_set(photo, "shadow");
return photo;
}

5
legacy/elementary/src/lib/Elementary.h.in
View File

@ -944,6 +944,7 @@ extern "C" {
EAPI Eina_Bool elm_photo_file_set(Evas_Object *obj, const char *file);
EAPI void elm_photo_size_set(Evas_Object *obj, int size);
EAPI void elm_photo_fill_inside_set(Evas_Object *obj, Eina_Bool fill);
EAPI void elm_photo_editable_set(Evas_Object *obj, Eina_Bool set);
/* smart callbacks called:
* "clicked" - the user clicked the icon
*/
@ -954,8 +955,10 @@ extern "C" {
EAPI void elm_thumb_path_get(const Evas_Object *obj, const char **file, const char **key);
EAPI void elm_thumb_animate_set(Evas_Object *obj, Elm_Thumb_Animation_Setting s);
EAPI Elm_Thumb_Animation_Setting elm_thumb_animate_get(const Evas_Object *obj);
EAPI Eina_Bool elm_thumb_ethumb_client_connected(void);
EAPI struct _Ethumb_Client *elm_thumb_ethumb_client_get(void);
EAPI Eina_Bool elm_thumb_ethumb_client_connected(void);
EAPI Eina_Bool elm_thumb_editable_set(Evas_Object *obj, Eina_Bool edit);
EAPI Eina_Bool elm_thumb_editable_get(Evas_Object *obj);
/* smart callbacks called:
* "clicked" - the user clicked the thumb