summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/eldbus
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/eldbus')
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c4
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c8
-rw-r--r--src/lib/eldbus/eldbus_model_method.c8
-rw-r--r--src/lib/eldbus/eldbus_model_object.c8
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c10
-rw-r--r--src/lib/eldbus/eldbus_model_signal.c10
6 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 69c0c00c15..f9f7f51c47 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -30,7 +30,7 @@ _eldbus_model_arguments_hash_free(Eina_Value *value)
30static Efl_Object* 30static Efl_Object*
31_eldbus_model_arguments_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 33 obj = efl_constructor(efl_super(obj, MY_CLASS));
34 34
35 pd->obj = obj; 35 pd->obj = obj;
36 pd->properties_array = NULL; 36 pd->properties_array = NULL;
@@ -67,7 +67,7 @@ _eldbus_model_arguments_efl_object_destructor(Eo *obj, Eldbus_Model_Arguments_Da
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 efl_destructor(eo_super(obj, MY_CLASS)); 70 efl_destructor(efl_super(obj, MY_CLASS));
71} 71}
72 72
73static Eina_Array const * 73static Eina_Array const *
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index ab3df81544..465673ad33 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -20,7 +20,7 @@ static void _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *);
20static Efl_Object* 20static Efl_Object*
21_eldbus_model_connection_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 23 obj = efl_constructor(efl_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;
@@ -55,7 +55,7 @@ _eldbus_model_connection_efl_object_destructor(Eo *obj, Eldbus_Model_Connection_
55 55
56 _eldbus_model_connection_clear(pd); 56 _eldbus_model_connection_clear(pd);
57 57
58 efl_destructor(eo_super(obj, MY_CLASS)); 58 efl_destructor(efl_super(obj, MY_CLASS));
59} 59}
60 60
61static Eina_Array const * 61static Eina_Array const *
@@ -287,7 +287,7 @@ _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *pd)
287 pd->unique_name = NULL; 287 pd->unique_name = NULL;
288 288
289 EINA_LIST_FREE(pd->children_list, child) 289 EINA_LIST_FREE(pd->children_list, child)
290 eo_unref(child); 290 efl_unref(child);
291 291
292 EINA_LIST_FREE(pd->pending_list, pending) 292 EINA_LIST_FREE(pd->pending_list, pending)
293 eldbus_pending_cancel(pending); 293 eldbus_pending_cancel(pending);
@@ -333,7 +333,7 @@ _eldbus_model_connection_names_list_cb(void *data,
333 { 333 {
334 DBG("(%p): bus = %s", pd->obj, bus); 334 DBG("(%p): bus = %s", pd->obj, bus);
335 335
336 Eo *child = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(eo_self, pd->connection, bus, "/")); 336 Eo *child = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(efl_self, pd->connection, bus, "/"));
337 337
338 pd->children_list = eina_list_append(pd->children_list, child); 338 pd->children_list = eina_list_append(pd->children_list, child);
339 } 339 }
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index 18ba147a62..e36f941a0d 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -19,7 +19,7 @@ static void _eldbus_model_method_call_cb(void *, const Eldbus_Message *, Eldbus_
19static Efl_Object* 19static Efl_Object*
20_eldbus_model_method_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 22 obj = efl_constructor(efl_super(obj, MY_CLASS));
23 23
24 pd->obj = obj; 24 pd->obj = obj;
25 pd->method = NULL; 25 pd->method = NULL;
@@ -35,7 +35,7 @@ _eldbus_model_method_constructor(Eo *obj EINA_UNUSED,
35 EINA_SAFETY_ON_NULL_RETURN(proxy); 35 EINA_SAFETY_ON_NULL_RETURN(proxy);
36 EINA_SAFETY_ON_NULL_RETURN(method); 36 EINA_SAFETY_ON_NULL_RETURN(method);
37 37
38 eldbus_model_arguments_constructor(eo_super(obj, MY_CLASS), proxy, method->name, method->arguments); 38 eldbus_model_arguments_constructor(efl_super(obj, MY_CLASS), proxy, method->name, method->arguments);
39 39
40 pd->method = method; 40 pd->method = method;
41} 41}
@@ -43,7 +43,7 @@ _eldbus_model_method_constructor(Eo *obj EINA_UNUSED,
43static void 43static void
44_eldbus_model_method_call(Eo *obj EINA_UNUSED, Eldbus_Model_Method_Data *pd EINA_UNUSED) 44_eldbus_model_method_call(Eo *obj EINA_UNUSED, Eldbus_Model_Method_Data *pd EINA_UNUSED)
45{ 45{
46 Eldbus_Model_Arguments_Data *data = eo_data_scope_get(obj, ELDBUS_MODEL_ARGUMENTS_CLASS); 46 Eldbus_Model_Arguments_Data *data = efl_data_scope_get(obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
47 Eldbus_Message *msg = eldbus_proxy_method_call_new(data->proxy, data->name); 47 Eldbus_Message *msg = eldbus_proxy_method_call_new(data->proxy, data->name);
48 Eldbus_Message_Iter *iter = eldbus_message_iter_get(msg); 48 Eldbus_Message_Iter *iter = eldbus_message_iter_get(msg);
49 const Eldbus_Introspection_Argument *argument; 49 const Eldbus_Introspection_Argument *argument;
@@ -92,7 +92,7 @@ static void
92_eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) 92_eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
93{ 93{
94 Eldbus_Model_Method_Data *pd = (Eldbus_Model_Method_Data*)data; 94 Eldbus_Model_Method_Data *pd = (Eldbus_Model_Method_Data*)data;
95 Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); 95 Eldbus_Model_Arguments_Data *args_data = efl_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 efl_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);
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index e45ae5d6c0..4de2400df1 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -25,7 +25,7 @@ static void _eldbus_model_object_create_children(Eldbus_Model_Object_Data *, Eld
25static Efl_Object* 25static Efl_Object*
26_eldbus_model_object_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 28 obj = efl_constructor(efl_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;
@@ -89,7 +89,7 @@ _eldbus_model_object_efl_object_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 efl_destructor(eo_super(obj, MY_CLASS)); 92 efl_destructor(efl_super(obj, MY_CLASS));
93} 93}
94 94
95static Eina_Array const * 95static Eina_Array const *
@@ -333,7 +333,7 @@ _eldbus_model_object_clear(Eldbus_Model_Object_Data *pd)
333 pd->unique_name = NULL; 333 pd->unique_name = NULL;
334 334
335 EINA_LIST_FREE(pd->children_list, child) 335 EINA_LIST_FREE(pd->children_list, child)
336 eo_unref(child); 336 efl_unref(child);
337 337
338 EINA_LIST_FREE(pd->pending_list, pending) 338 EINA_LIST_FREE(pd->pending_list, pending)
339 eldbus_pending_cancel(pending); 339 eldbus_pending_cancel(pending);
@@ -517,7 +517,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object
517 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name); 517 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name);
518 518
519 // TODO: increment reference to keep 'interface' in memory 519 // TODO: increment reference to keep 'interface' in memory
520 child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(eo_self, object, interface)); 520 child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(efl_self, object, interface));
521 521
522 pd->children_list = eina_list_append(pd->children_list, child); 522 pd->children_list = eina_list_append(pd->children_list, child);
523 } 523 }
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 24ab831b99..54eb6c667a 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -49,7 +49,7 @@ _eldbus_model_proxy_hash_free(Eina_Value *value)
49static Efl_Object* 49static Efl_Object*
50_eldbus_model_proxy_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 52 obj = efl_constructor(efl_super(obj, MY_CLASS));
53 53
54 pd->obj = obj; 54 pd->obj = obj;
55 pd->object = NULL; 55 pd->object = NULL;
@@ -91,7 +91,7 @@ _eldbus_model_proxy_efl_object_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 efl_destructor(eo_super(obj, MY_CLASS)); 94 efl_destructor(efl_super(obj, MY_CLASS));
95} 95}
96 96
97static Eina_Array const * 97static Eina_Array const *
@@ -296,7 +296,7 @@ _eldbus_model_proxy_create_methods_children(Eldbus_Model_Proxy_Data *pd)
296 INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s", 296 INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s",
297 pd->obj, bus, path, interface_name, method_name); 297 pd->obj, bus, path, interface_name, method_name);
298 298
299 child = eo_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(eo_self, pd->proxy, method)); 299 child = efl_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(efl_self, pd->proxy, method));
300 300
301 pd->children_list = eina_list_append(pd->children_list, child); 301 pd->children_list = eina_list_append(pd->children_list, child);
302 } 302 }
@@ -331,7 +331,7 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd)
331 DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s", 331 DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s",
332 pd->obj, bus, path, interface_name, signal_name); 332 pd->obj, bus, path, interface_name, signal_name);
333 333
334 child = eo_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(eo_self, pd->proxy, signal)); 334 child = efl_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(efl_self, pd->proxy, signal));
335 335
336 pd->children_list = eina_list_append(pd->children_list, child); 336 pd->children_list = eina_list_append(pd->children_list, child);
337 } 337 }
@@ -390,7 +390,7 @@ _eldbus_model_proxy_unload(Eldbus_Model_Proxy_Data *pd)
390 EINA_SAFETY_ON_NULL_RETURN(pd); 390 EINA_SAFETY_ON_NULL_RETURN(pd);
391 391
392 EINA_LIST_FREE(pd->children_list, child) 392 EINA_LIST_FREE(pd->children_list, child)
393 eo_unref(child); 393 efl_unref(child);
394 394
395 EINA_LIST_FREE(pd->pending_list, pending) 395 EINA_LIST_FREE(pd->pending_list, pending)
396 { 396 {
diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index 251d6266a8..12681cd3b7 100644
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -19,7 +19,7 @@ static void _eldbus_model_signal_callback_del(Eldbus_Model_Signal_Data *);
19static Efl_Object* 19static Efl_Object*
20_eldbus_model_signal_efl_object_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 efl_constructor(eo_super(obj, MY_CLASS)); 22 efl_constructor(efl_super(obj, MY_CLASS));
23 23
24 pd->obj = obj; 24 pd->obj = obj;
25 pd->handler = NULL; 25 pd->handler = NULL;
@@ -36,7 +36,7 @@ _eldbus_model_signal_constructor(Eo *obj EINA_UNUSED,
36 EINA_SAFETY_ON_NULL_RETURN(proxy); 36 EINA_SAFETY_ON_NULL_RETURN(proxy);
37 EINA_SAFETY_ON_NULL_RETURN(signal); 37 EINA_SAFETY_ON_NULL_RETURN(signal);
38 38
39 eldbus_model_arguments_constructor(eo_super(obj, MY_CLASS), proxy, signal->name, signal->arguments); 39 eldbus_model_arguments_constructor(efl_super(obj, MY_CLASS), proxy, signal->name, signal->arguments);
40 40
41 pd->signal = signal; 41 pd->signal = signal;
42 _eldbus_model_signal_callback_add(pd); 42 _eldbus_model_signal_callback_add(pd);
@@ -47,7 +47,7 @@ _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 efl_destructor(eo_super(obj, MY_CLASS)); 50 efl_destructor(efl_super(obj, MY_CLASS));
51} 51}
52 52
53 53
@@ -57,7 +57,7 @@ _eldbus_model_signal_callback_add(Eldbus_Model_Signal_Data *pd)
57 EINA_SAFETY_ON_NULL_RETURN(pd); 57 EINA_SAFETY_ON_NULL_RETURN(pd);
58 EINA_SAFETY_ON_FALSE_RETURN(NULL == pd->handler); 58 EINA_SAFETY_ON_FALSE_RETURN(NULL == pd->handler);
59 59
60 Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); 60 Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
61 EINA_SAFETY_ON_NULL_RETURN(args_data); 61 EINA_SAFETY_ON_NULL_RETURN(args_data);
62 62
63 pd->handler = eldbus_proxy_signal_handler_add(args_data->proxy, pd->signal->name, _eldbus_model_signal_handler_cb, pd); 63 pd->handler = eldbus_proxy_signal_handler_add(args_data->proxy, pd->signal->name, _eldbus_model_signal_handler_cb, pd);
@@ -80,7 +80,7 @@ _eldbus_model_signal_handler_cb(void *data, const Eldbus_Message *msg)
80{ 80{
81 Eldbus_Model_Signal_Data *pd = (Eldbus_Model_Signal_Data*)data; 81 Eldbus_Model_Signal_Data *pd = (Eldbus_Model_Signal_Data*)data;
82 82
83 Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); 83 Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
84 84
85 eldbus_model_arguments_process_arguments(args_data, msg, NULL); 85 eldbus_model_arguments_process_arguments(args_data, msg, NULL);
86} 86}