q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3fb4bc336eb38a4539a122abd8f6c42ca37933c2
commit 3fb4bc336eb38a4539a122abd8f6c42ca37933c2
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Fri Apr 21 17:58:38 2017 +0200
eo: hide dbg_info from eo files
Continues b780cf2af299ce17be260486bb7ab64badddbaec.
---
src/lib/edje/edje_object.eo | 1 -
src/lib/edje/edje_smart.c | 3 +++
src/lib/elementary/elm_layout.c | 3 +++
src/lib/elementary/elm_layout.eo | 1 -
src/lib/elementary/elm_widget.c | 2 ++
src/lib/elementary/elm_widget.eo | 1 -
src/lib/eo/Eo.h | 17 +++++++++++++++++
src/lib/eo/efl_object.eo | 12 ------------
src/lib/eo/eo_base_class.c | 5 ++++-
src/lib/evas/canvas/efl_canvas_image.c | 2 ++
src/lib/evas/canvas/efl_canvas_image.eo | 1 -
src/lib/evas/canvas/efl_canvas_image_internal.eo | 1 -
src/lib/evas/canvas/efl_canvas_object.eo | 1 -
src/lib/evas/canvas/efl_canvas_text.eo | 1 -
src/lib/evas/canvas/evas_object_image.c | 3 +++
src/lib/evas/canvas/evas_object_main.c | 1 +
src/lib/evas/canvas/evas_object_text.c | 3 +++
src/lib/evas/canvas/evas_object_textblock.c | 3 +++
src/lib/evas/canvas/evas_object_textgrid.c | 3 +++
src/lib/evas/canvas/evas_text.eo | 1 -
src/lib/evas/canvas/evas_textgrid.eo | 1 -
21 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index ca45b7d..8490370 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -2109,7 +2109,6 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File,
Efl.Container, Efl.Part,
Efl.Gfx.size { set; }
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Object.dbg_info_get;
Efl.Canvas.Object.no_render { set; }
Efl.Canvas.Object.paragraph_direction { set; }
Efl.Canvas.Group.group_add;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 7af25b9..6c42369 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -546,4 +546,7 @@ _edje_object_efl_observer_update(Eo *obj EINA_UNUSED, Edje
*ed, Efl_Object *obs,
}
}
+#define EDJE_OBJECT_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _edje_object_efl_object_dbg_info_get)
+
#include "edje_object.eo.c"
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 01311fa..e2519fc 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -2376,4 +2376,7 @@ ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_layout, ELM_LAYOUT,
Elm_Layout_Smart_Data,
/* Efl.Part end */
+#define ELM_LAYOUT_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get)
+
#include "elm_layout.eo.c"
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index 802f567..ad9c653 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -334,7 +334,6 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container,
Efl.File,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Object.dbg_info_get;
Efl.File.file { get; set; }
Efl.File.mmap { get; set; }
Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 0afdad7..cf5ecf4 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -6496,6 +6496,8 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj,
Elm_Widget_Smart_Data *pd, Ei
efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
}
+#define ELM_WIDGET_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_widget_efl_object_dbg_info_get)
#include "elm_widget_item.eo.c"
#include "elm_widget.eo.c"
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 894627f..4f124c9 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -838,7 +838,6 @@ abstract Elm.Widget (Efl.Canvas.Group,
Elm.Interface.Atspi_Accessible, Elm.Inter
Efl.Object.constructor;
Efl.Object.finalize;
Efl.Object.destructor;
- Efl.Object.dbg_info_get;
Efl.Object.provider_find;
Efl.Gfx.color { set; }
Efl.Gfx.visible { set; }
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 6e59f38..259e1ac 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -347,6 +347,23 @@ EOAPI Eina_Bool efl_event_callback_legacy_call(Eo *obj,
const Efl_Event_Descript
*/
/**
+ * @struct _Efl_Dbg_Info
+ * The structure for the debug info used by Eo.
+ */
+typedef struct _Efl_Dbg_Info
+{
+ Eina_Stringshare *name; /**< The name of the part (stringshare). */
+ Eina_Value value; /**< The value. */
+} Efl_Dbg_Info;
+
+/**
+ * @brief Get debug information from the object.
+ *
+ * @param[in] root_node Node of the tree
+ */
+EOAPI void efl_dbg_info_get(Eo *obj, Efl_Dbg_Info *root_node);
+
+/**
* @var EFL_DBG_INFO_TYPE
* The Eina_Value_Type for the debug info.
*/
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index f5f1d4e..6d0aa97 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -8,12 +8,6 @@ struct Efl.Event.Description {
restart: bool; [[$true if when the event is triggered again from a
callback, it should start from where it was]]
}
-struct Efl.Dbg_Info {
- [[The structure for the debug info used by Eo.]]
- name: stringshare; [[The name of the part (stringshare).]]
- value: generic_value; [[The value.]]
-}
-
abstract Efl.Object ()
{
[[Abstract Efl object class]]
@@ -312,12 +306,6 @@ abstract Efl.Object ()
@in new_obj: Efl.Object; [[The object to emit events from]]
}
}
- dbg_info_get {
- [[Get debug information from the object.]]
- params {
- @in root_node: ptr(Efl.Dbg_Info); [[Node of the tree]]
- }
- }
children_iterator_new {
[[Get an iterator on all childrens]]
return: free(own(iterator<Efl.Object>), eina_iterator_free)
@warn_unused; [[Children iterator]]
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index fe3dc28..aafa655 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -757,6 +757,8 @@ _efl_object_dbg_info_get(Eo *obj EINA_UNUSED,
Efl_Object_Data *pd EINA_UNUSED, E
return;
}
+EOAPI EFL_VOID_FUNC_BODYV(efl_dbg_info_get, EFL_FUNC_CALL(root_node),
Efl_Dbg_Info *root_node);
+
/* Weak reference. */
static inline size_t
@@ -1968,6 +1970,7 @@ _efl_object_future_link(Eo *obj EINA_UNUSED,
Efl_Object_Data *pd, Efl_Future *li
EFL_OBJECT_OP_FUNC(efl_event_callback_array_priority_add,
_efl_object_event_callback_array_priority_add), \
EFL_OBJECT_OP_FUNC(efl_event_callback_array_del,
_efl_object_event_callback_array_del), \
EFL_OBJECT_OP_FUNC(efl_event_callback_call,
_efl_object_event_callback_call), \
- EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call,
_efl_object_event_callback_legacy_call)
+ EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call,
_efl_object_event_callback_legacy_call), \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_object_dbg_info_get)
#include "efl_object.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_image.c
b/src/lib/evas/canvas/efl_canvas_image.c
index b03808e..05b05b3 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -861,5 +861,7 @@ _efl_canvas_image_efl_object_dbg_info_get(Eo *obj, void *pd
EINA_UNUSED, Efl_Dbg
}
}
+#define EFL_CANVAS_IMAGE_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get,
_efl_canvas_image_efl_object_dbg_info_get)
#include "efl_canvas_image.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo
b/src/lib/evas/canvas/efl_canvas_image.eo
index b6d6a0f..dc23c8a 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -34,6 +34,5 @@ class Efl.Canvas.Image (Efl.Canvas.Image.Internal,
Efl.Gfx.Buffer,
Efl.Image.Load.load_skip_header { get; set; }
Efl.Image.Load.load_region { get; set; }
Efl.Image.Load.load_region_support { get; }
- Efl.Object.dbg_info_get;
}
}
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo
b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 420743e..1676122 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -9,7 +9,6 @@ abstract Efl.Canvas.Image.Internal (Efl.Canvas.Object,
Efl.Canvas.Filter.Interna
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Object.dbg_info_get;
Efl.Object.finalize;
Efl.File.save;
Efl.Orientation.orientation { get; set; }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo
b/src/lib/evas/canvas/efl_canvas_object.eo
index 85557a2..458c1ae 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -637,7 +637,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx,
Efl.Gfx.Stack, Efl.Animator,
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Object.dbg_info_get;
Efl.Object.provider_find;
Efl.Gfx.visible { get; set; }
Efl.Gfx.color { get; set; }
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo
b/src/lib/evas/canvas/efl_canvas_text.eo
index ab69ec9..714ec72 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -364,7 +364,6 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Canvas.Filter.Internal)
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Object.dbg_info_get;
Efl.Canvas.Object.paragraph_direction { get; set; }
Efl.Text.text { get; set; }
Efl.Gfx.Filter.filter_program { get; set; }
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index a67a8bc..0dcb779 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -3551,6 +3551,9 @@ _evas_object_image_surface_get(Evas_Object_Protected_Data
*obj, Eina_Bool create
return pd->engine_data;
}
+#define EFL_CANVAS_IMAGE_INTERNAL_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get,
_efl_canvas_image_internal_efl_object_dbg_info_get)
+
#include "canvas/efl_canvas_image_internal.eo.c"
/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index 9501fb2..c6b4af8 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2566,6 +2566,7 @@ evas_object_size_hint_display_mode_get(const Evas_Object
*obj)
}
#define EFL_CANVAS_OBJECT_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get,
_efl_canvas_object_efl_object_dbg_info_get), \
EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call,
_efl_canvas_object_efl_object_event_callback_legacy_call), \
EFL_OBJECT_OP_FUNC(efl_event_callback_call,
_efl_canvas_object_efl_object_event_callback_call)
diff --git a/src/lib/evas/canvas/evas_object_text.c
b/src/lib/evas/canvas/evas_object_text.c
index 6e6f510..083e894 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2442,4 +2442,7 @@ _evas_text_efl_canvas_object_paragraph_direction_get(Eo
*eo_obj EINA_UNUSED,
return o->paragraph_direction;
}
+#define EVAS_TEXT_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _evas_text_efl_object_dbg_info_get)
+
#include "canvas/evas_text.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 2e93b11..2285e15 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -14952,5 +14952,8 @@ ppar(Evas_Object_Textblock_Paragraph *par)
#endif
+#define EFL_CANVAS_TEXT_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get,
_efl_canvas_text_efl_object_dbg_info_get)
+
#include "canvas/efl_canvas_text_cursor.eo.c"
#include "canvas/efl_canvas_text.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c
b/src/lib/evas/canvas/evas_object_textgrid.c
index 3fae820..597070a 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1508,4 +1508,7 @@ evas_object_textgrid_font_get(const Eo *obj, const char
**font_name, Evas_Font_S
efl_text_properties_font_get((Eo *) obj, font_name, font_size);
}
+#define EVAS_TEXTGRID_EXTRA_OPS \
+ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _evas_textgrid_efl_object_dbg_info_get)
+
#include "canvas/evas_textgrid.eo.c"
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 8cce0ed..eb715b9 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -261,7 +261,6 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Text.Properties, Efl.Canvas.Fi
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Object.dbg_info_get;
Efl.Gfx.size { set; }
Efl.Text.text { get; set; }
Efl.Text.Properties.font { get; set; }
diff --git a/src/lib/evas/canvas/evas_textgrid.eo
b/src/lib/evas/canvas/evas_textgrid.eo
index 1320e63..2eb18ca 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -199,7 +199,6 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties)
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Object.dbg_info_get;
Efl.Text.Properties.font { get; set; }
Efl.Text.Properties.font_source { get; set; }
}
--
