usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

Efl model: Remove the no longer needed .Base hack.

This commit is contained in:
Tom Hacohen 2016-05-10 11:36:13 +01:00
parent 05c01867b6
commit 138d4e1353
25 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Efl.am
View File

@ -21,7 +21,7 @@ efl_eolian_files = \
lib/efl/interfaces/efl_gfx_gradient_linear.eo \
lib/efl/interfaces/efl_gfx_gradient_radial.eo \
lib/efl/interfaces/efl_gfx_filter.eo \
lib/efl/interfaces/efl_model_base.eo \
lib/efl/interfaces/efl_model.eo \
lib/efl/interfaces/efl_animator.eo \
lib/efl/interfaces/efl_orientation.eo \
lib/efl/interfaces/efl_flipable.eo \

6
src/lib/efl/Efl_Model_Common.h
View File

@ -37,7 +37,7 @@ struct _Efl_Model_Children_Event
*/
typedef struct _Efl_Model_Children_Event Efl_Model_Children_Event;
#include "interfaces/efl_model_base.eo.h"
#include "interfaces/efl_model.eo.h"
EAPI int efl_model_init(void);
@ -64,7 +64,7 @@ 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_Base *model, const char *property);
EAPI void efl_model_property_changed_notify(Efl_Model *model, const char *property);
/**
* @brief Notifies a property invalidated event with an @c EFL_MODEL_EVENT_PROPERTIES_CHANGED
@ -74,7 +74,7 @@ EAPI void efl_model_property_changed_notify(Efl_Model_Base *model, const char *p
*
* @since 1.17
*/
EAPI void efl_model_property_invalidated_notify(Efl_Model_Base *model, const char *property);
EAPI void efl_model_property_invalidated_notify(Efl_Model *model, const char *property);
/**
* @brief Callback to setup a member of @c Eina_Value_Struct

2
src/lib/efl/Makefile.am
View File

@ -25,7 +25,7 @@ interfaces/efl_gfx_gradient_base.eo \
interfaces/efl_gfx_gradient_linear.eo \
interfaces/efl_gfx_gradient_radial.eo \
interfaces/efl_gfx_filter.eo \
interfaces/efl_model_base.eo \
interfaces/efl_model.eo \
interfaces/efl_animator.eo \
interfaces/efl_orientation.eo \
interfaces/efl_flipable.eo \

2
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -39,7 +39,7 @@ EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
#include "interfaces/efl_pack_linear.eo.c"
#include "interfaces/efl_pack_grid.eo.c"
#include "interfaces/efl_model_base.eo.c"
#include "interfaces/efl_model.eo.c"
#include "interfaces/efl_animator.eo.c"
#include "interfaces/efl_orientation.eo.c"
#include "interfaces/efl_flipable.eo.c"

2
src/lib/efl/interfaces/efl_model_base.eo → src/lib/efl/interfaces/efl_model.eo
View File

@ -3,7 +3,7 @@ struct Efl.Model.Property_Event {
invalidated_properties: array<const(char) *> *; [[Removed properties identified by name]]
}
interface Efl.Model.Base ()
interface Efl.Model ()
{
legacy_prefix: null;
eo_prefix: efl_model;

8
src/lib/efl/interfaces/efl_model_common.c
View File

@ -85,7 +85,7 @@ efl_model_list_slice(Eina_List *list, unsigned start, unsigned count)
}
EAPI void
efl_model_property_changed_notify(Efl_Model_Base *model, const char *property)
efl_model_property_changed_notify(Efl_Model *model, const char *property)
{
Eina_Array *changed_properties = eina_array_new(1);
EINA_SAFETY_ON_NULL_RETURN(changed_properties);
@ -94,14 +94,14 @@ efl_model_property_changed_notify(Efl_Model_Base *model, const char *property)
EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
eo_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
on_error:
eina_array_free(changed_properties);
}
EAPI void
efl_model_property_invalidated_notify(Efl_Model_Base *model, const char *property)
efl_model_property_invalidated_notify(Efl_Model *model, const char *property)
{
Eina_Array *invalidated_properties = eina_array_new(1);
EINA_SAFETY_ON_NULL_RETURN(invalidated_properties);
@ -110,7 +110,7 @@ efl_model_property_invalidated_notify(Efl_Model_Base *model, const char *propert
EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties};
eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
eo_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
on_error:
eina_array_free(invalidated_properties);

28
src/lib/eio/eio_model.c
View File

@ -98,7 +98,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
evt.changed_properties = properties;
eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
eina_array_free(properties);
}
@ -150,7 +150,7 @@ _efl_model_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata);
eina_value_flush(&path);
eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt);
eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
return EINA_TRUE;
}
@ -179,7 +179,7 @@ _efl_model_evt_deleted_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, vo
cevt.index = i;
cevt.child = cur->data;
eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt);
eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
priv->children_list = eina_list_remove_list(priv->children_list, cur);
eo_unref(cevt.child);
@ -240,7 +240,7 @@ _eio_error_unlink_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int
* Interfaces impl.
*/
static Eina_Array const *
_eio_model_efl_model_base_properties_get(Eo *obj EINA_UNUSED, Eio_Model_Data *_pd)
_eio_model_efl_model_properties_get(Eo *obj EINA_UNUSED, Eio_Model_Data *_pd)
{
Eio_Model_Data *priv = _pd;
@ -254,7 +254,7 @@ _eio_model_efl_model_base_properties_get(Eo *obj EINA_UNUSED, Eio_Model_Data *_p
* Property Get
*/
static void
_eio_model_efl_model_base_property_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, const char *property, Eina_Promise_Owner *promise)
_eio_model_efl_model_property_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, const char *property, Eina_Promise_Owner *promise)
{
_Eio_Property_Name property_name;
const char* value = NULL;
@ -320,7 +320,7 @@ _eio_model_efl_model_base_property_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv
* Property Set
*/
static void
_eio_model_efl_model_base_property_set(Eo *obj EINA_UNUSED,
_eio_model_efl_model_property_set(Eo *obj EINA_UNUSED,
Eio_Model_Data *priv,
const char * property,
const Eina_Value *value,
@ -361,14 +361,14 @@ _eio_model_efl_model_base_property_set(Eo *obj EINA_UNUSED,
* Children Count Get
*/
static void
_eio_model_efl_model_base_children_count_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eina_Promise_Owner *promise)
_eio_model_efl_model_children_count_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eina_Promise_Owner *promise)
{
unsigned int c = eina_list_count(priv->children_list);
eina_promise_owner_value_set(promise, &c, NULL);
}
static void
_eio_model_efl_model_base_monitor_add(Eio_Model_Data *priv)
_eio_model_efl_model_monitor_add(Eio_Model_Data *priv)
{
if (!priv->monitor)
{
@ -478,13 +478,13 @@ _eio_model_children_filter_set(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eio_Fi
* Child Add
*/
static Eo *
_eio_model_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eio_Model_Data *priv EINA_UNUSED)
_eio_model_efl_model_child_add(Eo *obj EINA_UNUSED, Eio_Model_Data *priv EINA_UNUSED)
{
return eo_add(EIO_MODEL_CLASS, obj);
}
static void
_eio_model_efl_model_base_child_del_stat(void* data, Eio_File* handler EINA_UNUSED, const Eina_Stat* stat)
_eio_model_efl_model_child_del_stat(void* data, Eio_File* handler EINA_UNUSED, const Eina_Stat* stat)
{
Eo* child = data;
Eio_Model_Data *child_priv = eo_data_scope_get(child, MY_CLASS);
@ -504,7 +504,7 @@ _eio_model_efl_model_base_child_del_stat(void* data, Eio_File* handler EINA_UNUS
* Child Remove
*/
static void
_eio_model_efl_model_base_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eo *child)
_eio_model_efl_model_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eo *child)
{
Eio_Model_Data *child_priv;
EINA_SAFETY_ON_NULL_RETURN(child);
@ -513,7 +513,7 @@ _eio_model_efl_model_base_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, E
EINA_SAFETY_ON_NULL_RETURN(child_priv);
priv->del_file = eio_file_direct_stat(child_priv->path,
&_eio_model_efl_model_base_child_del_stat,
&_eio_model_efl_model_child_del_stat,
&_eio_error_unlink_cb,
child);
eo_ref(child);
@ -523,7 +523,7 @@ _eio_model_efl_model_base_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, E
* Children Slice Get
*/
static void
_eio_model_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
_eio_model_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
unsigned start, unsigned count, Eina_Promise_Owner *promise)
{
/**
@ -540,7 +540,7 @@ _eio_model_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data
priv->children_promises = eina_list_prepend(priv->children_promises, p);
_eio_model_efl_model_base_monitor_add(priv);
_eio_model_efl_model_monitor_add(priv);
if (priv->is_listing == EINA_FALSE)

18
src/lib/eio/eio_model.eo
View File

@ -1,6 +1,6 @@
type @extern Eio_Filter_Direct_Cb: __undefined_type;
class Eio.Model (Eo.Base, Efl.Model.Base)
class Eio.Model (Eo.Base, Efl.Model)
{
[[Eio model class]]
@ -15,7 +15,7 @@ class Eio.Model (Eo.Base, Efl.Model.Base)
by returning either EINA_FALSE, to abort the notification or
EINA_TRUE to keep it.
See also @Efl.Model.Base.children_slice_get.
See also @Efl.Model.children_slice_get.
@since 1.11
]]
@ -37,12 +37,12 @@ class Eio.Model (Eo.Base, Efl.Model.Base)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Model.Base.properties.get;
Efl.Model.Base.property_set;
Efl.Model.Base.property_get;
Efl.Model.Base.child_add;
Efl.Model.Base.child_del;
Efl.Model.Base.children_slice_get;
Efl.Model.Base.children_count_get;
Efl.Model.properties.get;
Efl.Model.property_set;
Efl.Model.property_get;
Efl.Model.child_add;
Efl.Model.child_del;
Efl.Model.children_slice_get;
Efl.Model.children_count_get;
}
}

16
src/lib/eldbus/eldbus_model_arguments.c
View File

@ -71,7 +71,7 @@ _eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data
}
static Eina_Array const *
_eldbus_model_arguments_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
_eldbus_model_arguments_efl_model_properties_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Arguments_Data *pd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@ -114,7 +114,7 @@ _eldbus_model_arguments_properties_load(Eldbus_Model_Arguments_Data *pd)
}
static void
_eldbus_model_arguments_efl_model_base_property_set(Eo *obj EINA_UNUSED,
_eldbus_model_arguments_efl_model_property_set(Eo *obj EINA_UNUSED,
Eldbus_Model_Arguments_Data *pd,
const char *property,
Eina_Value const* value,
@ -140,7 +140,7 @@ _eldbus_model_arguments_efl_model_base_property_set(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_arguments_efl_model_base_property_get(Eo *obj EINA_UNUSED,
_eldbus_model_arguments_efl_model_property_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Arguments_Data *pd,
const char *property,
Eina_Promise_Owner *promise)
@ -163,20 +163,20 @@ _eldbus_model_arguments_efl_model_base_property_get(Eo *obj EINA_UNUSED,
}
static Eo *
_eldbus_model_arguments_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd EINA_UNUSED)
_eldbus_model_arguments_efl_model_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd EINA_UNUSED)
{
return NULL;
}
static void
_eldbus_model_arguments_efl_model_base_child_del(Eo *obj EINA_UNUSED,
_eldbus_model_arguments_efl_model_child_del(Eo *obj EINA_UNUSED,
Eldbus_Model_Arguments_Data *pd EINA_UNUSED,
Eo *child EINA_UNUSED)
{
}
static void
_eldbus_model_arguments_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
_eldbus_model_arguments_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Arguments_Data *pd EINA_UNUSED,
unsigned start EINA_UNUSED,
unsigned count EINA_UNUSED,
@ -186,7 +186,7 @@ _eldbus_model_arguments_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_arguments_efl_model_base_children_count_get(Eo *obj EINA_UNUSED,
_eldbus_model_arguments_efl_model_children_count_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Arguments_Data *pd EINA_UNUSED,
Eina_Promise_Owner *promise)
{
@ -280,7 +280,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd,
if (eina_array_count(changed_properties))
{
Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
}
result = EINA_TRUE;

16
src/lib/eldbus/eldbus_model_arguments.eo
View File

@ -1,6 +1,6 @@
import eldbus_types;
class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
class Eldbus.Model_Arguments (Eo.Base, Efl.Model) {
[[Eldbus model arguments class]]
legacy_prefix: null;
@ -26,13 +26,13 @@ class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Model.Base.properties.get;
Efl.Model.Base.property_set;
Efl.Model.Base.property_get;
Efl.Model.Base.child_add;
Efl.Model.Base.child_del;
Efl.Model.Base.children_slice_get;
Efl.Model.Base.children_count_get;
Efl.Model.properties.get;
Efl.Model.property_set;
Efl.Model.property_get;
Efl.Model.child_add;
Efl.Model.child_del;
Efl.Model.children_slice_get;
Efl.Model.children_count_get;
}
constructors {
.constructor;

16
src/lib/eldbus/eldbus_model_connection.c
View File

@ -59,7 +59,7 @@ _eldbus_model_connection_eo_base_destructor(Eo *obj, Eldbus_Model_Connection_Dat
}
static Eina_Array const *
_eldbus_model_connection_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
_eldbus_model_connection_efl_model_properties_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Connection_Data *pd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@ -81,7 +81,7 @@ _eldbus_model_connection_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
static void
_eldbus_model_connection_efl_model_base_property_set(Eo *obj EINA_UNUSED,
_eldbus_model_connection_efl_model_property_set(Eo *obj EINA_UNUSED,
Eldbus_Model_Connection_Data *pd EINA_UNUSED,
const char *property,
Eina_Value const* value EINA_UNUSED,
@ -92,7 +92,7 @@ _eldbus_model_connection_efl_model_base_property_set(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_connection_efl_model_base_property_get(Eo *obj EINA_UNUSED,
_eldbus_model_connection_efl_model_property_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Connection_Data *pd,
const char *property,
Eina_Promise_Owner *promise)
@ -121,20 +121,20 @@ _eldbus_model_connection_efl_model_base_property_get(Eo *obj EINA_UNUSED,
}
static Eo *
_eldbus_model_connection_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Connection_Data *pd EINA_UNUSED)
_eldbus_model_connection_efl_model_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Connection_Data *pd EINA_UNUSED)
{
return NULL;
}
static void
_eldbus_model_connection_efl_model_base_child_del(Eo *obj EINA_UNUSED,
_eldbus_model_connection_efl_model_child_del(Eo *obj EINA_UNUSED,
Eldbus_Model_Connection_Data *pd EINA_UNUSED,
Eo *child EINA_UNUSED)
{
}
static void
_eldbus_model_connection_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
_eldbus_model_connection_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Connection_Data *pd,
unsigned start,
unsigned count,
@ -169,7 +169,7 @@ _eldbus_model_connection_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_connection_efl_model_base_children_count_get(Eo *obj EINA_UNUSED,
_eldbus_model_connection_efl_model_children_count_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Connection_Data *pd,
Eina_Promise_Owner *promise)
{
@ -331,7 +331,7 @@ _eldbus_model_connection_names_list_cb(void *data,
count = eina_list_count(pd->children_list);
if (count)
eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count);
eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
pd->is_listed = EINA_TRUE;

16
src/lib/eldbus/eldbus_model_connection.eo
View File

@ -1,4 +1,4 @@
class Eldbus.Model_Connection (Eo.Base, Efl.Model.Base) {
class Eldbus.Model_Connection (Eo.Base, Efl.Model) {
[[Eldbus model connection class]]
legacy_prefix: null;
@ -35,13 +35,13 @@ class Eldbus.Model_Connection (Eo.Base, Efl.Model.Base) {
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Model.Base.properties.get;
Efl.Model.Base.property_set;
Efl.Model.Base.property_get;
Efl.Model.Base.child_add;
Efl.Model.Base.child_del;
Efl.Model.Base.children_slice_get;
Efl.Model.Base.children_count_get;
Efl.Model.properties.get;
Efl.Model.property_set;
Efl.Model.property_get;
Efl.Model.child_add;
Efl.Model.child_del;
Efl.Model.children_slice_get;
Efl.Model.children_count_get;
}
constructors {
.constructor;

14
src/lib/eldbus/eldbus_model_object.c
View File

@ -100,7 +100,7 @@ _eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
}
static Eina_Array const *
_eldbus_model_object_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
_eldbus_model_object_efl_model_properties_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Object_Data *pd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@ -121,7 +121,7 @@ _eldbus_model_object_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_object_efl_model_base_property_set(Eo *obj EINA_UNUSED,
_eldbus_model_object_efl_model_property_set(Eo *obj EINA_UNUSED,
Eldbus_Model_Object_Data *pd EINA_UNUSED,
const char *property,
const Eina_Value *value EINA_UNUSED,
@ -132,7 +132,7 @@ _eldbus_model_object_efl_model_base_property_set(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_object_efl_model_base_property_get(Eo *obj EINA_UNUSED,
_eldbus_model_object_efl_model_property_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Object_Data *pd,
const char *property,
Eina_Promise_Owner *promise)
@ -163,20 +163,20 @@ _eldbus_model_object_efl_model_base_property_get(Eo *obj EINA_UNUSED,
}
static Eo *
_eldbus_model_object_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Object_Data *pd EINA_UNUSED)
_eldbus_model_object_efl_model_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Object_Data *pd EINA_UNUSED)
{
return NULL;
}
static void
_eldbus_model_object_efl_model_base_child_del(Eo *obj EINA_UNUSED,
_eldbus_model_object_efl_model_child_del(Eo *obj EINA_UNUSED,
Eldbus_Model_Object_Data *pd EINA_UNUSED,
Eo *child EINA_UNUSED)
{
}
static void
_eldbus_model_object_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
_eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Object_Data *pd,
unsigned start,
unsigned count,
@ -206,7 +206,7 @@ _eldbus_model_object_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_object_efl_model_base_children_count_get(Eo *obj EINA_UNUSED,
_eldbus_model_object_efl_model_children_count_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Object_Data *pd,
Eina_Promise_Owner *promise)
{

16
src/lib/eldbus/eldbus_model_object.eo
View File

@ -1,6 +1,6 @@
import eldbus_types;
class Eldbus.Model_Object (Eo.Base, Efl.Model.Base) {
class Eldbus.Model_Object (Eo.Base, Efl.Model) {
[[Eldbus model object class]]
legacy_prefix: null;
@ -62,13 +62,13 @@ class Eldbus.Model_Object (Eo.Base, Efl.Model.Base) {
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Model.Base.properties.get;
Efl.Model.Base.property_set;
Efl.Model.Base.property_get;
Efl.Model.Base.child_add;
Efl.Model.Base.child_del;
Efl.Model.Base.children_slice_get;
Efl.Model.Base.children_count_get;
Efl.Model.properties.get;
Efl.Model.property_set;
Efl.Model.property_get;
Efl.Model.child_add;
Efl.Model.child_del;
Efl.Model.children_slice_get;
Efl.Model.children_count_get;
}
constructors {
.constructor;

18
src/lib/eldbus/eldbus_model_proxy.c
View File

@ -95,7 +95,7 @@ _eldbus_model_proxy_eo_base_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
}
static Eina_Array const *
_eldbus_model_proxy_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_efl_model_properties_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@ -105,7 +105,7 @@ _eldbus_model_proxy_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_proxy_efl_model_base_property_set(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd,
const char *property,
Eina_Value const* value,
@ -158,7 +158,7 @@ _eldbus_model_proxy_efl_model_base_property_set(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_proxy_efl_model_base_property_get(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_efl_model_property_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd,
const char *property,
Eina_Promise_Owner *promise)
@ -203,21 +203,21 @@ _eldbus_model_proxy_efl_model_base_property_get(Eo *obj EINA_UNUSED,
}
static Eo *
_eldbus_model_proxy_efl_model_base_child_add(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_efl_model_child_add(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd EINA_UNUSED)
{
return NULL;
}
static void
_eldbus_model_proxy_efl_model_base_child_del(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_efl_model_child_del(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd EINA_UNUSED,
Eo *child EINA_UNUSED)
{
}
static void
_eldbus_model_proxy_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd,
unsigned start,
unsigned count,
@ -238,7 +238,7 @@ _eldbus_model_proxy_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
}
static void
_eldbus_model_proxy_efl_model_base_children_count_get(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_efl_model_children_count_get(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd,
Eina_Promise_Owner *promise)
{
@ -607,7 +607,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
.changed_properties = changed_properties
};
eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
}
eina_array_free(changed_properties);
@ -672,7 +672,7 @@ _eldbus_model_proxy_property_set_cb(void *data,
.changed_properties = pd->properties_array
};
eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
efl_model_property_changed_notify(pd->obj, property_set_data->property);
}

16
src/lib/eldbus/eldbus_model_proxy.eo
View File

@ -1,6 +1,6 @@
import eldbus_types;
class Eldbus.Model_Proxy (Eo.Base, Efl.Model.Base) {
class Eldbus.Model_Proxy (Eo.Base, Efl.Model) {
[[Eldbus model proxy class]]
legacy_prefix: null;
@ -25,13 +25,13 @@ class Eldbus.Model_Proxy (Eo.Base, Efl.Model.Base) {
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Model.Base.properties.get;
Efl.Model.Base.property_set;
Efl.Model.Base.property_get;
Efl.Model.Base.child_add;
Efl.Model.Base.child_del;
Efl.Model.Base.children_slice_get;
Efl.Model.Base.children_count_get;
Efl.Model.properties.get;
Efl.Model.property_set;
Efl.Model.property_get;
Efl.Model.child_add;
Efl.Model.child_del;
Efl.Model.children_slice_get;
Efl.Model.children_count_get;
}
constructors {
.constructor;

4
src/lib/elementary/elm_view_form.c
View File

@ -287,7 +287,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
{
if (priv->model_obj != NULL)
{
eo_event_callback_del(priv->model_obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
eo_event_callback_del(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
eo_unref(priv->model_obj);
}
@ -296,7 +296,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
if (priv->model_obj != NULL)
{
eo_ref(priv->model_obj);
eo_event_callback_add(priv->model_obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
eo_event_callback_add(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
_update_model_properties(priv);
}
}

2
src/lib/elementary/elm_view_form.eo
View File

@ -8,7 +8,7 @@ class Elm.View_Form (Eo.Base)
@since 1.11
]]
params {
@in model: Efl.Model.Base*; [[Emodel object]]
@in model: Efl.Model*; [[Emodel object]]
}
}
widget_add {

8
src/lib/elementary/elm_view_list.c
View File

@ -57,7 +57,7 @@ static Eina_Bool _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event);
/* --- Genlist Callbacks --- */
EO_CALLBACKS_ARRAY_DEFINE(model_callbacks,
{ EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, _efl_model_children_count_change_cb });
{ EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, _efl_model_children_count_change_cb });
EO_CALLBACKS_ARRAY_DEFINE(genlist_callbacks,
{ ELM_GENLIST_EVENT_EXPAND_REQUEST, _expand_request_cb },
{ ELM_GENLIST_EVENT_CONTRACT_REQUEST, _contract_request_cb },
@ -81,7 +81,7 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
return;
eo_event_callback_array_del(idata->model, model_callbacks(), idata);
eo_event_callback_del(idata->model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
eo_event_callback_del(idata->model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
eo_unref(idata->model);
idata->model = NULL;
@ -320,7 +320,7 @@ _efl_model_load_children_then(View_List_ItemData *pdata, Eina_Accessor **accesso
idata->parent = pdata;
idata->model = child;
eo_ref(child);
eo_event_callback_add(child, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
eo_event_callback_add(child, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
idata->item = elm_genlist_item_append(priv->genlist, priv->itc, idata, pdata->item,
priv->itype, _item_sel_cb, idata);
}
@ -456,7 +456,7 @@ _elm_view_list_property_connect(Eo *obj EINA_UNUSED, Elm_View_List_Data *priv,
}
static void
_elm_view_list_model_set(Eo *obj EINA_UNUSED, Elm_View_List_Data *priv, Efl_Model_Base *model)
_elm_view_list_model_set(Eo *obj EINA_UNUSED, Elm_View_List_Data *priv, Efl_Model *model)
{
EINA_SAFETY_ON_NULL_RETURN(priv);
EINA_SAFETY_ON_NULL_RETURN(model);

4
src/lib/elementary/elm_view_list.eo
View File

@ -40,7 +40,7 @@ class Elm.View_List (Eo.Base)
@since 1.11
]]
params {
@in model: Efl.Model.Base *; [[New Emodel to set]]
@in model: Efl.Model *; [[New Emodel to set]]
}
}
model_unset {
@ -55,7 +55,7 @@ class Elm.View_List (Eo.Base)
@since 1.11
]]
params {
@out model: Efl.Model.Base *; [[Returned Emodel]]
@out model: Efl.Model *; [[Returned Emodel]]
}
}
}

4
src/tests/eio/eio_model_test_monitor_add.c
View File

@ -98,8 +98,8 @@ START_TEST(eio_model_test_test_monitor_add)
filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir));
fail_if(!filemodel, "ERROR: Cannot init model!\n");
eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &_children_removed_cb, NULL);
eo_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
eo_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_REMOVED, &_children_removed_cb, NULL);
Eina_Promise* promise;
efl_model_children_slice_get(filemodel, 0, 0, &promise);

18
src/tests/eldbus/eldbus_test_eldbus_model.c
View File

@ -102,8 +102,8 @@ efl_model_wait_for_event(Eo *obj, const Eo_Event_Description* event)
eo_event_callback_del(obj, event, _eo_event_quit_cb, NULL);
}
Efl_Model_Base *
efl_model_nth_child_get(Efl_Model_Base *efl_model, unsigned int n)
Efl_Model *
efl_model_nth_child_get(Efl_Model *efl_model, unsigned int n)
{
Eina_Accessor *accessor;
Eina_Promise *promise;
@ -122,8 +122,8 @@ efl_model_nth_child_get(Efl_Model_Base *efl_model, unsigned int n)
return child;
}
Efl_Model_Base *
efl_model_first_child_get(Efl_Model_Base *efl_model)
Efl_Model *
efl_model_first_child_get(Efl_Model *efl_model)
{
return efl_model_nth_child_get(efl_model, 1);
}
@ -180,7 +180,7 @@ create_object(void)
}
void
check_efl_model_children_count_eq(Efl_Model_Base *efl_model, unsigned int expected_children_count)
check_efl_model_children_count_eq(Efl_Model *efl_model, unsigned int expected_children_count)
{
unsigned int actual_children_count;
Eina_Promise *promise;
@ -190,7 +190,7 @@ check_efl_model_children_count_eq(Efl_Model_Base *efl_model, unsigned int expect
}
void
check_efl_model_children_count_ge(Efl_Model_Base *efl_model, unsigned int minimum_children_count)
check_efl_model_children_count_ge(Efl_Model *efl_model, unsigned int minimum_children_count)
{
unsigned int actual_children_count;
Eina_Promise *promise;
@ -200,7 +200,7 @@ check_efl_model_children_count_ge(Efl_Model_Base *efl_model, unsigned int minimu
}
void
check_efl_model_children_slice_get(Efl_Model_Base *efl_model)
check_efl_model_children_slice_get(Efl_Model *efl_model)
{
unsigned count;
Eina_Promise *promise;
@ -400,7 +400,7 @@ eldbus_model_signal_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *signal
}
void
check_efl_model_property_int_eq(Efl_Model_Base *efl_model, const char *property, int expected_value)
check_efl_model_property_int_eq(Efl_Model *efl_model, const char *property, int expected_value)
{
Eina_Value property_value;
Eina_Promise *promise;
@ -420,7 +420,7 @@ check_efl_model_property_int_eq(Efl_Model_Base *efl_model, const char *property,
}
void
check_efl_model_property_int_set(Efl_Model_Base *efl_model, const char *property, int value)
check_efl_model_property_int_set(Efl_Model *efl_model, const char *property, int value)
{
Eina_Value eina_value, value_ret;
Eina_Promise *promise;

14
src/tests/eldbus/eldbus_test_eldbus_model.h
View File

@ -11,14 +11,14 @@ Eo *create_connection(void);
Eo *create_object(void);
void efl_model_wait_for_event(Eo *obj, const Eo_Event_Description *event);
Efl_Model_Base *efl_model_nth_child_get(Efl_Model_Base *obj, unsigned int n);
Efl_Model_Base *efl_model_first_child_get(Efl_Model_Base *efl_model);
Efl_Model *efl_model_nth_child_get(Efl_Model *obj, unsigned int n);
Efl_Model *efl_model_first_child_get(Efl_Model *efl_model);
void check_efl_model_children_count_eq(Efl_Model_Base *obj, unsigned int expected_children_count);
void check_efl_model_children_count_ge(Efl_Model_Base *obj, unsigned int minimum_children_count);
void check_efl_model_children_slice_get(Efl_Model_Base *efl_model);
void check_efl_model_property_int_eq(Efl_Model_Base *obj, const char *property, int expected_value);
void check_efl_model_property_int_set(Efl_Model_Base *obj, const char *property, int value);
void check_efl_model_children_count_eq(Efl_Model *obj, unsigned int expected_children_count);
void check_efl_model_children_count_ge(Efl_Model *obj, unsigned int minimum_children_count);
void check_efl_model_children_slice_get(Efl_Model *efl_model);
void check_efl_model_property_int_eq(Efl_Model *obj, const char *property, int expected_value);
void check_efl_model_property_int_set(Efl_Model *obj, const char *property, int value);
void check_efl_model_promise_error(Eina_Promise *promise, Eina_Error *err);

2
src/tests/eldbus/eldbus_test_eldbus_model_signal.c
View File

@ -127,7 +127,7 @@ START_TEST(signals)
eldbus_model_method_call(ping_method);
efl_model_wait_for_event(pong_signal, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED);
efl_model_wait_for_event(pong_signal, EFL_MODEL_EVENT_PROPERTIES_CHANGED);
check_efl_model_property_int_eq(pong_signal, ARGUMENT_A, 100);
}

2
src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
View File

@ -85,7 +85,7 @@ _check_property_set(const char *property_name, int expected_property_value, int
efl_model_property_set(fake_server_proxy, property_name, &value, NULL);
eina_value_flush(&value);
efl_model_wait_for_event(fake_server_proxy, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED);
efl_model_wait_for_event(fake_server_proxy, EFL_MODEL_EVENT_PROPERTIES_CHANGED);
ck_assert_int_eq(expected_property_value, *actual_property_value);
}