[elm_genlist.c] Removed deprecated APIs.

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_groupitem_add_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_groupitem_add_func.c
deleted file mode 100644 (file)
index c63dbe0..0000000
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_groupitem_add_func.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win, *genlist;
-static char *Items[] = { "Main Item1", "Main Item 2", "Main Item 3", "Main Item 4", "Main Item 5", "Main Item 6", "Main Item 7", "Main Item 8"  };
-Elm_Genlist_Item_Class itc;
-
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_genlist_groupitem_add_func_01(void);
-static void utc_UIFW_elm_genlist_groupitem_add_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_genlist_groupitem_add_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_genlist_groupitem_add_func_02, NEGATIVE_TC_IDX },
-};
-
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
-{
-       int index = (int) data;
-
-       if (!strcmp(part, "elm.text")) {
-               return strdup(Items[index]);
-       }
-       return NULL;
-}
-
-static void startup(void)
-{
-       Elm_Genlist_Item *item = NULL;
-       int index = 0;
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);     
-       genlist = elm_genlist_add(main_win);
-       evas_object_show(genlist);
-       elm_win_resize_object_add(main_win, genlist);
-       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.state_get = NULL;
-       itc.func.del = NULL;
-       for (index = 0; index < 5; index++) {
-               item = elm_genlist_item_append(genlist, &itc, (void *) index, NULL,
-                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       }
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_genlist_groupitem_add()
- */
-static void utc_UIFW_elm_genlist_groupitem_add_func_01(void)
-{
-       Elm_Genlist_GroupItem *git = NULL;
-       git = elm_genlist_groupitem_add(genlist, &itc, NULL);
-       if (!git) {
-               tet_infoline("elm_genlist_groupitem_add() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_genlist_groupitem_add()
- */
-static void utc_UIFW_elm_genlist_groupitem_add_func_02(void)
-{
-       Elm_Genlist_GroupItem *git = NULL;
-       git = elm_genlist_groupitem_add(NULL, NULL, NULL);
-       if (git) {
-               tet_infoline("elm_genlist_groupitem_add() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_groupitem_del_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_groupitem_del_func.c
deleted file mode 100644 (file)
index 6065bd8..0000000
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_groupitem_del_func.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win, *genlist;
-static char *Items[] = { "Main Item1", "Main Item 2", "Main Item 3", "Main Item 4", "Main Item 5", "Main Item 6", "Main Item 7", "Main Item 8"  };
-Elm_Genlist_Item_Class itc;
-
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_genlist_groupitem_del_func_01(void);
-static void utc_UIFW_elm_genlist_groupitem_del_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_genlist_groupitem_del_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_genlist_groupitem_del_func_02, NEGATIVE_TC_IDX },
-};
-
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
-{
-       int index = (int) data;
-
-       if (!strcmp(part, "elm.text")) {
-               return strdup(Items[index]);
-       }
-       return NULL;
-}
-
-static void startup(void)
-{
-       Elm_Genlist_Item *item = NULL;
-       int index = 0;
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);     
-       genlist = elm_genlist_add(main_win);
-       evas_object_show(genlist);
-       elm_win_resize_object_add(main_win, genlist);
-       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.state_get = NULL;
-       itc.func.del = NULL;
-       for (index = 0; index < 5; index++) {
-               item = elm_genlist_item_append(genlist, &itc, (void *) index, NULL,
-                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       }
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_genlist_groupitem_del()
- */
-static void utc_UIFW_elm_genlist_groupitem_del_func_01(void)
-{
-       Elm_Genlist_GroupItem *git = NULL;
-       git = elm_genlist_groupitem_add(genlist, &itc, NULL);
-       elm_genlist_groupitem_del(git);
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_genlist_groupitem_del()
- */
-static void utc_UIFW_elm_genlist_groupitem_del_func_02(void)
-{
-       Elm_Genlist_GroupItem *git = NULL;
-       git = elm_genlist_groupitem_add(genlist, &itc, NULL);
-       elm_genlist_groupitem_del(NULL);
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_append_with_group_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_append_with_group_func.c
deleted file mode 100644 (file)
index 44ebb5e..0000000
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_append_with_group_func.c
+++ /dev/null
@@ -1,130 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win, *genlist;
-static char *Items[] = { "Main Item1", "Main Item 2", "Main Item 3", "Main Item 4", "Main Item 5", "Main Item 6", "Main Item 7", "Main Item 8"  };
-Elm_Genlist_Item_Class itc;
-
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_genlist_item_append_with_group_func_01(void);
-static void utc_UIFW_elm_genlist_item_append_with_group_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_genlist_item_append_with_group_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_genlist_item_append_with_group_func_02, NEGATIVE_TC_IDX },
-};
-
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
-{
-       int index = (int) data;
-
-       if (!strcmp(part, "elm.text")) {
-               return strdup(Items[index]);
-       }
-       return NULL;
-}
-
-static void startup(void)
-{
-       Elm_Genlist_Item *item = NULL;
-       int index = 0;
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);     
-       genlist = elm_genlist_add(main_win);
-       evas_object_show(genlist);
-       elm_win_resize_object_add(main_win, genlist);
-       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.state_get = NULL;
-       itc.func.del = NULL;
-       for (index = 0; index < 5; index++) {
-               item = elm_genlist_item_append(genlist, &itc, (void *) index, NULL,
-                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       }
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_genlist_item_append_with_group()
- */
-static void utc_UIFW_elm_genlist_item_append_with_group_func_01(void)
-{
-       Elm_Genlist_GroupItem *git = NULL;
-       Elm_Genlist_Item *it = NULL;
-       git = elm_genlist_groupitem_add(genlist, &itc, NULL);
-       it = elm_genlist_item_append_with_group(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, git, NULL, NULL);
-       if (!it) {
-               tet_infoline("elm_genlist_item_append_with_group() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_genlist_item_append_with_group()
- */
-static void utc_UIFW_elm_genlist_item_append_with_group_func_02(void)
-{
-       Elm_Genlist_GroupItem *git = NULL;
-       Elm_Genlist_Item *it = NULL;
-       git = elm_genlist_groupitem_add(genlist, &itc, NULL);
-       it = elm_genlist_item_append_with_group(NULL, NULL, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL, NULL);
-       if (it) {
-               tet_infoline("elm_genlist_item_append_with_group() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 7a1d4ce..1dce4c8 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1885,10 +1885,6 @@ extern "C" {
    EAPI Eina_Bool         elm_genlist_pinch_zoom_mode_get(const Evas_Object *obj);
 
    EINA_DEPRECATED EAPI void              elm_genlist_queue_exception_set(const Evas_Object *obj, Eina_Bool emode);
-   EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_groupitem_add(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data);
-   EINA_DEPRECATED EAPI void              elm_genlist_groupitem_del(Elm_Genlist_Item *git);
-   EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_item_append_with_group(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Elm_Genlist_Item *git, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);   
-   EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_item_prepend_with_group(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Elm_Genlist_Item *git, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
 
    /* check */
    EAPI Evas_Object *elm_check_add(Evas_Object *parent) EINA_ARG_NONNULL(1);

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index d7cebee..bdb4b89 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -6161,6 +6161,7 @@ elm_genlist_item_rename_mode_set(Elm_Genlist_Item *it, int emode)
      }
 }
 
+/*
 EAPI Elm_Genlist_Item *
 elm_genlist_groupitem_add(Evas_Object *obj, const Elm_Genlist_Item_Class *itc,
                           const void *data)
@@ -6196,6 +6197,7 @@ elm_genlist_groupitem_del(Elm_Genlist_Item *git)
    return elm_genlist_item_del(git);
 }
 
+*/
 static void
 _print_deprecated(const char *deprecated, const char *new)
 {