[genlist] Removed 'const' from (void *) type. I'll announce this and

apply this on June 22. This is a upstream merge. It was changed long
ago in upstream.

Change-Id: Ie6b9b1f32647affc2fcab48dd8fbbb26c07805e5

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 389d209..764514d 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -21,14 +21,14 @@ typedef struct _Testitem
 
 
 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);
 }
 
-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);
@@ -40,11 +40,11 @@ Evas_Object *gl_icon_get(const void *data __UNUSED__, Evas_Object *obj, const ch
    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__)
 {
    return EINA_FALSE;
 }
-void gl_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 {
 }
 
@@ -512,14 +512,14 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 /*************/
 
 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);
 }
-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];
@@ -551,11 +551,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 __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__)
 {
    return EINA_FALSE;
 }
-void gl2_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl2_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 {
 }
 
@@ -662,14 +662,14 @@ my_gl_item_check_changed(void *data, Evas_Object *obj, void *event_info __UNUSED
 }
 
 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);
 }
-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"))
@@ -695,11 +695,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 __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__)
 {
    return EINA_FALSE;
 }
-void gl3_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl3_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 {
 }
 
@@ -799,7 +799,7 @@ my_gl_item_check_changed2(void *data, Evas_Object *obj, void *event_info __UNUSE
 }
 
 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];
@@ -813,7 +813,7 @@ char *gl5_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *p
      }
    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];
@@ -849,11 +849,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 __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__)
 {
    return EINA_FALSE;
 }
-void gl5_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl5_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 {
 }
 
@@ -1073,13 +1073,13 @@ gl4_con_req(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    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);
 }
-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"))
@@ -1100,11 +1100,11 @@ Evas_Object *gl4_icon_get(const void *data __UNUSED__, Evas_Object *obj, const c
      }
    return NULL;
 }
-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__)
 {
    return EINA_FALSE;
 }
-void gl4_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+void gl4_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 {
 }
 
@@ -1320,7 +1320,7 @@ test_genlist7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 /*************/
 
 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);

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 27b8627..da3c031 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1845,10 +1845,10 @@ extern "C" {
    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