apply this on June 22. This is a upstream merge. It was changed long
ago in upstream.
Change-Id: Ie6b9b1f32647affc2fcab48dd8fbbb26c07805e5
static Elm_Genlist_Item_Class itc1;
static Elm_Genlist_Item_Class itc1;
-char *gl_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+char *gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
{
char buf[256];
snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data);
return strdup(buf);
}
{
char buf[256];
snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data);
return strdup(buf);
}
-Evas_Object *gl_icon_get(const void *data __UNUSED__, Evas_Object *obj, const char *part)
+Evas_Object *gl_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
{
char buf[PATH_MAX];
Evas_Object *ic = elm_icon_add(obj);
{
char buf[PATH_MAX];
Evas_Object *ic = elm_icon_add(obj);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
return ic;
}
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
return ic;
}
-Eina_Bool gl_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+Eina_Bool gl_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
-void gl_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
/*************/
static Elm_Genlist_Item_Class itc2;
/*************/
static Elm_Genlist_Item_Class itc2;
-char *gl2_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+char *gl2_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
{
const Testitem *tit = data;
char buf[256];
snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
return strdup(buf);
}
{
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];
{
const Testitem *tit = data;
char buf[PATH_MAX];
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
return ic;
}
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
return ic;
}
-Eina_Bool gl2_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+Eina_Bool gl2_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
-void gl2_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl2_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
}
static Elm_Genlist_Item_Class itc3;
}
static Elm_Genlist_Item_Class itc3;
-char *gl3_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+char *gl3_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
{
const Testitem *tit = data;
char buf[256];
snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
return strdup(buf);
}
{
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;
if (!strcmp(part, "elm.swallow.icon"))
{
const Testitem *tit = data;
if (!strcmp(part, "elm.swallow.icon"))
-Eina_Bool gl3_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+Eina_Bool gl3_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
-void gl3_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl3_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
}
static Elm_Genlist_Item_Class itc5;
}
static Elm_Genlist_Item_Class itc5;
-char *gl5_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part)
+char *gl5_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
{
const Testitem *tit = data;
char buf[256];
{
const Testitem *tit = data;
char buf[256];
-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];
{
const Testitem *tit = data;
char buf[PATH_MAX];
-Eina_Bool gl5_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+Eina_Bool gl5_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
-void gl5_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl5_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
elm_genlist_item_expanded_set(it, 0);
}
elm_genlist_item_expanded_set(it, 0);
}
-char *gl4_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+char *gl4_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
{
char buf[256];
snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data);
return strdup(buf);
}
{
char buf[256];
snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data);
return strdup(buf);
}
-Evas_Object *gl4_icon_get(const void *data __UNUSED__, Evas_Object *obj, const char *part)
+Evas_Object *gl4_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
{
char buf[PATH_MAX];
if (!strcmp(part, "elm.swallow.icon"))
{
char buf[PATH_MAX];
if (!strcmp(part, "elm.swallow.icon"))
-Eina_Bool gl4_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+Eina_Bool gl4_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
-void gl4_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl4_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
/*************/
static Elm_Genlist_Item_Class itc_group;
/*************/
static Elm_Genlist_Item_Class itc_group;
-char *gl8_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+char *gl8_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
{
char buf[256];
snprintf(buf, sizeof(buf), "Group Index # %i (Item # %i)", (int)((long)data / 10), (int)(long)data);
{
char buf[256];
snprintf(buf, sizeof(buf), "Group Index # %i (Item # %i)", (int)((long)data / 10), (int)(long)data);
typedef struct _Elm_Genlist_Item_Class Elm_Genlist_Item_Class;
typedef struct _Elm_Genlist_Item Elm_Genlist_Item; /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */
typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func;
typedef struct _Elm_Genlist_Item_Class Elm_Genlist_Item_Class;
typedef struct _Elm_Genlist_Item Elm_Genlist_Item; /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */
typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func;
- typedef char *(*GenlistItemLabelGetFunc) (const void *data, Evas_Object *obj, const char *part);
- typedef Evas_Object *(*GenlistItemIconGetFunc) (const void *data, Evas_Object *obj, const char *part);
- typedef Eina_Bool (*GenlistItemStateGetFunc) (const void *data, Evas_Object *obj, const char *part);
- typedef void (*GenlistItemDelFunc) (const void *data, Evas_Object *obj);
+ typedef char *(*GenlistItemLabelGetFunc) (void *data, Evas_Object *obj, const char *part);
+ typedef Evas_Object *(*GenlistItemIconGetFunc) (void *data, Evas_Object *obj, const char *part);
+ typedef Eina_Bool (*GenlistItemStateGetFunc) (void *data, Evas_Object *obj, const char *part);
+ typedef void (*GenlistItemDelFunc) (void *data, Evas_Object *obj);
typedef void (*GenlistItemMovedFunc) ( Evas_Object *genlist, Elm_Genlist_Item *item, Elm_Genlist_Item *rel_item, Eina_Bool move_after);
struct _Elm_Genlist_Item_Class
typedef void (*GenlistItemMovedFunc) ( Evas_Object *genlist, Elm_Genlist_Item *item, Elm_Genlist_Item *rel_item, Eina_Bool move_after);
struct _Elm_Genlist_Item_Class