summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
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/lib/eldbus
parent05c01867b6ea49ee3a6ddac374ab4f2019a1b3fa (diff)
Efl model: Remove the no longer needed .Base hack.
Diffstat (limited to 'src/lib/eldbus')
-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
8 files changed, 64 insertions, 64 deletions
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;