Fix tests to use the void *data instead of const...
SVN revision: 52374
This commit is contained in:
parent
53cbc881c8
commit
902819723b
|
@ -9,14 +9,14 @@ typedef struct _Testitem
|
|||
|
||||
|
||||
static Elm_Genlist_Item_Class itc1;
|
||||
static char *glf_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
static char *glf_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "Item # %i", (int)data);
|
||||
return strdup(buf);
|
||||
}
|
||||
|
||||
static Evas_Object *glf_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
static Evas_Object *glf_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
Evas_Object *ic = elm_icon_add(obj);
|
||||
|
@ -25,11 +25,11 @@ static Evas_Object *glf_icon_get(const void *data, Evas_Object *obj, const char
|
|||
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
||||
return ic;
|
||||
}
|
||||
static Eina_Bool glf_state_get(const void *data, Evas_Object *obj, const char *part)
|
||||
static Eina_Bool glf_state_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
static void glf_del(const void *data, Evas_Object *obj)
|
||||
static void glf_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@ grid_item_check_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
}
|
||||
|
||||
char *
|
||||
grid_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
grid_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *ti = data;
|
||||
char buf[256];
|
||||
|
@ -76,7 +76,7 @@ grid_label_get(const void *data, Evas_Object *obj, const char *part)
|
|||
}
|
||||
|
||||
Evas_Object *
|
||||
grid_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
grid_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *ti = data;
|
||||
if (!strcmp(part, "elm.swallow.icon"))
|
||||
|
@ -102,13 +102,13 @@ grid_icon_get(const void *data, Evas_Object *obj, const char *part)
|
|||
}
|
||||
|
||||
Eina_Bool
|
||||
grid_state_get(const void *data, Evas_Object *obj, const char *part)
|
||||
grid_state_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
grid_del(const void *data, Evas_Object *obj)
|
||||
grid_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -18,14 +18,14 @@ typedef struct _Testitem
|
|||
|
||||
|
||||
static Elm_Genlist_Item_Class itc1;
|
||||
char *gl_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
char *gl_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "Item # %i", (int)data);
|
||||
return strdup(buf);
|
||||
}
|
||||
|
||||
Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Evas_Object *gl_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
Evas_Object *ic = elm_icon_add(obj);
|
||||
|
@ -34,11 +34,11 @@ Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
|
|||
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
||||
return ic;
|
||||
}
|
||||
Eina_Bool gl_state_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Eina_Bool gl_state_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
void gl_del(const void *data, Evas_Object *obj)
|
||||
void gl_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -507,14 +507,14 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info)
|
|||
/*************/
|
||||
|
||||
static Elm_Genlist_Item_Class itc2;
|
||||
char *gl2_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
char *gl2_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *tit = data;
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
|
||||
return strdup(buf);
|
||||
}
|
||||
Evas_Object *gl2_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Evas_Object *gl2_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *tit = data;
|
||||
char buf[PATH_MAX];
|
||||
|
@ -546,11 +546,11 @@ Evas_Object *gl2_icon_get(const void *data, Evas_Object *obj, const char *part)
|
|||
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
||||
return ic;
|
||||
}
|
||||
Eina_Bool gl2_state_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Eina_Bool gl2_state_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
void gl2_del(const void *data, Evas_Object *obj)
|
||||
void gl2_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -657,14 +657,14 @@ my_gl_item_check_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
}
|
||||
|
||||
static Elm_Genlist_Item_Class itc3;
|
||||
char *gl3_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
char *gl3_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *tit = data;
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
|
||||
return strdup(buf);
|
||||
}
|
||||
Evas_Object *gl3_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Evas_Object *gl3_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *tit = data;
|
||||
char buf[PATH_MAX];
|
||||
|
@ -708,11 +708,11 @@ Evas_Object *gl3_icon_get(const void *data, Evas_Object *obj, const char *part)
|
|||
}
|
||||
return NULL;
|
||||
}
|
||||
Eina_Bool gl3_state_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Eina_Bool gl3_state_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
void gl3_del(const void *data, Evas_Object *obj)
|
||||
void gl3_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -812,7 +812,7 @@ my_gl_item_check_changed2(void *data, Evas_Object *obj, void *event_info)
|
|||
}
|
||||
|
||||
static Elm_Genlist_Item_Class itc5;
|
||||
char *gl5_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
char *gl5_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *tit = data;
|
||||
char buf[256];
|
||||
|
@ -826,7 +826,7 @@ char *gl5_label_get(const void *data, Evas_Object *obj, const char *part)
|
|||
}
|
||||
return strdup(buf);
|
||||
}
|
||||
Evas_Object *gl5_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Evas_Object *gl5_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
const Testitem *tit = data;
|
||||
char buf[PATH_MAX];
|
||||
|
@ -862,11 +862,11 @@ Evas_Object *gl5_icon_get(const void *data, Evas_Object *obj, const char *part)
|
|||
}
|
||||
return NULL;
|
||||
}
|
||||
Eina_Bool gl5_state_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Eina_Bool gl5_state_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
void gl5_del(const void *data, Evas_Object *obj)
|
||||
void gl5_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1049,13 +1049,13 @@ gl4_con_req(void *data, Evas_Object *obj, void *event_info)
|
|||
elm_genlist_item_expanded_set(it, 0);
|
||||
}
|
||||
|
||||
char *gl4_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
char *gl4_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "Item mode %i", (int)data);
|
||||
return strdup(buf);
|
||||
}
|
||||
Evas_Object *gl4_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Evas_Object *gl4_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
if (!strcmp(part, "elm.swallow.icon"))
|
||||
|
@ -1076,11 +1076,11 @@ Evas_Object *gl4_icon_get(const void *data, Evas_Object *obj, const char *part)
|
|||
}
|
||||
return NULL;
|
||||
}
|
||||
Eina_Bool gl4_state_get(const void *data, Evas_Object *obj, const char *part)
|
||||
Eina_Bool gl4_state_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
void gl4_del(const void *data, Evas_Object *obj)
|
||||
void gl4_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
static Elm_Genlist_Item_Class it_desk;
|
||||
|
||||
static char *
|
||||
desk_gl_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
desk_gl_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
#ifdef ELM_EFREET
|
||||
Efreet_Desktop *d = (Efreet_Desktop *)data;
|
||||
|
@ -13,7 +13,7 @@ desk_gl_label_get(const void *data, Evas_Object *obj, const char *part)
|
|||
#endif
|
||||
}
|
||||
static Evas_Object *
|
||||
desk_gl_icon_get(const void *data, Evas_Object *obj, const char *part)
|
||||
desk_gl_icon_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
// FIXME: elm_icon should grok this
|
||||
#ifdef ELM_EFREET
|
||||
|
@ -53,7 +53,7 @@ desk_gl_icon_get(const void *data, Evas_Object *obj, const char *part)
|
|||
#endif
|
||||
}
|
||||
static void
|
||||
desk_gl_del(const void *data, Evas_Object *obj)
|
||||
desk_gl_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
#ifdef ELM_EFREET
|
||||
Efreet_Desktop *d = (Efreet_Desktop *)data;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <Elementary.h>
|
||||
#ifndef ELM_LIB_QUICKLAUNCH
|
||||
static Elm_Genlist_Item_Class itci;
|
||||
char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
|
||||
char *gli_label_get(void *data, Evas_Object *obj, const char *part)
|
||||
{
|
||||
char buf[256];
|
||||
int j = (int)data;
|
||||
|
|
|
@ -5,10 +5,10 @@ static Elm_Genlist_Item_Class itc;
|
|||
|
||||
static void _bstatus(void *data, Evas_Object *obj, void *event_info);
|
||||
static void _tstatus(void *data, Evas_Object *obj, void *event_info);
|
||||
static char *_label_get(const void *data, Evas_Object *obj, const char *source);
|
||||
static Evas_Object *_icon_get(const void *data, Evas_Object *obj, const char *source);
|
||||
static Eina_Bool _state_get(const void *data, Evas_Object *obj, const char *source);
|
||||
static void _item_del(const void *data, Evas_Object *obj);
|
||||
static char *_label_get(void *data, Evas_Object *obj, const char *source);
|
||||
static Evas_Object *_icon_get(void *data, Evas_Object *obj, const char *source);
|
||||
static Eina_Bool _state_get(void *data, Evas_Object *obj, const char *source);
|
||||
static void _item_del(void *data, Evas_Object *obj);
|
||||
static void _fill_list(Evas_Object *obj);
|
||||
static Eina_Bool _dir_has_subs(const char *path);
|
||||
|
||||
|
@ -37,13 +37,13 @@ _bstatus(void *data, Evas_Object *obj, void *event_info)
|
|||
}
|
||||
|
||||
static char *
|
||||
_label_get(const void *data, Evas_Object *obj, const char *source)
|
||||
_label_get(void *data, Evas_Object *obj, const char *source)
|
||||
{
|
||||
return strdup(ecore_file_file_get(data));
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_icon_get(const void *data, Evas_Object *obj, const char *source)
|
||||
_icon_get(void *data, Evas_Object *obj, const char *source)
|
||||
{
|
||||
if (!strcmp(source, "elm.swallow.icon"))
|
||||
{
|
||||
|
@ -62,13 +62,13 @@ _icon_get(const void *data, Evas_Object *obj, const char *source)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_state_get(const void *data, Evas_Object *obj, const char *source)
|
||||
_state_get(void *data, Evas_Object *obj, const char *source)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
_item_del(const void *data, Evas_Object *obj)
|
||||
_item_del(void *data, Evas_Object *obj)
|
||||
{
|
||||
eina_stringshare_del(data);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue