Changed Eo class names to be consistent.

All the class names are now of the format: Lib_Type_Subtype_Extra.
This commit is contained in:
Tom Hacohen 2013-11-07 11:16:01 +00:00
parent 1b9d5f9a3e
commit c7addf4083
30 changed files with 45 additions and 41 deletions

View File

@ -1066,7 +1066,7 @@ ecore_memory_state_set(Ecore_Memory_State state)
static const Eo_Class_Description parent_class_desc = {
EO_VERSION,
"ecore_parent",
"Ecore_Parent",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
NULL,

View File

@ -12,7 +12,7 @@
#define MY_CLASS ECORE_ANIMATOR_CLASS
#define MY_CLASS_NAME "ecore_animator"
#define MY_CLASS_NAME "Ecore_Animator"
#define ECORE_ANIMATOR_CHECK(obj) \
if (!eo_isa((obj), ECORE_ANIMATOR_CLASS)) \

View File

@ -11,7 +11,7 @@
#define MY_CLASS ECORE_IDLE_ENTERER_CLASS
#define MY_CLASS_NAME "ecore_idle_enterer"
#define MY_CLASS_NAME "Ecore_Idle_Enterer"
EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID = EO_NOOP;

View File

@ -11,7 +11,7 @@
#define MY_CLASS ECORE_IDLE_EXITER_CLASS
#define MY_CLASS_NAME "ecore_idle_exiter"
#define MY_CLASS_NAME "Ecore_Idle_Exiter"
EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID = EO_NOOP;

View File

@ -11,7 +11,7 @@
#define MY_CLASS ECORE_IDLER_CLASS
#define MY_CLASS_NAME "ecore_idler"
#define MY_CLASS_NAME "Ecore_Idler"
EAPI Eo_Op ECORE_IDLER_BASE_ID = EO_NOOP;

View File

@ -11,7 +11,7 @@
#define MY_CLASS ECORE_JOB_CLASS
#define MY_CLASS_NAME "ecore_job"
#define MY_CLASS_NAME "Ecore_Job"
EAPI Eo_Op ECORE_JOB_BASE_ID = EO_NOOP;

View File

@ -11,7 +11,7 @@
#define MY_CLASS ECORE_POLLER_CLASS
#define MY_CLASS_NAME "ecore_poller"
#define MY_CLASS_NAME "Ecore_Poller"
EAPI Eo_Op ECORE_POLLER_BASE_ID = EO_NOOP;

View File

@ -11,7 +11,7 @@
#include "ecore_private.h"
#define MY_CLASS ECORE_TIMER_CLASS
#define MY_CLASS_NAME "ecore_timer"
#define MY_CLASS_NAME "Ecore_Timer"
EAPI Eo_Op ECORE_TIMER_BASE_ID = EO_NOOP;

View File

@ -18,7 +18,7 @@
EAPI Eo_Op ECORE_AUDIO_OBJ_BASE_ID = EO_NOOP;
#define MY_CLASS ECORE_AUDIO_OBJ_CLASS
#define MY_CLASS_NAME "ecore_audio_obj"
#define MY_CLASS_NAME "Ecore_Audio"
static void _name_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
{

View File

@ -24,7 +24,7 @@ EAPI const Eo_Event_Description _ECORE_AUDIO_EV_IN_SAMPLERATE_CHANGED =
EO_EVENT_DESCRIPTION("in,samplerate,changed", "Called when the input samplerate has changed.");
#define MY_CLASS ECORE_AUDIO_OBJ_IN_CLASS
#define MY_CLASS_NAME "ecore_audio_obj_in"
#define MY_CLASS_NAME "Ecore_Audio_In"
static void _speed_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
{

View File

@ -17,7 +17,7 @@
EAPI Eo_Op ECORE_AUDIO_OBJ_IN_SNDFILE_BASE_ID = EO_NOOP;
#define MY_CLASS ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS
#define MY_CLASS_NAME "ecore_audio_obj_in_sndfile"
#define MY_CLASS_NAME "Ecore_Audio_In_Sndfile"
extern SF_VIRTUAL_IO vio_wrapper;

View File

@ -17,7 +17,7 @@
EAPI Eo_Op ECORE_AUDIO_OBJ_IN_TONE_BASE_ID = EO_NOOP;
#define MY_CLASS ECORE_AUDIO_OBJ_IN_TONE_CLASS
#define MY_CLASS_NAME "ecore_audio_obj_in_tone"
#define MY_CLASS_NAME "Ecore_Audio_In_Tone"
struct _Ecore_Audio_Tone
{

View File

@ -17,7 +17,7 @@
EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_BASE_ID = EO_NOOP;
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_CLASS
#define MY_CLASS_NAME "ecore_audio_obj_out"
#define MY_CLASS_NAME "Ecore_Audio_Out"
static Eina_Bool _write_cb(void *data)
{

View File

@ -23,7 +23,7 @@ extern pa_mainloop_api functable;
EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID = EO_NOOP;
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_PULSE_CLASS
#define MY_CLASS_NAME "ecore_audio_obj_out_pulse"
#define MY_CLASS_NAME "Ecore_Audio_Out_Pulse"
EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY =
EO_EVENT_DESCRIPTION("context,ready", "Called when the output is ready for playback.");

View File

@ -17,7 +17,7 @@
EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_SNDFILE_BASE_ID = EO_NOOP;
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS
#define MY_CLASS_NAME "ecore_audio_obj_out_sndfile"
#define MY_CLASS_NAME "Ecore_Audio_Out_Sndfile"
extern SF_VIRTUAL_IO vio_wrapper;

View File

@ -10,7 +10,8 @@ EAPI Eo_Op EDJE_OBJ_BASE_ID = EO_NOOP;
#define MY_CLASS EDJE_OBJ_CLASS
#define MY_CLASS_NAME "edje"
#define MY_CLASS_NAME "Edje"
#define MY_CLASS_NAME_LEGACY "edje"
Eina_List *_edje_edjes = NULL;
@ -32,7 +33,7 @@ _edje_smart_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
ed->base = eo_data_ref(obj, EVAS_OBJ_SMART_CLIPPED_CLASS);
eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj, evas_obj_type_set(MY_CLASS_NAME));
eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
_edje_lib_ref();
}
@ -537,7 +538,7 @@ _edje_smart_class_constructor(Eo_Class *klass)
eo_class_funcs_set(klass, func_desc);
evas_smart_legacy_type_register(MY_CLASS_NAME, klass);
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
static const Eo_Op_Description op_desc[] = {

View File

@ -977,7 +977,7 @@ static const Eo_Event_Description *event_desc[] = {
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Eo Base",
"Eo_Base",
EO_CLASS_TYPE_REGULAR_NO_INSTANT,
EO_CLASS_DESCRIPTION_OPS(&EO_BASE_BASE_ID, op_desc, EO_BASE_SUB_ID_LAST),
event_desc,

View File

@ -8,7 +8,7 @@ EAPI Eo_Op EO_CLASS_CLASS_BASE_ID = 0;
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Eo Abstract Class",
"Eo_Abstract_Class",
EO_CLASS_TYPE_REGULAR_NO_INSTANT,
EO_CLASS_DESCRIPTION_OPS(&EO_CLASS_CLASS_BASE_ID, NULL, EO_CLASS_CLASS_SUB_ID_LAST),
NULL,

View File

@ -9,7 +9,8 @@
EAPI Eo_Op EVAS_OBJ_BOX_BASE_ID = EO_NOOP;
#define MY_CLASS_NAME "Evas_Object_Box"
#define MY_CLASS_NAME "Evas_Box"
#define MY_CLASS_NAME_LEGACY "Evas_Object_Box"
#define MY_CLASS EVAS_OBJ_BOX_CLASS
@ -512,7 +513,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj,
evas_obj_smart_callbacks_descriptions_set(_signals, NULL),
evas_obj_type_set(MY_CLASS_NAME));
evas_obj_type_set(MY_CLASS_NAME_LEGACY));
}
EAPI Evas_Object *
@ -2352,7 +2353,7 @@ _class_constructor(Eo_Class *klass)
eo_class_funcs_set(klass, func_desc);
evas_smart_legacy_type_register(MY_CLASS_NAME, klass);
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
static const Eo_Op_Description op_desc[] = {

View File

@ -664,7 +664,7 @@ static const Eo_Op_Description op_desc[] = {
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Evas_Object_Grid",
"Evas_Grid",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_GRID_BASE_ID, op_desc, EVAS_OBJ_GRID_SUB_ID_LAST),
NULL,

View File

@ -25,7 +25,7 @@ EAPI Eo_Op EVAS_OBJ_IMAGE_BASE_ID = EO_NOOP;
#define MY_CLASS EVAS_OBJ_IMAGE_CLASS
#define MY_CLASS_NAME "Evas_Object_Image"
#define MY_CLASS_NAME "Evas_Image"
#define VERBOSE_PROXY_ERROR 1

View File

@ -501,7 +501,7 @@ static const Eo_Op_Description op_desc[] = {
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Evas_Object_Line",
"Evas_Line",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_LINE_BASE_ID, op_desc, EVAS_OBJ_LINE_SUB_ID_LAST),
NULL,

View File

@ -614,7 +614,7 @@ static const Eo_Op_Description op_desc[] = {
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Evas_Object_Polygon",
"Evas_Polygon",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_POLYGON_BASE_ID, op_desc, EVAS_OBJ_POLYGON_SUB_ID_LAST),
NULL,

View File

@ -339,7 +339,7 @@ static const Eo_Op_Description op_desc[] = {
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Evas_Object_Rectangle",
"Evas_Rectangle",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_RECTANGLE_BASE_ID, op_desc, EVAS_OBJ_RECTANGLE_SUB_ID_LAST),
NULL,

View File

@ -7,7 +7,8 @@ EAPI Eo_Op EVAS_OBJ_SMART_BASE_ID = EO_NOOP;
#define MY_CLASS EVAS_OBJ_SMART_CLASS
#define MY_CLASS_NAME "Evas_Object_Smart"
#define MY_CLASS_NAME "Evas_Smart"
#define MY_CLASS_NAME_LEGACY "Evas_Object_Smart"
extern Eina_Hash* signals_hash_table;
@ -675,7 +676,7 @@ _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED)
eo_do(eo_obj, eo_parent_get(&parent));
evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
eo_do(eo_obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_add());
}
@ -1822,7 +1823,7 @@ _class_constructor(Eo_Class *klass)
_evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL);
evas_smart_legacy_type_register(MY_CLASS_NAME, klass);
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
static void

View File

@ -313,7 +313,7 @@ static const Eo_Op_Description op_desc[] = {
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Evas_Object_Smart_Clipped",
"Evas_Smart_Clipped",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_SMART_CLIPPED_BASE_ID, op_desc, EVAS_OBJ_SMART_CLIPPED_SUB_ID_LAST),
NULL,

View File

@ -8,7 +8,8 @@ EAPI Eo_Op EVAS_OBJ_TABLE_BASE_ID = EO_NOOP;
#define MY_CLASS EVAS_OBJ_TABLE_CLASS
#define MY_CLASS_NAME "Evas_Object_Table"
#define MY_CLASS_NAME "Evas_Table"
#define MY_CLASS_NAME_LEGACY "Evas_Object_Table"
typedef struct _Evas_Object_Table_Data Evas_Object_Table_Data;
typedef struct _Evas_Object_Table_Option Evas_Object_Table_Option;
@ -964,7 +965,7 @@ static void
_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj, evas_obj_type_set(MY_CLASS_NAME));
eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
}
EAPI Evas_Object *
@ -1593,7 +1594,7 @@ _class_constructor(Eo_Class *klass)
};
eo_class_funcs_set(klass, func_desc);
evas_smart_legacy_type_register(MY_CLASS_NAME, klass);
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(EVAS_OBJ_TABLE_SUB_ID_ADD_TO, "Create a table that is child of a given element parent."),
@ -1617,7 +1618,7 @@ static const Eo_Op_Description op_desc[] = {
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Evas_Object_Table",
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_TABLE_BASE_ID, op_desc, EVAS_OBJ_TABLE_SUB_ID_LAST),
NULL,

View File

@ -7,7 +7,7 @@ EAPI Eo_Op EVAS_OBJ_TEXT_BASE_ID = EO_NOOP;
#define MY_CLASS EVAS_OBJ_TEXT_CLASS
#define MY_CLASS_NAME "Evas_Object_Text"
#define MY_CLASS_NAME "Evas_Text"
/* save typing */
#define ENFN obj->layer->evas->engine.func

View File

@ -74,7 +74,7 @@ EAPI Eo_Op EVAS_OBJ_TEXTBLOCK_BASE_ID = EO_NOOP;
#define MY_CLASS EVAS_OBJ_TEXTBLOCK_CLASS
#define MY_CLASS_NAME "Evas_Object_Textblock"
#define MY_CLASS_NAME "Evas_Textblock"
#include "linebreak.h"
#include "wordbreak.h"

View File

@ -7,14 +7,14 @@ EAPI Eo_Op EVAS_OBJ_TEXTGRID_BASE_ID = EO_NOOP;
#define MY_CLASS EVAS_OBJ_TEXTGRID_CLASS
#define MY_CLASS_NAME "textgrid"
#define MY_CLASS_NAME "Evas_Textgrid"
/* save typing */
#define ENFN obj->layer->evas->engine.func
#define ENDT obj->layer->evas->engine.data.output
/* private magic number for text objects */
static const char o_type[] = MY_CLASS_NAME;
static const char o_type[] = "textgrid";
/* private struct for line object internal data */
typedef struct _Evas_Object_Textgrid Evas_Object_Textgrid;
@ -1739,7 +1739,7 @@ static const Eo_Op_Description op_desc[] = {
static const Eo_Class_Description class_desc = {
EO_VERSION,
"evas_object_textgrid",
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_TEXTGRID_BASE_ID, op_desc, EVAS_OBJ_TEXTGRID_SUB_ID_LAST),
NULL,