efl: make efl.model use of eina_value and eina_future instead of efl_future.

1 files changed, 33 insertions, 19 deletions

diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h
index 5c565c64ab..b4b5690917 100644
--- a/src/lib/efl/Efl_Model_Common.h
+++ b/src/lib/efl/Efl_Model_Common.h
@@ -20,15 +20,11 @@ EAPI extern Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT; /**< @since 1.19 */
  */
 struct _Efl_Model_Children_Event
 {
-   Eo *child; /**< child, for child_add */
    /**
     * index is a hint and is intended
     * to provide a way for applications
     * to control/know children relative
     * positions through listings.
-    *
-    * NOTE: If listing is performed asynchronously
-    * exact order may not be guaranteed.
     */
    unsigned int index;
 };
@@ -42,20 +38,6 @@ typedef struct _Efl_Model_Children_Event Efl_Model_Children_Event;
 
 EAPI int efl_model_init(void);
 
-/**
- * @brief Slices a list
- *
- * If the @p start and @p count are 0, a new accessor of the entire list is returned
- *
- * @param list The list to get the slice
- * @param start The nth element to start the slice
- * @param count The number of elements
- * @return The accessor to the sliced elements or @c NULL if error
- *
- * @since 1.17
- */
-EAPI Eina_Accessor *efl_model_list_slice(Eina_List *list, unsigned start, unsigned count) EINA_ARG_NONNULL(1);
-
 
 /**
  * @brief Notifies a property changed event with an @c EFL_MODEL_EVENT_PROPERTIES_CHANGED
@@ -65,7 +47,9 @@ EAPI Eina_Accessor *efl_model_list_slice(Eina_List *list, unsigned start, unsign
  *
  * @since 1.17
  */
-EAPI void efl_model_property_changed_notify(Efl_Model *model, const char *property);
+EAPI void _efl_model_properties_changed_internal(const Efl_Model *model, ...);
+
+#define efl_model_properties_changed(Model, ...) _efl_model_properties_changed_internal(Model, ##__VA_ARGS__, NULL)
 
 /**
  * @brief Notifies a property invalidated event with an @c EFL_MODEL_EVENT_PROPERTIES_CHANGED
@@ -107,4 +91,34 @@ EAPI Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned int
  */
 EAPI void efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc);
 
+
+static inline Eina_Value
+efl_model_list_value_get(Eina_List *childrens,
+                         unsigned int start,
+                         unsigned int count)
+{
+   Eina_Value v = EINA_VALUE_EMPTY;
+   Eina_List *l;
+   Eo *child;
+
+   eina_value_array_setup(&v, EINA_VALUE_TYPE_OBJECT, eina_list_count(childrens));
+
+   EINA_LIST_FOREACH(childrens, l, child)
+     {
+        if (start != 0)
+          {
+             start--;
+             continue;
+          }
+        if (count == 0)
+          continue;
+        count--;
+
+        eina_value_array_append(&v, child);
+     }
+
+   return v;
+}
+
+
 #endif