dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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?
This commit is contained in:
Mike Blumenkrantz 2018-02-14 21:14:52 -05:00
parent 005f3ef955
commit fcfd832ce5
17 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/examples/eldbus/dbusmodel.c
View File

@ -250,7 +250,7 @@ main(int argc, char **argv EINA_UNUSED)
ELDBUS_CONNECTION_TYPE_SESSION);
root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(),
eldbus_model_object_constructor(efl_added, conn_type, NULL, EINA_FALSE, bus_name, path),
eldbus_model_object_custom_constructor(efl_added, conn_type, NULL, EINA_FALSE, bus_name, path),
efl_event_callback_array_add(efl_added, event_cbs(), NULL));
efl_future_then(efl_future_all(efl_model_children_slice_get(root, 0, 0),

2
src/lib/eldbus/eldbus_model_arguments.c
View File

@ -43,7 +43,7 @@ _eldbus_model_arguments_efl_object_constructor(Eo *obj, Eldbus_Model_Arguments_D
}
static void
_eldbus_model_arguments_constructor(Eo *obj EINA_UNUSED,
_eldbus_model_arguments_custom_constructor(Eo *obj EINA_UNUSED,
Eldbus_Model_Arguments_Data *pd,
Eldbus_Proxy *proxy,
const char *name,

4
src/lib/eldbus/eldbus_model_arguments.eo
View File

@ -4,7 +4,7 @@ class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
[[Eldbus model arguments class]]
methods {
constructor {
custom_constructor {
[[Custom Eldbus_Model_Arguments constructor.
@since 1.16]]
@ -34,6 +34,6 @@ class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
Efl.Model.children_count_get;
}
constructors {
.constructor;
.custom_constructor;
}
}

2
src/lib/eldbus/eldbus_model_connection.c
View File

@ -37,7 +37,7 @@ _eldbus_model_connection_efl_object_constructor(Eo *obj, Eldbus_Model_Connection
}
static void
_eldbus_model_connection_constructor(Eo *obj EINA_UNUSED,
_eldbus_model_connection_custom_constructor(Eo *obj EINA_UNUSED,
Eldbus_Model_Connection_Data *pd,
Eldbus_Connection_Type type,
const char* address,

4
src/lib/eldbus/eldbus_model_connection.eo
View File

@ -4,7 +4,7 @@ class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
[[Eldbus model connection class]]
methods {
constructor {
custom_constructor {
[[Custom Eldbus_Model_Connection constructor.
@since 1.16]]
@ -48,6 +48,6 @@ class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
Efl.Model.children_count_get;
}
constructors {
.constructor;
.custom_constructor;
}
}

4
src/lib/eldbus/eldbus_model_method.c
View File

@ -27,7 +27,7 @@ _eldbus_model_method_efl_object_constructor(Eo *obj, Eldbus_Model_Method_Data *p
}
static void
_eldbus_model_method_constructor(Eo *obj EINA_UNUSED,
_eldbus_model_method_method_constructor(Eo *obj EINA_UNUSED,
Eldbus_Model_Method_Data *pd,
Eldbus_Proxy *proxy,
const Eldbus_Introspection_Method *method)
@ -35,7 +35,7 @@ _eldbus_model_method_constructor(Eo *obj EINA_UNUSED,
EINA_SAFETY_ON_NULL_RETURN(proxy);
EINA_SAFETY_ON_NULL_RETURN(method);
eldbus_model_arguments_constructor(efl_super(obj, MY_CLASS), proxy, method->name, method->arguments);
eldbus_model_arguments_custom_constructor(efl_super(obj, MY_CLASS), proxy, method->name, method->arguments);
pd->method = method;
}

4
src/lib/eldbus/eldbus_model_method.eo
View File

@ -3,7 +3,7 @@ import eldbus_types;
class Eldbus.Model.Method (Eldbus.Model.Arguments) {
[[Eldbus model method class]]
methods {
constructor {
method_constructor {
[[Custom Eldbus_Model_Method constructor.
@since 1.16]]
@ -26,7 +26,7 @@ class Eldbus.Model.Method (Eldbus.Model.Arguments) {
Efl.Object.constructor;
}
constructors {
.constructor;
.method_constructor;
}
events {
successful,call; [[Event dispatched for a successful method call.]]

4
src/lib/eldbus/eldbus_model_object.c
View File

@ -46,7 +46,7 @@ _eldbus_model_object_efl_object_constructor(Eo *obj, Eldbus_Model_Object_Data *p
}
static void
_eldbus_model_object_constructor(Eo *obj EINA_UNUSED,
_eldbus_model_object_custom_constructor(Eo *obj EINA_UNUSED,
Eldbus_Model_Object_Data *pd,
Eldbus_Connection_Type type,
const char* address,
@ -487,7 +487,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object
DBG("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name);
// TODO: increment reference to keep 'interface' in memory
child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, pd->obj, eldbus_model_proxy_constructor(efl_added, object, interface));
child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, pd->obj, eldbus_model_proxy_custom_constructor(efl_added, object, interface));
pd->children_list = eina_list_append(pd->children_list, child);
}

4
src/lib/eldbus/eldbus_model_object.eo
View File

@ -5,7 +5,7 @@ class Eldbus.Model.Object (Efl.Object, Efl.Model) {
data: Eldbus_Model_Object_Data;
methods {
constructor {
custom_constructor {
[[Custom Eldbus_Model_Object constructor.
@since 1.16]]
@ -75,7 +75,7 @@ class Eldbus.Model.Object (Efl.Object, Efl.Model) {
Efl.Model.children_count_get;
}
constructors {
.constructor;
.custom_constructor;
.connection_constructor;
}
}

2
src/lib/eldbus/eldbus_model_proxy.c
View File

@ -68,7 +68,7 @@ _eldbus_model_proxy_efl_object_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
}
static void
_eldbus_model_proxy_constructor(Eo *obj EINA_UNUSED,
_eldbus_model_proxy_custom_constructor(Eo *obj EINA_UNUSED,
Eldbus_Model_Proxy_Data *pd,
Eldbus_Object *object,
const Eldbus_Introspection_Interface *interface)

4
src/lib/eldbus/eldbus_model_proxy.eo
View File

@ -4,7 +4,7 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
[[Eldbus model proxy class]]
methods {
constructor {
custom_constructor {
[[Custom Eldbus_Model_Proxy constructor.
@since 1.16]]
@ -33,6 +33,6 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
Efl.Model.children_count_get;
}
constructors {
.constructor;
.custom_constructor;
}
}

4
src/lib/eldbus/eldbus_model_signal.c
View File

@ -28,7 +28,7 @@ _eldbus_model_signal_efl_object_constructor(Eo *obj, Eldbus_Model_Signal_Data *p
}
static void
_eldbus_model_signal_constructor(Eo *obj EINA_UNUSED,
_eldbus_model_signal_signal_constructor(Eo *obj EINA_UNUSED,
Eldbus_Model_Signal_Data *pd,
Eldbus_Proxy *proxy,
const Eldbus_Introspection_Signal *signal)
@ -36,7 +36,7 @@ _eldbus_model_signal_constructor(Eo *obj EINA_UNUSED,
EINA_SAFETY_ON_NULL_RETURN(proxy);
EINA_SAFETY_ON_NULL_RETURN(signal);
eldbus_model_arguments_constructor(efl_super(obj, MY_CLASS), proxy, signal->name, signal->arguments);
eldbus_model_arguments_custom_constructor(efl_super(obj, MY_CLASS), proxy, signal->name, signal->arguments);
pd->signal = signal;
_eldbus_model_signal_callback_add(pd);

4
src/lib/eldbus/eldbus_model_signal.eo
View File

@ -2,7 +2,7 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
[[Eldbus model signal class]]
methods {
constructor {
signal_constructor {
[[Custom Eldbus_Model_Signal constructor.
@since 1.16]]
@ -17,6 +17,6 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
Efl.Object.destructor;
}
constructors {
.constructor;
.signal_constructor;
}
}

4
src/tests/eldbus/eldbus_test_eldbus_model.c
View File

@ -172,7 +172,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value
Eo *
create_connection(void)
{
Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, efl_main_loop_get(), eldbus_model_connection_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, efl_main_loop_get(), eldbus_model_connection_custom_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
ck_assert_ptr_ne(NULL, connection);
return connection;
}
@ -180,7 +180,7 @@ create_connection(void)
Eo *
create_object(void)
{
Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_custom_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
ck_assert_ptr_ne(NULL, object);
return object;
}

2
src/tests/eldbus/eldbus_test_eldbus_model_method.c
View File

@ -29,7 +29,7 @@ _setup(void)
fake_server = fake_server_start(&fake_server_data);
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_custom_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
ck_assert_ptr_ne(NULL, fake_server_object);
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);

2
src/tests/eldbus/eldbus_test_eldbus_model_signal.c
View File

@ -27,7 +27,7 @@ _setup(void)
fake_server = fake_server_start(&fake_server_data);
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_custom_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
ck_assert_ptr_ne(NULL, fake_server_object);
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);

2
src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
View File

@ -33,7 +33,7 @@ _setup(void)
};
fake_server = fake_server_start(&fake_server_data);
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_custom_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
ck_assert_ptr_ne(NULL, fake_server_object);
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);