[genlist] change tc to compliant merged elm

Change-Id: Ib04db2cdb3b58bda16a097921fc8a33c3bec86a9

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_get_func.c
index b3406a9..14e3d18 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -62,7 +62,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -74,8 +74,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_set_func.c
index fdb39c1..ec840a1 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_always_select_mode_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_at_xy_item_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_at_xy_item_get_func.c
index 71c4f2d..0ec7897 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_at_xy_item_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_at_xy_item_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -100,7 +100,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_at_xy_item_get_func_01(void)
 {
-       Elm_Genlist_Item *ret = NULL;
+       Elm_Object_Item *ret = NULL;
        int where = 0;
 
        ret = elm_genlist_at_xy_item_get(genlist, 0, 0, &where);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_at_xy_item_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_at_xy_item_get_func_02(void)
 {
-       Elm_Genlist_Item *ret = NULL;
+       Elm_Object_Item *ret = NULL;
        int where = 0;
 
        ret = elm_genlist_at_xy_item_get(NULL, 0, 0, &where);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_get_func.c
index cceb3b8..c7d8ced 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_set_func.c
index bdd5752..b581c8f 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_block_count_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_get_func.c
index 1015577..499dd44 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_set_func.c
index 49a403a..9a97540 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_bounce_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_clear_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_clear_func.c
index 3547a25..2b03d0f 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_clear_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_clear_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -62,7 +62,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -74,8 +74,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_get_func.c
index 1d456ea..a055ece 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_get_func.c
@@ -50,7 +50,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -62,7 +62,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -74,8 +74,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_set_func.c
index db2ff31..9687f41 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_compress_mode_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_edit_mode_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_edit_mode_set_func.c
index 1164473..c67e08b 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_edit_mode_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_edit_mode_set_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_effect_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_effect_set_func.c
index 0c669ff..ffc7cde 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_effect_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_effect_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_first_item_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_first_item_get_func.c
index 2017fc1..89d1c4e 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_first_item_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_first_item_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_first_item_get_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -121,7 +121,7 @@ static void utc_UIFW_elm_genlist_first_item_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_first_item_get_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_get_func.c
index 6075c21..d3d14f6 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_set_func.c
index 9bc82d8..10dfb40 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_homogeneous_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_get_func.c
index 66cf009..5997256 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -77,8 +77,8 @@ static void startup(void)
        elm_genlist_multi_select_set(genlist, EINA_TRUE);
        elm_genlist_horizontal_mode_set(genlist, ELM_LIST_LIMIT);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_set_func.c
index ba3f54a..11f497d 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_horizontal_mode_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -62,7 +62,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_genlist_multi_select_set(genlist, EINA_TRUE);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_append_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_append_func.c
index 0e27f59..7b1ca35 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_append_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_append_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_append_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
        if (!item) {
@@ -99,7 +99,7 @@ static void utc_UIFW_elm_genlist_item_append_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_append_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        item = elm_genlist_item_append(NULL, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
        if (item) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_bring_in_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_bring_in_func.c
index 0ebd34a..bb44a03 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_bring_in_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_bring_in_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_bring_in_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_bring_in(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_bring_in_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_bring_in_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_bring_in(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_get_func.c
index b538881..aaab71a 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_data_get_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        char *my_data = NULL, *data = "123", *get_data = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_set_func.c
index 0ec9d1b..ba9b4c7 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_data_set_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_data_set_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        char *my_data = NULL, *data = "123";
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_del_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_del_func.c
index 874f4e3..212e5ec 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_del_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_del_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_del_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_del(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_del_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_del_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_del(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_get_func.c
index ac00998..67b7545 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_get_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_disabled_get_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
@@ -105,7 +105,7 @@ static void utc_UIFW_elm_genlist_item_disabled_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_disabled_get_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_set_func.c
index d1fe28b..9600d54 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_disabled_set_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_disabled_set_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -104,7 +104,7 @@ static void utc_UIFW_elm_genlist_item_disabled_set_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_disabled_set_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_disabled_set(NULL, EINA_FALSE);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_get_func.c
index 1d8efbf..68ceb64 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_display_only_get_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        Eina_Bool display_only = EINA_TRUE, result = EINA_TRUE;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -121,7 +121,7 @@ static void utc_UIFW_elm_genlist_item_display_only_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_display_only_get_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        Eina_Bool display_only = EINA_TRUE, result = EINA_TRUE;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_func.c
index 0628f69..3b78628 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_display_only_set_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -104,7 +104,7 @@ static void utc_UIFW_elm_genlist_item_display_only_set_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_display_only_set_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_display_only_set(NULL, EINA_FALSE);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_depth_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_depth_get_func.c
index 6c2be3e..b49965e 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_depth_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_depth_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_expanded_depth_get_func_01(void)
 {
-       Elm_Genlist_Item *it1 = NULL, *it2 = NULL;
+       Elm_Object_Item *it1 = NULL, *it2 = NULL;
        int depth = 0;
 
        it1 = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -120,7 +120,7 @@ static void utc_UIFW_elm_genlist_item_expanded_depth_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_expanded_depth_get_func_02(void)
 {
-       Elm_Genlist_Item *it1 = NULL;
+       Elm_Object_Item *it1 = NULL;
        int depth = 0;
        it1 = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        depth = elm_genlist_item_expanded_depth_get(it1);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c
index 80be942..87f5424 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_expanded_get_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
@@ -105,7 +105,7 @@ static void utc_UIFW_elm_genlist_item_expanded_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_expanded_get_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_set_func.c
index ce74920..9750e1d 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_set_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_expanded_set_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -97,7 +97,7 @@ static void utc_UIFW_elm_genlist_item_expanded_set_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_expanded_set_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_genlist_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_genlist_get_func.c
index 4e36680..6fb2169 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_genlist_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_genlist_get_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_genlist_get_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Evas_Object *ret = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -102,7 +102,7 @@ static void utc_UIFW_elm_genlist_item_genlist_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_genlist_get_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Evas_Object *ret = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_after_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_after_func.c
index a4ab829..817f9af 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_after_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_after_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_insert_after_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -104,7 +104,7 @@ static void utc_UIFW_elm_genlist_item_insert_after_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_insert_after_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_before_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_before_func.c
index 21ab297..f6ec0c6 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_before_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_insert_before_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_insert_before_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -104,7 +104,7 @@ static void utc_UIFW_elm_genlist_item_insert_before_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_insert_before_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_bring_in_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_bring_in_func.c
index d6cfe71..a3df98e 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_bring_in_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_bring_in_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_middle_bring_in_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_middle_bring_in(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_middle_bring_in_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_middle_bring_in_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_middle_bring_in(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_show_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_show_func.c
index 752ce57..11abc27 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_show_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_middle_show_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_middle_show_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_middle_show(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_middle_show_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_middle_show_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_middle_show(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_move_after_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_move_after_func.c
index e8cc986..2c6e54d 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_move_after_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_move_after_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_move_after_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL, *item2 = NULL;
+       Elm_Object_Item *item = NULL, *item2 = NULL;
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        item2 = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_move_after(item2, item);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_next_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_next_get_func.c
index 318b057..9dbce85 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_next_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_next_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -100,7 +100,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_next_get_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL, *ret = NULL;
+       Elm_Object_Item *it = NULL, *ret = NULL;
 
        it = elm_genlist_first_item_get(genlist);
        ret = elm_genlist_item_next_get(it);
@@ -118,7 +118,7 @@ static void utc_UIFW_elm_genlist_item_next_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_next_get_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL, *ret = NULL;
+       Elm_Object_Item *it = NULL, *ret = NULL;
 
        it = elm_genlist_first_item_get(genlist);
        ret = elm_genlist_item_next_get(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_object_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_object_get_func.c
index 0fb561b..a65fbf1 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_object_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_object_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_object_get_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        Evas_Object *obj = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_parent_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_parent_get_func.c
index 9f7d2da..4105c54 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_parent_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_parent_get_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_parent_get_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL, *ret = NULL;
+       Elm_Object_Item *item = NULL, *ret = NULL;
 
        item = elm_genlist_last_item_get(genlist);
        ret = elm_genlist_item_parent_get(item);
@@ -96,7 +96,7 @@ static void utc_UIFW_elm_genlist_item_parent_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_parent_get_func_02(void)
 {
-       Elm_Genlist_Item  *ret = NULL;
+       Elm_Object_Item  *ret = NULL;
 
        ret = elm_genlist_item_parent_get(NULL);
 

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prepend_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prepend_func.c
index 293daa7..866086c 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prepend_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prepend_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_prepend_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        item = elm_genlist_item_prepend(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
@@ -100,7 +100,7 @@ static void utc_UIFW_elm_genlist_item_prepend_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_prepend_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        item = elm_genlist_item_prepend(NULL, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
 

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prev_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prev_get_func.c
index 8d129ef..17876ef 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prev_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_prev_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -100,7 +100,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_prev_get_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL, *ret = NULL;
+       Elm_Object_Item *it = NULL, *ret = NULL;
 
        it = elm_genlist_last_item_get(genlist);
        ret = elm_genlist_item_prev_get(it);
@@ -118,7 +118,7 @@ static void utc_UIFW_elm_genlist_item_prev_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_prev_get_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL, *ret = NULL;
+       Elm_Object_Item *it = NULL, *ret = NULL;
 
        it = elm_genlist_last_item_get(genlist);
        ret = elm_genlist_item_prev_get(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_rename_mode_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_rename_mode_set_func.c
index 339cf45..916624b 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_rename_mode_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_rename_mode_set_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_rename_mode_set_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_rename_mode_set(it, EINA_TRUE);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_get_func.c
index f2cfbd2..2bf682d 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_get_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_selected_get_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
@@ -105,7 +105,7 @@ static void utc_UIFW_elm_genlist_item_selected_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_selected_get_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_set_func.c
index 039b5d2..4e17afb 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_selected_set_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_selected_set_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_selected_set(item, EINA_TRUE);
@@ -96,7 +96,7 @@ static void utc_UIFW_elm_genlist_item_selected_set_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_selected_set_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_selected_set(NULL, 1);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_show_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_show_func.c
index 6400126..38dd6e1 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_show_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_show_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_show_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_show(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_show_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_show_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_show(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_subitems_clear_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_subitems_clear_func.c
index 707a880..29c9dee 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_subitems_clear_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_subitems_clear_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_subitems_clear_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_bring_in_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_bring_in_func.c
index db87c61..2f55ec8 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_bring_in_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_bring_in_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_top_bring_in_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_top_bring_in(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_top_bring_in_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_top_bring_in_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_top_bring_in(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c
index e4e3fca..cdd1e5c 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_top_show_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_top_show(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_top_show_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_top_show_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_top_show(NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_update_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_update_func.c
index f787618..e772f95 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_update_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_update_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_update_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_update(it);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_last_item_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_last_item_get_func.c
index 77fbd58..8622e8c 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_last_item_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_last_item_get_func.c
@@ -62,8 +62,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -83,7 +83,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_last_item_get_func_01(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -103,7 +103,7 @@ static void utc_UIFW_elm_genlist_last_item_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_last_item_get_func_02(void)
 {
-       Elm_Genlist_Item *item = NULL, *result_item = NULL;
+       Elm_Object_Item *item = NULL, *result_item = NULL;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_get_func.c
index 91211cd..8ff25d5 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_set_func.c
index b4c4391..358ff55 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_longpress_timeout_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_get_func.c
index 3961e64..eb8e8d7 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_genlist_multi_select_set(genlist, EINA_TRUE);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_set_func.c
index cb39112..b536297 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_multi_select_set_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_get_func.c
index 35911f5..21919c7 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -62,7 +62,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -74,8 +74,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_set_func.c
index 5593fba..700951c 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_no_select_mode_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_get_func.c
index 55dc312..2c1e684 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_get_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -62,7 +62,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -74,8 +74,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_set_func.c
index 2cc23fc..018945d 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_mode_set_func.c
@@ -51,7 +51,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_set_func.c
index d0c55ad..7e0975d 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_pinch_zoom_set_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 8; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_realized_items_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_realized_items_get_func.c
index a2189fd..3ad5ddf 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_realized_items_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_realized_items_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_scroller_policy_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_scroller_policy_set_func.c
index fe8e4a4..4279f3e 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_scroller_policy_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_scroller_policy_set_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,7 +64,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -76,8 +76,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_item_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_item_get_func.c
index e5dd2d1..c0a68f9 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_item_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_item_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_selected_item_get_func_01(void)
 {
-       Elm_Genlist_Item *ret = NULL;
+       Elm_Object_Item *ret = NULL;
 
        ret = elm_genlist_selected_item_get(genlist);
 
@@ -118,7 +118,7 @@ static void utc_UIFW_elm_genlist_selected_item_get_func_01(void)
  */
 static void utc_UIFW_elm_genlist_selected_item_get_func_02(void)
 {
-       Elm_Genlist_Item *ret = NULL;
+       Elm_Object_Item *ret = NULL;
 
        ret = elm_genlist_selected_item_get(NULL);
 

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_items_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_items_get_func.c
index 3df94fa..d20bdd7 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_items_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_selected_items_get_func.c
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -63,7 +63,7 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 }
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
@@ -75,8 +75,8 @@ static void startup(void)
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {