tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c7addf40839c85cf2568f322a34220e8082d26f0
commit c7addf40839c85cf2568f322a34220e8082d26f0
Author: Tom Hacohen <t...@stosb.com>
Date: Thu Nov 7 11:16:01 2013 +0000
Changed Eo class names to be consistent.
All the class names are now of the format: Lib_Type_Subtype_Extra.
---
src/lib/ecore/ecore.c | 2 +-
src/lib/ecore/ecore_anim.c | 2 +-
src/lib/ecore/ecore_idle_enterer.c | 2 +-
src/lib/ecore/ecore_idle_exiter.c | 2 +-
src/lib/ecore/ecore_idler.c | 2 +-
src/lib/ecore/ecore_job.c | 2 +-
src/lib/ecore/ecore_poll.c | 2 +-
src/lib/ecore/ecore_timer.c | 2 +-
src/lib/ecore_audio/ecore_audio_obj.c | 2 +-
src/lib/ecore_audio/ecore_audio_obj_in.c | 2 +-
src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c | 2 +-
src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 2 +-
src/lib/ecore_audio/ecore_audio_obj_out.c | 2 +-
src/lib/ecore_audio/ecore_audio_obj_out_pulse.c | 2 +-
src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c | 2 +-
src/lib/edje/edje_smart.c | 7 ++++---
src/lib/eo/eo_base_class.c | 2 +-
src/lib/eo/eo_class_class.c | 2 +-
src/lib/evas/canvas/evas_object_box.c | 7 ++++---
src/lib/evas/canvas/evas_object_grid.c | 2 +-
src/lib/evas/canvas/evas_object_image.c | 2 +-
src/lib/evas/canvas/evas_object_line.c | 2 +-
src/lib/evas/canvas/evas_object_polygon.c | 2 +-
src/lib/evas/canvas/evas_object_rectangle.c | 2 +-
src/lib/evas/canvas/evas_object_smart.c | 7 ++++---
src/lib/evas/canvas/evas_object_smart_clipped.c | 2 +-
src/lib/evas/canvas/evas_object_table.c | 9 +++++----
src/lib/evas/canvas/evas_object_text.c | 2 +-
src/lib/evas/canvas/evas_object_textblock.c | 2 +-
src/lib/evas/canvas/evas_object_textgrid.c | 6 +++---
30 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index bbe51ba..1e7a1b7 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -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,
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 5d32c31..5e99eae 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -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)) \
diff --git a/src/lib/ecore/ecore_idle_enterer.c
b/src/lib/ecore/ecore_idle_enterer.c
index 7cbabc8..bf8d48e 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -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;
diff --git a/src/lib/ecore/ecore_idle_exiter.c
b/src/lib/ecore/ecore_idle_exiter.c
index da85f1d..e18aacb 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -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;
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 051c3e1..3ac38ee 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -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;
diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index 8720a7f..8e149fe 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -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;
diff --git a/src/lib/ecore/ecore_poll.c b/src/lib/ecore/ecore_poll.c
index 4883d7b..f4a998f 100644
--- a/src/lib/ecore/ecore_poll.c
+++ b/src/lib/ecore/ecore_poll.c
@@ -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;
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index eb83321..5c03e80 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -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;
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c
b/src/lib/ecore_audio/ecore_audio_obj.c
index 83ddbe9..9154e4a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -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)
{
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c
b/src/lib/ecore_audio/ecore_audio_obj_in.c
index 1abaae4..e383a97 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -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)
{
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index 4799f6d..4f8e711 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -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;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index f0fec98..3d97134 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -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
{
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c
b/src/lib/ecore_audio/ecore_audio_obj_out.c
index e3822ef..b269411 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -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)
{
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 80f7fb0..af15cef 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -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.");
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
index 445a63e..282c22a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -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;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 4fd5471..dae9b59 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -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[] = {
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 5fea6ed..5d1e6d1 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -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,
diff --git a/src/lib/eo/eo_class_class.c b/src/lib/eo/eo_class_class.c
index f9844c5..654e2ef 100644
--- a/src/lib/eo/eo_class_class.c
+++ b/src/lib/eo/eo_class_class.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_box.c
b/src/lib/evas/canvas/evas_object_box.c
index 84200ed..194f3e7 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -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[] = {
diff --git a/src/lib/evas/canvas/evas_object_grid.c
b/src/lib/evas/canvas/evas_object_grid.c
index c0bbc96..67e5d92 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index b508074..49677e8 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -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
diff --git a/src/lib/evas/canvas/evas_object_line.c
b/src/lib/evas/canvas/evas_object_line.c
index 621a43e..ccdfa01 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_polygon.c
b/src/lib/evas/canvas/evas_object_polygon.c
index 618a029..38fdaff 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c
b/src/lib/evas/canvas/evas_object_rectangle.c
index 36ebb21..338c1cc 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_smart.c
b/src/lib/evas/canvas/evas_object_smart.c
index cfdae7f..fa1175f 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -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
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c
b/src/lib/evas/canvas/evas_object_smart_clipped.c
index f247f6d..212355c 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_table.c
b/src/lib/evas/canvas/evas_object_table.c
index efe3240..2377669 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_text.c
b/src/lib/evas/canvas/evas_object_text.c
index d345322..5c52e5f 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -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
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 0c01a86..63cb70d 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -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"
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c
b/src/lib/evas/canvas/evas_object_textgrid.c
index 087df05..2e0e592 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -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,
--
