forked from enlightenment/efl
eldbus: rename conflicting "name" properties for some classes
This commit is contained in:
parent
fcfd832ce5
commit
eda0c85910
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue