eldbus_model: Removed a few constructors

7 files changed, 207 insertions, 74 deletions

diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 3329b081bc..cc82a20cb8 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -45,21 +45,64 @@ _eldbus_model_arguments_eo_base_constructor(Eo *obj, Eldbus_Model_Arguments_Data
 }
 
 static void
-_eldbus_model_arguments_constructor(Eo *obj EINA_UNUSED,
-                                    Eldbus_Model_Arguments_Data *pd,
-                                    Eldbus_Proxy *proxy,
-                                    const char *name,
-                                    const Eina_List *arguments)
+_eldbus_model_arguments_arguments_set(Eo *obj EINA_UNUSED,
+                                      Eldbus_Model_Arguments_Data *pd,
+                                      const Eina_List *arguments)
+{
+   DBG("(%p)", obj);
+
+   pd->arguments = arguments;
+}
+
+static const Eina_List*
+_eldbus_model_arguments_arguments_get(Eo *obj EINA_UNUSED,
+                                      Eldbus_Model_Arguments_Data *pd)
+{
+   DBG("(%p)", obj);
+
+   return pd->arguments;
+}
+
+static void
+_eldbus_model_arguments_proxy_set(Eo *obj EINA_UNUSED,
+                                  Eldbus_Model_Arguments_Data *pd,
+                                  Eldbus_Proxy *proxy)
 {
    DBG("(%p)", obj);
    EINA_SAFETY_ON_NULL_RETURN(proxy);
-   EINA_SAFETY_ON_NULL_RETURN(name);
 
    pd->proxy = eldbus_proxy_ref(proxy);
-   pd->arguments = arguments;
+}
+
+static Eldbus_Proxy*
+_eldbus_model_arguments_proxy_get(Eo *obj EINA_UNUSED,
+                                  Eldbus_Model_Arguments_Data *pd)
+{
+   DBG("(%p)", obj);
+
+   return pd->proxy;
+}
+
+static void
+_eldbus_model_arguments_name_set(Eo *obj EINA_UNUSED,
+                                 Eldbus_Model_Arguments_Data *pd,
+                                 const char *name)
+{
+   DBG("(%p)", obj);
+   EINA_SAFETY_ON_NULL_RETURN(name);
+
    pd->name = eina_stringshare_add(name);
 }
 
+static const char*
+_eldbus_model_arguments_name_get(Eo *obj EINA_UNUSED,
+                                 Eldbus_Model_Arguments_Data *pd)
+{
+   DBG("(%p)", obj);
+
+   return pd->name;
+}
+
 static void
 _eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
 {
@@ -257,12 +300,6 @@ _eldbus_model_arguments_efl_model_base_children_load(Eo *obj, Eldbus_Model_Argum
    efl_model_load_set(pd->obj, &pd->load, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN);
 }
 
-static const char *
-_eldbus_model_arguments_name_get(Eo *obj EINA_UNUSED, Eldbus_Model_Arguments_Data *pd)
-{
-   return pd->name;
-}
-
 static void
 _eldbus_model_arguments_unload(Eldbus_Model_Arguments_Data *pd)
 {
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 64f39f9ce2..c2c78bf777 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -1,40 +1,53 @@
 class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
-    legacy_prefix: null;
-    methods {
-        constructor {
-            [[Custom Eldbus_Model_Arguments constructor.
+   legacy_prefix: null;
+   methods {
+      @property proxy {
+         [[Custom Eldbus_Model_Arguments constructor.
 
-            @since 1.16]]
-            params {
-                @in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
-                @in name: const(char)*; [[Name]]
-                @in arguments: const(Eina_List)*; [[The introspected arguments]]
-            }
-        }
-    @property name {
-            get {}
-            values {
-                value: const(char)*;
-            }
-        }
-    }
-    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
-        Efl.Model.Base.properties.get;
-        Efl.Model.Base.properties_load;
-        Efl.Model.Base.property.set;
-        Efl.Model.Base.property.get;
-        Efl.Model.Base.load;
-        Efl.Model.Base.load_status.get;
-        Efl.Model.Base.unload;
-        Efl.Model.Base.child_add;
-        Efl.Model.Base.child_del;
-        Efl.Model.Base.children_slice.get;
-        Efl.Model.Base.children_count.get;
-        Efl.Model.Base.children_load;
-    }
-    constructors {
-        .constructor;
-    }
+         @since 1.16]]
+         set {}
+         get {}
+         values {
+            proxy: Eldbus_Proxy*; [[Eldbus proxy]]
+         }
+      }
+      @property arguments {
+         [[Custom Eldbus_Model_Arguments constructor.
+
+         @since 1.16]]
+         set {}
+         get {}
+         values {
+            arguments: const(list<Eldbus_Introspection_Argument*>)* @optional; [[The introspected arguments]]
+         }
+      }
+      @property name {
+         get {}
+         set {}
+         values {
+            value: const(char)*;
+         }
+      }
+   }
+   implements {
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Efl.Model.Base.properties.get;
+      Efl.Model.Base.properties_load;
+      Efl.Model.Base.property.set;
+      Efl.Model.Base.property.get;
+      Efl.Model.Base.load;
+      Efl.Model.Base.load_status.get;
+      Efl.Model.Base.unload;
+      Efl.Model.Base.child_add;
+      Efl.Model.Base.child_del;
+      Efl.Model.Base.children_slice.get;
+      Efl.Model.Base.children_count.get;
+      Efl.Model.Base.children_load;
+   }
+   constructors {
+      .proxy;
+      .name;
+      .arguments @optional;
+   }
 }
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index 0f4e88b7cf..03911c0671 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -28,17 +28,50 @@ _eldbus_model_method_eo_base_constructor(Eo *obj, Eldbus_Model_Method_Data *pd)
 }
 
 static void
-_eldbus_model_method_constructor(Eo *obj EINA_UNUSED,
-                                 Eldbus_Model_Method_Data *pd,
-                                 Eldbus_Proxy *proxy,
-                                 const Eldbus_Introspection_Method *method)
+_eldbus_model_method_proxy_set(Eo *obj EINA_UNUSED,
+                               Eldbus_Model_Method_Data *pd EINA_UNUSED,
+                               Eldbus_Proxy *proxy)
 {
    DBG("(%p)", obj);
    EINA_SAFETY_ON_NULL_RETURN(proxy);
+
+   eo_do(obj, eldbus_model_arguments_proxy_set(proxy));
+}
+
+static void
+_eldbus_model_method_method_set(Eo *obj EINA_UNUSED,
+                                Eldbus_Model_Method_Data *pd,
+                                const Eldbus_Introspection_Method *method)
+{
+   DBG("(%p)", obj);
+
    EINA_SAFETY_ON_NULL_RETURN(method);
-   eo_do_super(obj, MY_CLASS, eldbus_model_arguments_constructor(proxy, method->name, method->arguments));
 
    pd->method = method;
+   eo_do(obj,
+         eldbus_model_arguments_name_set(method->name),
+         eldbus_model_arguments_set(method->arguments));
+}
+
+static Eldbus_Proxy*
+_eldbus_model_method_proxy_get(Eo *obj EINA_UNUSED,
+                               Eldbus_Model_Method_Data *pd EINA_UNUSED)
+{
+   DBG("(%p)", obj);
+
+   Eldbus_Proxy* p = NULL;
+   eo_do_super(obj, MY_CLASS, p = eldbus_model_arguments_proxy_get());
+
+   return p;
+}
+
+static const Eldbus_Introspection_Method *
+_eldbus_model_method_method_get(Eo *obj EINA_UNUSED,
+                                Eldbus_Model_Method_Data *pd)
+{
+   DBG("(%p)", obj);
+
+   return pd->method;
 }
 
 static Efl_Model_Load_Status
diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index 8b9d71411f..334d750090 100644
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -1,13 +1,21 @@
 class Eldbus.Model_Method (Eldbus.Model_Arguments) {
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Eldbus_Model_Method constructor.
+        // @property proxy {
+        //     [[Custom Eldbus_Model_Method constructor.
 
-              @since 1.16]]
-            params {
-                @in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
-                @in method: const(Eldbus_Introspection_Method)*; [[The introspected method]]
+        //       @since 1.16]]
+        //     get {}
+        //     set {}
+        //     values {
+        //         proxy: Eldbus_Proxy*; [[Eldbus proxy]]
+        //     }
+        // }
+        @property method {
+            get {}
+            set {}
+            values {
+                method: const(Eldbus_Introspection_Method)*; [[The introspected method]]
             }
         }
         call {
@@ -26,7 +34,7 @@ class Eldbus.Model_Method (Eldbus.Model_Arguments) {
         Eo.Base.constructor;
     }
     constructors {
-        .constructor;
+        .method;
     }
     events {
       successful,call; [[Event dispatched for a successful method call.]]
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 36b50fd960..74ac463fb2 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -322,7 +322,8 @@ _eldbus_model_proxy_create_methods_children(Eldbus_Model_Proxy_Data *pd)
         INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s", pd->obj, bus, path, interface_name, method_name);
 
         Eo *child = eo_add(ELDBUS_MODEL_METHOD_CLASS, NULL,
-                           eldbus_model_method_constructor(pd->proxy, method));
+                           eldbus_model_arguments_proxy_set(pd->proxy),
+                           eldbus_model_method_set(method));
 
         pd->children_list = eina_list_append(pd->children_list, child);
      }
@@ -350,7 +351,8 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd)
         DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s", pd->obj, bus, path, interface_name, signal_name);
 
         Eo *child = eo_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL,
-                           eldbus_model_signal_constructor(pd->proxy, signal));
+                           eldbus_model_signal_proxy_set(pd->proxy),
+                           eldbus_model_signal_set(signal));
 
         pd->children_list = eina_list_append(pd->children_list, child);
      }
diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index 2c4f6dbdd3..7bab6f3269 100644
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -28,17 +28,48 @@ _eldbus_model_signal_eo_base_constructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
 }
 
 static void
-_eldbus_model_signal_constructor(Eo *obj EINA_UNUSED,
-                                 Eldbus_Model_Signal_Data *pd,
-                                 Eldbus_Proxy *proxy,
-                                 const Eldbus_Introspection_Signal *signal)
+_eldbus_model_signal_proxy_set(Eo *obj EINA_UNUSED,
+                               Eldbus_Model_Signal_Data *pd EINA_UNUSED,
+                               Eldbus_Proxy *proxy)
 {
    DBG("(%p)", obj);
    EINA_SAFETY_ON_NULL_RETURN(proxy);
+
+   eo_do_super(obj, MY_CLASS, eldbus_model_arguments_proxy_set(proxy));
+}
+
+static Eldbus_Proxy*
+_eldbus_model_signal_proxy_get(Eo *obj EINA_UNUSED,
+                               Eldbus_Model_Signal_Data *pd EINA_UNUSED)
+{
+   DBG("(%p)", obj);
+   Eldbus_Proxy* p = NULL;
+   
+   eo_do_super(obj, MY_CLASS, p = eldbus_model_arguments_proxy_get());
+
+   return p;
+}
+
+static void
+_eldbus_model_signal_signal_set(Eo *obj EINA_UNUSED,
+                                Eldbus_Model_Signal_Data *pd,
+                                const Eldbus_Introspection_Signal *signal)
+{
+   DBG("(%p)", obj);
+
    EINA_SAFETY_ON_NULL_RETURN(signal);
-   eo_do_super(obj, MY_CLASS, eldbus_model_arguments_constructor(proxy, signal->name, signal->arguments));
 
    pd->signal = signal;
+   eo_do(obj,
+         eldbus_model_arguments_name_set(signal->name),
+         eldbus_model_arguments_set(signal->arguments));
+}
+
+static const Eldbus_Introspection_Signal*
+_eldbus_model_signal_signal_get(Eo *obj EINA_UNUSED,
+                                Eldbus_Model_Signal_Data *pd)
+{
+   return pd->signal;
 }
 
 static void
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 237b149dbe..473c64ec4e 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -1,13 +1,21 @@
 class Eldbus.Model_Signal (Eldbus.Model_Arguments) {
     legacy_prefix: null;
     methods {
-        constructor {
+        @property proxy {
               [[Custom Eldbus_Model_Signal constructor.
 
                 @since 1.16]]
-            params {
-                @in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
-                @in signal: const(Eldbus_Introspection_Signal)*; [[The introspected method]]
+            set {}
+            get {}
+            values {
+               proxy: Eldbus_Proxy*; [[Eldbus proxy]]
+            }
+        }
+        @property signal {
+            set {}
+            get {}
+            values {
+               signal: const(Eldbus_Introspection_Signal)*; [[The introspected method]]
             }
         }
     }
@@ -18,6 +26,7 @@ class Eldbus.Model_Signal (Eldbus.Model_Arguments) {
         Efl.Model.Base.unload;
     }
     constructors {
-        .constructor;
+        .proxy;
+        .signal;
     }
 }