forked from enlightenment/efl
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
This commit is contained in:
Mike Blumenkrantz
parent
5bfe2e89d2
commit
7eb60a371e
|
|
@ -28,10 +28,7 @@ ecore_con_eolian_files = \
|
|||
lib/ecore_con/efl_net_control_technology.eo \
|
||||
lib/ecore_con/efl_net_control_manager.eo \
|
||||
lib/ecore_con/efl_net_session.eo \
|
||||
lib/ecore_con/efl_net_ip_address.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
|
||||
lib/ecore_con/efl_net_ip_address.eo
|
||||
|
||||
if HAVE_WINDOWS
|
||||
ecore_con_eolian_files += \
|
||||
|
|
@ -53,8 +50,7 @@ ecore_con_eolian_type_files = \
|
|||
|
||||
ecore_con_eolian_c = $(ecore_con_eolian_files:%.eo=%.eo.c)
|
||||
ecore_con_eolian_h = $(ecore_con_eolian_files:%.eo=%.eo.h) \
|
||||
$(ecore_con_eolian_type_files:%.eot=%.eot.h) \
|
||||
$(ecore_con_eolian_files:%.eo=%.eo.legacy.h)
|
||||
$(ecore_con_eolian_type_files:%.eot=%.eot.h)
|
||||
|
||||
BUILT_SOURCES += \
|
||||
$(ecore_con_eolian_c) \
|
||||
|
|
@ -77,7 +73,14 @@ lib/ecore_con/Ecore_Con.h \
|
|||
lib/ecore_con/Efl_Net.h \
|
||||
lib/ecore_con/Ecore_Con_Eet.h \
|
||||
lib/ecore_con/Ecore_Con_Eet_Legacy.h \
|
||||
lib/ecore_con/Ecore_Con_Eet_Eo.h
|
||||
lib/ecore_con/Ecore_Con_Eet_Eo.h \
|
||||
lib/ecore_con/ecore_con_eet_base_eo.h \
|
||||
lib/ecore_con/ecore_con_eet_base_eo.legacy.h \
|
||||
lib/ecore_con/ecore_con_eet_client_obj_eo.h \
|
||||
lib/ecore_con/ecore_con_eet_client_obj_eo.legacy.h \
|
||||
lib/ecore_con/ecore_con_eet_server_obj_eo.h \
|
||||
lib/ecore_con/ecore_con_eet_server_obj_eo.legacy.h
|
||||
|
||||
|
||||
nodist_installed_ecoreconmainheaders_DATA = \
|
||||
$(ecore_con_eolian_h)
|
||||
|
|
@ -145,6 +148,10 @@ endif
|
|||
# object Private Data and allows functions to
|
||||
# be all static
|
||||
EXTRA_DIST2 += \
|
||||
lib/ecore_con/ecore_con_eet_base_eo.c \
|
||||
lib/ecore_con/ecore_con_eet_base_eo.legacy.c \
|
||||
lib/ecore_con/ecore_con_eet_client_obj_eo.c \
|
||||
lib/ecore_con/ecore_con_eet_server_obj_eo.c \
|
||||
lib/ecore_con/efl_net_ssl_conn-openssl.c \
|
||||
lib/ecore_con/efl_net_ssl_conn-gnutls.c \
|
||||
lib/ecore_con/efl_net_ssl_conn-none.c \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#include "ecore_con_eet_base.eo.h"
|
||||
#include "ecore_con_eet_server_obj.eo.h"
|
||||
#include "ecore_con_eet_client_obj.eo.h"
|
||||
#include "ecore_con_eet_base_eo.h"
|
||||
#include "ecore_con_eet_server_obj_eo.h"
|
||||
#include "ecore_con_eet_client_obj_eo.h"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#include "ecore_con_eet_base.eo.legacy.h"
|
||||
#include "ecore_con_eet_client_obj.eo.legacy.h"
|
||||
#include "ecore_con_eet_server_obj.eo.legacy.h"
|
||||
#include "ecore_con_eet_base_eo.legacy.h"
|
||||
#include "ecore_con_eet_client_obj_eo.legacy.h"
|
||||
#include "ecore_con_eet_server_obj_eo.legacy.h"
|
||||
|
|
|
|||
|
|
@ -955,6 +955,6 @@ ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const
|
|||
eina_binbuf_free(buf);
|
||||
}
|
||||
|
||||
#include "ecore_con_eet_base.eo.c"
|
||||
#include "ecore_con_eet_server_obj.eo.c"
|
||||
#include "ecore_con_eet_client_obj.eo.c"
|
||||
#include "ecore_con_eet_base_eo.c"
|
||||
#include "ecore_con_eet_server_obj_eo.c"
|
||||
#include "ecore_con_eet_client_obj_eo.c"
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
struct @extern Ecore_Con_Server; [[Ecore connection server structure]]
|
||||
type @extern Ecore_Con_Eet_Data_Cb: __undefined_type; [[Ecore connection eet data callback type]] /* FIXME: function pointers not supported. */
|
||||
type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; [[Ecore connection eet raw data callback type]]/* FIXME: function pointers not supported. */
|
||||
|
||||
struct @extern Eet.Data.Descriptor; [[Eet data descriptor data structure]]
|
||||
struct Ecore.Con.Reply; [[Ecore connection reply data structure]]
|
||||
|
||||
class Ecore.Con.Eet.Base extends Efl.Object {
|
||||
[[Ecore Connection Eet Base class.
|
||||
|
||||
This class provides Eet data serialization features to Ecore Connection objects.]]
|
||||
|
||||
methods {
|
||||
@property server {
|
||||
[[The server object to which we send and receive.]]
|
||||
set {
|
||||
}
|
||||
get {
|
||||
}
|
||||
values {
|
||||
data: ptr(Ecore_Con_Server); [[Server object]]
|
||||
}
|
||||
}
|
||||
@property data_callback {
|
||||
[[A callback function which should be called when data is
|
||||
received by ecore_con_eet_object.]]
|
||||
set {
|
||||
}
|
||||
values {
|
||||
name: string; [[The name of the eet stream.]]
|
||||
func: Ecore_Con_Eet_Data_Cb; [[The callback function.]]
|
||||
data: const(void_ptr); [[The data (if any) that should be
|
||||
passed to callback function.]]
|
||||
}
|
||||
}
|
||||
@property raw_data_callback {
|
||||
[[A callback function which should be calledn when raw data
|
||||
is received by ecore_con_eet_object.]]
|
||||
set {
|
||||
}
|
||||
values {
|
||||
name: string; [[The name of the eet stream.]]
|
||||
func: Ecore_Con_Eet_Raw_Data_Cb; [[The callback function.]]
|
||||
data: const(void_ptr); [[The data (if any) that should be
|
||||
passed to callback function.]]
|
||||
}
|
||||
}
|
||||
data_callback_del {
|
||||
[[Function to delete the @.data_callback.]]
|
||||
params {
|
||||
name: string; [[The name of the eet stream.]]
|
||||
}
|
||||
}
|
||||
raw_data_callback_del {
|
||||
[[Function to delete the @.raw_data_callback.]]
|
||||
params {
|
||||
name: string; [[The name of the eet stream.]]
|
||||
}
|
||||
}
|
||||
register {
|
||||
[[Function to register a \@ref Eet.Data.Descriptor to the
|
||||
ecore_con_eet object.]]
|
||||
legacy: ecore_con_eet;
|
||||
params {
|
||||
name: string; [[The name of the eet stream.]]
|
||||
edd: ptr(Eet.Data.Descriptor); [[The Eet.Data.Descriptor that
|
||||
is to be registered.]]
|
||||
}
|
||||
}
|
||||
send {
|
||||
[[Function to send data.]]
|
||||
params {
|
||||
reply: ptr(Ecore.Con.Reply); [[Contains the ecore_con_eet object
|
||||
to which the data has to be sent.]]
|
||||
name: string; [[The name of the eet stream.]]
|
||||
value: void_ptr; [[Actual data]]
|
||||
}
|
||||
}
|
||||
raw_send {
|
||||
[[Function to send raw data.]]
|
||||
params {
|
||||
reply: ptr(Ecore.Con.Reply); [[Contains the ecore_con_eet object
|
||||
to which the data has to be sent.]]
|
||||
protocol_name: string; [[The name of the eet stream.]]
|
||||
section: string; [[Name of section in the eet descriptor.]]
|
||||
section_data: ptr(Eina.Binbuf);
|
||||
}
|
||||
}
|
||||
}
|
||||
implements {
|
||||
Efl.Object.constructor;
|
||||
Efl.Object.destructor;
|
||||
Efl.Object.finalize;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
|
||||
void _ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Server *data);
|
||||
|
||||
EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_server_set, EFL_FUNC_CALL(data), Ecore_Con_Server *data);
|
||||
|
||||
Ecore_Con_Server *_ecore_con_eet_base_server_get(const Eo *obj, Ecore_Con_Eet_Base_Data *pd);
|
||||
|
||||
EOAPI EFL_FUNC_BODY_CONST(ecore_con_eet_base_server_get, Ecore_Con_Server *, NULL);
|
||||
|
||||
void _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);
|
||||
|
||||
EOAPI 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);
|
||||
|
||||
void _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);
|
||||
|
||||
EOAPI 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);
|
||||
|
||||
void _ecore_con_eet_base_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name);
|
||||
|
||||
EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_data_callback_del, EFL_FUNC_CALL(name), const char *name);
|
||||
|
||||
void _ecore_con_eet_base_raw_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name);
|
||||
|
||||
EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_data_callback_del, EFL_FUNC_CALL(name), const char *name);
|
||||
|
||||
void _ecore_con_eet_base_register(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name, Eet_Data_Descriptor *edd);
|
||||
|
||||
EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_register, EFL_FUNC_CALL(name, edd), const char *name, Eet_Data_Descriptor *edd);
|
||||
|
||||
void _ecore_con_eet_base_send(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Reply *reply, const char *name, void *value);
|
||||
|
||||
EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_send, EFL_FUNC_CALL(reply, name, value), Ecore_Con_Reply *reply, const char *name, void *value);
|
||||
|
||||
void _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);
|
||||
|
||||
EOAPI 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);
|
||||
|
||||
Efl_Object *_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd);
|
||||
|
||||
|
||||
void _ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd);
|
||||
|
||||
|
||||
Efl_Object *_ecore_con_eet_base_efl_object_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd);
|
||||
|
||||
|
||||
static Eina_Bool
|
||||
_ecore_con_eet_base_class_initializer(Efl_Class *klass)
|
||||
{
|
||||
const Efl_Object_Ops *opsp = NULL;
|
||||
|
||||
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
|
||||
|
||||
#ifndef ECORE_CON_EET_BASE_EXTRA_OPS
|
||||
#define ECORE_CON_EET_BASE_EXTRA_OPS
|
||||
#endif
|
||||
|
||||
EFL_OPS_DEFINE(ops,
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_server_set, _ecore_con_eet_base_server_set),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_server_get, _ecore_con_eet_base_server_get),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_data_callback_set, _ecore_con_eet_base_data_callback_set),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_raw_data_callback_set, _ecore_con_eet_base_raw_data_callback_set),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_data_callback_del, _ecore_con_eet_base_data_callback_del),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_raw_data_callback_del, _ecore_con_eet_base_raw_data_callback_del),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_register, _ecore_con_eet_base_register),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_send, _ecore_con_eet_base_send),
|
||||
EFL_OBJECT_OP_FUNC(ecore_con_eet_base_raw_send, _ecore_con_eet_base_raw_send),
|
||||
EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_con_eet_base_efl_object_constructor),
|
||||
EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_con_eet_base_efl_object_destructor),
|
||||
EFL_OBJECT_OP_FUNC(efl_finalize, _ecore_con_eet_base_efl_object_finalize),
|
||||
ECORE_CON_EET_BASE_EXTRA_OPS
|
||||
);
|
||||
opsp = &ops;
|
||||
|
||||
return efl_class_functions_set(klass, opsp, ropsp);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _ecore_con_eet_base_class_desc = {
|
||||
EO_VERSION,
|
||||
"Ecore.Con.Eet.Base",
|
||||
EFL_CLASS_TYPE_REGULAR,
|
||||
sizeof(Ecore_Con_Eet_Base_Data),
|
||||
_ecore_con_eet_base_class_initializer,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
EFL_DEFINE_CLASS(ecore_con_eet_base_class_get, &_ecore_con_eet_base_class_desc, EFL_OBJECT_CLASS, NULL);
|
||||
|
||||
#include "ecore_con_eet_base_eo.legacy.c"
|
||||
|
|
@ -0,0 +1,142 @@
|
|||
#ifndef _ECORE_CON_EET_BASE_EO_H_
|
||||
#define _ECORE_CON_EET_BASE_EO_H_
|
||||
|
||||
#ifndef _ECORE_CON_EET_BASE_EO_CLASS_TYPE
|
||||
#define _ECORE_CON_EET_BASE_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Ecore_Con_Eet_Base;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ECORE_CON_EET_BASE_EO_TYPES
|
||||
#define _ECORE_CON_EET_BASE_EO_TYPES
|
||||
|
||||
/** Ecore connection reply data structure
|
||||
*
|
||||
* @ingroup Ecore_Con
|
||||
*/
|
||||
typedef struct _Ecore_Con_Reply Ecore_Con_Reply;
|
||||
|
||||
|
||||
#endif
|
||||
/**
|
||||
* @brief Ecore Connection Eet Base class.
|
||||
*
|
||||
* This class provides Eet data serialization features to Ecore Connection
|
||||
* objects.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
#define ECORE_CON_EET_BASE_CLASS ecore_con_eet_base_class_get()
|
||||
|
||||
EWAPI const Efl_Class *ecore_con_eet_base_class_get(void);
|
||||
|
||||
/**
|
||||
* @brief The server object to which we send and receive.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] data Server object
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Server *data);
|
||||
|
||||
/**
|
||||
* @brief The server object to which we send and receive.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
*
|
||||
* @return Server object
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI Ecore_Con_Server *ecore_con_eet_base_server_get(const Eo *obj);
|
||||
|
||||
/**
|
||||
* @brief A callback function which should be called when data is received by
|
||||
* ecore_con_eet_object.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] name The name of the eet stream.
|
||||
* @param[in] func The callback function.
|
||||
* @param[in] data The data (if any) that should be passed to callback
|
||||
* function.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* @brief A callback function which should be calledn when raw data is received
|
||||
* by ecore_con_eet_object.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] name The name of the eet stream.
|
||||
* @param[in] func The callback function.
|
||||
* @param[in] data The data (if any) that should be passed to callback
|
||||
* function.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_raw_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* @brief Function to delete the @ref ecore_con_eet_base_data_callback_set.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] name The name of the eet stream.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_data_callback_del(Eo *obj, const char *name);
|
||||
|
||||
/**
|
||||
* @brief Function to delete the @ref ecore_con_eet_base_raw_data_callback_set.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] name The name of the eet stream.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_raw_data_callback_del(Eo *obj, const char *name);
|
||||
|
||||
/**
|
||||
* @brief Function to register a @ref Eet.Data.Descriptor to the ecore_con_eet
|
||||
* object.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] name The name of the eet stream.
|
||||
* @param[in] edd The Eet.Data.Descriptor that is to be registered.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_register(Eo *obj, const char *name, Eet_Data_Descriptor *edd);
|
||||
|
||||
/**
|
||||
* @brief Function to send data.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] reply Contains the ecore_con_eet object to which the data has to
|
||||
* be sent.
|
||||
* @param[in] name The name of the eet stream.
|
||||
* @param[in] value Actual data
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_send(Eo *obj, Ecore_Con_Reply *reply, const char *name, void *value);
|
||||
|
||||
/**
|
||||
* @brief Function to send raw data.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] reply Contains the ecore_con_eet object to which the data has to
|
||||
* be sent.
|
||||
* @param[in] protocol_name The name of the eet stream.
|
||||
* @param[in] section Name of section in the eet descriptor.
|
||||
* @param[in] section_data
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Base
|
||||
*/
|
||||
EOAPI void ecore_con_eet_base_raw_send(Eo *obj, Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data);
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
|
||||
EAPI void
|
||||
ecore_con_eet(Ecore_Con_Eet_Base *obj, const char *name, Eet_Data_Descriptor *edd)
|
||||
{
|
||||
ecore_con_eet_base_register(obj, name, edd);
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#ifndef _ECORE_CON_EET_BASE_EO_LEGACY_H_
|
||||
#define _ECORE_CON_EET_BASE_EO_LEGACY_H_
|
||||
|
||||
#ifndef _ECORE_CON_EET_BASE_EO_CLASS_TYPE
|
||||
#define _ECORE_CON_EET_BASE_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Ecore_Con_Eet_Base;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ECORE_CON_EET_BASE_EO_TYPES
|
||||
#define _ECORE_CON_EET_BASE_EO_TYPES
|
||||
|
||||
/** Ecore connection reply data structure
|
||||
*
|
||||
* @ingroup Ecore_Con
|
||||
*/
|
||||
typedef struct _Ecore_Con_Reply Ecore_Con_Reply;
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @brief Function to register a @ref Eet.Data.Descriptor to the ecore_con_eet
|
||||
* object.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] name The name of the eet stream.
|
||||
* @param[in] edd The Eet.Data.Descriptor that is to be registered.
|
||||
*
|
||||
* @ingroup (null)_Group
|
||||
*/
|
||||
EAPI void ecore_con_eet(Ecore_Con_Eet_Base *obj, const char *name, Eet_Data_Descriptor *edd);
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
class Ecore.Con.Eet.Client.Obj extends Ecore.Con.Eet.Base {
|
||||
[[Ecore Connection Eet Client class.]]
|
||||
|
||||
eo_prefix: ecore_con_eet_client_obj;
|
||||
implements {
|
||||
Efl.Object.constructor;
|
||||
Efl.Object.destructor;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
|
||||
Efl_Object *_ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd);
|
||||
|
||||
|
||||
void _ecore_con_eet_client_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd);
|
||||
|
||||
|
||||
static Eina_Bool
|
||||
_ecore_con_eet_client_obj_class_initializer(Efl_Class *klass)
|
||||
{
|
||||
const Efl_Object_Ops *opsp = NULL;
|
||||
|
||||
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
|
||||
|
||||
#ifndef ECORE_CON_EET_CLIENT_OBJ_EXTRA_OPS
|
||||
#define ECORE_CON_EET_CLIENT_OBJ_EXTRA_OPS
|
||||
#endif
|
||||
|
||||
EFL_OPS_DEFINE(ops,
|
||||
EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_con_eet_client_obj_efl_object_constructor),
|
||||
EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_con_eet_client_obj_efl_object_destructor),
|
||||
ECORE_CON_EET_CLIENT_OBJ_EXTRA_OPS
|
||||
);
|
||||
opsp = &ops;
|
||||
|
||||
return efl_class_functions_set(klass, opsp, ropsp);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _ecore_con_eet_client_obj_class_desc = {
|
||||
EO_VERSION,
|
||||
"Ecore.Con.Eet.Client.Obj",
|
||||
EFL_CLASS_TYPE_REGULAR,
|
||||
sizeof(Ecore_Con_Eet_Client_Obj_Data),
|
||||
_ecore_con_eet_client_obj_class_initializer,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
EFL_DEFINE_CLASS(ecore_con_eet_client_obj_class_get, &_ecore_con_eet_client_obj_class_desc, ECORE_CON_EET_BASE_CLASS, NULL);
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_H_
|
||||
#define _ECORE_CON_EET_CLIENT_OBJ_EO_H_
|
||||
|
||||
#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
|
||||
#define _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Ecore_Con_Eet_Client_Obj;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
|
||||
#define _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
/** Ecore Connection Eet Client class.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Client_Obj
|
||||
*/
|
||||
#define ECORE_CON_EET_CLIENT_OBJ_CLASS ecore_con_eet_client_obj_class_get()
|
||||
|
||||
EWAPI const Efl_Class *ecore_con_eet_client_obj_class_get(void);
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_LEGACY_H_
|
||||
#define _ECORE_CON_EET_CLIENT_OBJ_EO_LEGACY_H_
|
||||
|
||||
#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
|
||||
#define _ECORE_CON_EET_CLIENT_OBJ_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Ecore_Con_Eet_Client_Obj;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
|
||||
#define _ECORE_CON_EET_CLIENT_OBJ_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
class Ecore.Con.Eet.Server.Obj extends Ecore.Con.Eet.Base {
|
||||
[[Ecore Connection Eet Server class.]]
|
||||
|
||||
eo_prefix: ecore_con_eet_server_obj;
|
||||
implements {
|
||||
Efl.Object.constructor;
|
||||
Efl.Object.destructor;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
|
||||
Efl_Object *_ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd);
|
||||
|
||||
|
||||
void _ecore_con_eet_server_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd);
|
||||
|
||||
|
||||
static Eina_Bool
|
||||
_ecore_con_eet_server_obj_class_initializer(Efl_Class *klass)
|
||||
{
|
||||
const Efl_Object_Ops *opsp = NULL;
|
||||
|
||||
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
|
||||
|
||||
#ifndef ECORE_CON_EET_SERVER_OBJ_EXTRA_OPS
|
||||
#define ECORE_CON_EET_SERVER_OBJ_EXTRA_OPS
|
||||
#endif
|
||||
|
||||
EFL_OPS_DEFINE(ops,
|
||||
EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_con_eet_server_obj_efl_object_constructor),
|
||||
EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_con_eet_server_obj_efl_object_destructor),
|
||||
ECORE_CON_EET_SERVER_OBJ_EXTRA_OPS
|
||||
);
|
||||
opsp = &ops;
|
||||
|
||||
return efl_class_functions_set(klass, opsp, ropsp);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _ecore_con_eet_server_obj_class_desc = {
|
||||
EO_VERSION,
|
||||
"Ecore.Con.Eet.Server.Obj",
|
||||
EFL_CLASS_TYPE_REGULAR,
|
||||
sizeof(Ecore_Con_Eet_Server_Obj_Data),
|
||||
_ecore_con_eet_server_obj_class_initializer,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
EFL_DEFINE_CLASS(ecore_con_eet_server_obj_class_get, &_ecore_con_eet_server_obj_class_desc, ECORE_CON_EET_BASE_CLASS, NULL);
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_H_
|
||||
#define _ECORE_CON_EET_SERVER_OBJ_EO_H_
|
||||
|
||||
#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
|
||||
#define _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Ecore_Con_Eet_Server_Obj;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
|
||||
#define _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
/** Ecore Connection Eet Server class.
|
||||
*
|
||||
* @ingroup Ecore_Con_Eet_Server_Obj
|
||||
*/
|
||||
#define ECORE_CON_EET_SERVER_OBJ_CLASS ecore_con_eet_server_obj_class_get()
|
||||
|
||||
EWAPI const Efl_Class *ecore_con_eet_server_obj_class_get(void);
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_LEGACY_H_
|
||||
#define _ECORE_CON_EET_SERVER_OBJ_EO_LEGACY_H_
|
||||
|
||||
#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
|
||||
#define _ECORE_CON_EET_SERVER_OBJ_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Ecore_Con_Eet_Server_Obj;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
|
||||
#define _ECORE_CON_EET_SERVER_OBJ_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -17,36 +17,6 @@ if ipv6
|
|||
config_h.set('HAVE_IPV6', 1)
|
||||
endif
|
||||
|
||||
pub_legacy_eo_files = [
|
||||
'ecore_con_eet_base.eo',
|
||||
'ecore_con_eet_server_obj.eo',
|
||||
'ecore_con_eet_client_obj.eo'
|
||||
]
|
||||
|
||||
pub_eo_file_target = []
|
||||
foreach eo_file : pub_legacy_eo_files
|
||||
pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
|
||||
input : eo_file,
|
||||
output : [eo_file + '.h'],
|
||||
depfile : eo_file + '.d',
|
||||
install : true,
|
||||
install_dir : dir_package_include,
|
||||
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
|
||||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-gchd', '@INPUT@'])
|
||||
pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
|
||||
input : eo_file,
|
||||
output : [eo_file + '.legacy.h'],
|
||||
depfile : eo_file + '.legacy.d',
|
||||
install : true,
|
||||
install_dir : dir_package_include,
|
||||
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
|
||||
'-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
|
||||
'-gld', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
pub_eo_files = [
|
||||
'efl_net_socket.eo',
|
||||
|
|
@ -133,7 +103,13 @@ ecore_con_header_src = [
|
|||
'Efl_Net.h',
|
||||
'Ecore_Con_Eet.h',
|
||||
'Ecore_Con_Eet_Legacy.h',
|
||||
'Ecore_Con_Eet_Eo.h'
|
||||
'Ecore_Con_Eet_Eo.h',
|
||||
'ecore_con_eet_base_eo.h',
|
||||
'ecore_con_eet_base_eo.legacy.h',
|
||||
'ecore_con_eet_client_obj_eo.h',
|
||||
'ecore_con_eet_client_obj_eo.legacy.h',
|
||||
'ecore_con_eet_server_obj_eo.h',
|
||||
'ecore_con_eet_server_obj_eo.legacy.h'
|
||||
]
|
||||
|
||||
ecore_con_src = [
|
||||
|
|
@ -224,7 +200,7 @@ ecore_con = declare_dependency(
|
|||
dependencies: ecore_con_pub_deps,
|
||||
)
|
||||
|
||||
install_data(pub_eo_files + pub_eo_types_files + pub_legacy_eo_files,
|
||||
install_data(pub_eo_files + pub_eo_types_files,
|
||||
install_dir: eolian_ecore_dir
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue