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
commiteda0c859103c49ffab5f7d5e7ba0cb9f27a6d5af (patch)
tree383c718b6a97d858ea05e34ab890069a7af11b54 /src/lib/eldbus
parentfcfd832ce5285c37610867132c9cf974221e9a6b (diff)
eldbus: rename conflicting "name" properties for some classes
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.eo2
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c2
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.eo2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 0e659ebc2d..9e034ff1b8 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -208,7 +208,7 @@ _eldbus_model_arguments_efl_model_children_count_get(Eo *obj EINA_UNUSED,
208} 208}
209 209
210static const char * 210static const char *
211_eldbus_model_arguments_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd) 211_eldbus_model_arguments_arg_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd)
212{ 212{
213 return pd->name; 213 return pd->name;
214} 214}
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index e77b6b295f..4dec2dc395 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -14,7 +14,7 @@ class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
14 @in arguments: const(list<ptr(Eldbus.Introspection.Argument)>); [[The introspected arguments]] 14 @in arguments: const(list<ptr(Eldbus.Introspection.Argument)>); [[The introspected arguments]]
15 } 15 }
16 } 16 }
17 @property name { 17 @property arg_name {
18 [[Name of the argument]] 18 [[Name of the argument]]
19 get {} 19 get {}
20 values { 20 values {
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 99cae04a0c..3c54d22ca5 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -340,7 +340,7 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd)
340} 340}
341 341
342static const char * 342static const char *
343_eldbus_model_proxy_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Proxy_Data *pd) 343_eldbus_model_proxy_proxy_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Proxy_Data *pd)
344{ 344{
345 return pd->name; 345 return pd->name;
346} 346}
diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index 9f6e306ee3..00521e67c8 100644
--- a/src/lib/eldbus/eldbus_model_proxy.eo
+++ b/src/lib/eldbus/eldbus_model_proxy.eo
@@ -13,7 +13,7 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
13 @cref interface: Eldbus.Introspection.Interface; [[The introspected interface]] 13 @cref interface: Eldbus.Introspection.Interface; [[The introspected interface]]
14 } 14 }
15 } 15 }
16 @property name { 16 @property proxy_name {
17 [[Proxy name]] 17 [[Proxy name]]
18 get {} 18 get {}
19 values { 19 values {