deprecate elm_genlist_clear and elm_gengrid_clear: use elm_gen_clear instead

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64276 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c
index 27aa9fc..f235ac2 100644 (file)
--- a/src/bin/test_eio.c
+++ b/src/bin/test_eio.c
@@ -111,7 +111,7 @@ _gl_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 static void
 _test_eio_clear(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
 {
-   elm_genlist_clear(data);
+   elm_gen_clear(data);
 }
 
 void

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 08df265..dad6770 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -179,7 +179,7 @@ static void
 my_gl_clear(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *gl = data;
-   elm_genlist_clear(gl);
+   elm_gen_clear(gl);
 }
 
 static void

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 8d514c8..9fc9971 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -9294,7 +9294,7 @@ extern "C" {
     *
     * @ingroup Gengrid
     */
-   EAPI void               elm_gengrid_clear(Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EINA_DEPRECATED EAPI void elm_gengrid_clear(Evas_Object *obj) EINA_ARG_NONNULL(1);
 
    /**
     * Get the selected item in a given gengrid widget
@@ -18191,7 +18191,7 @@ extern "C" {
     *
     * @ingroup Genlist
     */
-   EAPI void              elm_genlist_clear(Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EINA_DEPRECATED EAPI void elm_genlist_clear(Evas_Object *obj) EINA_ARG_NONNULL(1);
    /**
     * Enable or disable multi-selection in the genlist
     *

diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 10f4bee..4551748 100644 (file)
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -630,8 +630,8 @@ _signal_first(Widget_Request *wr)
    evas_object_smart_callback_call(wr->obj, SIG_DIRECTORY_OPEN, (void *)wr->path);
    if (!wr->parent)
      {
-        elm_genlist_clear(wr->wd->files_list);
-        elm_gengrid_clear(wr->wd->files_grid);
+        elm_gen_clear(wr->wd->files_list);
+        elm_gen_clear(wr->wd->files_grid);
         eina_stringshare_replace(&wr->wd->path, wr->path);
         _do_anchors(wr->obj, wr->path);
      }
@@ -727,8 +727,8 @@ _populate(Evas_Object      *obj,
    evas_object_smart_callback_call(obj, SIG_DIRECTORY_OPEN, (void *)path);
    if (!parent)
      {
-        elm_genlist_clear(wd->files_list);
-        elm_gengrid_clear(wd->files_grid);
+        elm_gen_clear(wd->files_list);
+        elm_gen_clear(wd->files_grid);
         eina_stringshare_replace(&wd->path, path);
         _do_anchors(obj, path);
      }

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 1c445e2..4a3127b 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -592,7 +592,7 @@ _del_pre_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_gengrid_clear(obj);
+   elm_gen_clear(obj);
    evas_object_del(wd->pan_smart);
    wd->pan_smart = NULL;
 }

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 73cada9..afd2ff8 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -550,7 +550,7 @@ _del_pre_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_genlist_clear(obj);
+   elm_gen_clear(obj);
    evas_object_del(wd->pan_smart);
    wd->pan_smart = NULL;
 }

diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index 8807e90..a9adff3 100644 (file)
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -583,7 +583,7 @@ elm_store_free(Elm_Store *st)
         evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
         evas_object_smart_callback_del(st->genlist, "realized", _store_genlist_item_realized);
         evas_object_smart_callback_del(st->genlist, "unrealized", _store_genlist_item_unrealized);
-        elm_genlist_clear(st->genlist);
+        elm_gen_clear(st->genlist);
         st->genlist = NULL;
      }
    if (st->free) st->free(st);
@@ -600,14 +600,14 @@ elm_store_target_genlist_set(Elm_Store *st, Evas_Object *obj)
         evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
         evas_object_smart_callback_del(st->genlist, "realized", _store_genlist_item_realized);
         evas_object_smart_callback_del(st->genlist, "unrealized", _store_genlist_item_unrealized);
-        elm_genlist_clear(st->genlist);
+        elm_gen_clear(st->genlist);
      }
    st->genlist = obj;
    if (!st->genlist) return;
    evas_object_smart_callback_add(st->genlist, "realized", _store_genlist_item_realized, st);
    evas_object_smart_callback_add(st->genlist, "unrealized", _store_genlist_item_unrealized, st);
    evas_object_event_callback_add(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
-   elm_genlist_clear(st->genlist);
+   elm_gen_clear(st->genlist);
 }
 
 EAPI void