summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:11:00 -0500
commitfcfd832ce5285c37610867132c9cf974221e9a6b (patch)
tree932e1549dd1e8f8ab3da3c00599ca896acd6f113 /src/lib/eldbus
parent005f3ef955c88e8f30b2bac303c45f4bb7a1f8d7 (diff)
eldbus: rename custom constructor methods
"constructor" conflicts with the base efl object constructor some of the params for these should maybe be refactored into properties and use finalize?
Diffstat (limited to 'src/lib/eldbus')
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c2
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.eo4
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c2
-rw-r--r--src/lib/eldbus/eldbus_model_connection.eo4
-rw-r--r--src/lib/eldbus/eldbus_model_method.c4
-rw-r--r--src/lib/eldbus/eldbus_model_method.eo4
-rw-r--r--src/lib/eldbus/eldbus_model_object.c4
-rw-r--r--src/lib/eldbus/eldbus_model_object.eo4
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c2
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.eo4
-rw-r--r--src/lib/eldbus/eldbus_model_signal.c4
-rw-r--r--src/lib/eldbus/eldbus_model_signal.eo4
12 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 6e89db1096..0e659ebc2d 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -43,7 +43,7 @@ _eldbus_model_arguments_efl_object_constructor(Eo *obj, Eldbus_Model_Arguments_D
43} 43}
44 44
45static void 45static void
46_eldbus_model_arguments_constructor(Eo *obj EINA_UNUSED, 46_eldbus_model_arguments_custom_constructor(Eo *obj EINA_UNUSED,
47 Eldbus_Model_Arguments_Data *pd, 47 Eldbus_Model_Arguments_Data *pd,
48 Eldbus_Proxy *proxy, 48 Eldbus_Proxy *proxy,
49 const char *name, 49 const char *name,
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 1487e2319c..e77b6b295f 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -4,7 +4,7 @@ class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
4 [[Eldbus model arguments class]] 4 [[Eldbus model arguments class]]
5 5
6 methods { 6 methods {
7 constructor { 7 custom_constructor {
8 [[Custom Eldbus_Model_Arguments constructor. 8 [[Custom Eldbus_Model_Arguments constructor.
9 9
10 @since 1.16]] 10 @since 1.16]]
@@ -34,6 +34,6 @@ class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
34 Efl.Model.children_count_get; 34 Efl.Model.children_count_get;
35 } 35 }
36 constructors { 36 constructors {
37 .constructor; 37 .custom_constructor;
38 } 38 }
39} 39}
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index e311c9824c..62b7cec2a1 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -37,7 +37,7 @@ _eldbus_model_connection_efl_object_constructor(Eo *obj, Eldbus_Model_Connection
37} 37}
38 38
39static void 39static void
40_eldbus_model_connection_constructor(Eo *obj EINA_UNUSED, 40_eldbus_model_connection_custom_constructor(Eo *obj EINA_UNUSED,
41 Eldbus_Model_Connection_Data *pd, 41 Eldbus_Model_Connection_Data *pd,
42 Eldbus_Connection_Type type, 42 Eldbus_Connection_Type type,
43 const char* address, 43 const char* address,
diff --git a/src/lib/eldbus/eldbus_model_connection.eo b/src/lib/eldbus/eldbus_model_connection.eo
index 8db09682af..b1f9a1daa9 100644
--- a/src/lib/eldbus/eldbus_model_connection.eo
+++ b/src/lib/eldbus/eldbus_model_connection.eo
@@ -4,7 +4,7 @@ class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
4 [[Eldbus model connection class]] 4 [[Eldbus model connection class]]
5 5
6 methods { 6 methods {
7 constructor { 7 custom_constructor {
8 [[Custom Eldbus_Model_Connection constructor. 8 [[Custom Eldbus_Model_Connection constructor.
9 9
10 @since 1.16]] 10 @since 1.16]]
@@ -48,6 +48,6 @@ class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
48 Efl.Model.children_count_get; 48 Efl.Model.children_count_get;
49 } 49 }
50 constructors { 50 constructors {
51 .constructor; 51 .custom_constructor;
52 } 52 }
53} 53}
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index e36f941a0d..caafddda16 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -27,7 +27,7 @@ _eldbus_model_method_efl_object_constructor(Eo *obj, Eldbus_Model_Method_Data *p
27} 27}
28 28
29static void 29static void
30_eldbus_model_method_constructor(Eo *obj EINA_UNUSED, 30_eldbus_model_method_method_constructor(Eo *obj EINA_UNUSED,
31 Eldbus_Model_Method_Data *pd, 31 Eldbus_Model_Method_Data *pd,
32 Eldbus_Proxy *proxy, 32 Eldbus_Proxy *proxy,
33 const Eldbus_Introspection_Method *method) 33 const Eldbus_Introspection_Method *method)
@@ -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(efl_super(obj, MY_CLASS), proxy, method->name, method->arguments); 38 eldbus_model_arguments_custom_constructor(efl_super(obj, MY_CLASS), proxy, method->name, method->arguments);
39 39
40 pd->method = method; 40 pd->method = method;
41} 41}
diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index 61e309ab8a..015ebc72da 100644
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -3,7 +3,7 @@ import eldbus_types;
3class Eldbus.Model.Method (Eldbus.Model.Arguments) { 3class Eldbus.Model.Method (Eldbus.Model.Arguments) {
4 [[Eldbus model method class]] 4 [[Eldbus model method class]]
5 methods { 5 methods {
6 constructor { 6 method_constructor {
7 [[Custom Eldbus_Model_Method constructor. 7 [[Custom Eldbus_Model_Method constructor.
8 8
9 @since 1.16]] 9 @since 1.16]]
@@ -26,7 +26,7 @@ class Eldbus.Model.Method (Eldbus.Model.Arguments) {
26 Efl.Object.constructor; 26 Efl.Object.constructor;
27 } 27 }
28 constructors { 28 constructors {
29 .constructor; 29 .method_constructor;
30 } 30 }
31 events { 31 events {
32 successful,call; [[Event dispatched for a successful method call.]] 32 successful,call; [[Event dispatched for a successful method call.]]
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index b359eaf5e3..695f91ce96 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -46,7 +46,7 @@ _eldbus_model_object_efl_object_constructor(Eo *obj, Eldbus_Model_Object_Data *p
46} 46}
47 47
48static void 48static void
49_eldbus_model_object_constructor(Eo *obj EINA_UNUSED, 49_eldbus_model_object_custom_constructor(Eo *obj EINA_UNUSED,
50 Eldbus_Model_Object_Data *pd, 50 Eldbus_Model_Object_Data *pd,
51 Eldbus_Connection_Type type, 51 Eldbus_Connection_Type type,
52 const char* address, 52 const char* address,
@@ -487,7 +487,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object
487 DBG("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name); 487 DBG("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name);
488 488
489 // TODO: increment reference to keep 'interface' in memory 489 // TODO: increment reference to keep 'interface' in memory
490 child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, pd->obj, eldbus_model_proxy_constructor(efl_added, object, interface)); 490 child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, pd->obj, eldbus_model_proxy_custom_constructor(efl_added, object, interface));
491 491
492 pd->children_list = eina_list_append(pd->children_list, child); 492 pd->children_list = eina_list_append(pd->children_list, child);
493 } 493 }
diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo
index e3fea3f38e..6123d3aca0 100644
--- a/src/lib/eldbus/eldbus_model_object.eo
+++ b/src/lib/eldbus/eldbus_model_object.eo
@@ -5,7 +5,7 @@ class Eldbus.Model.Object (Efl.Object, Efl.Model) {
5 5
6 data: Eldbus_Model_Object_Data; 6 data: Eldbus_Model_Object_Data;
7 methods { 7 methods {
8 constructor { 8 custom_constructor {
9 [[Custom Eldbus_Model_Object constructor. 9 [[Custom Eldbus_Model_Object constructor.
10 10
11 @since 1.16]] 11 @since 1.16]]
@@ -75,7 +75,7 @@ class Eldbus.Model.Object (Efl.Object, Efl.Model) {
75 Efl.Model.children_count_get; 75 Efl.Model.children_count_get;
76 } 76 }
77 constructors { 77 constructors {
78 .constructor; 78 .custom_constructor;
79 .connection_constructor; 79 .connection_constructor;
80 } 80 }
81} 81}
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 9b5fa888c3..99cae04a0c 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -68,7 +68,7 @@ _eldbus_model_proxy_efl_object_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
68} 68}
69 69
70static void 70static void
71_eldbus_model_proxy_constructor(Eo *obj EINA_UNUSED, 71_eldbus_model_proxy_custom_constructor(Eo *obj EINA_UNUSED,
72 Eldbus_Model_Proxy_Data *pd, 72 Eldbus_Model_Proxy_Data *pd,
73 Eldbus_Object *object, 73 Eldbus_Object *object,
74 const Eldbus_Introspection_Interface *interface) 74 const Eldbus_Introspection_Interface *interface)
diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index 31221ca742..9f6e306ee3 100644
--- a/src/lib/eldbus/eldbus_model_proxy.eo
+++ b/src/lib/eldbus/eldbus_model_proxy.eo
@@ -4,7 +4,7 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
4 [[Eldbus model proxy class]] 4 [[Eldbus model proxy class]]
5 5
6 methods { 6 methods {
7 constructor { 7 custom_constructor {
8 [[Custom Eldbus_Model_Proxy constructor. 8 [[Custom Eldbus_Model_Proxy constructor.
9 9
10 @since 1.16]] 10 @since 1.16]]
@@ -33,6 +33,6 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
33 Efl.Model.children_count_get; 33 Efl.Model.children_count_get;
34 } 34 }
35 constructors { 35 constructors {
36 .constructor; 36 .custom_constructor;
37 } 37 }
38} 38}
diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index 12681cd3b7..d1bb490195 100644
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -28,7 +28,7 @@ _eldbus_model_signal_efl_object_constructor(Eo *obj, Eldbus_Model_Signal_Data *p
28} 28}
29 29
30static void 30static void
31_eldbus_model_signal_constructor(Eo *obj EINA_UNUSED, 31_eldbus_model_signal_signal_constructor(Eo *obj EINA_UNUSED,
32 Eldbus_Model_Signal_Data *pd, 32 Eldbus_Model_Signal_Data *pd,
33 Eldbus_Proxy *proxy, 33 Eldbus_Proxy *proxy,
34 const Eldbus_Introspection_Signal *signal) 34 const Eldbus_Introspection_Signal *signal)
@@ -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(efl_super(obj, MY_CLASS), proxy, signal->name, signal->arguments); 39 eldbus_model_arguments_custom_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);
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 2a27fde209..4aa547cb21 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -2,7 +2,7 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
2 [[Eldbus model signal class]] 2 [[Eldbus model signal class]]
3 3
4 methods { 4 methods {
5 constructor { 5 signal_constructor {
6 [[Custom Eldbus_Model_Signal constructor. 6 [[Custom Eldbus_Model_Signal constructor.
7 7
8 @since 1.16]] 8 @since 1.16]]
@@ -17,6 +17,6 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
17 Efl.Object.destructor; 17 Efl.Object.destructor;
18 } 18 }
19 constructors { 19 constructors {
20 .constructor; 20 .signal_constructor;
21 } 21 }
22} 22}