forked from enlightenment/efl
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:
parent
005f3ef955
commit
fcfd832ce5
|
@ -250,7 +250,7 @@ main(int argc, char **argv EINA_UNUSED)
|
||||||
ELDBUS_CONNECTION_TYPE_SESSION);
|
ELDBUS_CONNECTION_TYPE_SESSION);
|
||||||
|
|
||||||
root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(),
|
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_event_callback_array_add(efl_added, event_cbs(), NULL));
|
||||||
|
|
||||||
efl_future_then(efl_future_all(efl_model_children_slice_get(root, 0, 0),
|
efl_future_then(efl_future_all(efl_model_children_slice_get(root, 0, 0),
|
||||||
|
|
|
@ -43,7 +43,7 @@ _eldbus_model_arguments_efl_object_constructor(Eo *obj, Eldbus_Model_Arguments_D
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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_Model_Arguments_Data *pd,
|
||||||
Eldbus_Proxy *proxy,
|
Eldbus_Proxy *proxy,
|
||||||
const char *name,
|
const char *name,
|
||||||
|
|
|
@ -4,7 +4,7 @@ class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
|
||||||
[[Eldbus model arguments class]]
|
[[Eldbus model arguments class]]
|
||||||
|
|
||||||
methods {
|
methods {
|
||||||
constructor {
|
custom_constructor {
|
||||||
[[Custom Eldbus_Model_Arguments constructor.
|
[[Custom Eldbus_Model_Arguments constructor.
|
||||||
|
|
||||||
@since 1.16]]
|
@since 1.16]]
|
||||||
|
@ -34,6 +34,6 @@ class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
|
||||||
Efl.Model.children_count_get;
|
Efl.Model.children_count_get;
|
||||||
}
|
}
|
||||||
constructors {
|
constructors {
|
||||||
.constructor;
|
.custom_constructor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,7 @@ _eldbus_model_connection_efl_object_constructor(Eo *obj, Eldbus_Model_Connection
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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_Model_Connection_Data *pd,
|
||||||
Eldbus_Connection_Type type,
|
Eldbus_Connection_Type type,
|
||||||
const char* address,
|
const char* address,
|
||||||
|
|
|
@ -4,7 +4,7 @@ class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
|
||||||
[[Eldbus model connection class]]
|
[[Eldbus model connection class]]
|
||||||
|
|
||||||
methods {
|
methods {
|
||||||
constructor {
|
custom_constructor {
|
||||||
[[Custom Eldbus_Model_Connection constructor.
|
[[Custom Eldbus_Model_Connection constructor.
|
||||||
|
|
||||||
@since 1.16]]
|
@since 1.16]]
|
||||||
|
@ -48,6 +48,6 @@ class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
|
||||||
Efl.Model.children_count_get;
|
Efl.Model.children_count_get;
|
||||||
}
|
}
|
||||||
constructors {
|
constructors {
|
||||||
.constructor;
|
.custom_constructor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ _eldbus_model_method_efl_object_constructor(Eo *obj, Eldbus_Model_Method_Data *p
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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_Model_Method_Data *pd,
|
||||||
Eldbus_Proxy *proxy,
|
Eldbus_Proxy *proxy,
|
||||||
const Eldbus_Introspection_Method *method)
|
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(proxy);
|
||||||
EINA_SAFETY_ON_NULL_RETURN(method);
|
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;
|
pd->method = method;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ import eldbus_types;
|
||||||
class Eldbus.Model.Method (Eldbus.Model.Arguments) {
|
class Eldbus.Model.Method (Eldbus.Model.Arguments) {
|
||||||
[[Eldbus model method class]]
|
[[Eldbus model method class]]
|
||||||
methods {
|
methods {
|
||||||
constructor {
|
method_constructor {
|
||||||
[[Custom Eldbus_Model_Method constructor.
|
[[Custom Eldbus_Model_Method constructor.
|
||||||
|
|
||||||
@since 1.16]]
|
@since 1.16]]
|
||||||
|
@ -26,7 +26,7 @@ class Eldbus.Model.Method (Eldbus.Model.Arguments) {
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
}
|
}
|
||||||
constructors {
|
constructors {
|
||||||
.constructor;
|
.method_constructor;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
successful,call; [[Event dispatched for a successful method call.]]
|
successful,call; [[Event dispatched for a successful method call.]]
|
||||||
|
|
|
@ -46,7 +46,7 @@ _eldbus_model_object_efl_object_constructor(Eo *obj, Eldbus_Model_Object_Data *p
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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_Model_Object_Data *pd,
|
||||||
Eldbus_Connection_Type type,
|
Eldbus_Connection_Type type,
|
||||||
const char* address,
|
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);
|
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
|
// 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);
|
pd->children_list = eina_list_append(pd->children_list, child);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ class Eldbus.Model.Object (Efl.Object, Efl.Model) {
|
||||||
|
|
||||||
data: Eldbus_Model_Object_Data;
|
data: Eldbus_Model_Object_Data;
|
||||||
methods {
|
methods {
|
||||||
constructor {
|
custom_constructor {
|
||||||
[[Custom Eldbus_Model_Object constructor.
|
[[Custom Eldbus_Model_Object constructor.
|
||||||
|
|
||||||
@since 1.16]]
|
@since 1.16]]
|
||||||
|
@ -75,7 +75,7 @@ class Eldbus.Model.Object (Efl.Object, Efl.Model) {
|
||||||
Efl.Model.children_count_get;
|
Efl.Model.children_count_get;
|
||||||
}
|
}
|
||||||
constructors {
|
constructors {
|
||||||
.constructor;
|
.custom_constructor;
|
||||||
.connection_constructor;
|
.connection_constructor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,7 +68,7 @@ _eldbus_model_proxy_efl_object_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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_Model_Proxy_Data *pd,
|
||||||
Eldbus_Object *object,
|
Eldbus_Object *object,
|
||||||
const Eldbus_Introspection_Interface *interface)
|
const Eldbus_Introspection_Interface *interface)
|
||||||
|
|
|
@ -4,7 +4,7 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
|
||||||
[[Eldbus model proxy class]]
|
[[Eldbus model proxy class]]
|
||||||
|
|
||||||
methods {
|
methods {
|
||||||
constructor {
|
custom_constructor {
|
||||||
[[Custom Eldbus_Model_Proxy constructor.
|
[[Custom Eldbus_Model_Proxy constructor.
|
||||||
|
|
||||||
@since 1.16]]
|
@since 1.16]]
|
||||||
|
@ -33,6 +33,6 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
|
||||||
Efl.Model.children_count_get;
|
Efl.Model.children_count_get;
|
||||||
}
|
}
|
||||||
constructors {
|
constructors {
|
||||||
.constructor;
|
.custom_constructor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ _eldbus_model_signal_efl_object_constructor(Eo *obj, Eldbus_Model_Signal_Data *p
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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_Model_Signal_Data *pd,
|
||||||
Eldbus_Proxy *proxy,
|
Eldbus_Proxy *proxy,
|
||||||
const Eldbus_Introspection_Signal *signal)
|
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(proxy);
|
||||||
EINA_SAFETY_ON_NULL_RETURN(signal);
|
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;
|
pd->signal = signal;
|
||||||
_eldbus_model_signal_callback_add(pd);
|
_eldbus_model_signal_callback_add(pd);
|
||||||
|
|
|
@ -2,7 +2,7 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
|
||||||
[[Eldbus model signal class]]
|
[[Eldbus model signal class]]
|
||||||
|
|
||||||
methods {
|
methods {
|
||||||
constructor {
|
signal_constructor {
|
||||||
[[Custom Eldbus_Model_Signal constructor.
|
[[Custom Eldbus_Model_Signal constructor.
|
||||||
|
|
||||||
@since 1.16]]
|
@since 1.16]]
|
||||||
|
@ -17,6 +17,6 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
}
|
}
|
||||||
constructors {
|
constructors {
|
||||||
.constructor;
|
.signal_constructor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,7 +172,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value
|
||||||
Eo *
|
Eo *
|
||||||
create_connection(void)
|
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);
|
ck_assert_ptr_ne(NULL, connection);
|
||||||
return connection;
|
return connection;
|
||||||
}
|
}
|
||||||
|
@ -180,7 +180,7 @@ create_connection(void)
|
||||||
Eo *
|
Eo *
|
||||||
create_object(void)
|
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);
|
ck_assert_ptr_ne(NULL, object);
|
||||||
return object;
|
return object;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ _setup(void)
|
||||||
|
|
||||||
fake_server = fake_server_start(&fake_server_data);
|
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);
|
ck_assert_ptr_ne(NULL, fake_server_object);
|
||||||
|
|
||||||
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
|
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
|
||||||
|
|
|
@ -27,7 +27,7 @@ _setup(void)
|
||||||
|
|
||||||
fake_server = fake_server_start(&fake_server_data);
|
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);
|
ck_assert_ptr_ne(NULL, fake_server_object);
|
||||||
|
|
||||||
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
|
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
|
||||||
|
|
|
@ -33,7 +33,7 @@ _setup(void)
|
||||||
};
|
};
|
||||||
fake_server = fake_server_start(&fake_server_data);
|
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);
|
ck_assert_ptr_ne(NULL, fake_server_object);
|
||||||
|
|
||||||
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
|
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
|
||||||
|
|
Loading…
Reference in New Issue