summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-03-06 19:05:49 +0100
commit7eb60a371ece859f18bdc146b68d75067691ef1b (patch)
tree418078a5ac94faf86ff6f264259fa5fd8d463703 /src/lib/ecore_con
parent5bfe2e89d247ac6491b2cfbfe5a787286859a202 (diff)
ecore-con: remove all legacy usage from eo files
this takes the current generated output from eolian for legacy code in evas and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Marcel Hollerbach <marcel-hollerbach@t-online.de> Differential Revision: https://phab.enlightenment.org/D8108
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/Ecore_Con_Eet_Eo.h6
-rw-r--r--src/lib/ecore_con/Ecore_Con_Eet_Legacy.h6
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c6
-rw-r--r--src/lib/ecore_con/ecore_con_eet_base.eo95
-rw-r--r--src/lib/ecore_con/ecore_con_eet_base_eo.c90
-rw-r--r--src/lib/ecore_con/ecore_con_eet_base_eo.h142
-rw-r--r--src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c6
-rw-r--r--src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h43
-rw-r--r--src/lib/ecore_con/ecore_con_eet_client_obj.eo10
-rw-r--r--src/lib/ecore_con/ecore_con_eet_client_obj_eo.c39
-rw-r--r--src/lib/ecore_con/ecore_con_eet_client_obj_eo.h24
-rw-r--r--src/lib/ecore_con/ecore_con_eet_client_obj_eo.legacy.h17
-rw-r--r--src/lib/ecore_con/ecore_con_eet_server_obj.eo10
-rw-r--r--src/lib/ecore_con/ecore_con_eet_server_obj_eo.c39
-rw-r--r--src/lib/ecore_con/ecore_con_eet_server_obj_eo.h24
-rw-r--r--src/lib/ecore_con/ecore_con_eet_server_obj_eo.legacy.h17
-rw-r--r--src/lib/ecore_con/meson.build40
17 files changed, 458 insertions, 156 deletions
diff --git a/src/lib/ecore_con/Ecore_Con_Eet_Eo.h b/src/lib/ecore_con/Ecore_Con_Eet_Eo.h
index 52b1a4b9ed..ae751987d3 100644
--- a/src/lib/ecore_con/Ecore_Con_Eet_Eo.h
+++ b/src/lib/ecore_con/Ecore_Con_Eet_Eo.h
@@ -1,3 +1,3 @@
1#include "ecore_con_eet_base.eo.h" 1#include "ecore_con_eet_base_eo.h"
2#include "ecore_con_eet_server_obj.eo.h" 2#include "ecore_con_eet_server_obj_eo.h"
3#include "ecore_con_eet_client_obj.eo.h" 3#include "ecore_con_eet_client_obj_eo.h"
diff --git a/src/lib/ecore_con/Ecore_Con_Eet_Legacy.h b/src/lib/ecore_con/Ecore_Con_Eet_Legacy.h
index 34047283c6..6bd6bf58d6 100644
--- a/src/lib/ecore_con/Ecore_Con_Eet_Legacy.h
+++ b/src/lib/ecore_con/Ecore_Con_Eet_Legacy.h
@@ -1,3 +1,3 @@
1#include "ecore_con_eet_base.eo.legacy.h" 1#include "ecore_con_eet_base_eo.legacy.h"
2#include "ecore_con_eet_client_obj.eo.legacy.h" 2#include "ecore_con_eet_client_obj_eo.legacy.h"
3#include "ecore_con_eet_server_obj.eo.legacy.h" 3#include "ecore_con_eet_server_obj_eo.legacy.h"
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index fd7c547caa..bd7aed5ec5 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -955,6 +955,6 @@ ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const
955 eina_binbuf_free(buf); 955 eina_binbuf_free(buf);
956} 956}
957 957
958#include "ecore_con_eet_base.eo.c" 958#include "ecore_con_eet_base_eo.c"
959#include "ecore_con_eet_server_obj.eo.c" 959#include "ecore_con_eet_server_obj_eo.c"
960#include "ecore_con_eet_client_obj.eo.c" 960#include "ecore_con_eet_client_obj_eo.c"
diff --git a/src/lib/ecore_con/ecore_con_eet_base.eo b/src/lib/ecore_con/ecore_con_eet_base.eo
deleted file mode 100644
index 26717efa04..0000000000
--- a/src/lib/ecore_con/ecore_con_eet_base.eo
+++ /dev/null
@@ -1,95 +0,0 @@
1struct @extern Ecore_Con_Server; [[Ecore connection server structure]]
2type @extern Ecore_Con_Eet_Data_Cb: __undefined_type; [[Ecore connection eet data callback type]] /* FIXME: function pointers not supported. */
3type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; [[Ecore connection eet raw data callback type]]/* FIXME: function pointers not supported. */
4
5struct @extern Eet.Data.Descriptor; [[Eet data descriptor data structure]]
6struct Ecore.Con.Reply; [[Ecore connection reply data structure]]
7
8class Ecore.Con.Eet.Base extends Efl.Object {
9 [[Ecore Connection Eet Base class.
10
11 This class provides Eet data serialization features to Ecore Connection objects.]]
12
13 methods {
14 @property server {
15 [[The server object to which we send and receive.]]
16 set {
17 }
18 get {
19 }
20 values {
21 data: ptr(Ecore_Con_Server); [[Server object]]
22 }
23 }
24 @property data_callback {
25 [[A callback function which should be called when data is
26 received by ecore_con_eet_object.]]
27 set {
28 }
29 values {
30 name: string; [[The name of the eet stream.]]
31 func: Ecore_Con_Eet_Data_Cb; [[The callback function.]]
32 data: const(void_ptr); [[The data (if any) that should be
33 passed to callback function.]]
34 }
35 }
36 @property raw_data_callback {
37 [[A callback function which should be calledn when raw data
38 is received by ecore_con_eet_object.]]
39 set {
40 }
41 values {
42 name: string; [[The name of the eet stream.]]
43 func: Ecore_Con_Eet_Raw_Data_Cb; [[The callback function.]]
44 data: const(void_ptr); [[The data (if any) that should be
45 passed to callback function.]]
46 }
47 }
48 data_callback_del {
49 [[Function to delete the @.data_callback.]]
50 params {
51 name: string; [[The name of the eet stream.]]
52 }
53 }
54 raw_data_callback_del {
55 [[Function to delete the @.raw_data_callback.]]
56 params {
57 name: string; [[The name of the eet stream.]]
58 }
59 }
60 register {
61 [[Function to register a \@ref Eet.Data.Descriptor to the
62 ecore_con_eet object.]]
63 legacy: ecore_con_eet;
64 params {
65 name: string; [[The name of the eet stream.]]
66 edd: ptr(Eet.Data.Descriptor); [[The Eet.Data.Descriptor that
67 is to be registered.]]
68 }
69 }
70 send {
71 [[Function to send data.]]
72 params {
73 reply: ptr(Ecore.Con.Reply); [[Contains the ecore_con_eet object
74 to which the data has to be sent.]]
75 name: string; [[The name of the eet stream.]]
76 value: void_ptr; [[Actual data]]
77 }
78 }
79 raw_send {
80 [[Function to send raw data.]]
81 params {
82 reply: ptr(Ecore.Con.Reply); [[Contains the ecore_con_eet object
83 to which the data has to be sent.]]
84 protocol_name: string; [[The name of the eet stream.]]
85 section: string; [[Name of section in the eet descriptor.]]
86 section_data: ptr(Eina.Binbuf);
87 }
88 }
89 }
90 implements {
91 Efl.Object.constructor;
92 Efl.Object.destructor;
93 Efl.Object.finalize;
94 }
95}
diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.c b/src/lib/ecore_con/ecore_con_eet_base_eo.c
new file mode 100644
index 0000000000..7e1e6913c1
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_base_eo.c
@@ -0,0 +1,90 @@
1
2void _ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Server *data);
3
4EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_server_set, EFL_FUNC_CALL(data), Ecore_Con_Server *data);
5
6Ecore_Con_Server *_ecore_con_eet_base_server_get(const Eo *obj, Ecore_Con_Eet_Base_Data *pd);
7
8EOAPI EFL_FUNC_BODY_CONST(ecore_con_eet_base_server_get, Ecore_Con_Server *, NULL);
9
10void _ecore_con_eet_base_data_callback_set(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data);
11
12EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_data_callback_set, EFL_FUNC_CALL(name, func, data), const char *name, Ecore_Con_Eet_Data_Cb func, const void *data);
13
14void _ecore_con_eet_base_raw_data_callback_set(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data);
15
16EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_data_callback_set, EFL_FUNC_CALL(name, func, data), const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data);
17
18void _ecore_con_eet_base_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name);
19
20EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_data_callback_del, EFL_FUNC_CALL(name), const char *name);
21
22void _ecore_con_eet_base_raw_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name);
23
24EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_data_callback_del, EFL_FUNC_CALL(name), const char *name);
25
26void _ecore_con_eet_base_register(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name, Eet_Data_Descriptor *edd);
27
28EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_register, EFL_FUNC_CALL(name, edd), const char *name, Eet_Data_Descriptor *edd);
29
30void _ecore_con_eet_base_send(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Reply *reply, const char *name, void *value);
31
32EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_send, EFL_FUNC_CALL(reply, name, value), Ecore_Con_Reply *reply, const char *name, void *value);
33
34void _ecore_con_eet_base_raw_send(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data);
35
36EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_send, EFL_FUNC_CALL(reply, protocol_name, section, section_data), Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data);
37
38Efl_Object *_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd);
39
40
41void _ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd);
42
43
44Efl_Object *_ecore_con_eet_base_efl_object_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd);
45
46
47static Eina_Bool
48_ecore_con_eet_base_class_initializer(Efl_Class *klass)
49{
50 const Efl_Object_Ops *opsp = NULL;
51
52 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
53
54#ifndef ECORE_CON_EET_BASE_EXTRA_OPS
55#define ECORE_CON_EET_BASE_EXTRA_OPS
56#endif
57
58 EFL_OPS_DEFINE(ops,
59 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_server_set, _ecore_con_eet_base_server_set),
60 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_server_get, _ecore_con_eet_base_server_get),
61 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_data_callback_set, _ecore_con_eet_base_data_callback_set),
62 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_raw_data_callback_set, _ecore_con_eet_base_raw_data_callback_set),
63 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_data_callback_del, _ecore_con_eet_base_data_callback_del),
64 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_raw_data_callback_del, _ecore_con_eet_base_raw_data_callback_del),
65 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_register, _ecore_con_eet_base_register),
66 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_send, _ecore_con_eet_base_send),
67 EFL_OBJECT_OP_FUNC(ecore_con_eet_base_raw_send, _ecore_con_eet_base_raw_send),
68 EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_con_eet_base_efl_object_constructor),
69 EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_con_eet_base_efl_object_destructor),
70 EFL_OBJECT_OP_FUNC(efl_finalize, _ecore_con_eet_base_efl_object_finalize),
71 ECORE_CON_EET_BASE_EXTRA_OPS
72 );
73 opsp = &ops;
74
75 return efl_class_functions_set(klass, opsp, ropsp);
76}
77
78static const Efl_Class_Description _ecore_con_eet_base_class_desc = {
79 EO_VERSION,
80 "Ecore.Con.Eet.Base",
81 EFL_CLASS_TYPE_REGULAR,
82 sizeof(Ecore_Con_Eet_Base_Data),
83 _ecore_con_eet_base_class_initializer,
84 NULL,
85 NULL
86};
87
88EFL_DEFINE_CLASS(ecore_con_eet_base_class_get, &_ecore_con_eet_base_class_desc, EFL_OBJECT_CLASS, NULL);
89
90#include "ecore_con_eet_base_eo.legacy.c"
diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.h b/src/lib/ecore_con/ecore_con_eet_base_eo.h
new file mode 100644
index 0000000000..6c8176861f
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_base_eo.h
@@ -0,0 +1,142 @@
1#ifndef _ECORE_CON_EET_BASE_EO_H_
2#define _ECORE_CON_EET_BASE_EO_H_
3
4#ifndef _ECORE_CON_EET_BASE_EO_CLASS_TYPE
5#define _ECORE_CON_EET_BASE_EO_CLASS_TYPE
6
7typedef Eo Ecore_Con_Eet_Base;
8
9#endif
10
11#ifndef _ECORE_CON_EET_BASE_EO_TYPES
12#define _ECORE_CON_EET_BASE_EO_TYPES
13
14/** Ecore connection reply data structure
15 *
16 * @ingroup Ecore_Con
17 */
18typedef struct _Ecore_Con_Reply Ecore_Con_Reply;
19
20
21#endif
22/**
23 * @brief Ecore Connection Eet Base class.
24 *
25 * This class provides Eet data serialization features to Ecore Connection
26 * objects.
27 *
28 * @ingroup Ecore_Con_Eet_Base
29 */
30#define ECORE_CON_EET_BASE_CLASS ecore_con_eet_base_class_get()
31
32EWAPI const Efl_Class *ecore_con_eet_base_class_get(void);
33
34/**
35 * @brief The server object to which we send and receive.
36 *
37 * @param[in] obj The object.
38 * @param[in] data Server object
39 *
40 * @ingroup Ecore_Con_Eet_Base
41 */
42EOAPI void ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Server *data);
43
44/**
45 * @brief The server object to which we send and receive.
46 *
47 * @param[in] obj The object.
48 *
49 * @return Server object
50 *
51 * @ingroup Ecore_Con_Eet_Base
52 */
53EOAPI Ecore_Con_Server *ecore_con_eet_base_server_get(const Eo *obj);
54
55/**
56 * @brief A callback function which should be called when data is received by
57 * ecore_con_eet_object.
58 *
59 * @param[in] obj The object.
60 * @param[in] name The name of the eet stream.
61 * @param[in] func The callback function.
62 * @param[in] data The data (if any) that should be passed to callback
63 * function.
64 *
65 * @ingroup Ecore_Con_Eet_Base
66 */
67EOAPI void ecore_con_eet_base_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data);
68
69/**
70 * @brief A callback function which should be calledn when raw data is received
71 * by ecore_con_eet_object.
72 *
73 * @param[in] obj The object.
74 * @param[in] name The name of the eet stream.
75 * @param[in] func The callback function.
76 * @param[in] data The data (if any) that should be passed to callback
77 * function.
78 *
79 * @ingroup Ecore_Con_Eet_Base
80 */
81EOAPI void ecore_con_eet_base_raw_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data);
82
83/**
84 * @brief Function to delete the @ref ecore_con_eet_base_data_callback_set.
85 *
86 * @param[in] obj The object.
87 * @param[in] name The name of the eet stream.
88 *
89 * @ingroup Ecore_Con_Eet_Base
90 */
91EOAPI void ecore_con_eet_base_data_callback_del(Eo *obj, const char *name);
92
93/**
94 * @brief Function to delete the @ref ecore_con_eet_base_raw_data_callback_set.
95 *
96 * @param[in] obj The object.
97 * @param[in] name The name of the eet stream.
98 *
99 * @ingroup Ecore_Con_Eet_Base
100 */
101EOAPI void ecore_con_eet_base_raw_data_callback_del(Eo *obj, const char *name);
102
103/**
104 * @brief Function to register a @ref Eet.Data.Descriptor to the ecore_con_eet
105 * object.
106 *
107 * @param[in] obj The object.
108 * @param[in] name The name of the eet stream.
109 * @param[in] edd The Eet.Data.Descriptor that is to be registered.
110 *
111 * @ingroup Ecore_Con_Eet_Base
112 */
113EOAPI void ecore_con_eet_base_register(Eo *obj, const char *name, Eet_Data_Descriptor *edd);
114
115/**
116 * @brief Function to send data.
117 *
118 * @param[in] obj The object.
119 * @param[in] reply Contains the ecore_con_eet object to which the data has to
120 * be sent.
121 * @param[in] name The name of the eet stream.
122 * @param[in] value Actual data
123 *
124 * @ingroup Ecore_Con_Eet_Base
125 */
126EOAPI void ecore_con_eet_base_send(Eo *obj, Ecore_Con_Reply *reply, const char *name, void *value);
127
128/**
129 * @brief Function to send raw data.
130 *
131 * @param[in] obj The object.
132 * @param[in] reply Contains the ecore_con_eet object to which the data has to
133 * be sent.
134 * @param[in] protocol_name The name of the eet stream.
135 * @param[in] section Name of section in the eet descriptor.
136 * @param[in] section_data
137 *
138 * @ingroup Ecore_Con_Eet_Base
139 */
140EOAPI void ecore_con_eet_base_raw_send(Eo *obj, Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data);
141
142#endif
diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c
new file mode 100644
index 0000000000..696028a9c8
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c
@@ -0,0 +1,6 @@
1
2EAPI void
3ecore_con_eet(Ecore_Con_Eet_Base *obj, const char *name, Eet_Data_Descriptor *edd)
4{
5 ecore_con_eet_base_register(obj, name, edd);
6}
diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h
new file mode 100644
index 0000000000..4636f095bb
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h
@@ -0,0 +1,43 @@
1#ifndef _ECORE_CON_EET_BASE_EO_LEGACY_H_
2#define _ECORE_CON_EET_BASE_EO_LEGACY_H_
3
4#ifndef _ECORE_CON_EET_BASE_EO_CLASS_TYPE
5#define _ECORE_CON_EET_BASE_EO_CLASS_TYPE
6
7typedef Eo Ecore_Con_Eet_Base;
8
9#endif
10
11#ifndef _ECORE_CON_EET_BASE_EO_TYPES
12#define _ECORE_CON_EET_BASE_EO_TYPES
13
14/** Ecore connection reply data structure
15 *
16 * @ingroup Ecore_Con
17 */
18typedef struct _Ecore_Con_Reply Ecore_Con_Reply;
19
20
21#endif
22
23
24
25
26
27
28
29/**
30 * @brief Function to register a @ref Eet.Data.Descriptor to the ecore_con_eet
31 * object.
32 *
33 * @param[in] obj The object.
34 * @param[in] name The name of the eet stream.
35 * @param[in] edd The Eet.Data.Descriptor that is to be registered.
36 *
37 * @ingroup (null)_Group
38 */
39EAPI void ecore_con_eet(Ecore_Con_Eet_Base *obj, const char *name, Eet_Data_Descriptor *edd);
40
41
42
43#endif
diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj.eo b/src/lib/ecore_con/ecore_con_eet_client_obj.eo
deleted file mode 100644
index 8b5955a49a..0000000000
--- a/src/lib/ecore_con/ecore_con_eet_client_obj.eo
+++ /dev/null
@@ -1,10 +0,0 @@
1class Ecore.Con.Eet.Client.Obj extends Ecore.Con.Eet.Base {
2 [[Ecore Connection Eet Client class.]]
3
4 eo_prefix: ecore_con_eet_client_obj;
5 implements {
6 Efl.Object.constructor;
7 Efl.Object.destructor;
8 }
9}
10
diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj_eo.c b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.c
new file mode 100644
index 0000000000..3c9f7cbef4
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.c
@@ -0,0 +1,39 @@
1
2Efl_Object *_ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd);
3
4
5void _ecore_con_eet_client_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd);
6
7
8static Eina_Bool
9_ecore_con_eet_client_obj_class_initializer(Efl_Class *klass)
10{
11 const Efl_Object_Ops *opsp = NULL;
12
13 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
14
15#ifndef ECORE_CON_EET_CLIENT_OBJ_EXTRA_OPS
16#define ECORE_CON_EET_CLIENT_OBJ_EXTRA_OPS
17#endif
18
19 EFL_OPS_DEFINE(ops,
20 EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_con_eet_client_obj_efl_object_constructor),
21 EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_con_eet_client_obj_efl_object_destructor),
22 ECORE_CON_EET_CLIENT_OBJ_EXTRA_OPS
23 );
24 opsp = &ops;
25
26 return efl_class_functions_set(klass, opsp, ropsp);
27}
28
29static const Efl_Class_Description _ecore_con_eet_client_obj_class_desc = {
30 EO_VERSION,
31 "Ecore.Con.Eet.Client.Obj",
32 EFL_CLASS_TYPE_REGULAR,
33 sizeof(Ecore_Con_Eet_Client_Obj_Data),
34 _ecore_con_eet_client_obj_class_initializer,
35 NULL,
36 NULL
37};
38
39EFL_DEFINE_CLASS(ecore_con_eet_client_obj_class_get, &_ecore_con_eet_client_obj_class_desc, ECORE_CON_EET_BASE_CLASS, NULL);
diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj_eo.h b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.h
new file mode 100644
index 0000000000..0de995fca3
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.h
@@ -0,0 +1,24 @@
1#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_H_
2#define _ECORE_CON_EET_CLIENT_OBJ_EO_H_
3
4#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
5#define _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
6
7typedef Eo Ecore_Con_Eet_Client_Obj;
8
9#endif
10
11#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
12#define _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
13
14
15#endif
16/** Ecore Connection Eet Client class.
17 *
18 * @ingroup Ecore_Con_Eet_Client_Obj
19 */
20#define ECORE_CON_EET_CLIENT_OBJ_CLASS ecore_con_eet_client_obj_class_get()
21
22EWAPI const Efl_Class *ecore_con_eet_client_obj_class_get(void);
23
24#endif
diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj_eo.legacy.h b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.legacy.h
new file mode 100644
index 0000000000..81081c0894
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_LEGACY_H_
2#define _ECORE_CON_EET_CLIENT_OBJ_EO_LEGACY_H_
3
4#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
5#define _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
6
7typedef Eo Ecore_Con_Eet_Client_Obj;
8
9#endif
10
11#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
12#define _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj.eo b/src/lib/ecore_con/ecore_con_eet_server_obj.eo
deleted file mode 100644
index 11c97d4889..0000000000
--- a/src/lib/ecore_con/ecore_con_eet_server_obj.eo
+++ /dev/null
@@ -1,10 +0,0 @@
1class Ecore.Con.Eet.Server.Obj extends Ecore.Con.Eet.Base {
2 [[Ecore Connection Eet Server class.]]
3
4 eo_prefix: ecore_con_eet_server_obj;
5 implements {
6 Efl.Object.constructor;
7 Efl.Object.destructor;
8 }
9}
10
diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj_eo.c b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.c
new file mode 100644
index 0000000000..3f7f4eac18
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.c
@@ -0,0 +1,39 @@
1
2Efl_Object *_ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd);
3
4
5void _ecore_con_eet_server_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd);
6
7
8static Eina_Bool
9_ecore_con_eet_server_obj_class_initializer(Efl_Class *klass)
10{
11 const Efl_Object_Ops *opsp = NULL;
12
13 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
14
15#ifndef ECORE_CON_EET_SERVER_OBJ_EXTRA_OPS
16#define ECORE_CON_EET_SERVER_OBJ_EXTRA_OPS
17#endif
18
19 EFL_OPS_DEFINE(ops,
20 EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_con_eet_server_obj_efl_object_constructor),
21 EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_con_eet_server_obj_efl_object_destructor),
22 ECORE_CON_EET_SERVER_OBJ_EXTRA_OPS
23 );
24 opsp = &ops;
25
26 return efl_class_functions_set(klass, opsp, ropsp);
27}
28
29static const Efl_Class_Description _ecore_con_eet_server_obj_class_desc = {
30 EO_VERSION,
31 "Ecore.Con.Eet.Server.Obj",
32 EFL_CLASS_TYPE_REGULAR,
33 sizeof(Ecore_Con_Eet_Server_Obj_Data),
34 _ecore_con_eet_server_obj_class_initializer,
35 NULL,
36 NULL
37};
38
39EFL_DEFINE_CLASS(ecore_con_eet_server_obj_class_get, &_ecore_con_eet_server_obj_class_desc, ECORE_CON_EET_BASE_CLASS, NULL);
diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj_eo.h b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.h
new file mode 100644
index 0000000000..3d2a76c38e
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.h
@@ -0,0 +1,24 @@
1#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_H_
2#define _ECORE_CON_EET_SERVER_OBJ_EO_H_
3
4#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
5#define _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
6
7typedef Eo Ecore_Con_Eet_Server_Obj;
8
9#endif
10
11#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
12#define _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
13
14
15#endif
16/** Ecore Connection Eet Server class.
17 *
18 * @ingroup Ecore_Con_Eet_Server_Obj
19 */
20#define ECORE_CON_EET_SERVER_OBJ_CLASS ecore_con_eet_server_obj_class_get()
21
22EWAPI const Efl_Class *ecore_con_eet_server_obj_class_get(void);
23
24#endif
diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj_eo.legacy.h b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.legacy.h
new file mode 100644
index 0000000000..c3c37b3bde
--- /dev/null
+++ b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_LEGACY_H_
2#define _ECORE_CON_EET_SERVER_OBJ_EO_LEGACY_H_
3
4#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
5#define _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
6
7typedef Eo Ecore_Con_Eet_Server_Obj;
8
9#endif
10
11#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
12#define _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index d1375e246e..d46a8cdb04 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -17,36 +17,6 @@ if ipv6
17 config_h.set('HAVE_IPV6', 1) 17 config_h.set('HAVE_IPV6', 1)
18endif 18endif
19 19
20pub_legacy_eo_files = [
21 'ecore_con_eet_base.eo',
22 'ecore_con_eet_server_obj.eo',
23 'ecore_con_eet_client_obj.eo'
24]
25
26pub_eo_file_target = []
27foreach eo_file : pub_legacy_eo_files
28 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
29 input : eo_file,
30 output : [eo_file + '.h'],
31 depfile : eo_file + '.d',
32 install : true,
33 install_dir : dir_package_include,
34 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
35 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
36 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
37 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
38 '-gchd', '@INPUT@'])
39 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
40 input : eo_file,
41 output : [eo_file + '.legacy.h'],
42 depfile : eo_file + '.legacy.d',
43 install : true,
44 install_dir : dir_package_include,
45 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
46 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'),
47 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
48 '-gld', '@INPUT@'])
49endforeach
50 20
51pub_eo_files = [ 21pub_eo_files = [
52 'efl_net_socket.eo', 22 'efl_net_socket.eo',
@@ -133,7 +103,13 @@ ecore_con_header_src = [
133 'Efl_Net.h', 103 'Efl_Net.h',
134 'Ecore_Con_Eet.h', 104 'Ecore_Con_Eet.h',
135 'Ecore_Con_Eet_Legacy.h', 105 'Ecore_Con_Eet_Legacy.h',
136 'Ecore_Con_Eet_Eo.h' 106 'Ecore_Con_Eet_Eo.h',
107 'ecore_con_eet_base_eo.h',
108 'ecore_con_eet_base_eo.legacy.h',
109 'ecore_con_eet_client_obj_eo.h',
110 'ecore_con_eet_client_obj_eo.legacy.h',
111 'ecore_con_eet_server_obj_eo.h',
112 'ecore_con_eet_server_obj_eo.legacy.h'
137] 113]
138 114
139ecore_con_src = [ 115ecore_con_src = [
@@ -224,7 +200,7 @@ ecore_con = declare_dependency(
224 dependencies: ecore_con_pub_deps, 200 dependencies: ecore_con_pub_deps,
225) 201)
226 202
227install_data(pub_eo_files + pub_eo_types_files + pub_legacy_eo_files, 203install_data(pub_eo_files + pub_eo_types_files,
228 install_dir: eolian_ecore_dir 204 install_dir: eolian_ecore_dir
229) 205)
230 206