summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-10 11:36:13 +0100
committerTom Hacohen <tom@stosb.com>2016-05-10 11:36:35 +0100
commit138d4e1353d207b9768be3bdcf7a50f3ff0f1e5a (patch)
tree3d460d12edb5f85f003f0553a392220b1621fff8 /src
parent05c01867b6ea49ee3a6ddac374ab4f2019a1b3fa (diff)
Efl model: Remove the no longer needed .Base hack.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/lib/efl/Efl_Model_Common.h6
-rw-r--r--src/lib/efl/Makefile.am2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_model.eo (renamed from src/lib/efl/interfaces/efl_model_base.eo)2
-rw-r--r--src/lib/efl/interfaces/efl_model_common.c8
-rw-r--r--src/lib/eio/eio_model.c28
-rw-r--r--src/lib/eio/eio_model.eo18
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c16
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.eo16
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c16
-rw-r--r--src/lib/eldbus/eldbus_model_connection.eo16
-rw-r--r--src/lib/eldbus/eldbus_model_object.c14
-rw-r--r--src/lib/eldbus/eldbus_model_object.eo16
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c18
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.eo16
-rw-r--r--src/lib/elementary/elm_view_form.c4
-rw-r--r--src/lib/elementary/elm_view_form.eo2
-rw-r--r--src/lib/elementary/elm_view_list.c8
-rw-r--r--src/lib/elementary/elm_view_list.eo4
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c18
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.h16
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c2
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c2
25 files changed, 128 insertions, 128 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 480ecfa6b7..21a1c002b7 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -21,7 +21,7 @@ efl_eolian_files = \
21 lib/efl/interfaces/efl_gfx_gradient_linear.eo \ 21 lib/efl/interfaces/efl_gfx_gradient_linear.eo \
22 lib/efl/interfaces/efl_gfx_gradient_radial.eo \ 22 lib/efl/interfaces/efl_gfx_gradient_radial.eo \
23 lib/efl/interfaces/efl_gfx_filter.eo \ 23 lib/efl/interfaces/efl_gfx_filter.eo \
24 lib/efl/interfaces/efl_model_base.eo \ 24 lib/efl/interfaces/efl_model.eo \
25 lib/efl/interfaces/efl_animator.eo \ 25 lib/efl/interfaces/efl_animator.eo \
26 lib/efl/interfaces/efl_orientation.eo \ 26 lib/efl/interfaces/efl_orientation.eo \
27 lib/efl/interfaces/efl_flipable.eo \ 27 lib/efl/interfaces/efl_flipable.eo \
diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h
index 60fe2201f4..68de92a0a1 100644
--- a/src/lib/efl/Efl_Model_Common.h
+++ b/src/lib/efl/Efl_Model_Common.h
@@ -37,7 +37,7 @@ struct _Efl_Model_Children_Event
37 */ 37 */
38typedef struct _Efl_Model_Children_Event Efl_Model_Children_Event; 38typedef struct _Efl_Model_Children_Event Efl_Model_Children_Event;
39 39
40#include "interfaces/efl_model_base.eo.h" 40#include "interfaces/efl_model.eo.h"
41 41
42EAPI int efl_model_init(void); 42EAPI int efl_model_init(void);
43 43
@@ -64,7 +64,7 @@ EAPI Eina_Accessor *efl_model_list_slice(Eina_List *list, unsigned start, unsign
64 * 64 *
65 * @since 1.17 65 * @since 1.17
66 */ 66 */
67EAPI void efl_model_property_changed_notify(Efl_Model_Base *model, const char *property); 67EAPI void efl_model_property_changed_notify(Efl_Model *model, const char *property);
68 68
69/** 69/**
70 * @brief Notifies a property invalidated event with an @c EFL_MODEL_EVENT_PROPERTIES_CHANGED 70 * @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
74 * 74 *
75 * @since 1.17 75 * @since 1.17
76 */ 76 */
77EAPI void efl_model_property_invalidated_notify(Efl_Model_Base *model, const char *property); 77EAPI void efl_model_property_invalidated_notify(Efl_Model *model, const char *property);
78 78
79/** 79/**
80 * @brief Callback to setup a member of @c Eina_Value_Struct 80 * @brief Callback to setup a member of @c Eina_Value_Struct
diff --git a/src/lib/efl/Makefile.am b/src/lib/efl/Makefile.am
index 673b789fcb..321152ef46 100644
--- a/src/lib/efl/Makefile.am
+++ b/src/lib/efl/Makefile.am
@@ -25,7 +25,7 @@ interfaces/efl_gfx_gradient_base.eo \
25interfaces/efl_gfx_gradient_linear.eo \ 25interfaces/efl_gfx_gradient_linear.eo \
26interfaces/efl_gfx_gradient_radial.eo \ 26interfaces/efl_gfx_gradient_radial.eo \
27interfaces/efl_gfx_filter.eo \ 27interfaces/efl_gfx_filter.eo \
28interfaces/efl_model_base.eo \ 28interfaces/efl_model.eo \
29interfaces/efl_animator.eo \ 29interfaces/efl_animator.eo \
30interfaces/efl_orientation.eo \ 30interfaces/efl_orientation.eo \
31interfaces/efl_flipable.eo \ 31interfaces/efl_flipable.eo \
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index dbdb4fb2fe..14b665ba89 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -39,7 +39,7 @@ EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
39#include "interfaces/efl_pack_linear.eo.c" 39#include "interfaces/efl_pack_linear.eo.c"
40#include "interfaces/efl_pack_grid.eo.c" 40#include "interfaces/efl_pack_grid.eo.c"
41 41
42#include "interfaces/efl_model_base.eo.c" 42#include "interfaces/efl_model.eo.c"
43#include "interfaces/efl_animator.eo.c" 43#include "interfaces/efl_animator.eo.c"
44#include "interfaces/efl_orientation.eo.c" 44#include "interfaces/efl_orientation.eo.c"
45#include "interfaces/efl_flipable.eo.c" 45#include "interfaces/efl_flipable.eo.c"
diff --git a/src/lib/efl/interfaces/efl_model_base.eo b/src/lib/efl/interfaces/efl_model.eo
index a8a993c43c..a920e15eec 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model.eo
@@ -3,7 +3,7 @@ struct Efl.Model.Property_Event {
3 invalidated_properties: array<const(char) *> *; [[Removed properties identified by name]] 3 invalidated_properties: array<const(char) *> *; [[Removed properties identified by name]]
4} 4}
5 5
6interface Efl.Model.Base () 6interface Efl.Model ()
7{ 7{
8 legacy_prefix: null; 8 legacy_prefix: null;
9 eo_prefix: efl_model; 9 eo_prefix: efl_model;
diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c
index d97e2c7cf6..d25d1ff7a5 100644
--- a/src/lib/efl/interfaces/efl_model_common.c
+++ b/src/lib/efl/interfaces/efl_model_common.c
@@ -85,7 +85,7 @@ efl_model_list_slice(Eina_List *list, unsigned start, unsigned count)
85} 85}
86 86
87EAPI void 87EAPI void
88efl_model_property_changed_notify(Efl_Model_Base *model, const char *property) 88efl_model_property_changed_notify(Efl_Model *model, const char *property)
89{ 89{
90 Eina_Array *changed_properties = eina_array_new(1); 90 Eina_Array *changed_properties = eina_array_new(1);
91 EINA_SAFETY_ON_NULL_RETURN(changed_properties); 91 EINA_SAFETY_ON_NULL_RETURN(changed_properties);
@@ -94,14 +94,14 @@ efl_model_property_changed_notify(Efl_Model_Base *model, const char *property)
94 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); 94 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
95 95
96 Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; 96 Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
97 eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); 97 eo_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
98 98
99on_error: 99on_error:
100 eina_array_free(changed_properties); 100 eina_array_free(changed_properties);
101} 101}
102 102
103EAPI void 103EAPI void
104efl_model_property_invalidated_notify(Efl_Model_Base *model, const char *property) 104efl_model_property_invalidated_notify(Efl_Model *model, const char *property)
105{ 105{
106 Eina_Array *invalidated_properties = eina_array_new(1); 106 Eina_Array *invalidated_properties = eina_array_new(1);
107 EINA_SAFETY_ON_NULL_RETURN(invalidated_properties); 107 EINA_SAFETY_ON_NULL_RETURN(invalidated_properties);
@@ -110,7 +110,7 @@ efl_model_property_invalidated_notify(Efl_Model_Base *model, const char *propert
110 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); 110 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
111 111
112 Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties}; 112 Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties};
113 eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); 113 eo_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
114 114
115on_error: 115on_error:
116 eina_array_free(invalidated_properties); 116 eina_array_free(invalidated_properties);
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index c1e6ee06b6..c5436d9c38 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -98,7 +98,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
98 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]); 98 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
99 evt.changed_properties = properties; 99 evt.changed_properties = properties;
100 100
101 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); 101 eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
102 eina_array_free(properties); 102 eina_array_free(properties);
103} 103}
104 104
@@ -150,7 +150,7 @@ _efl_model_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
150 eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata); 150 eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata);
151 eina_value_flush(&path); 151 eina_value_flush(&path);
152 152
153 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt); 153 eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
154 154
155 return EINA_TRUE; 155 return EINA_TRUE;
156} 156}
@@ -179,7 +179,7 @@ _efl_model_evt_deleted_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, vo
179 cevt.index = i; 179 cevt.index = i;
180 cevt.child = cur->data; 180 cevt.child = cur->data;
181 181
182 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt); 182 eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
183 183
184 priv->children_list = eina_list_remove_list(priv->children_list, cur); 184 priv->children_list = eina_list_remove_list(priv->children_list, cur);
185 eo_unref(cevt.child); 185 eo_unref(cevt.child);
@@ -240,7 +240,7 @@ _eio_error_unlink_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int
240 * Interfaces impl. 240 * Interfaces impl.
241 */ 241 */
242static Eina_Array const * 242static Eina_Array const *
243_eio_model_efl_model_base_properties_get(Eo *obj EINA_UNUSED, Eio_Model_Data *_pd) 243_eio_model_efl_model_properties_get(Eo *obj EINA_UNUSED, Eio_Model_Data *_pd)
244{ 244{
245 Eio_Model_Data *priv = _pd; 245 Eio_Model_Data *priv = _pd;
246 246
@@ -254,7 +254,7 @@ _eio_model_efl_model_base_properties_get(Eo *obj EINA_UNUSED, Eio_Model_Data *_p
254 * Property Get 254 * Property Get
255 */ 255 */
256static void 256static void
257_eio_model_efl_model_base_property_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, const char *property, Eina_Promise_Owner *promise) 257_eio_model_efl_model_property_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, const char *property, Eina_Promise_Owner *promise)
258{ 258{
259 _Eio_Property_Name property_name; 259 _Eio_Property_Name property_name;
260 const char* value = NULL; 260 const char* value = NULL;
@@ -320,7 +320,7 @@ _eio_model_efl_model_base_property_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv
320 * Property Set 320 * Property Set
321 */ 321 */
322static void 322static void
323_eio_model_efl_model_base_property_set(Eo *obj EINA_UNUSED, 323_eio_model_efl_model_property_set(Eo *obj EINA_UNUSED,
324 Eio_Model_Data *priv, 324 Eio_Model_Data *priv,
325 const char * property, 325 const char * property,
326 const Eina_Value *value, 326 const Eina_Value *value,
@@ -361,14 +361,14 @@ _eio_model_efl_model_base_property_set(Eo *obj EINA_UNUSED,
361 * Children Count Get 361 * Children Count Get
362 */ 362 */
363static void 363static void
364_eio_model_efl_model_base_children_count_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eina_Promise_Owner *promise) 364_eio_model_efl_model_children_count_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eina_Promise_Owner *promise)
365{ 365{
366 unsigned int c = eina_list_count(priv->children_list); 366 unsigned int c = eina_list_count(priv->children_list);
367 eina_promise_owner_value_set(promise, &c, NULL); 367 eina_promise_owner_value_set(promise, &c, NULL);
368} 368}
369 369
370static void 370static void
371_eio_model_efl_model_base_monitor_add(Eio_Model_Data *priv) 371_eio_model_efl_model_monitor_add(Eio_Model_Data *priv)
372{ 372{
373 if (!priv->monitor) 373 if (!priv->monitor)
374 { 374 {
@@ -478,13 +478,13 @@ _eio_model_children_filter_set(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eio_Fi
478 * Child Add 478 * Child Add
479 */ 479 */
480static Eo * 480static Eo *
481_eio_model_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eio_Model_Data *priv EINA_UNUSED) 481_eio_model_efl_model_child_add(Eo *obj EINA_UNUSED, Eio_Model_Data *priv EINA_UNUSED)
482{ 482{
483 return eo_add(EIO_MODEL_CLASS, obj); 483 return eo_add(EIO_MODEL_CLASS, obj);
484} 484}
485 485
486static void 486static void
487_eio_model_efl_model_base_child_del_stat(void* data, Eio_File* handler EINA_UNUSED, const Eina_Stat* stat) 487_eio_model_efl_model_child_del_stat(void* data, Eio_File* handler EINA_UNUSED, const Eina_Stat* stat)
488{ 488{
489 Eo* child = data; 489 Eo* child = data;
490 Eio_Model_Data *child_priv = eo_data_scope_get(child, MY_CLASS); 490 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
504 * Child Remove 504 * Child Remove
505 */ 505 */
506static void 506static void
507_eio_model_efl_model_base_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eo *child) 507_eio_model_efl_model_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eo *child)
508{ 508{
509 Eio_Model_Data *child_priv; 509 Eio_Model_Data *child_priv;
510 EINA_SAFETY_ON_NULL_RETURN(child); 510 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
513 EINA_SAFETY_ON_NULL_RETURN(child_priv); 513 EINA_SAFETY_ON_NULL_RETURN(child_priv);
514 514
515 priv->del_file = eio_file_direct_stat(child_priv->path, 515 priv->del_file = eio_file_direct_stat(child_priv->path,
516 &_eio_model_efl_model_base_child_del_stat, 516 &_eio_model_efl_model_child_del_stat,
517 &_eio_error_unlink_cb, 517 &_eio_error_unlink_cb,
518 child); 518 child);
519 eo_ref(child); 519 eo_ref(child);
@@ -523,7 +523,7 @@ _eio_model_efl_model_base_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, E
523 * Children Slice Get 523 * Children Slice Get
524 */ 524 */
525static void 525static void
526_eio_model_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, 526_eio_model_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
527 unsigned start, unsigned count, Eina_Promise_Owner *promise) 527 unsigned start, unsigned count, Eina_Promise_Owner *promise)
528{ 528{
529 /** 529 /**
@@ -540,7 +540,7 @@ _eio_model_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data
540 540
541 priv->children_promises = eina_list_prepend(priv->children_promises, p); 541 priv->children_promises = eina_list_prepend(priv->children_promises, p);
542 542
543 _eio_model_efl_model_base_monitor_add(priv); 543 _eio_model_efl_model_monitor_add(priv);
544 544
545 545
546 if (priv->is_listing == EINA_FALSE) 546 if (priv->is_listing == EINA_FALSE)
diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo
index 407d79f35d..14080a035c 100644
--- a/src/lib/eio/eio_model.eo
+++ b/src/lib/eio/eio_model.eo
@@ -1,6 +1,6 @@
1type @extern Eio_Filter_Direct_Cb: __undefined_type; 1type @extern Eio_Filter_Direct_Cb: __undefined_type;
2 2
3class Eio.Model (Eo.Base, Efl.Model.Base) 3class Eio.Model (Eo.Base, Efl.Model)
4{ 4{
5 [[Eio model class]] 5 [[Eio model class]]
6 6
@@ -15,7 +15,7 @@ class Eio.Model (Eo.Base, Efl.Model.Base)
15 by returning either EINA_FALSE, to abort the notification or 15 by returning either EINA_FALSE, to abort the notification or
16 EINA_TRUE to keep it. 16 EINA_TRUE to keep it.
17 17
18 See also @Efl.Model.Base.children_slice_get. 18 See also @Efl.Model.children_slice_get.
19 19
20 @since 1.11 20 @since 1.11
21 ]] 21 ]]
@@ -37,12 +37,12 @@ class Eio.Model (Eo.Base, Efl.Model.Base)
37 implements { 37 implements {
38 Eo.Base.constructor; 38 Eo.Base.constructor;
39 Eo.Base.destructor; 39 Eo.Base.destructor;
40 Efl.Model.Base.properties.get; 40 Efl.Model.properties.get;
41 Efl.Model.Base.property_set; 41 Efl.Model.property_set;
42 Efl.Model.Base.property_get; 42 Efl.Model.property_get;
43 Efl.Model.Base.child_add; 43 Efl.Model.child_add;
44 Efl.Model.Base.child_del; 44 Efl.Model.child_del;
45 Efl.Model.Base.children_slice_get; 45 Efl.Model.children_slice_get;
46 Efl.Model.Base.children_count_get; 46 Efl.Model.children_count_get;
47 } 47 }
48} 48}
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 6831f5b0cf..645125486f 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -71,7 +71,7 @@ _eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data
71} 71}
72 72
73static Eina_Array const * 73static Eina_Array const *
74_eldbus_model_arguments_efl_model_base_properties_get(Eo *obj EINA_UNUSED, 74_eldbus_model_arguments_efl_model_properties_get(Eo *obj EINA_UNUSED,
75 Eldbus_Model_Arguments_Data *pd) 75 Eldbus_Model_Arguments_Data *pd)
76{ 76{
77 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL); 77 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@@ -114,7 +114,7 @@ _eldbus_model_arguments_properties_load(Eldbus_Model_Arguments_Data *pd)
114} 114}
115 115
116static void 116static void
117_eldbus_model_arguments_efl_model_base_property_set(Eo *obj EINA_UNUSED, 117_eldbus_model_arguments_efl_model_property_set(Eo *obj EINA_UNUSED,
118 Eldbus_Model_Arguments_Data *pd, 118 Eldbus_Model_Arguments_Data *pd,
119 const char *property, 119 const char *property,
120 Eina_Value const* value, 120 Eina_Value const* value,
@@ -140,7 +140,7 @@ _eldbus_model_arguments_efl_model_base_property_set(Eo *obj EINA_UNUSED,
140} 140}
141 141
142static void 142static void
143_eldbus_model_arguments_efl_model_base_property_get(Eo *obj EINA_UNUSED, 143_eldbus_model_arguments_efl_model_property_get(Eo *obj EINA_UNUSED,
144 Eldbus_Model_Arguments_Data *pd, 144 Eldbus_Model_Arguments_Data *pd,
145 const char *property, 145 const char *property,
146 Eina_Promise_Owner *promise) 146 Eina_Promise_Owner *promise)
@@ -163,20 +163,20 @@ _eldbus_model_arguments_efl_model_base_property_get(Eo *obj EINA_UNUSED,
163} 163}
164 164
165static Eo * 165static Eo *
166_eldbus_model_arguments_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd EINA_UNUSED) 166_eldbus_model_arguments_efl_model_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd EINA_UNUSED)
167{ 167{
168 return NULL; 168 return NULL;
169} 169}
170 170
171static void 171static void
172_eldbus_model_arguments_efl_model_base_child_del(Eo *obj EINA_UNUSED, 172_eldbus_model_arguments_efl_model_child_del(Eo *obj EINA_UNUSED,
173 Eldbus_Model_Arguments_Data *pd EINA_UNUSED, 173 Eldbus_Model_Arguments_Data *pd EINA_UNUSED,
174 Eo *child EINA_UNUSED) 174 Eo *child EINA_UNUSED)
175{ 175{
176} 176}
177 177
178static void 178static void
179_eldbus_model_arguments_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, 179_eldbus_model_arguments_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
180 Eldbus_Model_Arguments_Data *pd EINA_UNUSED, 180 Eldbus_Model_Arguments_Data *pd EINA_UNUSED,
181 unsigned start EINA_UNUSED, 181 unsigned start EINA_UNUSED,
182 unsigned count EINA_UNUSED, 182 unsigned count EINA_UNUSED,
@@ -186,7 +186,7 @@ _eldbus_model_arguments_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
186} 186}
187 187
188static void 188static void
189_eldbus_model_arguments_efl_model_base_children_count_get(Eo *obj EINA_UNUSED, 189_eldbus_model_arguments_efl_model_children_count_get(Eo *obj EINA_UNUSED,
190 Eldbus_Model_Arguments_Data *pd EINA_UNUSED, 190 Eldbus_Model_Arguments_Data *pd EINA_UNUSED,
191 Eina_Promise_Owner *promise) 191 Eina_Promise_Owner *promise)
192{ 192{
@@ -280,7 +280,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd,
280 if (eina_array_count(changed_properties)) 280 if (eina_array_count(changed_properties))
281 { 281 {
282 Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; 282 Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
283 eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); 283 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
284 } 284 }
285 285
286 result = EINA_TRUE; 286 result = EINA_TRUE;
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index e6278439de..1cf2cf0995 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -1,6 +1,6 @@
1import eldbus_types; 1import eldbus_types;
2 2
3class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) { 3class Eldbus.Model_Arguments (Eo.Base, Efl.Model) {
4 [[Eldbus model arguments class]] 4 [[Eldbus model arguments class]]
5 5
6 legacy_prefix: null; 6 legacy_prefix: null;
@@ -26,13 +26,13 @@ class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
26 implements { 26 implements {
27 Eo.Base.constructor; 27 Eo.Base.constructor;
28 Eo.Base.destructor; 28 Eo.Base.destructor;
29 Efl.Model.Base.properties.get; 29 Efl.Model.properties.get;
30 Efl.Model.Base.property_set; 30 Efl.Model.property_set;
31 Efl.Model.Base.property_get; 31 Efl.Model.property_get;
32 Efl.Model.Base.child_add; 32 Efl.Model.child_add;
33 Efl.Model.Base.child_del; 33 Efl.Model.child_del;
34 Efl.Model.Base.children_slice_get; 34 Efl.Model.children_slice_get;
35 Efl.Model.Base.children_count_get; 35 Efl.Model.children_count_get;
36 } 36 }
37 constructors { 37 constructors {
38 .constructor; 38 .constructor;
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index 07da95d59a..591bc373f8 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -59,7 +59,7 @@ _eldbus_model_connection_eo_base_destructor(Eo *obj, Eldbus_Model_Connection_Dat
59} 59}
60 60
61static Eina_Array const * 61static Eina_Array const *
62_eldbus_model_connection_efl_model_base_properties_get(Eo *obj EINA_UNUSED, 62_eldbus_model_connection_efl_model_properties_get(Eo *obj EINA_UNUSED,
63 Eldbus_Model_Connection_Data *pd) 63 Eldbus_Model_Connection_Data *pd)
64{ 64{
65 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL); 65 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@@ -81,7 +81,7 @@ _eldbus_model_connection_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
81 81
82 82
83static void 83static void
84_eldbus_model_connection_efl_model_base_property_set(Eo *obj EINA_UNUSED, 84_eldbus_model_connection_efl_model_property_set(Eo *obj EINA_UNUSED,
85 Eldbus_Model_Connection_Data *pd EINA_UNUSED, 85 Eldbus_Model_Connection_Data *pd EINA_UNUSED,
86 const char *property, 86 const char *property,
87 Eina_Value const* value EINA_UNUSED, 87 Eina_Value const* value EINA_UNUSED,
@@ -92,7 +92,7 @@ _eldbus_model_connection_efl_model_base_property_set(Eo *obj EINA_UNUSED,
92} 92}
93 93
94static void 94static void
95_eldbus_model_connection_efl_model_base_property_get(Eo *obj EINA_UNUSED, 95_eldbus_model_connection_efl_model_property_get(Eo *obj EINA_UNUSED,
96 Eldbus_Model_Connection_Data *pd, 96 Eldbus_Model_Connection_Data *pd,
97 const char *property, 97 const char *property,
98 Eina_Promise_Owner *promise) 98 Eina_Promise_Owner *promise)
@@ -121,20 +121,20 @@ _eldbus_model_connection_efl_model_base_property_get(Eo *obj EINA_UNUSED,
121} 121}
122 122
123static Eo * 123static Eo *
124_eldbus_model_connection_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Connection_Data *pd EINA_UNUSED) 124_eldbus_model_connection_efl_model_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Connection_Data *pd EINA_UNUSED)
125{ 125{
126 return NULL; 126 return NULL;
127} 127}
128 128
129static void 129static void
130_eldbus_model_connection_efl_model_base_child_del(Eo *obj EINA_UNUSED, 130_eldbus_model_connection_efl_model_child_del(Eo *obj EINA_UNUSED,
131 Eldbus_Model_Connection_Data *pd EINA_UNUSED, 131 Eldbus_Model_Connection_Data *pd EINA_UNUSED,
132 Eo *child EINA_UNUSED) 132 Eo *child EINA_UNUSED)
133{ 133{
134} 134}
135 135
136static void 136static void
137_eldbus_model_connection_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, 137_eldbus_model_connection_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
138 Eldbus_Model_Connection_Data *pd, 138 Eldbus_Model_Connection_Data *pd,
139 unsigned start, 139 unsigned start,
140 unsigned count, 140 unsigned count,
@@ -169,7 +169,7 @@ _eldbus_model_connection_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
169} 169}
170 170
171static void 171static void
172_eldbus_model_connection_efl_model_base_children_count_get(Eo *obj EINA_UNUSED, 172_eldbus_model_connection_efl_model_children_count_get(Eo *obj EINA_UNUSED,
173 Eldbus_Model_Connection_Data *pd, 173 Eldbus_Model_Connection_Data *pd,
174 Eina_Promise_Owner *promise) 174 Eina_Promise_Owner *promise)
175{ 175{
@@ -331,7 +331,7 @@ _eldbus_model_connection_names_list_cb(void *data,
331 count = eina_list_count(pd->children_list); 331 count = eina_list_count(pd->children_list);
332 332
333 if (count) 333 if (count)
334 eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count); 334 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
335 335
336 pd->is_listed = EINA_TRUE; 336 pd->is_listed = EINA_TRUE;
337 337
diff --git a/src/lib/eldbus/eldbus_model_connection.eo b/src/lib/eldbus/eldbus_model_connection.eo
index 3d797cb385..e5b8175e19 100644
--- a/src/lib/eldbus/eldbus_model_connection.eo
+++ b/src/lib/eldbus/eldbus_model_connection.eo
@@ -1,4 +1,4 @@
1class Eldbus.Model_Connection (Eo.Base, Efl.Model.Base) { 1class Eldbus.Model_Connection (Eo.Base, Efl.Model) {
2 [[Eldbus model connection class]] 2 [[Eldbus model connection class]]
3 3
4 legacy_prefix: null; 4 legacy_prefix: null;
@@ -35,13 +35,13 @@ class Eldbus.Model_Connection (Eo.Base, Efl.Model.Base) {
35 implements { 35 implements {
36 Eo.Base.constructor; 36 Eo.Base.constructor;
37 Eo.Base.destructor; 37 Eo.Base.destructor;
38 Efl.Model.Base.properties.get; 38 Efl.Model.properties.get;
39 Efl.Model.Base.property_set; 39 Efl.Model.property_set;
40 Efl.Model.Base.property_get; 40 Efl.Model.property_get;
41 Efl.Model.Base.child_add; 41 Efl.Model.child_add;
42 Efl.Model.Base.child_del; 42 Efl.Model.child_del;
43 Efl.Model.Base.children_slice_get; 43 Efl.Model.children_slice_get;
44 Efl.Model.Base.children_count_get; 44 Efl.Model.children_count_get;
45 } 45 }
46 constructors { 46 constructors {
47 .constructor; 47 .constructor;
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index c27d74e5c4..9efc270779 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -100,7 +100,7 @@ _eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
100} 100}
101 101
102static Eina_Array const * 102static Eina_Array const *
103_eldbus_model_object_efl_model_base_properties_get(Eo *obj EINA_UNUSED, 103_eldbus_model_object_efl_model_properties_get(Eo *obj EINA_UNUSED,
104 Eldbus_Model_Object_Data *pd) 104 Eldbus_Model_Object_Data *pd)
105{ 105{
106 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL); 106 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@@ -121,7 +121,7 @@ _eldbus_model_object_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
121} 121}
122 122
123static void 123static void
124_eldbus_model_object_efl_model_base_property_set(Eo *obj EINA_UNUSED, 124_eldbus_model_object_efl_model_property_set(Eo *obj EINA_UNUSED,
125 Eldbus_Model_Object_Data *pd EINA_UNUSED, 125 Eldbus_Model_Object_Data *pd EINA_UNUSED,
126 const char *property, 126 const char *property,
127 const Eina_Value *value EINA_UNUSED, 127 const Eina_Value *value EINA_UNUSED,
@@ -132,7 +132,7 @@ _eldbus_model_object_efl_model_base_property_set(Eo *obj EINA_UNUSED,
132} 132}
133 133
134static void 134static void
135_eldbus_model_object_efl_model_base_property_get(Eo *obj EINA_UNUSED, 135_eldbus_model_object_efl_model_property_get(Eo *obj EINA_UNUSED,
136 Eldbus_Model_Object_Data *pd, 136 Eldbus_Model_Object_Data *pd,
137 const char *property, 137 const char *property,
138 Eina_Promise_Owner *promise) 138 Eina_Promise_Owner *promise)
@@ -163,20 +163,20 @@ _eldbus_model_object_efl_model_base_property_get(Eo *obj EINA_UNUSED,
163} 163}
164 164
165static Eo * 165static Eo *
166_eldbus_model_object_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Object_Data *pd EINA_UNUSED) 166_eldbus_model_object_efl_model_child_add(Eo *obj EINA_UNUSED, Eldbus_Model_Object_Data *pd EINA_UNUSED)
167{ 167{
168 return NULL; 168 return NULL;
169} 169}
170 170
171static void 171static void
172_eldbus_model_object_efl_model_base_child_del(Eo *obj EINA_UNUSED, 172_eldbus_model_object_efl_model_child_del(Eo *obj EINA_UNUSED,
173 Eldbus_Model_Object_Data *pd EINA_UNUSED, 173 Eldbus_Model_Object_Data *pd EINA_UNUSED,
174 Eo *child EINA_UNUSED) 174 Eo *child EINA_UNUSED)
175{ 175{
176} 176}
177 177
178static void 178static void
179_eldbus_model_object_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, 179_eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
180 Eldbus_Model_Object_Data *pd, 180 Eldbus_Model_Object_Data *pd,
181 unsigned start, 181 unsigned start,
182 unsigned count, 182 unsigned count,
@@ -206,7 +206,7 @@ _eldbus_model_object_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
206} 206}
207 207
208static void 208static void
209_eldbus_model_object_efl_model_base_children_count_get(Eo *obj EINA_UNUSED, 209_eldbus_model_object_efl_model_children_count_get(Eo *obj EINA_UNUSED,
210 Eldbus_Model_Object_Data *pd, 210 Eldbus_Model_Object_Data *pd,
211 Eina_Promise_Owner *promise) 211 Eina_Promise_Owner *promise)
212{ 212{
diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo
index b3a8b73651..c0aafceb81 100644
--- a/src/lib/eldbus/eldbus_model_object.eo
+++ b/src/lib/eldbus/eldbus_model_object.eo
@@ -1,6 +1,6 @@
1import eldbus_types; 1import eldbus_types;
2 2
3class Eldbus.Model_Object (Eo.Base, Efl.Model.Base) { 3class Eldbus.Model_Object (Eo.Base, Efl.Model) {
4 [[Eldbus model object class]] 4 [[Eldbus model object class]]
5 5
6 legacy_prefix: null; 6 legacy_prefix: null;
@@ -62,13 +62,13 @@ class Eldbus.Model_Object (Eo.Base, Efl.Model.Base) {
62 implements { 62 implements {
63 Eo.Base.constructor; 63 Eo.Base.constructor;
64 Eo.Base.destructor; 64 Eo.Base.destructor;
65 Efl.Model.Base.properties.get; 65 Efl.Model.properties.get;
66 Efl.Model.Base.property_set; 66 Efl.Model.property_set;
67 Efl.Model.Base.property_get; 67 Efl.Model.property_get;
68 Efl.Model.Base.child_add; 68 Efl.Model.child_add;
69 Efl.Model.Base.child_del; 69 Efl.Model.child_del;
70 Efl.Model.Base.children_slice_get; 70 Efl.Model.children_slice_get;
71 Efl.Model.Base.children_count_get; 71 Efl.Model.children_count_get;
72 } 72 }
73 constructors { 73 constructors {
74 .constructor; 74 .constructor;
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 16a9f1345c..41504750a0 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -95,7 +95,7 @@ _eldbus_model_proxy_eo_base_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
95} 95}
96 96
97static Eina_Array const * 97static Eina_Array const *
98_eldbus_model_proxy_efl_model_base_properties_get(Eo *obj EINA_UNUSED, 98_eldbus_model_proxy_efl_model_properties_get(Eo *obj EINA_UNUSED,
99 Eldbus_Model_Proxy_Data *pd) 99 Eldbus_Model_Proxy_Data *pd)
100{ 100{
101 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL); 101 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
@@ -105,7 +105,7 @@ _eldbus_model_proxy_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
105} 105}
106 106
107static void 107static void
108_eldbus_model_proxy_efl_model_base_property_set(Eo *obj EINA_UNUSED, 108_eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
109 Eldbus_Model_Proxy_Data *pd, 109 Eldbus_Model_Proxy_Data *pd,
110 const char *property, 110 const char *property,
111 Eina_Value const* value, 111 Eina_Value const* value,
@@ -158,7 +158,7 @@ _eldbus_model_proxy_efl_model_base_property_set(Eo *obj EINA_UNUSED,
158} 158}
159 159
160static void 160static void
161_eldbus_model_proxy_efl_model_base_property_get(Eo *obj EINA_UNUSED, 161_eldbus_model_proxy_efl_model_property_get(Eo *obj EINA_UNUSED,
162 Eldbus_Model_Proxy_Data *pd, 162 Eldbus_Model_Proxy_Data *pd,
163 const char *property, 163 const char *property,
164 Eina_Promise_Owner *promise) 164 Eina_Promise_Owner *promise)
@@ -203,21 +203,21 @@ _eldbus_model_proxy_efl_model_base_property_get(Eo *obj EINA_UNUSED,
203} 203}
204 204
205static Eo * 205static Eo *
206_eldbus_model_proxy_efl_model_base_child_add(Eo *obj EINA_UNUSED, 206_eldbus_model_proxy_efl_model_child_add(Eo *obj EINA_UNUSED,
207 Eldbus_Model_Proxy_Data *pd EINA_UNUSED) 207 Eldbus_Model_Proxy_Data *pd EINA_UNUSED)
208{ 208{
209 return NULL; 209 return NULL;
210} 210}
211 211
212static void 212static void
213_eldbus_model_proxy_efl_model_base_child_del(Eo *obj EINA_UNUSED, 213_eldbus_model_proxy_efl_model_child_del(Eo *obj EINA_UNUSED,
214 Eldbus_Model_Proxy_Data *pd EINA_UNUSED, 214 Eldbus_Model_Proxy_Data *pd EINA_UNUSED,
215 Eo *child EINA_UNUSED) 215 Eo *child EINA_UNUSED)
216{ 216{
217} 217}
218 218
219static void 219static void
220_eldbus_model_proxy_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, 220_eldbus_model_proxy_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
221 Eldbus_Model_Proxy_Data *pd, 221 Eldbus_Model_Proxy_Data *pd,
222 unsigned start, 222 unsigned start,
223 unsigned count, 223 unsigned count,
@@ -238,7 +238,7 @@ _eldbus_model_proxy_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED,
238} 238}
239 239
240static void 240static void
241_eldbus_model_proxy_efl_model_base_children_count_get(Eo *obj EINA_UNUSED, 241_eldbus_model_proxy_efl_model_children_count_get(Eo *obj EINA_UNUSED,
242 Eldbus_Model_Proxy_Data *pd, 242 Eldbus_Model_Proxy_Data *pd,
243 Eina_Promise_Owner *promise) 243 Eina_Promise_Owner *promise)
244{ 244{
@@ -607,7 +607,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
607 .changed_properties = changed_properties 607 .changed_properties = changed_properties
608 }; 608 };
609 609
610 eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); 610 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
611 } 611 }
612 612
613 eina_array_free(changed_properties); 613 eina_array_free(changed_properties);
@@ -672,7 +672,7 @@ _eldbus_model_proxy_property_set_cb(void *data,
672 .changed_properties = pd->properties_array 672 .changed_properties = pd->properties_array
673 }; 673 };
674 674
675 eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); 675 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
676 efl_model_property_changed_notify(pd->obj, property_set_data->property); 676 efl_model_property_changed_notify(pd->obj, property_set_data->property);
677 677
678 } 678 }
diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index fb0f26c7f8..a65e6be9f6 100644
--- a/src/lib/eldbus/eldbus_model_proxy.eo
+++ b/src/lib/eldbus/eldbus_model_proxy.eo
@@ -1,6 +1,6 @@
1import eldbus_types; 1import eldbus_types;
2 2
3class Eldbus.Model_Proxy (Eo.Base, Efl.Model.Base) { 3class Eldbus.Model_Proxy (Eo.Base, Efl.Model) {
4 [[Eldbus model proxy class]] 4 [[Eldbus model proxy class]]
5 5
6 legacy_prefix: null; 6 legacy_prefix: null;
@@ -25,13 +25,13 @@ class Eldbus.Model_Proxy (Eo.Base, Efl.Model.Base) {
25 implements { 25 implements {
26 Eo.Base.constructor; 26 Eo.Base.constructor;
27 Eo.Base.destructor; 27 Eo.Base.destructor;
28 Efl.Model.Base.properties.get; 28 Efl.Model.properties.get;
29 Efl.Model.Base.property_set; 29 Efl.Model.property_set;
30 Efl.Model.Base.property_get; 30 Efl.Model.property_get;
31 Efl.Model.Base.child_add; 31 Efl.Model.child_add;
32 Efl.Model.Base.child_del; 32 Efl.Model.child_del;
33 Efl.Model.Base.children_slice_get; 33 Efl.Model.children_slice_get;
34 Efl.Model.Base.children_count_get; 34 Efl.Model.children_count_get;
35 } 35 }
36 constructors { 36 constructors {
37 .constructor; 37 .constructor;
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 7310026e79..612165f045 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -287,7 +287,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
287{ 287{
288 if (priv->model_obj != NULL) 288 if (priv->model_obj != NULL)
289 { 289 {
290 eo_event_callback_del(priv->model_obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv); 290 eo_event_callback_del(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
291 eo_unref(priv->model_obj); 291 eo_unref(priv->model_obj);
292 } 292 }
293 293
@@ -296,7 +296,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
296 if (priv->model_obj != NULL) 296 if (priv->model_obj != NULL)
297 { 297 {
298 eo_ref(priv->model_obj); 298 eo_ref(priv->model_obj);
299 eo_event_callback_add(priv->model_obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv); 299 eo_event_callback_add(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
300 _update_model_properties(priv); 300 _update_model_properties(priv);
301 } 301 }
302} 302}
diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo
index f2ebb19e64..d3c37b7859 100644
--- a/src/lib/elementary/elm_view_form.eo
+++ b/src/lib/elementary/elm_view_form.eo
@@ -8,7 +8,7 @@ class Elm.View_Form (Eo.Base)
8 @since 1.11 8 @since 1.11
9 ]] 9 ]]
10 params { 10 params {
11 @in model: Efl.Model.Base*; [[Emodel object]] 11 @in model: Efl.Model*; [[Emodel object]]
12 } 12 }
13 } 13 }
14 widget_add { 14 widget_add {
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index 183c979611..0b2bd8f2c2 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -57,7 +57,7 @@ static Eina_Bool _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event);
57 57
58/* --- Genlist Callbacks --- */ 58/* --- Genlist Callbacks --- */
59EO_CALLBACKS_ARRAY_DEFINE(model_callbacks, 59EO_CALLBACKS_ARRAY_DEFINE(model_callbacks,
60 { EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, _efl_model_children_count_change_cb }); 60 { EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, _efl_model_children_count_change_cb });
61EO_CALLBACKS_ARRAY_DEFINE(genlist_callbacks, 61EO_CALLBACKS_ARRAY_DEFINE(genlist_callbacks,
62 { ELM_GENLIST_EVENT_EXPAND_REQUEST, _expand_request_cb }, 62 { ELM_GENLIST_EVENT_EXPAND_REQUEST, _expand_request_cb },
63 { ELM_GENLIST_EVENT_CONTRACT_REQUEST, _contract_request_cb }, 63 { ELM_GENLIST_EVENT_CONTRACT_REQUEST, _contract_request_cb },
@@ -81,7 +81,7 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
81 return; 81 return;
82 82
83 eo_event_callback_array_del(idata->model, model_callbacks(), idata); 83 eo_event_callback_array_del(idata->model, model_callbacks(), idata);
84 eo_event_callback_del(idata->model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata); 84 eo_event_callback_del(idata->model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
85 85
86 eo_unref(idata->model); 86 eo_unref(idata->model);
87 idata->model = NULL; 87 idata->model = NULL;
@@ -320,7 +320,7 @@ _efl_model_load_children_then(View_List_ItemData *pdata, Eina_Accessor **accesso
320 idata->parent = pdata; 320 idata->parent = pdata;
321 idata->model = child; 321 idata->model = child;
322 eo_ref(child); 322 eo_ref(child);
323 eo_event_callback_add(child, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata); 323 eo_event_callback_add(child, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
324 idata->item = elm_genlist_item_append(priv->genlist, priv->itc, idata, pdata->item, 324 idata->item = elm_genlist_item_append(priv->genlist, priv->itc, idata, pdata->item,
325 priv->itype, _item_sel_cb, idata); 325 priv->itype, _item_sel_cb, idata);
326 } 326 }
@@ -456,7 +456,7 @@ _elm_view_list_property_connect(Eo *obj EINA_UNUSED, Elm_View_List_Data *priv,
456} 456}
457 457
458static void 458static void
459_elm_view_list_model_set(Eo *obj EINA_UNUSED, Elm_View_List_Data *priv, Efl_Model_Base *model) 459_elm_view_list_model_set(Eo *obj EINA_UNUSED, Elm_View_List_Data *priv, Efl_Model *model)
460{ 460{
461 EINA_SAFETY_ON_NULL_RETURN(priv); 461 EINA_SAFETY_ON_NULL_RETURN(priv);
462 EINA_SAFETY_ON_NULL_RETURN(model); 462 EINA_SAFETY_ON_NULL_RETURN(model);
diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo
index d32e479ee6..cbef664176 100644
--- a/src/lib/elementary/elm_view_list.eo
+++ b/src/lib/elementary/elm_view_list.eo
@@ -40,7 +40,7 @@ class Elm.View_List (Eo.Base)
40 @since 1.11 40 @since 1.11
41 ]] 41 ]]
42 params { 42 params {
43 @in model: Efl.Model.Base *; [[New Emodel to set]] 43 @in model: Efl.Model *; [[New Emodel to set]]
44 } 44 }
45 } 45 }
46 model_unset { 46 model_unset {
@@ -55,7 +55,7 @@ class Elm.View_List (Eo.Base)
55 @since 1.11 55 @since 1.11
56 ]] 56 ]]
57 params { 57 params {
58 @out model: Efl.Model.Base *; [[Returned Emodel]] 58 @out model: Efl.Model *; [[Returned Emodel]]
59 } 59 }
60 } 60 }
61 } 61 }
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index f47655eba2..09c0f13254 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -98,8 +98,8 @@ START_TEST(eio_model_test_test_monitor_add)
98 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir)); 98 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir));
99 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 99 fail_if(!filemodel, "ERROR: Cannot init model!\n");
100 100
101 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &_children_added_cb, filemodel); 101 eo_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
102 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &_children_removed_cb, NULL); 102 eo_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_REMOVED, &_children_removed_cb, NULL);
103 103
104 Eina_Promise* promise; 104 Eina_Promise* promise;
105 efl_model_children_slice_get(filemodel, 0, 0, &promise); 105 efl_model_children_slice_get(filemodel, 0, 0, &promise);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index dcd9fe4ac7..361aead2a7 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -102,8 +102,8 @@ efl_model_wait_for_event(Eo *obj, const Eo_Event_Description* event)
102 eo_event_callback_del(obj, event, _eo_event_quit_cb, NULL); 102 eo_event_callback_del(obj, event, _eo_event_quit_cb, NULL);
103} 103}
104 104
105Efl_Model_Base * 105Efl_Model *
106efl_model_nth_child_get(Efl_Model_Base *efl_model, unsigned int n) 106efl_model_nth_child_get(Efl_Model *efl_model, unsigned int n)
107{ 107{
108 Eina_Accessor *accessor; 108 Eina_Accessor *accessor;
109 Eina_Promise *promise; 109 Eina_Promise *promise;
@@ -122,8 +122,8 @@ efl_model_nth_child_get(Efl_Model_Base *efl_model, unsigned int n)
122 return child; 122 return child;
123} 123}
124 124
125Efl_Model_Base * 125Efl_Model *
126efl_model_first_child_get(Efl_Model_Base *efl_model) 126efl_model_first_child_get(Efl_Model *efl_model)
127{ 127{
128 return efl_model_nth_child_get(efl_model, 1); 128 return efl_model_nth_child_get(efl_model, 1);
129} 129}
@@ -180,7 +180,7 @@ create_object(void)
180} 180}
181 181
182void 182void
183check_efl_model_children_count_eq(Efl_Model_Base *efl_model, unsigned int expected_children_count) 183check_efl_model_children_count_eq(Efl_Model *efl_model, unsigned int expected_children_count)
184{ 184{
185 unsigned int actual_children_count; 185 unsigned int actual_children_count;
186 Eina_Promise *promise; 186 Eina_Promise *promise;
@@ -190,7 +190,7 @@ check_efl_model_children_count_eq(Efl_Model_Base *efl_model, unsigned int expect
190} 190}
191 191
192void 192void
193check_efl_model_children_count_ge(Efl_Model_Base *efl_model, unsigned int minimum_children_count) 193check_efl_model_children_count_ge(Efl_Model *efl_model, unsigned int minimum_children_count)
194{ 194{
195 unsigned int actual_children_count; 195 unsigned int actual_children_count;
196 Eina_Promise *promise; 196 Eina_Promise *promise;
@@ -200,7 +200,7 @@ check_efl_model_children_count_ge(Efl_Model_Base *efl_model, unsigned int minimu
200} 200}
201 201
202void 202void
203check_efl_model_children_slice_get(Efl_Model_Base *efl_model) 203check_efl_model_children_slice_get(Efl_Model *efl_model)
204{ 204{
205 unsigned count; 205 unsigned count;
206 Eina_Promise *promise; 206 Eina_Promise *promise;
@@ -400,7 +400,7 @@ eldbus_model_signal_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *signal
400} 400}
401 401
402void 402void
403check_efl_model_property_int_eq(Efl_Model_Base *efl_model, const char *property, int expected_value) 403check_efl_model_property_int_eq(Efl_Model *efl_model, const char *property, int expected_value)
404{ 404{
405 Eina_Value property_value; 405 Eina_Value property_value;
406 Eina_Promise *promise; 406 Eina_Promise *promise;
@@ -420,7 +420,7 @@ check_efl_model_property_int_eq(Efl_Model_Base *efl_model, const char *property,
420} 420}
421 421
422void 422void
423check_efl_model_property_int_set(Efl_Model_Base *efl_model, const char *property, int value) 423check_efl_model_property_int_set(Efl_Model *efl_model, const char *property, int value)
424{ 424{
425 Eina_Value eina_value, value_ret; 425 Eina_Value eina_value, value_ret;
426 Eina_Promise *promise; 426 Eina_Promise *promise;
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.h b/src/tests/eldbus/eldbus_test_eldbus_model.h
index 641073fe4c..53f61fcd3d 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.h
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.h
@@ -11,14 +11,14 @@ Eo *create_connection(void);
11Eo *create_object(void); 11Eo *create_object(void);
12 12
13void efl_model_wait_for_event(Eo *obj, const Eo_Event_Description *event); 13void efl_model_wait_for_event(Eo *obj, const Eo_Event_Description *event);
14Efl_Model_Base *efl_model_nth_child_get(Efl_Model_Base *obj, unsigned int n); 14Efl_Model *efl_model_nth_child_get(Efl_Model *obj, unsigned int n);
15Efl_Model_Base *efl_model_first_child_get(Efl_Model_Base *efl_model); 15Efl_Model *efl_model_first_child_get(Efl_Model *efl_model);
16 16
17void check_efl_model_children_count_eq(Efl_Model_Base *obj, unsigned int expected_children_count); 17void check_efl_model_children_count_eq(Efl_Model *obj, unsigned int expected_children_count);
18void check_efl_model_children_count_ge(Efl_Model_Base *obj, unsigned int minimum_children_count); 18void check_efl_model_children_count_ge(Efl_Model *obj, unsigned int minimum_children_count);
19void check_efl_model_children_slice_get(Efl_Model_Base *efl_model); 19void check_efl_model_children_slice_get(Efl_Model *efl_model);
20void check_efl_model_property_int_eq(Efl_Model_Base *obj, const char *property, int expected_value); 20void check_efl_model_property_int_eq(Efl_Model *obj, const char *property, int expected_value);
21void check_efl_model_property_int_set(Efl_Model_Base *obj, const char *property, int value); 21void check_efl_model_property_int_set(Efl_Model *obj, const char *property, int value);
22void check_efl_model_promise_error(Eina_Promise *promise, Eina_Error *err); 22void check_efl_model_promise_error(Eina_Promise *promise, Eina_Error *err);
23 23
24 24
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index e90404dc56..42bcdf38be 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -127,7 +127,7 @@ START_TEST(signals)
127 127
128 eldbus_model_method_call(ping_method); 128 eldbus_model_method_call(ping_method);
129 129
130 efl_model_wait_for_event(pong_signal, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED); 130 efl_model_wait_for_event(pong_signal, EFL_MODEL_EVENT_PROPERTIES_CHANGED);
131 131
132 check_efl_model_property_int_eq(pong_signal, ARGUMENT_A, 100); 132 check_efl_model_property_int_eq(pong_signal, ARGUMENT_A, 100);
133} 133}
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index 99a11955df..8b5e87e419 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -85,7 +85,7 @@ _check_property_set(const char *property_name, int expected_property_value, int
85 efl_model_property_set(fake_server_proxy, property_name, &value, NULL); 85 efl_model_property_set(fake_server_proxy, property_name, &value, NULL);
86 eina_value_flush(&value); 86 eina_value_flush(&value);
87 87
88 efl_model_wait_for_event(fake_server_proxy, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED); 88 efl_model_wait_for_event(fake_server_proxy, EFL_MODEL_EVENT_PROPERTIES_CHANGED);
89 89
90 ck_assert_int_eq(expected_property_value, *actual_property_value); 90 ck_assert_int_eq(expected_property_value, *actual_property_value);
91} 91}