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?

diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index a6c2d15..fb197b6 100644 (file)
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -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),

diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 6e89db1..0e659eb 100644 (file)
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -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,

diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 1487e23..e77b6b2 100644 (file)
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -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;
     }
 }

diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index e311c98..62b7cec 100644 (file)
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -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,

diff --git a/src/lib/eldbus/eldbus_model_connection.eo b/src/lib/eldbus/eldbus_model_connection.eo
index 8db0968..b1f9a1d 100644 (file)
--- a/src/lib/eldbus/eldbus_model_connection.eo
+++ b/src/lib/eldbus/eldbus_model_connection.eo
@@ -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;
     }
 }

diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index e36f941..caafddd 100644 (file)
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -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;
 }

diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index 61e309a..015ebc7 100644 (file)
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -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.]]

diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index b359eaf..695f91c 100644 (file)
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -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);
      }

diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo
index e3fea3f..6123d3a 100644 (file)
--- a/src/lib/eldbus/eldbus_model_object.eo
+++ b/src/lib/eldbus/eldbus_model_object.eo
@@ -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;
     }
 }

diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 9b5fa88..99cae04 100644 (file)
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -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)

diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index 31221ca..9f6e306 100644 (file)
--- a/src/lib/eldbus/eldbus_model_proxy.eo
+++ b/src/lib/eldbus/eldbus_model_proxy.eo
@@ -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;
     }
 }

diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index 12681cd..d1bb490 100644 (file)
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -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);

diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 2a27fde..4aa547c 100644 (file)
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -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;
     }
 }

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index bf05142..1991af8 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -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;
 }

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index d240fef..df74b5c 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -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);

diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index 87a01df..be90e9c 100644 (file)
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -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);

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 5362600..cbd93bd 100644 (file)
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -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);