ecore_con: from ecore_con_connector to efl_network_connector.

Summary:
Changed ecore_con_connector.eo to efl_network_connector.eo as part of
migrating to efl_network.

Signed-off-by: Srivardhan Hebbar <sri.hebbar@samsung.com>
Reviewers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D3427

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>

diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 544e6d9..8ed6b08 100644 (file)
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -5,7 +5,7 @@ ecore_con_eolian_files = \
        lib/ecore_con/ecore_con_base.eo \
        lib/ecore_con/ecore_con_client.eo \
        lib/ecore_con/ecore_con_server.eo \
-       lib/ecore_con/ecore_con_connector.eo \
+       lib/ecore_con/efl_network_connector.eo \
        lib/ecore_con/ecore_con_eet_base.eo \
        lib/ecore_con/ecore_con_eet_server_obj.eo \
        lib/ecore_con/ecore_con_eet_client_obj.eo \

diff --git a/src/lib/ecore_con/Ecore_Con_Eo.h b/src/lib/ecore_con/Ecore_Con_Eo.h
index 2ccaabe..460e15e 100644 (file)
--- a/src/lib/ecore_con/Ecore_Con_Eo.h
+++ b/src/lib/ecore_con/Ecore_Con_Eo.h
@@ -1,5 +1,5 @@
 #include "ecore_con_base.eo.h"
 #include "ecore_con_server.eo.h"
-#include "ecore_con_connector.eo.h"
+#include "efl_network_connector.eo.h"
 #include "ecore_con_client.eo.h"
 #include "efl_network_url.eo.h"

diff --git a/src/lib/ecore_con/Ecore_Con_Legacy.h b/src/lib/ecore_con/Ecore_Con_Legacy.h
index 44de302..6f9b3f3 100644 (file)
--- a/src/lib/ecore_con/Ecore_Con_Legacy.h
+++ b/src/lib/ecore_con/Ecore_Con_Legacy.h
@@ -5,7 +5,7 @@
 
 #include "ecore_con_base.eo.legacy.h"
 #include "ecore_con_server.eo.legacy.h"
-#include "ecore_con_connector.eo.legacy.h"
+#include "efl_network_connector.eo.legacy.h"
 #include "ecore_con_client.eo.legacy.h"
 
 

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 991d8c6..1205439 100644 (file)
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -306,7 +306,7 @@ _ecore_con_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char
    if (!name || !done_cb)
      return EINA_FALSE;
 
-   obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL,
+   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
          ecore_con_server_obj_connection_type_set(ECORE_CON_REMOTE_TCP),
          ecore_con_server_obj_name_set(name),
          ecore_con_obj_port_set(1025));
@@ -462,7 +462,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
    /* local  user   socket: FILE:   ~/.ecore/[name]/[port] */
    /* local  system socket: FILE:   /tmp/.ecore_service|[name]|[port] */
    /* remote system socket: TCP/IP: [name]:[port] */
-   obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL,
+   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
          ecore_con_server_obj_connection_type_set(compl_type),
          ecore_con_server_obj_name_set(name),
          ecore_con_obj_port_set(port));
@@ -473,7 +473,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
 }
 
 EOLIAN static Eo *
-_ecore_con_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
+_efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
 {
    Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
    Ecore_Con_Type compl_type = svr->type;
@@ -3004,4 +3004,4 @@ _ecore_con_lookup_done(void *data,
 #include "ecore_con_base.eo.c"
 #include "ecore_con_client.eo.c"
 #include "ecore_con_server.eo.c"
-#include "ecore_con_connector.eo.c"
+#include "efl_network_connector.eo.c"

diff --git a/src/lib/ecore_con/ecore_con_connector.eo b/src/lib/ecore_con/ecore_con_connector.eo
deleted file mode 100644 (file)
index 9952637..0000000
--- a/src/lib/ecore_con/ecore_con_connector.eo
+++ /dev/null
@@ -1,8 +0,0 @@
-class Ecore.Con.Connector (Ecore.Con.Server) {
-   legacy_prefix: null;
-   eo_prefix: ecore_con_connector_obj;
-   data: null;
-   implements {
-      Eo.Base.finalize;
-   }
-}

diff --git a/src/lib/ecore_con/efl_network_connector.eo b/src/lib/ecore_con/efl_network_connector.eo
new file mode 100644 (file)
index 0000000..ef92d77
--- /dev/null
+++ b/src/lib/ecore_con/efl_network_connector.eo
@@ -0,0 +1,7 @@
+class Efl.Network.Connector (Ecore.Con.Server) {
+   eo_prefix: efl_network_connector_obj;
+   data: null;
+   implements {
+      Eo.Base.finalize;
+   }
+}