aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2018-10-11 13:46:36 +0900
committerHermet Park <hermetpark@gmail.com>2018-10-11 13:46:37 +0900
commit27fd6a2eab6021c4859b8fbdfc01a90e1ba4748c (patch)
tree57300a6635d74c3a77b6df125dc793604ce0e136
parentmeson: do not build deprecated wl & drm (diff)
downloadefl-27fd6a2eab6021c4859b8fbdfc01a90e1ba4748c.tar.gz
evas: remove redundant internal functions.
Summary: Since efl object is introduced, magic check is no more used. Plus, remove redundant object functions interfaces - type_id, - visual_id, - store - unstore Reviewers: #committers, bu5hm4n Reviewed By: #committers, bu5hm4n Subscribers: bu5hm4n, raster, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7153
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c22
-rw-r--r--src/lib/evas/canvas/evas_object_image.c22
-rw-r--r--src/lib/evas/canvas/evas_object_line.c23
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c20
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c20
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c20
-rw-r--r--src/lib/evas/canvas/evas_object_text.c22
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c20
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c30
-rw-r--r--src/lib/evas/include/evas_private.h18
-rw-r--r--src/lib/evas/main.c60
11 files changed, 2 insertions, 275 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index 7db12f1f68..6aa798a058 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -22,8 +22,6 @@ static void _efl_canvas_vg_render_pre(Evas_Object *eo_obj,
static void _efl_canvas_vg_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int _efl_canvas_vg_id_get(Evas_Object *eo_obj);
-static unsigned int _efl_canvas_vg_visual_id_get(Evas_Object *eo_obj);
static void *_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj);
static int _efl_canvas_vg_is_opaque(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
@@ -39,14 +37,10 @@ static const Evas_Object_Func object_func =
_efl_canvas_vg_render,
_efl_canvas_vg_render_pre,
_efl_canvas_vg_render_post,
- _efl_canvas_vg_id_get,
- _efl_canvas_vg_visual_id_get,
_efl_canvas_vg_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
_efl_canvas_vg_is_opaque,
_efl_canvas_vg_was_opaque,
NULL,
@@ -754,22 +748,6 @@ _efl_canvas_vg_render_post(Evas_Object *eo_obj EINA_UNUSED,
evas_object_cur_prev(obj);
}
-static unsigned int
-_efl_canvas_vg_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_VG;
-}
-
-static unsigned int
-_efl_canvas_vg_visual_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_SHAPE;
-}
-
static void *
_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj)
{
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 896603301e..8aa9ded3b8 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -30,8 +30,6 @@ static void evas_object_image_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int evas_object_image_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_image_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_image_engine_data_get(Evas_Object *eo_obj);
static int evas_object_image_is_opaque(Evas_Object *eo_obj,
@@ -63,14 +61,10 @@ static const Evas_Object_Func object_func =
evas_object_image_render,
evas_object_image_render_pre,
evas_object_image_render_post,
- evas_object_image_id_get,
- evas_object_image_visual_id_get,
evas_object_image_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
evas_object_image_is_opaque,
evas_object_image_was_opaque,
evas_object_image_is_inside,
@@ -2699,22 +2693,6 @@ evas_object_image_render_post(Evas_Object *eo_obj EINA_UNUSED,
/* FIXME: copy strings across */
}
-static unsigned int
-evas_object_image_id_get(Evas_Object *eo_obj)
-{
- Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_IMAGE;
-}
-
-static unsigned int
-evas_object_image_visual_id_get(Evas_Object *eo_obj)
-{
- Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_IMAGE;
-}
-
static void *
evas_object_image_engine_data_get(Evas_Object *eo_obj)
{
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index ef6cf14730..47adade454 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -39,8 +39,6 @@ static void evas_object_line_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int evas_object_line_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_line_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_line_engine_data_get(Evas_Object *eo_obj);
static int evas_object_line_is_opaque(Evas_Object *eo_obj,
@@ -68,14 +66,10 @@ static const Evas_Object_Func object_func =
evas_object_line_render,
evas_object_line_render_pre,
evas_object_line_render_post,
- evas_object_line_id_get,
- evas_object_line_visual_id_get,
evas_object_line_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
evas_object_line_is_opaque,
evas_object_line_was_opaque,
evas_object_line_is_inside,
@@ -84,8 +78,7 @@ static const Evas_Object_Func object_func =
NULL,
NULL,
NULL,
- NULL, // render_prepare
- NULL
+ NULL // render_prepare
};
/* the actual api call to add a rect */
@@ -358,20 +351,6 @@ evas_object_line_render_post(Evas_Object *eo_obj EINA_UNUSED,
o->prev = o->cur;
}
-static unsigned int evas_object_line_id_get(Evas_Object *eo_obj)
-{
- Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_LINE;
-}
-
-static unsigned int evas_object_line_visual_id_get(Evas_Object *eo_obj)
-{
- Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_SHAPE;
-}
-
static void *evas_object_line_engine_data_get(Evas_Object *eo_obj)
{
Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 8993f5fd0b..985420b14b 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -32,8 +32,6 @@ static void evas_object_polygon_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int evas_object_polygon_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_polygon_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj);
static int evas_object_polygon_is_opaque(Evas_Object *eo_obj,
@@ -58,14 +56,10 @@ static const Evas_Object_Func object_func =
evas_object_polygon_render,
evas_object_polygon_render_pre,
evas_object_polygon_render_post,
- evas_object_polygon_id_get,
- evas_object_polygon_visual_id_get,
evas_object_polygon_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
evas_object_polygon_is_opaque,
evas_object_polygon_was_opaque,
evas_object_polygon_is_inside,
@@ -416,20 +410,6 @@ evas_object_polygon_render_post(Evas_Object *eo_obj EINA_UNUSED,
evas_object_cur_prev(obj);
}
-static unsigned int evas_object_polygon_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_POLYGON;
-}
-
-static unsigned int evas_object_polygon_visual_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_SHAPE;
-}
-
static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj)
{
Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index ee9177bbb7..d2dd430b12 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -30,8 +30,6 @@ static void evas_object_rectangle_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj);
static int evas_object_rectangle_is_opaque(Evas_Object *eo_obj,
@@ -58,14 +56,10 @@ static const Evas_Object_Func object_func =
evas_object_rectangle_render,
evas_object_rectangle_render_pre,
evas_object_rectangle_render_post,
- evas_object_rectangle_id_get,
- evas_object_rectangle_visual_id_get,
evas_object_rectangle_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
evas_object_rectangle_is_opaque,
evas_object_rectangle_was_opaque,
NULL,
@@ -303,20 +297,6 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
return (obj->prev->cache.clip.a == 255) ? 1 : 0;
}
-static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_RECTANGLE;
-}
-
-static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_SHAPE;
-}
-
static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj)
{
Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 52ad3cd7f0..11d8feb8cb 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -91,8 +91,6 @@ static void evas_object_smart_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int evas_object_smart_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_smart_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj);
static void _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj,
Evas_BiDi_Direction dir);
@@ -104,8 +102,6 @@ static const Evas_Object_Func object_func =
evas_object_smart_render,
evas_object_smart_render_pre,
evas_object_smart_render_post,
- evas_object_smart_id_get,
- evas_object_smart_visual_id_get,
evas_object_smart_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
@@ -118,8 +114,6 @@ static const Evas_Object_Func object_func =
NULL,
NULL,
NULL,
- NULL,
- NULL,
NULL // render_prepare
};
@@ -1737,20 +1731,6 @@ evas_object_smart_render_post(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Prote
o->prev = o->cur;
}
-static unsigned int evas_object_smart_id_get(Evas_Object *eo_obj)
-{
- Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_SMART;
-}
-
-static unsigned int evas_object_smart_visual_id_get(Evas_Object *eo_obj)
-{
- Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_CONTAINER;
-}
-
static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
{
Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 4474c85db6..07b8202fd3 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -103,8 +103,6 @@ static void evas_object_text_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int evas_object_text_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_text_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_text_engine_data_get(Evas_Object *eo_obj);
static int evas_object_text_is_opaque(Evas_Object *eo_obj,
@@ -123,14 +121,10 @@ static const Evas_Object_Func object_func =
evas_object_text_render,
evas_object_text_render_pre,
evas_object_text_render_post,
- evas_object_text_id_get,
- evas_object_text_visual_id_get,
evas_object_text_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
evas_object_text_is_opaque,
evas_object_text_was_opaque,
NULL,
@@ -2165,22 +2159,6 @@ evas_object_text_render_post(Evas_Object *eo_obj EINA_UNUSED,
evas_object_cur_prev(obj);
}
-static unsigned int
-evas_object_text_id_get(Evas_Object *eo_obj)
-{
- Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_TEXT;
-}
-
-static unsigned int
-evas_object_text_visual_id_get(Evas_Object *eo_obj)
-{
- Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_SHAPE;
-}
-
static void *
evas_object_text_engine_data_get(Evas_Object *eo_obj)
{
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 8be4865a7a..c0f963759d 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -695,8 +695,6 @@ static void evas_object_textblock_render_post(Evas_Object *eo_obj,
void *type_private_data);
static Evas_Object_Textblock_Node_Text *_evas_textblock_node_text_new(void);
-static unsigned int evas_object_textblock_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_textblock_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj);
static int evas_object_textblock_is_opaque(Evas_Object *eo_obj,
@@ -716,14 +714,10 @@ static const Evas_Object_Func object_func =
evas_object_textblock_render,
evas_object_textblock_render_pre,
evas_object_textblock_render_post,
- evas_object_textblock_id_get,
- evas_object_textblock_visual_id_get,
evas_object_textblock_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
evas_object_textblock_is_opaque,
evas_object_textblock_was_opaque,
NULL,
@@ -14869,20 +14863,6 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
_filter_output_cache_prune(obj, o);
}
-static unsigned int evas_object_textblock_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_TEXTBLOCK;
-}
-
-static unsigned int evas_object_textblock_visual_id_get(Evas_Object *eo_obj)
-{
- Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_CUSTOM;
-}
-
static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj)
{
Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 15a8dff5b3..52cfe66175 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -20,8 +20,6 @@ typedef struct _Evas_Object_Textgrid_Line Evas_Object_Textgrid_Line;
struct _Evas_Textgrid_Data
{
- DATA32 magic;
-
struct {
int w, h;
int char_width;
@@ -102,8 +100,6 @@ static void evas_object_textgrid_render_post(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-static unsigned int evas_object_textgrid_id_get(Evas_Object *eo_obj);
-static unsigned int evas_object_textgrid_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_textgrid_engine_data_get(Evas_Object *eo_obj);
static int evas_object_textgrid_is_opaque(Evas_Object *eo_obj,
@@ -120,14 +116,10 @@ static const Evas_Object_Func object_func =
evas_object_textgrid_render,
evas_object_textgrid_render_pre,
evas_object_textgrid_render_post,
- evas_object_textgrid_id_get,
- evas_object_textgrid_visual_id_get,
evas_object_textgrid_engine_data_get,
/* these are optional. NULL = nothing */
NULL,
NULL,
- NULL,
- NULL,
evas_object_textgrid_is_opaque,
evas_object_textgrid_was_opaque,
NULL,
@@ -136,8 +128,7 @@ static const Evas_Object_Func object_func =
NULL,
NULL,
NULL,
- NULL, // render_prepare
- NULL
+ NULL // render_prepare
};
/* all nice and private */
@@ -151,7 +142,6 @@ evas_object_textgrid_init(Evas_Object *eo_obj)
obj->type = o_type;
Evas_Textgrid_Data *o = obj->private_data;
- o->magic = MAGIC_OBJ_TEXTGRID;
o->prev.bitmap_scalable = o->cur.bitmap_scalable = EFL_TEXT_FONT_BITMAP_SCALABLE_COLOR;
o->prev = o->cur;
eina_array_step_set(&o->cur.palette_standard, sizeof (Eina_Array), 16);
@@ -230,8 +220,6 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj E
while ((c = eina_array_pop(&o->cur.palette_extended)))
free(c);
eina_array_flush(&o->cur.palette_extended);
-
- o->magic = 0;
}
EOLIAN static void
@@ -827,22 +815,6 @@ evas_object_textgrid_render_post(Evas_Object *eo_obj EINA_UNUSED,
o->prev = o->cur;
}
-static unsigned int
-evas_object_textgrid_id_get(Evas_Object *eo_obj)
-{
- Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_TEXTGRID;
-}
-
-static unsigned int
-evas_object_textgrid_visual_id_get(Evas_Object *eo_obj)
-{
- Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- if (!o) return 0;
- return MAGIC_OBJ_SHAPE;
-}
-
static void *
evas_object_textgrid_engine_data_get(Evas_Object *eo_obj)
{
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 76bb46cfa2..38f6e89f9b 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -509,19 +509,8 @@ OPAQUE_TYPE(Evas_Font_Instance); /* General type for RGBA_Font_Int */
#define MAGIC_EVAS 0x70777770
#define MAGIC_OBJ 0x71737723
-#define MAGIC_OBJ_RECTANGLE 0x76748772
-#define MAGIC_OBJ_LINE 0x7a27f839
-#define MAGIC_OBJ_POLYGON 0x7bb7577e
-#define MAGIC_OBJ_IMAGE 0x747ad76c
-#define MAGIC_OBJ_TEXT 0x77757721
-#define MAGIC_OBJ_SMART 0x78c7c73f
-#define MAGIC_OBJ_TEXTBLOCK 0x71737744
-#define MAGIC_OBJ_TEXTGRID 0x7377a7ca
#define MAGIC_SMART 0x7c6977c5
#define MAGIC_OBJ_SHAPE 0x747297f7
-#define MAGIC_OBJ_CONTAINER 0x71877776
-#define MAGIC_OBJ_VG 0x77817EE7
-#define MAGIC_OBJ_CUSTOM 0x7b7857ab
#define MAGIC_EVAS_GL 0x77976718
#define MAGIC_MAP 0x7575177d
#define MAGIC_DEV 0x7d773738
@@ -1246,13 +1235,8 @@ struct _Evas_Object_Func
void (*render_pre) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
void (*render_post) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
- unsigned int (*type_id_get) (Evas_Object *obj);
- unsigned int (*visual_id_get) (Evas_Object *obj);
void *(*engine_data_get) (Evas_Object *obj);
- void (*store) (Evas_Object *obj);
- void (*unstore) (Evas_Object *obj);
-
int (*is_visible) (Evas_Object *obj);
int (*was_visible) (Evas_Object *obj);
@@ -1583,8 +1567,6 @@ void evas_object_event_callback_call(Evas_Object *obj, Evas_Object_Protected_Dat
Eina_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y);
void evas_debug_error(void);
void evas_debug_input_null(void);
-void evas_debug_magic_null(void);
-void evas_debug_magic_wrong(DATA32 expected, DATA32 supplied);
void evas_debug_generic(const char *str);
const char *evas_debug_magic_string_get(DATA32 magic);
void evas_render_update_del(Evas_Public_Data *e, int x, int y, int w, int h);
diff --git a/src/lib/evas/main.c b/src/lib/evas/main.c
index c0f7e91312..2c8bccbe94 100644
--- a/src/lib/evas/main.c
+++ b/src/lib/evas/main.c
@@ -56,36 +56,6 @@ evas_debug_input_null(void)
}
void
-evas_debug_magic_null(void)
-{
- if (!_evas_debug_init)
- {
- _evas_debug_init_from_env();
- }
- if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
- (_evas_debug_show == _EVAS_DEBUG_DEFAULT))
- CRI("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!");
- if (_evas_debug_abort) abort();
-}
-
-void
-evas_debug_magic_wrong(DATA32 expected, DATA32 supplied)
-{
- if (!_evas_debug_init)
- {
- _evas_debug_init_from_env();
- }
- if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
- (_evas_debug_show == _EVAS_DEBUG_DEFAULT))
- CRI("Input object is wrong type\n"
- " Expected: %08x - %s\n"
- " Supplied: %08x - %s",
- expected, evas_debug_magic_string_get(expected),
- supplied, evas_debug_magic_string_get(supplied));
- if (_evas_debug_abort) abort();
-}
-
-void
evas_debug_generic(const char *str)
{
if (!_evas_debug_init)
@@ -97,33 +67,3 @@ evas_debug_generic(const char *str)
CRI("%s", str);
if (_evas_debug_abort) abort();
}
-
-const char *
-evas_debug_magic_string_get(DATA32 magic)
-{
- switch (magic)
- {
- case MAGIC_EVAS:
- return "Evas";
- case MAGIC_OBJ:
- return "Evas_Object";
- case MAGIC_OBJ_RECTANGLE:
- return "Evas_Object (Rectangle)";
- case MAGIC_OBJ_LINE:
- return "Evas_Object (Line)";
- case MAGIC_OBJ_POLYGON:
- return "Evas_Object (Polygon)";
- case MAGIC_OBJ_IMAGE:
- return "Evas_Object (Image)";
- case MAGIC_OBJ_TEXT:
- return "Evas_Object (Text)";
- case MAGIC_OBJ_SMART:
- return "Evas_Object (Smart)";
- case MAGIC_EVAS_GL:
- return "Evas_GL";
- case MAGIC_MAP:
- return "Evas_Map";
- default:
- return "<UNKNOWN>";
- };
-}