summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/lib/eldbus
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/lib/eldbus')
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c12
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c12
-rw-r--r--src/lib/eldbus/eldbus_model_connection.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_method.c8
-rw-r--r--src/lib/eldbus/eldbus_model_method.eo2
-rw-r--r--src/lib/eldbus/eldbus_model_object.c10
-rw-r--r--src/lib/eldbus/eldbus_model_object.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c14
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_signal.c10
-rw-r--r--src/lib/eldbus/eldbus_model_signal.eo4
12 files changed, 48 insertions, 48 deletions
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index fd6cb7c539..69c0c00c15 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -27,10 +27,10 @@ _eldbus_model_arguments_hash_free(Eina_Value *value)
27 eina_value_free(value); 27 eina_value_free(value);
28} 28}
29 29
30static Eo_Base* 30static Efl_Object*
31_eldbus_model_arguments_eo_base_constructor(Eo *obj, Eldbus_Model_Arguments_Data *pd) 31_eldbus_model_arguments_efl_object_constructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
32{ 32{
33 obj = eo_constructor(eo_super(obj, MY_CLASS)); 33 obj = efl_constructor(eo_super(obj, MY_CLASS));
34 34
35 pd->obj = obj; 35 pd->obj = obj;
36 pd->properties_array = NULL; 36 pd->properties_array = NULL;
@@ -58,7 +58,7 @@ _eldbus_model_arguments_constructor(Eo *obj EINA_UNUSED,
58} 58}
59 59
60static void 60static void
61_eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data *pd) 61_eldbus_model_arguments_efl_object_destructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
62{ 62{
63 _eldbus_model_arguments_unload(pd); 63 _eldbus_model_arguments_unload(pd);
64 64
@@ -67,7 +67,7 @@ _eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data
67 eina_stringshare_del(pd->name); 67 eina_stringshare_del(pd->name);
68 eldbus_proxy_unref(pd->proxy); 68 eldbus_proxy_unref(pd->proxy);
69 69
70 eo_destructor(eo_super(obj, MY_CLASS)); 70 efl_destructor(eo_super(obj, MY_CLASS));
71} 71}
72 72
73static Eina_Array const * 73static Eina_Array const *
@@ -290,7 +290,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd,
290 if (eina_array_count(changed_properties)) 290 if (eina_array_count(changed_properties))
291 { 291 {
292 Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; 292 Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
293 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 293 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
294 } 294 }
295 295
296 result = EINA_TRUE; 296 result = EINA_TRUE;
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 3849fbf7b3..834580a30c 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) { 3class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
4 [[Eldbus model arguments class]] 4 [[Eldbus model arguments class]]
5 5
6 methods { 6 methods {
@@ -23,8 +23,8 @@ class Eldbus.Model.Arguments (Eo.Base, Efl.Model) {
23 } 23 }
24 } 24 }
25 implements { 25 implements {
26 Eo.Base.constructor; 26 Efl.Object.constructor;
27 Eo.Base.destructor; 27 Efl.Object.destructor;
28 Efl.Model.properties.get; 28 Efl.Model.properties.get;
29 Efl.Model.property_set; 29 Efl.Model.property_set;
30 Efl.Model.property_get; 30 Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index d0ba9394a7..ab3df81544 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -17,10 +17,10 @@ static void _eldbus_model_connection_connect(Eldbus_Model_Connection_Data *);
17static void _eldbus_model_connection_disconnect(Eldbus_Model_Connection_Data *); 17static void _eldbus_model_connection_disconnect(Eldbus_Model_Connection_Data *);
18static void _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *); 18static void _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *);
19 19
20static Eo_Base* 20static Efl_Object*
21_eldbus_model_connection_eo_base_constructor(Eo *obj, Eldbus_Model_Connection_Data *pd) 21_eldbus_model_connection_efl_object_constructor(Eo *obj, Eldbus_Model_Connection_Data *pd)
22{ 22{
23 obj = eo_constructor(eo_super(obj, MY_CLASS)); 23 obj = efl_constructor(eo_super(obj, MY_CLASS));
24 24
25 pd->obj = obj; 25 pd->obj = obj;
26 pd->is_listed = EINA_FALSE; 26 pd->is_listed = EINA_FALSE;
@@ -49,13 +49,13 @@ _eldbus_model_connection_constructor(Eo *obj EINA_UNUSED,
49} 49}
50 50
51static void 51static void
52_eldbus_model_connection_eo_base_destructor(Eo *obj, Eldbus_Model_Connection_Data *pd) 52_eldbus_model_connection_efl_object_destructor(Eo *obj, Eldbus_Model_Connection_Data *pd)
53{ 53{
54 eina_stringshare_del(pd->address); 54 eina_stringshare_del(pd->address);
55 55
56 _eldbus_model_connection_clear(pd); 56 _eldbus_model_connection_clear(pd);
57 57
58 eo_destructor(eo_super(obj, MY_CLASS)); 58 efl_destructor(eo_super(obj, MY_CLASS));
59} 59}
60 60
61static Eina_Array const * 61static Eina_Array const *
@@ -341,7 +341,7 @@ _eldbus_model_connection_names_list_cb(void *data,
341 count = eina_list_count(pd->children_list); 341 count = eina_list_count(pd->children_list);
342 342
343 if (count) 343 if (count)
344 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count); 344 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
345 345
346 pd->is_listed = EINA_TRUE; 346 pd->is_listed = EINA_TRUE;
347 347
diff --git a/src/lib/eldbus/eldbus_model_connection.eo b/src/lib/eldbus/eldbus_model_connection.eo
index 7aafd1d5e1..8a0a392f3b 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) { 1class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
2 [[Eldbus model connection class]] 2 [[Eldbus model connection class]]
3 3
4 methods { 4 methods {
@@ -32,8 +32,8 @@ class Eldbus.Model.Connection (Eo.Base, Efl.Model) {
32 } 32 }
33 } 33 }
34 implements { 34 implements {
35 Eo.Base.constructor; 35 Efl.Object.constructor;
36 Eo.Base.destructor; 36 Efl.Object.destructor;
37 Efl.Model.properties.get; 37 Efl.Model.properties.get;
38 Efl.Model.property_set; 38 Efl.Model.property_set;
39 Efl.Model.property_get; 39 Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index 76292ecdad..18ba147a62 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -16,10 +16,10 @@
16 16
17static void _eldbus_model_method_call_cb(void *, const Eldbus_Message *, Eldbus_Pending *); 17static void _eldbus_model_method_call_cb(void *, const Eldbus_Message *, Eldbus_Pending *);
18 18
19static Eo_Base* 19static Efl_Object*
20_eldbus_model_method_eo_base_constructor(Eo *obj, Eldbus_Model_Method_Data *pd) 20_eldbus_model_method_efl_object_constructor(Eo *obj, Eldbus_Model_Method_Data *pd)
21{ 21{
22 obj = eo_constructor(eo_super(obj, MY_CLASS)); 22 obj = efl_constructor(eo_super(obj, MY_CLASS));
23 23
24 pd->obj = obj; 24 pd->obj = obj;
25 pd->method = NULL; 25 pd->method = NULL;
@@ -95,7 +95,7 @@ _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendi
95 Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); 95 Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
96 96
97 if (eldbus_model_arguments_process_arguments(args_data, msg, pending)) 97 if (eldbus_model_arguments_process_arguments(args_data, msg, pending))
98 eo_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL); 98 efl_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
99} 99}
100 100
101#include "eldbus_model_method.eo.c" 101#include "eldbus_model_method.eo.c"
diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index f7c13d03a0..f26bdf953b 100644
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -23,7 +23,7 @@ class Eldbus.Model.Method (Eldbus.Model.Arguments) {
23 } 23 }
24 } 24 }
25 implements { 25 implements {
26 Eo.Base.constructor; 26 Efl.Object.constructor;
27 } 27 }
28 constructors { 28 constructors {
29 .constructor; 29 .constructor;
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index ba6530b15f..e45ae5d6c0 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -22,10 +22,10 @@ static void _eldbus_model_object_introspect_nodes(Eldbus_Model_Object_Data *, co
22static char *_eldbus_model_object_concatenate_path(const char *, const char *); 22static char *_eldbus_model_object_concatenate_path(const char *, const char *);
23static void _eldbus_model_object_create_children(Eldbus_Model_Object_Data *, Eldbus_Object *, Eina_List *); 23static void _eldbus_model_object_create_children(Eldbus_Model_Object_Data *, Eldbus_Object *, Eina_List *);
24 24
25static Eo_Base* 25static Efl_Object*
26_eldbus_model_object_eo_base_constructor(Eo *obj, Eldbus_Model_Object_Data *pd) 26_eldbus_model_object_efl_object_constructor(Eo *obj, Eldbus_Model_Object_Data *pd)
27{ 27{
28 obj = eo_constructor(eo_super(obj, MY_CLASS)); 28 obj = efl_constructor(eo_super(obj, MY_CLASS));
29 29
30 pd->obj = obj; 30 pd->obj = obj;
31 pd->is_listed = EINA_FALSE; 31 pd->is_listed = EINA_FALSE;
@@ -81,7 +81,7 @@ _eldbus_model_object_connection_constructor(Eo *obj EINA_UNUSED,
81} 81}
82 82
83static void 83static void
84_eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd) 84_eldbus_model_object_efl_object_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
85{ 85{
86 eina_stringshare_del(pd->address); 86 eina_stringshare_del(pd->address);
87 eina_stringshare_del(pd->bus); 87 eina_stringshare_del(pd->bus);
@@ -89,7 +89,7 @@ _eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
89 89
90 _eldbus_model_object_clear(pd); 90 _eldbus_model_object_clear(pd);
91 91
92 eo_destructor(eo_super(obj, MY_CLASS)); 92 efl_destructor(eo_super(obj, MY_CLASS));
93} 93}
94 94
95static Eina_Array const * 95static Eina_Array const *
diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo
index 18529fbab5..f02e8bbef7 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) { 3class Eldbus.Model.Object (Efl.Object, Efl.Model) {
4 [[Eldbus model object class]] 4 [[Eldbus model object class]]
5 5
6 data: Eldbus_Model_Object_Data; 6 data: Eldbus_Model_Object_Data;
@@ -59,8 +59,8 @@ class Eldbus.Model.Object (Eo.Base, Efl.Model) {
59 } 59 }
60 } 60 }
61 implements { 61 implements {
62 Eo.Base.constructor; 62 Efl.Object.constructor;
63 Eo.Base.destructor; 63 Efl.Object.destructor;
64 Efl.Model.properties.get; 64 Efl.Model.properties.get;
65 Efl.Model.property_set; 65 Efl.Model.property_set;
66 Efl.Model.property_get; 66 Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 430ccb2282..24ab831b99 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -46,10 +46,10 @@ _eldbus_model_proxy_hash_free(Eina_Value *value)
46 eina_value_free(value); 46 eina_value_free(value);
47} 47}
48 48
49static Eo_Base* 49static Efl_Object*
50_eldbus_model_proxy_eo_base_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd) 50_eldbus_model_proxy_efl_object_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
51{ 51{
52 obj = eo_constructor(eo_super(obj, MY_CLASS)); 52 obj = efl_constructor(eo_super(obj, MY_CLASS));
53 53
54 pd->obj = obj; 54 pd->obj = obj;
55 pd->object = NULL; 55 pd->object = NULL;
@@ -82,7 +82,7 @@ _eldbus_model_proxy_constructor(Eo *obj EINA_UNUSED,
82} 82}
83 83
84static void 84static void
85_eldbus_model_proxy_eo_base_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd) 85_eldbus_model_proxy_efl_object_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
86{ 86{
87 _eldbus_model_proxy_unload(pd); 87 _eldbus_model_proxy_unload(pd);
88 88
@@ -91,7 +91,7 @@ _eldbus_model_proxy_eo_base_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
91 eina_stringshare_del(pd->name); 91 eina_stringshare_del(pd->name);
92 eldbus_object_unref(pd->object); 92 eldbus_object_unref(pd->object);
93 93
94 eo_destructor(eo_super(obj, MY_CLASS)); 94 efl_destructor(eo_super(obj, MY_CLASS));
95} 95}
96 96
97static Eina_Array const * 97static Eina_Array const *
@@ -620,7 +620,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
620 .changed_properties = changed_properties 620 .changed_properties = changed_properties
621 }; 621 };
622 622
623 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 623 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
624 } 624 }
625 625
626 eina_array_free(changed_properties); 626 eina_array_free(changed_properties);
@@ -686,7 +686,7 @@ _eldbus_model_proxy_property_set_cb(void *data,
686 .changed_properties = pd->properties_array 686 .changed_properties = pd->properties_array
687 }; 687 };
688 688
689 eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 689 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
690 efl_model_property_changed_notify(pd->obj, property_set_data->property); 690 efl_model_property_changed_notify(pd->obj, property_set_data->property);
691 691
692 } 692 }
diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index 7b9363069e..3ee8f0bc1f 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) { 3class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
4 [[Eldbus model proxy class]] 4 [[Eldbus model proxy class]]
5 5
6 methods { 6 methods {
@@ -22,8 +22,8 @@ class Eldbus.Model.Proxy (Eo.Base, Efl.Model) {
22 } 22 }
23 } 23 }
24 implements { 24 implements {
25 Eo.Base.constructor; 25 Efl.Object.constructor;
26 Eo.Base.destructor; 26 Efl.Object.destructor;
27 Efl.Model.properties.get; 27 Efl.Model.properties.get;
28 Efl.Model.property_set; 28 Efl.Model.property_set;
29 Efl.Model.property_get; 29 Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index 24a69f8c5e..251d6266a8 100644
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -16,10 +16,10 @@ static void _eldbus_model_signal_handler_cb(void *, const Eldbus_Message *);
16static void _eldbus_model_signal_callback_add(Eldbus_Model_Signal_Data *); 16static void _eldbus_model_signal_callback_add(Eldbus_Model_Signal_Data *);
17static void _eldbus_model_signal_callback_del(Eldbus_Model_Signal_Data *); 17static void _eldbus_model_signal_callback_del(Eldbus_Model_Signal_Data *);
18 18
19static Eo_Base* 19static Efl_Object*
20_eldbus_model_signal_eo_base_constructor(Eo *obj, Eldbus_Model_Signal_Data *pd) 20_eldbus_model_signal_efl_object_constructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
21{ 21{
22 eo_constructor(eo_super(obj, MY_CLASS)); 22 efl_constructor(eo_super(obj, MY_CLASS));
23 23
24 pd->obj = obj; 24 pd->obj = obj;
25 pd->handler = NULL; 25 pd->handler = NULL;
@@ -43,11 +43,11 @@ _eldbus_model_signal_constructor(Eo *obj EINA_UNUSED,
43} 43}
44 44
45static void 45static void
46_eldbus_model_signal_eo_base_destructor(Eo *obj, Eldbus_Model_Signal_Data *pd) 46_eldbus_model_signal_efl_object_destructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
47{ 47{
48 _eldbus_model_signal_callback_del(pd); 48 _eldbus_model_signal_callback_del(pd);
49 49
50 eo_destructor(eo_super(obj, MY_CLASS)); 50 efl_destructor(eo_super(obj, MY_CLASS));
51} 51}
52 52
53 53
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 096934b85b..fda4fd8e3b 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -13,8 +13,8 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
13 } 13 }
14 } 14 }
15 implements { 15 implements {
16 Eo.Base.constructor; 16 Efl.Object.constructor;
17 Eo.Base.destructor; 17 Efl.Object.destructor;
18 } 18 }
19 constructors { 19 constructors {
20 .constructor; 20 .constructor;