discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=eda0c859103c49ffab5f7d5e7ba0cb9f27a6d5af
commit eda0c859103c49ffab5f7d5e7ba0cb9f27a6d5af Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 eldbus: rename conflicting "name" properties for some classes --- src/lib/eldbus/eldbus_model_arguments.c | 2 +- src/lib/eldbus/eldbus_model_arguments.eo | 2 +- src/lib/eldbus/eldbus_model_proxy.c | 2 +- src/lib/eldbus/eldbus_model_proxy.eo | 2 +- src/tests/eldbus/eldbus_test_eldbus_model.c | 2 +- src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c | 6 +++--- 6 files changed, 8 insertions(+), 8 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, } static const char * -_eldbus_model_arguments_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd) +_eldbus_model_arguments_arg_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd) { return pd->name; } 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) { @in arguments: const(list<ptr(Eldbus.Introspection.Argument)>); [[The introspected arguments]] } } - @property name { + @property arg_name { [[Name of the argument]] get {} 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) } static const char * -_eldbus_model_proxy_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Proxy_Data *pd) +_eldbus_model_proxy_proxy_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Proxy_Data *pd) { return pd->name; } 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) { @cref interface: Eldbus.Introspection.Interface; [[The introspected interface]] } } - @property name { + @property proxy_name { [[Proxy name]] get {} values { diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c index 1991af8ca9..49814ec95a 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model.c @@ -385,7 +385,7 @@ _eldbus_model_arguments_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *me continue; const char *name; - name = eldbus_model_arguments_name_get(child); + name = eldbus_model_arguments_arg_name_get(child); ck_assert_ptr_ne(NULL, name); if (strcmp(name, method_name) == 0) goto end; diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c index cbd93bd051..ec8d3bd5b3 100644 --- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c +++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c @@ -127,9 +127,9 @@ START_TEST(children_slice_get) Eldbus_Model_Arguments *method2 = efl_model_nth_child_get(fake_server_proxy, 1); Eldbus_Model_Arguments *signal1 = efl_model_nth_child_get(fake_server_proxy, 2); - const char *actual_method1_name = eldbus_model_arguments_name_get(method1); - const char *actual_method2_name = eldbus_model_arguments_name_get(method2); - const char *actual_signal1_name = eldbus_model_arguments_name_get(signal1); + const char *actual_method1_name = eldbus_model_arguments_arg_name_get(method1); + const char *actual_method2_name = eldbus_model_arguments_arg_name_get(method2); + const char *actual_signal1_name = eldbus_model_arguments_arg_name_get(signal1); ck_assert_ptr_ne(NULL, actual_method1_name); ck_assert_ptr_ne(NULL, actual_method2_name); --
