elementary/gengrid - removed elm_gengrid_item_sorted_insert

and rename elm_gengrid_item_direct_sorted_insert to elm_gengrid_item_sorted_insert

SVN revision: 68545

diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 5d305aa..dd256e2 100644 (file)
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -665,7 +665,7 @@ _main_cb(void *data, Eio_File *handler, const Eina_File_Direct_Info *info __UNUS
                                        _file_list_cmp, NULL, NULL);
      }
    else if (wr->wd->mode == ELM_FILESELECTOR_GRID)
-     elm_gengrid_item_direct_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"),
+     elm_gengrid_item_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"),
                                            eina_stringshare_ref(eio_file_associate_find(handler, "filename")),
                                            _file_grid_cmp, NULL, NULL);
 }

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 189b947..b687dd5 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -3965,6 +3965,30 @@ EINA_DEPRECATED EAPI const Evas_Object            *elm_gengrid_item_object_get(c
  */
 EINA_DEPRECATED EAPI void                          elm_gengrid_item_item_class_set(Elm_Object_Item *it, const Elm_Gengrid_Item_Class *gic);
 
+/**
+ * Insert an item in a gengrid widget using a user-defined sort function.
+ *
+ * @param obj The gengrid object.
+ * @param gic The item class for the item.
+ * @param data The item data.
+ * @param comp User defined comparison function that defines the sort order
+ *             based on Elm_Gen_Item.
+ * @param func Convenience function called when the item is selected.
+ * @param func_data Data to be passed to @p func.
+ * @return A handle to the item added or @c NULL, on errors.
+ *
+ * This inserts an item in the gengrid based on user defined comparison function.
+ *
+ * @see elm_gengrid_item_append()
+ * @see elm_gengrid_item_prepend()
+ * @see elm_gengrid_item_insert_after()
+ * @see elm_object_item_del()
+ * @see elm_gengrid_item_sorted_insert()
+ *
+ * @deprecated Use elm_gengrid_item_sorted_insert() instead
+ * @ingroup Gengrid
+ */
+EINA_DEPRECATED EAPI Elm_Object_Item             *elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
 
 /**
  * Append a filter function for text inserted in the entry

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 6df75de..35dc77c 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1855,15 +1855,6 @@ _scr_scroll(void            *data,
 }
 
 static int
-_elm_gengrid_item_compare_data(const void *data, const void *data1)
-{
-   const Elm_Gen_Item *it = data;
-   const Elm_Gen_Item *item1 = data1;
-
-   return it->wd->item_compare_data_cb(it->base.data, item1->base.data);
-}
-
-static int
 _elm_gengrid_item_compare(const void *data, const void *data1)
 {
    Elm_Gen_Item *it, *item1;
@@ -2205,12 +2196,12 @@ elm_gengrid_item_insert_after(Evas_Object                  *obj,
 }
 
 EAPI Elm_Object_Item *
-elm_gengrid_item_direct_sorted_insert(Evas_Object                  *obj,
-                                      const Elm_Gengrid_Item_Class *itc,
-                                      const void                   *data,
-                                      Eina_Compare_Cb               comp,
-                                      Evas_Smart_Cb                 func,
-                                      const void                   *func_data)
+elm_gengrid_item_sorted_insert(Evas_Object                  *obj,
+                               const Elm_Gengrid_Item_Class *itc,
+                               const void                   *data,
+                               Eina_Compare_Cb               comp,
+                               Evas_Smart_Cb                 func,
+                               const void                   *func_data)
 {
    Elm_Gen_Item *it;
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
@@ -2232,18 +2223,15 @@ elm_gengrid_item_direct_sorted_insert(Evas_Object                  *obj,
    return (Elm_Object_Item *) it;
 }
 
-EAPI Elm_Object_Item *
-elm_gengrid_item_sorted_insert(Evas_Object                  *obj,
-                               const Elm_Gengrid_Item_Class *itc,
-                               const void                   *data,
-                               Eina_Compare_Cb               comp,
-                               Evas_Smart_Cb                 func,
-                               const void                   *func_data)
+EINA_DEPRECATED Elm_Object_Item *
+elm_gengrid_item_direct_sorted_insert(Evas_Object                  *obj,
+                                      const Elm_Gengrid_Item_Class *itc,
+                                      const void                   *data,
+                                      Eina_Compare_Cb               comp,
+                                      Evas_Smart_Cb                 func,
+                                      const void                   *func_data)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   wd->item_compare_data_cb = comp;
-
-   return elm_gengrid_item_direct_sorted_insert(obj, itc, data, _elm_gengrid_item_compare_data, func, func_data);
+   return elm_gengrid_item_sorted_insert(obj, itc, data, comp, func, func_data);
 }
 
 EAPI void

diff --git a/src/lib/elm_gengrid.h b/src/lib/elm_gengrid.h
index d594fa4..8a6450e 100644 (file)
--- a/src/lib/elm_gengrid.h
+++ b/src/lib/elm_gengrid.h
@@ -551,44 +551,20 @@ EAPI Elm_Object_Item             *elm_gengrid_item_insert_after(Evas_Object *obj
  * @param func_data Data to be passed to @p func.
  * @return A handle to the item added or @c NULL, on errors.
  *
- * This inserts an item in the gengrid based on user defined comparison function.
+ * This inserts an item in the gengrid based on user defined comparison
+ * function. The two arguments passed to the function @p func are gengrid
+ * item handles to compare.
  *
  * @see elm_gengrid_item_append()
  * @see elm_gengrid_item_prepend()
  * @see elm_gengrid_item_insert_after()
  * @see elm_object_item_del()
- * @see elm_gengrid_item_direct_sorted_insert()
  *
  * @ingroup Gengrid
  */
 EAPI Elm_Object_Item             *elm_gengrid_item_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
 
 /**
- * Insert an item in a gengrid widget using a user-defined sort function.
- *
- * @param obj The gengrid object.
- * @param gic The item class for the item.
- * @param data The item data.
- * @param comp User defined comparison function that defines the sort order
- *             based on Elm_Gen_Item.
- * @param func Convenience function called when the item is selected.
- * @param func_data Data to be passed to @p func.
- * @return A handle to the item added or @c NULL, on errors.
- *
- * This inserts an item in the gengrid based on user defined comparison function.
- *
- * @see elm_gengrid_item_append()
- * @see elm_gengrid_item_prepend()
- * @see elm_gengrid_item_insert_after()
- * @see elm_object_item_del()
- * @see elm_gengrid_item_sorted_insert()
- *
- * @ingroup Gengrid
- */
-//XXX: should be removed.
-EAPI Elm_Object_Item             *elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
-
-/**
  * Set whether items on a given gengrid widget are to get their
  * selection callbacks issued for @b every subsequent selection
  * click on them or just for the first click.

diff --git a/src/lib/elm_genlist.h b/src/lib/elm_genlist.h
index aeaba39..7840747 100644 (file)
--- a/src/lib/elm_genlist.h
+++ b/src/lib/elm_genlist.h
@@ -900,6 +900,15 @@ EAPI Elm_Object_Item             *elm_genlist_item_insert_after(Evas_Object *obj
  * @param func_data Data passed to @p func above.
  * @return A handle to the item added or NULL if not possible
  *
+ * This inserts an item in the genlist based on user defined comparison
+ * function. The two arguments passed to the function @p func are genlist item
+ * handles to compare.
+ *
+ * @see elm_genlist_item_append()
+ * @see elm_genlist_item_prepend()
+ * @see elm_genlist_item_insert_after()
+ * @see elm_object_item_del()
+
  * @ingroup Genlist
  */
 EAPI Elm_Object_Item             *elm_genlist_item_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Flags flags, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);