aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-11-16 10:45:05 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2018-11-16 11:11:13 +0100
commit2d460e52e4a1f6b87bd04cdd8a99a2ec4f1ba659 (patch)
tree3f81ce288f41220bf192ef855c9f05534fc55997 /src/lib
parentEvas textblock: fix test to use provided hyphen dictionary (diff)
downloadefl-2d460e52e4a1f6b87bd04cdd8a99a2ec4f1ba659.tar.gz
elementary: remove Efl.Ui.Layout namespace
Summary: Efl.Ui.Layout namespace is removed to keep consistency with other widgets. Consequently, "Efl.Ui.Layout.Object" is renamed to "Efl.Ui.Layout" and "Efl.Ui.Layout." is renamed to "Efl.Ui.Layout_". Reviewers: segfaultxavi, bu5hm4n, cedric Reviewed By: segfaultxavi Subscribers: #reviewers, #committers, SanghyeonLee, woohyun Tags: #efl Differential Revision: https://phab.enlightenment.org/D7291
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.eo2
-rw-r--r--src/lib/elementary/efl_ui_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_button_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_calendar.eo2
-rw-r--r--src/lib/elementary/efl_ui_check_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_clock.eo2
-rw-r--r--src/lib/elementary/efl_ui_datepicker.eo2
-rw-r--r--src/lib/elementary/efl_ui_frame.eo2
-rw-r--r--src/lib/elementary/efl_ui_item.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout.c (renamed from src/lib/elementary/efl_ui_layout_object.c)236
-rw-r--r--src/lib/elementary/efl_ui_layout.eo (renamed from src/lib/elementary/efl_ui_layout_object.eo)4
-rw-r--r--src/lib/elementary/efl_ui_layout_factory.c4
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c28
-rw-r--r--src/lib/elementary/efl_ui_layout_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_box.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_content.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_legacy.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_table.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_list.c2
-rw-r--r--src/lib/elementary/efl_ui_list.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_default_item.c2
-rw-r--r--src/lib/elementary/efl_ui_list_default_item_part_end.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_default_item_part_icon.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_empty_item.c2
-rw-r--r--src/lib/elementary/efl_ui_list_view.eo4
-rw-r--r--src/lib/elementary/efl_ui_list_view_types.eot2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c6
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.eo4
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout_private.h2
-rw-r--r--src/lib/elementary/efl_ui_pager.eo2
-rw-r--r--src/lib/elementary/efl_ui_panes.eo2
-rw-r--r--src/lib/elementary/efl_ui_panes_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert.c2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_scroll_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_part_backwall.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_scroller.c2
-rw-r--r--src/lib/elementary/efl_ui_scroller.eo2
-rw-r--r--src/lib/elementary/efl_ui_slider.eo2
-rw-r--r--src/lib/elementary/efl_ui_spin.eo2
-rw-r--r--src/lib/elementary/efl_ui_stack.eo2
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.eo2
-rw-r--r--src/lib/elementary/efl_ui_tab_page.eo2
-rw-r--r--src/lib/elementary/efl_ui_tab_page_part_tab.eo2
-rw-r--r--src/lib/elementary/efl_ui_tags.c2
-rw-r--r--src/lib/elementary/efl_ui_tags.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_textpath.eo2
-rw-r--r--src/lib/elementary/efl_ui_textpath_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c16
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_actionslider_part.eo2
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_bubble_part.eo2
-rw-r--r--src/lib/elementary/elm_calendar.eo2
-rw-r--r--src/lib/elementary/elm_clock.eo2
-rw-r--r--src/lib/elementary/elm_code_widget.eo2
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_conformant.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup_part.eo2
-rw-r--r--src/lib/elementary/elm_dayselector.eo2
-rw-r--r--src/lib/elementary/elm_dayselector_part.eo2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_entry_part.eo2
-rw-r--r--src/lib/elementary/elm_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_part.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_part.eo2
-rw-r--r--src/lib/elementary/elm_flipselector.eo2
-rw-r--r--src/lib/elementary/elm_gengrid.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_genlist.eo2
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hover_part.eo2
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_inwin.eo2
-rw-r--r--src/lib/elementary/elm_label.eo2
-rw-r--r--src/lib/elementary/elm_label_part.eo2
-rw-r--r--src/lib/elementary/elm_layout.h2
-rw-r--r--src/lib/elementary/elm_layout_legacy.h2
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_part.eo2
-rw-r--r--src/lib/elementary/elm_naviframe.eo2
-rw-r--r--src/lib/elementary/elm_naviframe_part.eo2
-rw-r--r--src/lib/elementary/elm_panel.eo2
-rw-r--r--src/lib/elementary/elm_player.eo2
-rw-r--r--src/lib/elementary/elm_player_part.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_popup_part.eo2
-rw-r--r--src/lib/elementary/elm_scroller.eo2
-rw-r--r--src/lib/elementary/elm_scroller_part.eo2
-rw-r--r--src/lib/elementary/elm_segment_control.eo2
-rw-r--r--src/lib/elementary/elm_separator.eo2
-rw-r--r--src/lib/elementary/elm_slider_part_indicator.eo2
-rw-r--r--src/lib/elementary/elm_slideshow.eo2
-rw-r--r--src/lib/elementary/elm_spinner.eo2
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_widget_layout.h6
-rw-r--r--src/lib/elementary/meson.build4
119 files changed, 266 insertions, 266 deletions
diff --git a/src/lib/elementary/efl_ui_bg_widget.eo b/src/lib/elementary/efl_ui_bg_widget.eo
index f54775cbc9..6af5aa5ae5 100644
--- a/src/lib/elementary/efl_ui_bg_widget.eo
+++ b/src/lib/elementary/efl_ui_bg_widget.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Bg_Widget (Efl.Ui.Layout.Object, Efl.Ui.Bg, Efl.Gfx.Image_Load_Controller)
+class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Gfx.Image_Load_Controller)
{
[[The bg (background) widget is used for setting (solid) background decorations
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 64c0b7f3a5..851f54e309 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
+class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
Efl.Text, Efl.Content,
Efl.Access.Widget.Action, Efl.Ui.Translatable)
{
diff --git a/src/lib/elementary/efl_ui_button_legacy_part.eo b/src/lib/elementary/efl_ui_button_legacy_part.eo
index 15b07c863f..ba66edfb5d 100644
--- a/src/lib/elementary/efl_ui_button_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_button_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout_Part_Content)
{
[[Elementary button internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo
index 5caa2e66b8..4a6415f701 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Calendar_Weekday
last [[Sentinel value to indicate last enum field during iteration]]
}
-class Efl.Ui.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format)
+class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format)
{
[[Calendar widget
diff --git a/src/lib/elementary/efl_ui_check_legacy_part.eo b/src/lib/elementary/efl_ui_check_legacy_part.eo
index 40d62d3661..7907db9346 100644
--- a/src/lib/elementary/efl_ui_check_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_check_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout_Part_Content)
{
[[Elementary check internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 962b7bac19..f882ba0d3f 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Clock_Type
ampm = 7, [[Indicates AM/PM field .]]
}
-class Efl.Ui.Clock (Efl.Ui.Layout.Object)
+class Efl.Ui.Clock (Efl.Ui.Layout)
{
[[Efl UI clock class]]
methods {
diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo
index 7b769e9bae..74a0876344 100644
--- a/src/lib/elementary/efl_ui_datepicker.eo
+++ b/src/lib/elementary/efl_ui_datepicker.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Datepicker (Efl.Ui.Layout.Object)
+class Efl.Ui.Datepicker (Efl.Ui.Layout)
{
[[Datepicker widget
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index dd2d25cd9a..038f257de5 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Frame (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
+class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
Efl.Ui.Translatable, Efl.Content)
{
[[Frame widget
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index 6137dd9fb7..ea9cf5d4f1 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
-abstract Efl.Ui.Item (Efl.Ui.Layout.Object, Efl.Ui.Selectable, Efl.Ui.Clickable)
+abstract Efl.Ui.Item (Efl.Ui.Layout, Efl.Ui.Selectable, Efl.Ui.Clickable)
{
[[Item abstract class for pack widget. All item have to be inherited from this class.]]
methods {
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout.c
index f3b4cd12f3..66ee47931c 100644
--- a/src/lib/elementary/efl_ui_layout_object.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -14,14 +14,14 @@
#include "elm_part_helper.h"
#include "elm_entry.eo.h"
-#define MY_CLASS EFL_UI_LAYOUT_OBJECT_CLASS
-#define MY_CLASS_PFX efl_ui_layout_object
+#define MY_CLASS EFL_UI_LAYOUT_CLASS
+#define MY_CLASS_PFX efl_ui_layout
-#define MY_CLASS_NAME "Efl.Ui.Layout.Object"
+#define MY_CLASS_NAME "Efl.Ui.Layout"
-Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout_Object *obj, Edje_Part_Type type, const char *part);
+Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part);
static void _efl_model_properties_changed_cb(void *, const Efl_Event *);
-static Eina_Bool _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part_name);
+static Eina_Bool _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Data *sd, const char *part_name);
static const char SIG_THEME_CHANGED[] = "theme,changed";
const char SIG_LAYOUT_FOCUSED[] = "focused";
@@ -80,7 +80,7 @@ struct _Efl_Ui_Layout_Sub_Iterator
{
Eina_Iterator iterator;
Eina_Iterator *real_iterator;
- Efl_Ui_Layout_Object *object;
+ Efl_Ui_Layout *object;
};
struct _Efl_Ui_Layout_Sub_Object_Data
@@ -123,7 +123,7 @@ struct _Efl_Ui_Layout_Sub_Object_Cursor
#define MY_CLASS_NAME_LEGACY "elm_layout"
static void
-_efl_ui_layout_object_class_constructor(Efl_Class *klass)
+_efl_ui_layout_class_constructor(Efl_Class *klass)
{
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
@@ -149,7 +149,7 @@ _part_cursor_free(Efl_Ui_Layout_Sub_Object_Cursor *pc)
}
static void
-_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Object_Data *sd)
+_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd)
{
Evas_Coord minh = -1, minw = -1;
Evas_Coord rest_w = 0, rest_h = 0;
@@ -192,7 +192,7 @@ _signals_emit(Eo *obj,
}
static inline void
-_icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
+_icon_signal_emit(Efl_Ui_Layout_Data *sd,
Efl_Ui_Layout_Sub_Object_Data *sub_d,
Eina_Bool visible)
{
@@ -245,7 +245,7 @@ _icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
}
static inline void
-_text_signal_emit(Efl_Ui_Layout_Object_Data *sd,
+_text_signal_emit(Efl_Ui_Layout_Data *sd,
Efl_Ui_Layout_Sub_Object_Data *sub_d,
Eina_Bool visible)
{
@@ -302,7 +302,7 @@ _text_signal_emit(Efl_Ui_Layout_Object_Data *sd,
}
static void
-_parts_signals_emit(Efl_Ui_Layout_Object_Data *sd)
+_parts_signals_emit(Efl_Ui_Layout_Data *sd)
{
const Eina_List *l;
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -323,7 +323,7 @@ _part_cursor_part_apply(const Efl_Ui_Layout_Sub_Object_Cursor *pc)
}
static void
-_parts_cursors_apply(Efl_Ui_Layout_Object_Data *sd)
+_parts_cursors_apply(Efl_Ui_Layout_Data *sd)
{
const Eina_List *l;
const char *file, *group;
@@ -387,7 +387,7 @@ _efl_ui_layout_highlight_in_theme(Evas_Object *obj)
static Eina_Bool
_visuals_refresh(Evas_Object *obj,
- Efl_Ui_Layout_Object_Data *sd)
+ Efl_Ui_Layout_Data *sd)
{
Eina_Bool ret = EINA_FALSE;
@@ -413,7 +413,7 @@ _visuals_refresh(Evas_Object *obj,
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Eina_Bool disabled)
+_efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -442,7 +442,7 @@ _efl_ui_layout_object_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Ob
}
static Efl_Ui_Theme_Apply
-_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
{
Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED;
@@ -459,7 +459,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
}
if (ret)
- efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL);
+ efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
if (!_visuals_refresh(obj, sd))
ret = EFL_UI_THEME_APPLY_FAILED;
@@ -468,7 +468,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
}
EOLIAN static Efl_Ui_Theme_Apply
-_efl_ui_layout_object_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
{
Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED;
@@ -480,7 +480,7 @@ _efl_ui_layout_object_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Object_Da
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED)
+_efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -512,7 +512,7 @@ _efl_ui_layout_object_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Evas_Object *sobj)
+_efl_ui_layout_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{
Eina_Bool int_ret = EINA_FALSE;
@@ -529,7 +529,7 @@ _efl_ui_layout_object_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd, Evas_Object *sobj)
+_efl_ui_layout_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj)
{
Eina_List *l;
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -647,7 +647,7 @@ _box_reference_del(void *data,
static Evas_Object *
_sub_box_remove(Evas_Object *obj,
- Efl_Ui_Layout_Object_Data *sd,
+ Efl_Ui_Layout_Data *sd,
Efl_Ui_Layout_Sub_Object_Data *sub_d)
{
Evas_Object *child = sub_d->obj; /* sub_d will die in
@@ -690,7 +690,7 @@ _sub_box_is(const Efl_Ui_Layout_Sub_Object_Data *sub_d)
static Evas_Object *
_sub_table_remove(Evas_Object *obj,
- Efl_Ui_Layout_Object_Data *sd,
+ Efl_Ui_Layout_Data *sd,
Efl_Ui_Layout_Sub_Object_Data *sub_d)
{
Evas_Object *child;
@@ -722,7 +722,7 @@ _on_size_evaluate_signal(void *data,
}
EOLIAN static void
-_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED)
+_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
{
Evas_Object *edje;
@@ -747,7 +747,7 @@ _efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Object_Data *_p
}
EOLIAN static void
-_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Data *sd)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
Efl_Ui_Layout_Sub_Object_Cursor *pc;
@@ -813,7 +813,7 @@ _efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd
/* rewrite or extend this one on your derived class as to suit your
* needs */
EOLIAN static void
-_efl_ui_layout_object_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Data *sd)
{
if (sd->needs_size_calc)
{
@@ -823,7 +823,7 @@ _efl_ui_layout_object_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Ob
}
static Efl_Ui_Layout_Sub_Object_Cursor *
-_parts_cursors_find(Efl_Ui_Layout_Object_Data *sd,
+_parts_cursors_find(Efl_Ui_Layout_Data *sd,
const char *part)
{
const Eina_List *l;
@@ -842,7 +842,7 @@ _parts_cursors_find(Efl_Ui_Layout_Object_Data *sd,
* widget inheriting from elm_layout */
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *file, const char *group)
+_efl_ui_layout_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *file, const char *group)
{
Eina_Bool int_ret = EINA_FALSE;
@@ -866,7 +866,7 @@ _efl_ui_layout_object_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd,
}
EOLIAN static void
-_efl_ui_layout_object_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char **file, const char **group)
+_efl_ui_layout_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char **file, const char **group)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
edje_object_file_get(wd->resize_obj, file, group);
@@ -874,7 +874,7 @@ _efl_ui_layout_object_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Object_Data
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const Eina_File *file, const char *group)
+_efl_ui_layout_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Data *sd, const Eina_File *file, const char *group)
{
Eina_Bool int_ret = EINA_FALSE;
@@ -898,20 +898,20 @@ _efl_ui_layout_object_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd,
}
EOLIAN static void
-_efl_ui_layout_object_efl_file_mmap_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const Eina_File **file, const char **group)
+_efl_ui_layout_efl_file_mmap_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const Eina_File **file, const char **group)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
efl_file_mmap_get(wd->resize_obj, file, group);
}
EOLIAN static Efl_Ui_Theme_Apply
-_efl_ui_layout_object_theme_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *klass, const char *group, const char *style)
+_efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style)
{
Eina_Bool changed = EINA_FALSE;
if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj))
{
- ERR("Efl.Ui.Layout.theme can only be set before finalize!");
+ ERR("Efl.Ui.Layout_theme can only be set before finalize!");
return EFL_UI_THEME_APPLY_FAILED;
}
@@ -927,7 +927,7 @@ _efl_ui_layout_object_theme_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const ch
}
EOLIAN static void
-_efl_ui_layout_object_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source)
+_efl_ui_layout_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source)
{
// Don't do anything else than call forward here
EINA_SAFETY_ON_TRUE_RETURN(efl_invalidated_get(obj));
@@ -936,7 +936,7 @@ _efl_ui_layout_object_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Objec
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
+_efl_ui_layout_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
{
// Don't do anything else than call forward here
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -944,7 +944,7 @@ _efl_ui_layout_object_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layo
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
+_efl_ui_layout_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
// Don't do anything else than call forward here
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -972,7 +972,7 @@ elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conte
}
static Eina_Bool
-_efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *content)
+_efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *content)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
Eina_List *l;
@@ -1058,7 +1058,7 @@ elm_layout_content_get(const Evas_Object *obj, const char *swallow)
}
static Evas_Object*
-_efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part)
+_efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
{
const Eina_List *l;
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -1092,7 +1092,7 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow)
}
static Evas_Object*
-_efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part)
+_efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
Eina_List *l;
@@ -1138,7 +1138,7 @@ _efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED,
+_efl_ui_layout_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED,
Efl_Gfx_Entity *content)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1161,7 +1161,7 @@ elm_layout_content_swallow_list_get(const Evas_Object *obj)
EFL_UI_LAYOUT_CHECK(obj) NULL;
Eina_List *ret = NULL;
Efl_Ui_Layout_Sub_Object_Data *sub_d = NULL;
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_get(obj, MY_CLASS);
Eina_List *l = NULL;
EINA_LIST_FOREACH(sd->subs, l, sub_d)
@@ -1185,7 +1185,7 @@ _sub_iterator_next(Efl_Ui_Layout_Sub_Iterator *it, void **data)
return EINA_TRUE;
}
-static Efl_Ui_Layout_Object *
+static Efl_Ui_Layout *
_sub_iterator_get_container(Efl_Ui_Layout_Sub_Iterator *it)
{
return it->object;
@@ -1199,7 +1199,7 @@ _sub_iterator_free(Efl_Ui_Layout_Sub_Iterator *it)
}
static Eina_Iterator *
-_sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Object_Data *sd)
+_sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Data *sd)
{
Efl_Ui_Layout_Sub_Iterator *it;
@@ -1219,19 +1219,19 @@ _sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Object_Data *sd)
}
EOLIAN static Eina_Iterator *
-_efl_ui_layout_object_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Data *sd)
{
return _sub_iterator_create(eo_obj, sd);
}
EOLIAN static int
-_efl_ui_layout_object_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Data *sd)
{
return eina_list_count(sd->subs);
}
static Eina_Bool
-_efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text, Eina_Bool is_markup)
+_efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text, Eina_Bool is_markup)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1312,13 +1312,13 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const ch
}
static Eina_Bool
-_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text)
+_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text)
{
return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_FALSE);
}
static const char*
-_efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part)
+_efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@@ -1330,7 +1330,7 @@ _efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, cons
}
static const char*
-_efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part)
+_efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@@ -1338,13 +1338,13 @@ _efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSE
}
static Eina_Bool
-_efl_ui_layout_text_markup_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text)
+_efl_ui_layout_text_markup_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text)
{
return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_TRUE);
}
static void
-_layout_box_subobj_init(Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, const char *part, Evas_Object *child)
+_layout_box_subobj_init(Efl_Ui_Layout_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, const char *part, Evas_Object *child)
{
sub_d->part = eina_stringshare_add(part);
sub_d->obj = child;
@@ -1353,7 +1353,7 @@ _layout_box_subobj_init(Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_
}
Eina_Bool
-_efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child)
+_efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -1390,7 +1390,7 @@ _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *pa
}
Eina_Bool
-_efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child)
+_efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -1427,7 +1427,7 @@ _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *p
}
Eina_Bool
-_efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference)
+_efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -1469,7 +1469,7 @@ _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const c
}
Eina_Bool
-_efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned int pos)
+_efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned int pos)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1507,7 +1507,7 @@ _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char
}
Evas_Object *
-_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child)
+_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@@ -1528,7 +1528,7 @@ _efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *pa
}
Eina_Bool
-_efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear)
+_efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
@@ -1558,7 +1558,7 @@ _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char
}
Eina_Bool
-_efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
+_efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
{
Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -1605,7 +1605,7 @@ _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *pa
}
Evas_Object *
-_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child)
+_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@@ -1627,7 +1627,7 @@ _efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *
}
Eina_Bool
-_efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear)
+_efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
@@ -1665,7 +1665,7 @@ elm_layout_edje_get(const Eo *obj)
}
EOLIAN static const char *
-_efl_ui_layout_object_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *key)
+_efl_ui_layout_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *key)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@@ -1673,7 +1673,7 @@ _efl_ui_layout_object_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layo
}
EOLIAN static Eina_Size2D
-_efl_ui_layout_object_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED)
+_efl_ui_layout_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
@@ -1681,7 +1681,7 @@ _efl_ui_layout_object_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_
}
EOLIAN static Eina_Size2D
-_efl_ui_layout_object_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED)
+_efl_ui_layout_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
@@ -1689,7 +1689,7 @@ _efl_ui_layout_object_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_
}
EOLIAN static Eina_Bool
-_efl_ui_layout_object_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *part)
+_efl_ui_layout_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *part)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1701,7 +1701,7 @@ _efl_ui_layout_object_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layo
* Evas's rendering phase, it will be addressed, finally (see
* _efl_ui_layout_smart_calculate()). */
static void
-_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Data *sd)
{
if (!efl_finalized_get(obj)) return;
if (sd->frozen) return;
@@ -1714,7 +1714,7 @@ _elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
EAPI void
elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
{
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
if (!sd) return;
sd->restricted_calc_w = !!w;
@@ -1724,7 +1724,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
}
EOLIAN static int
-_efl_ui_layout_object_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
@@ -1736,7 +1736,7 @@ _efl_ui_layout_object_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Object_
}
EOLIAN static int
-_efl_ui_layout_object_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
@@ -1750,7 +1750,7 @@ _efl_ui_layout_object_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Object_Da
}
static Eina_Bool
-_efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, const char *cursor)
+_efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Data *sd, const char *part_name, const char *cursor)
{
Evas_Object *part_obj;
Efl_Ui_Layout_Sub_Object_Cursor *pc;
@@ -1809,7 +1809,7 @@ _efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Object_Data *sd, const char *part_n
}
static const char *
-_efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name)
+_efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
@@ -1821,7 +1821,7 @@ _efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Object_Data *sd, const char *part_n
}
static Eina_Bool
-_efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part_name)
+_efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@@ -1843,7 +1843,7 @@ _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part
}
static Eina_Bool
-_efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, const char *style)
+_efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Data *sd, const char *part_name, const char *style)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@@ -1858,7 +1858,7 @@ _efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Object_Data *sd, const char *
}
static const char*
-_efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name)
+_efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
@@ -1870,7 +1870,7 @@ _efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Object_Data *sd, const char *
}
static Eina_Bool
-_efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, Eina_Bool engine_only)
+_efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Data *sd, const char *part_name, Eina_Bool engine_only)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@@ -1885,7 +1885,7 @@ _efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Object_Data *sd, const
}
static Eina_Bool
-_efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name)
+_efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Data *sd, const char *part_name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
@@ -1899,7 +1899,7 @@ _efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Object_Data *sd, const
EAPI Eina_Bool
elm_layout_edje_object_can_access_set(Eo *obj, Eina_Bool can_access)
{
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
sd->can_access = !!can_access;
return EINA_TRUE;
@@ -1908,13 +1908,13 @@ elm_layout_edje_object_can_access_set(Eo *obj, Eina_Bool can_access)
EAPI Eina_Bool
elm_layout_edje_object_can_access_get(const Eo *obj)
{
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
return sd->can_access;
}
EOLIAN static void
-_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
+_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
{
efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
@@ -1940,7 +1940,7 @@ _efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Object_Data *_p
}
static void
-_efl_ui_layout_view_model_property_update(Efl_Ui_Layout_Object_Data *pd, const char *part, const char *fetch)
+_efl_ui_layout_view_model_property_update(Efl_Ui_Layout_Data *pd, const char *part, const char *fetch)
{
Eina_Value *v = NULL;
char *value = NULL;
@@ -1960,7 +1960,7 @@ _efl_ui_layout_view_model_property_update(Efl_Ui_Layout_Object_Data *pd, const c
}
static void
-_efl_ui_layout_view_model_signal_update(Efl_Ui_Layout_Object_Data *pd, const char *signal, const char *fetch)
+_efl_ui_layout_view_model_signal_update(Efl_Ui_Layout_Data *pd, const char *signal, const char *fetch)
{
Eina_Value *v = NULL;
Eina_Strbuf *buf;
@@ -2004,7 +2004,7 @@ _efl_ui_layout_view_model_signal_update(Efl_Ui_Layout_Object_Data *pd, const cha
}
static void
-_efl_ui_layout_view_model_content_update(Efl_Ui_Layout_Object_Data *pd, Efl_Ui_Factory *factory, const char *name)
+_efl_ui_layout_view_model_content_update(Efl_Ui_Layout_Data *pd, Efl_Ui_Factory *factory, const char *name)
{
Efl_Gfx_Entity *content;
@@ -2013,7 +2013,7 @@ _efl_ui_layout_view_model_content_update(Efl_Ui_Layout_Object_Data *pd, Efl_Ui_F
}
static void
-_efl_ui_layout_view_model_update(Efl_Ui_Layout_Object_Data *pd)
+_efl_ui_layout_view_model_update(Efl_Ui_Layout_Data *pd)
{
Eina_Hash_Tuple *tuple;
Eina_Iterator *it;
@@ -2040,7 +2040,7 @@ static void
_efl_model_properties_changed_cb(void *data, const Efl_Event *event)
{
Efl_Model_Property_Event *evt = event->info;
- Efl_Ui_Layout_Object_Data *pd = data;
+ Efl_Ui_Layout_Data *pd = data;
const char *prop;
Eina_Array_Iterator it;
unsigned int i;
@@ -2068,7 +2068,7 @@ _efl_model_properties_changed_cb(void *data, const Efl_Event *event)
}
static void
-_efl_ui_layout_connect_hash(Efl_Ui_Layout_Object_Data *pd)
+_efl_ui_layout_connect_hash(Efl_Ui_Layout_Data *pd)
{
if (pd->connect.properties) return ;
@@ -2079,7 +2079,7 @@ _efl_ui_layout_connect_hash(Efl_Ui_Layout_Object_Data *pd)
}
EOLIAN static void
-_efl_ui_layout_object_efl_ui_view_model_set(Eo *obj, Efl_Ui_Layout_Object_Data *pd, Efl_Model *model)
+_efl_ui_layout_efl_ui_view_model_set(Eo *obj, Efl_Ui_Layout_Data *pd, Efl_Model *model)
{
Eina_Stringshare *name;
Eina_Hash_Tuple *tuple;
@@ -2123,13 +2123,13 @@ _efl_ui_layout_object_efl_ui_view_model_set(Eo *obj, Efl_Ui_Layout_Object_Data *
}
EOLIAN static Efl_Model *
-_efl_ui_layout_object_efl_ui_view_model_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd)
+_efl_ui_layout_efl_ui_view_model_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd)
{
return pd->connect.model;
}
EOLIAN static void
-_efl_ui_layout_object_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd, const char *name, const char *property)
+_efl_ui_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd, const char *name, const char *property)
{
EINA_SAFETY_ON_NULL_RETURN(name);
Eina_Stringshare *sprop;
@@ -2178,7 +2178,7 @@ _efl_ui_layout_object_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_L
}
EOLIAN static void
-_efl_ui_layout_object_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd,
+_efl_ui_layout_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd,
const char *name, Efl_Ui_Factory *factory)
{
EINA_SAFETY_ON_NULL_RETURN(name);
@@ -2210,7 +2210,7 @@ _efl_ui_layout_object_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_L
}
EOLIAN static Eo *
-_efl_ui_layout_object_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
+_efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd)
{
sd->obj = obj;
obj = efl_constructor(efl_super(obj, MY_CLASS));
@@ -2221,7 +2221,7 @@ _efl_ui_layout_object_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Object_Data
}
EOLIAN static Efl_Object*
-_efl_ui_layout_object_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED)
+_efl_ui_layout_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED)
{
Eo *eo;
@@ -2232,14 +2232,14 @@ _efl_ui_layout_object_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Object_Data *pd
}
EOLIAN static void
-_efl_ui_layout_object_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
+_efl_ui_layout_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
efl_layout_signal_message_send(wd->resize_obj, id, msg);
}
EOLIAN static void
-_efl_ui_layout_object_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED, Eina_Bool recurse)
+_efl_ui_layout_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Eina_Bool recurse)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
efl_layout_signal_process(wd->resize_obj, recurse);
@@ -2248,7 +2248,7 @@ _efl_ui_layout_object_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Ob
/* Efl.Part implementation */
EOLIAN static Eo *
-_efl_ui_layout_object_efl_part_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part)
+_efl_ui_layout_efl_part_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
{
Efl_Canvas_Layout_Part_Type type = EFL_CANVAS_LAYOUT_PART_TYPE_NONE;
@@ -2313,7 +2313,7 @@ _efl_ui_layout_object_efl_part_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data
}
static const char *
-_efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED)
+_efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED)
{
const char *part = NULL;
if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE))
@@ -2322,7 +2322,7 @@ _efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data
}
static const char *
-_efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED)
+_efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED)
{
const char *part = NULL;
if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
@@ -2330,13 +2330,13 @@ _efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *s
return part;
}
-/* Efl.Ui.Layout.Part (common) */
+/* Efl.Ui.Layout_Part (common) */
EOLIAN static Eina_Bool
_efl_ui_layout_part_efl_ui_cursor_cursor_set(Eo *obj, void *_pd EINA_UNUSED, const char *cursor)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
return _efl_ui_layout_part_cursor_set(sd, pd->part, cursor);
}
@@ -2344,7 +2344,7 @@ EOLIAN static const char *
_efl_ui_layout_part_efl_ui_cursor_cursor_get(const Eo *obj, void *_pd EINA_UNUSED)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
return _efl_ui_layout_part_cursor_get(sd, pd->part);
}
@@ -2352,7 +2352,7 @@ EOLIAN static Eina_Bool
_efl_ui_layout_part_efl_ui_cursor_cursor_style_set(Eo *obj, void *_pd EINA_UNUSED, const char *style)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
return _efl_ui_layout_part_cursor_style_set(sd, pd->part, style);
}
@@ -2360,7 +2360,7 @@ EOLIAN static const char *
_efl_ui_layout_part_efl_ui_cursor_cursor_style_get(const Eo *obj, void *_pd EINA_UNUSED)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
return _efl_ui_layout_part_cursor_style_get(sd, pd->part);
}
@@ -2368,7 +2368,7 @@ EOLIAN static Eina_Bool
_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool allow)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
return _efl_ui_layout_part_cursor_engine_only_set(sd, pd->part, !allow);
}
@@ -2376,7 +2376,7 @@ EOLIAN static Eina_Bool
_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(const Eo *obj, void *_pd EINA_UNUSED)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
- Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
+ Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
return !_efl_ui_layout_part_cursor_engine_only_get(sd, pd->part);
}
@@ -2395,12 +2395,12 @@ _efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(const Eo *obj,
ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(part_typename, typename, ELM_PART_OVERRIDE_INTERNALS_FETCH(CLASS, TYPENAME)) \
ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(part_typename, typename, ELM_PART_OVERRIDE_INTERNALS_FETCH(CLASS, TYPENAME)) \
-/* Efl.Ui.Layout.Part_Content */
-CONTENT_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data)
+/* Efl.Ui.Layout_Part_Content */
+CONTENT_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
-/* Efl.Ui.Layout.Part_Text */
-TEXT_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data)
-MARKUP_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data)
+/* Efl.Ui.Layout_Part_Text */
+TEXT_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+MARKUP_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
EOLIAN static const char *
_efl_ui_layout_part_text_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain)
@@ -2416,10 +2416,10 @@ _efl_ui_layout_part_text_efl_ui_translatable_translatable_text_set(Eo *obj, void
elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain);
}
-/* Efl.Ui.Layout.Part_Legacy */
-CONTENT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data)
-TEXT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data)
-MARKUP_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data)
+/* Efl.Ui.Layout_Part_Legacy */
+CONTENT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+TEXT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+MARKUP_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
EOLIAN static const char *
_efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain)
@@ -2435,12 +2435,12 @@ _efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_set(Eo *obj, vo
elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain);
}
-/* Efl.Ui.Layout.Part_Bg (common) */
+/* Efl.Ui.Layout_Part_Bg (common) */
EOLIAN static Efl_Object *
_efl_ui_layout_part_bg_efl_object_finalize(Eo *obj, void *_pd EINA_UNUSED)
{
- Efl_Ui_Layout_Object_Data *sd;
+ Efl_Ui_Layout_Data *sd;
Elm_Part_Data *pd;
Eo *bg;
@@ -2459,7 +2459,7 @@ _efl_ui_layout_part_bg_efl_object_finalize(Eo *obj, void *_pd EINA_UNUSED)
return obj;
}
-/* Efl.Ui.Layout.Part_Xxx includes */
+/* Efl.Ui.Layout_Part_Xxx includes */
#include "efl_ui_layout_part.eo.c"
#include "efl_ui_layout_part_content.eo.c"
#include "efl_ui_layout_part_bg.eo.c"
@@ -2478,7 +2478,7 @@ EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
-#define EFL_UI_LAYOUT_OBJECT_EXTRA_OPS \
+#define EFL_UI_LAYOUT_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout), \
ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout), \
@@ -2487,7 +2487,7 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_efl_object_dbg_info_get)
-#include "efl_ui_layout_object.eo.c"
+#include "efl_ui_layout.eo.c"
#include "efl_ui_layout_legacy.eo.h"
@@ -2702,7 +2702,7 @@ _elm_layout_signal_callback_add_legacy(Eo *obj, Eo *edje, Eina_List **p_edje_sig
EAPI void
elm_layout_signal_callback_add(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
- Efl_Ui_Layout_Object_Data *sd;
+ Efl_Ui_Layout_Data *sd;
if (!emission || !source) return;
@@ -2756,7 +2756,7 @@ _elm_layout_signal_callback_del_legacy(Eo *obj EINA_UNUSED, Eo *edje, Eina_List
EAPI void *
elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func)
{
- Efl_Ui_Layout_Object_Data *sd;
+ Efl_Ui_Layout_Data *sd;
if (!emission || !source) return NULL;
@@ -2788,7 +2788,7 @@ elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, con
{
Efl_Ui_Theme_Apply ta;
- ta = efl_ui_layout_object_theme_set(obj, klass, group, style);
+ ta = efl_ui_layout_theme_set(obj, klass, group, style);
return (ta != EFL_UI_THEME_APPLY_FAILED);
}
diff --git a/src/lib/elementary/efl_ui_layout_object.eo b/src/lib/elementary/efl_ui_layout.eo
index 1aa121b10b..510096c98a 100644
--- a/src/lib/elementary/efl_ui_layout_object.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,6 +1,6 @@
import efl_ui;
-class Efl.Ui.Layout.Object (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
+class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory,
Efl.Layout.Calc, Efl.Layout.Signal,
Efl.Layout.Group)
@@ -16,7 +16,7 @@ class Efl.Ui.Layout.Object (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
Widgets that inherit from this class will call this function
automatically so it should not be called by applications, unless
- you are dealing directly with a @Efl.Ui.Layout.Object object.
+ you are dealing directly with a @Efl.Ui.Layout object.
]]
set {
[[Sets the edje group from the elementary theme that will be used
diff --git a/src/lib/elementary/efl_ui_layout_factory.c b/src/lib/elementary/efl_ui_layout_factory.c
index 73d18091f4..43d0a0f35d 100644
--- a/src/lib/elementary/efl_ui_layout_factory.c
+++ b/src/lib/elementary/efl_ui_layout_factory.c
@@ -92,9 +92,9 @@ _efl_ui_layout_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Layout_
}
else */
{
- layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, parent,
+ layout = efl_add(EFL_UI_LAYOUT_CLASS, parent,
efl_ui_view_model_set(efl_added, model),
- efl_ui_layout_object_theme_set(efl_added, pd->klass, pd->group, pd->style));
+ efl_ui_layout_theme_set(efl_added, pd->klass, pd->group, pd->style));
eina_hash_foreach(pd->connects, _model_connect, layout);
eina_hash_foreach(pd->factory_connects, _factory_model_connect, layout);
diff --git a/src/lib/elementary/efl_ui_layout_legacy.eo b/src/lib/elementary/efl_ui_layout_legacy.eo
index 383f461584..e444e4deba 100644
--- a/src/lib/elementary/efl_ui_layout_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Legacy (Efl.Ui.Layout.Object, Efl.Ui.Legacy)
+class Efl.Ui.Layout_Legacy (Efl.Ui.Layout, Efl.Ui.Legacy)
{
[[Elementary layout class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index 4cd9915bbf..e01ba6616f 100644
--- a/src/lib/elementary/efl_ui_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -17,15 +17,15 @@
#include "../evas/canvas/evas_table.eo.h"
/* layout internals for box & table */
-Eina_Bool _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child);
-Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child);
-Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference);
-Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned int pos);
-Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child);
-Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear);
-Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child);
-Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear);
+Eina_Bool _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
+Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
+Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference);
+Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned int pos);
+Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
+Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear);
+Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
+Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
+Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear);
#define BOX_CLASS EFL_UI_LAYOUT_PART_BOX_CLASS
#define TABLE_CLASS EFL_UI_LAYOUT_PART_TABLE_CLASS
@@ -35,14 +35,14 @@ typedef struct _Layout_Part_Data Efl_Ui_Layout_Table_Data;
struct _Layout_Part_Data
{
- Efl_Ui_Layout_Object *obj; // no ref
- Efl_Ui_Layout_Object_Data *sd; // data xref
+ Efl_Ui_Layout *obj; // no ref
+ Efl_Ui_Layout_Data *sd; // data xref
Eina_Stringshare *part;
unsigned char temp;
};
Eo *
-_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout_Object *obj, Edje_Part_Type type, const char *part)
+_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part)
{
if (type == EDJE_PART_TYPE_BOX)
return efl_add(BOX_CLASS, obj,
@@ -67,7 +67,7 @@ EOLIAN static void
_efl_ui_layout_part_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part)
{
pd->obj = layout;
- pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_OBJECT_CLASS, obj);
+ pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
eina_stringshare_replace(&pd->part, part);
pd->temp = 1;
}
@@ -225,7 +225,7 @@ EOLIAN static void
_efl_ui_layout_part_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part)
{
pd->obj = layout;
- pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_OBJECT_CLASS, obj);
+ pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
eina_stringshare_replace(&pd->part, part);
pd->temp = 1;
}
diff --git a/src/lib/elementary/efl_ui_layout_part.eo b/src/lib/elementary/efl_ui_layout_part.eo
index eac6aa5ac7..0a3f84b894 100644
--- a/src/lib/elementary/efl_ui_layout_part.eo
+++ b/src/lib/elementary/efl_ui_layout_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout.Part (Efl.Ui.Widget_Part, Efl.Ui.Cursor)
+class Efl.Ui.Layout_Part (Efl.Ui.Widget_Part, Efl.Ui.Cursor)
{
[[Elementary layout internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_bg.eo b/src/lib/elementary/efl_ui_layout_part_bg.eo
index 27b79d5b9e..372099e1cd 100644
--- a/src/lib/elementary/efl_ui_layout_part_bg.eo
+++ b/src/lib/elementary/efl_ui_layout_part_bg.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout.Part_Bg (Efl.Ui.Widget_Part_Bg)
+class Efl.Ui.Layout_Part_Bg (Efl.Ui.Widget_Part_Bg)
{
[[Elementary layout internal part background class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo
index 6526c5681c..575749ab78 100644
--- a/src/lib/elementary/efl_ui_layout_part_box.eo
+++ b/src/lib/elementary/efl_ui_layout_part_box.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout.Part_Box (Efl.Object, Efl.Pack_Linear,
+class Efl.Ui.Layout_Part_Box (Efl.Object, Efl.Pack_Linear,
Efl.Ui.Direction)
{
[[Represents a Box created as part of a layout.
diff --git a/src/lib/elementary/efl_ui_layout_part_content.eo b/src/lib/elementary/efl_ui_layout_part_content.eo
index c1884f89c8..20284f2d1c 100644
--- a/src/lib/elementary/efl_ui_layout_part_content.eo
+++ b/src/lib/elementary/efl_ui_layout_part_content.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout.Part_Content (Efl.Ui.Layout.Part, Efl.Content)
+class Efl.Ui.Layout_Part_Content (Efl.Ui.Layout_Part, Efl.Content)
{
[[Elementary layout internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_legacy.eo b/src/lib/elementary/efl_ui_layout_part_legacy.eo
index 8c7e2d3a43..5bb80040ca 100644
--- a/src/lib/elementary/efl_ui_layout_part_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_part_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout.Part_Legacy (Efl.Ui.Layout.Part, Efl.Content, Efl.Text,
+class Efl.Ui.Layout_Part_Legacy (Efl.Ui.Layout_Part, Efl.Content, Efl.Text,
Efl.Text_Markup, Efl.Ui.Translatable)
{
[[Elementary layout internal part class]]
diff --git a/src/lib/elementary/efl_ui_layout_part_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo
index 6f75c49c6e..660afa4f2a 100644
--- a/src/lib/elementary/efl_ui_layout_part_table.eo
+++ b/src/lib/elementary/efl_ui_layout_part_table.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout.Part_Table (Efl.Object, Efl.Pack_Table)
+class Efl.Ui.Layout_Part_Table (Efl.Object, Efl.Pack_Table)
{
[[Represents a Table created as part of a layout.
diff --git a/src/lib/elementary/efl_ui_layout_part_text.eo b/src/lib/elementary/efl_ui_layout_part_text.eo
index 82347b93ef..abe9fcef47 100644
--- a/src/lib/elementary/efl_ui_layout_part_text.eo
+++ b/src/lib/elementary/efl_ui_layout_part_text.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout.Part_Text (Efl.Ui.Layout.Part, Efl.Text, Efl.Text_Markup,
+class Efl.Ui.Layout_Part_Text (Efl.Ui.Layout_Part, Efl.Text, Efl.Text_Markup,
Efl.Ui.Translatable)
{
[[Elementary layout internal part class]]
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 479e051d1b..8a9a2990b7 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -427,7 +427,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
- Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_object_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj));
+ Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj));
if (theme_apply == EFL_UI_THEME_APPLY_FAILED)
CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL");
diff --git a/src/lib/elementary/efl_ui_list.eo b/src/lib/elementary/efl_ui_list.eo
index b97e5b5b99..f6fb19cef6 100644
--- a/src/lib/elementary/efl_ui_list.eo
+++ b/src/lib/elementary/efl_ui_list.eo
@@ -1,6 +1,6 @@
import efl_ui_list_item;
-class Efl.Ui.List (Efl.Ui.Layout.Object,
+class Efl.Ui.List (Efl.Ui.Layout,
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar,
Efl.Pack_Linear, Efl.Pack_Layout,
diff --git a/src/lib/elementary/efl_ui_list_default_item.c b/src/lib/elementary/efl_ui_list_default_item.c
index 19bfed4e0d..fc41087b1e 100644
--- a/src/lib/elementary/efl_ui_list_default_item.c
+++ b/src/lib/elementary/efl_ui_list_default_item.c
@@ -23,7 +23,7 @@ _efl_ui_list_default_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
Eo *eo;
eo = efl_finalize(efl_super(obj, MY_CLASS));
ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
- Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_object_theme_set(obj, "list_item", NULL, NULL);
+ Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL);
if (theme_apply == EFL_UI_THEME_APPLY_FAILED)
CRI("Default Item(%p) failed to set theme [efl/list_item]!", eo);
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_end.eo b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
index 7388c9f49b..d149213089 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_end.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_Default_Item_Part_End (Efl.Ui.Layout.Part, Efl.Content)
+class Efl.Ui.List_Default_Item_Part_End (Efl.Ui.Layout_Part, Efl.Content)
{
[[List Default Item internal content of end part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
index faed96db51..b3359eb595 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_Default_Item_Part_Icon (Efl.Ui.Layout.Part, Efl.Content)
+class Efl.Ui.List_Default_Item_Part_Icon (Efl.Ui.Layout_Part, Efl.Content)
{
[[List Default Item internal content of icon part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_list_empty_item.c b/src/lib/elementary/efl_ui_list_empty_item.c
index 066abddbdc..8435489a96 100644
--- a/src/lib/elementary/efl_ui_list_empty_item.c
+++ b/src/lib/elementary/efl_ui_list_empty_item.c
@@ -21,7 +21,7 @@ _efl_ui_list_empty_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
Eo *eo;
eo = efl_finalize(efl_super(obj, MY_CLASS));
ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
- Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_object_theme_set(obj, "list_item", NULL, "empty");
+ Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty");
if (theme_apply == EFL_UI_THEME_APPLY_FAILED)
CRI("Empty Item(%p) failed to set theme [efl/list_item:empty]!", eo);
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 07be70b9c9..8b967a2f71 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -2,11 +2,11 @@ import elm_general;
struct Efl.Ui.List_View_Item_Event
{
- layout: Efl.Ui.Layout.Object;
+ layout: Efl.Ui.Layout;
child: Efl.Model;
index: int;
}
-class Efl.Ui.List_View (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
+class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager)
{
diff --git a/src/lib/elementary/efl_ui_list_view_types.eot b/src/lib/elementary/efl_ui_list_view_types.eot
index fe7d03e292..f33bbf5b22 100644
--- a/src/lib/elementary/efl_ui_list_view_types.eot
+++ b/src/lib/elementary/efl_ui_list_view_types.eot
@@ -1,5 +1,5 @@
struct Efl.Ui.List_View_Layout_Item {
- layout: Efl.Ui.Layout.Object;
+ layout: Efl.Ui.Layout;
children: Efl.Model;
index_offset: int;
tree_node: void_ptr;
diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo
index ec43bea68b..f718bc82c5 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar (Efl.Ui.Layout.Object, Efl.Content, Efl.Text, Efl.Ui.Translatable)
+class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text, Efl.Ui.Translatable)
{
[[Navigation_Bar widget.
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part.eo b/src/lib/elementary/efl_ui_navigation_bar_part.eo
index 3f14eb33a3..30f677f53d 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar_Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Navigation_Bar_Part (Efl.Ui.Layout_Part_Content)
{
[[Efl UI Navigation_Bar internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
index fb342abe6f..21ebddb3e4 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar_Part_Back_Button (Efl.Ui.Layout.Part, Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content)
+class Efl.Ui.Navigation_Bar_Part_Back_Button (Efl.Ui.Layout_Part, Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content)
{
[[Efl Ui Navigation_Bar internal part back button class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c
index e00dc31e40..843dcbbe34 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.c
+++ b/src/lib/elementary/efl_ui_navigation_layout.c
@@ -13,15 +13,15 @@
#define MY_CLASS_NAME "Efl.Ui.Navigation_Layout"
EOLIAN static void
-_efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Efl_Ui_Layout_Object *bar)
+_efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Efl_Ui_Layout *bar)
{
- EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_OBJECT_CLASS));
+ EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_CLASS));
efl_content_set(efl_part(obj, "efl.bar"), bar);
pd->bar = bar;
}
-EOLIAN static Efl_Ui_Layout_Object *
+EOLIAN static Efl_Ui_Layout *
_efl_ui_navigation_layout_bar_get(const Eo *obj EINA_UNUSED, Efl_Ui_Navigation_Layout_Data *pd)
{
return pd->bar;
diff --git a/src/lib/elementary/efl_ui_navigation_layout.eo b/src/lib/elementary/efl_ui_navigation_layout.eo
index fc26479b88..846fbf68af 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.eo
+++ b/src/lib/elementary/efl_ui_navigation_layout.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Layout (Efl.Ui.Layout.Object, Efl.Content)
+class Efl.Ui.Navigation_Layout (Efl.Ui.Layout, Efl.Content)
{
[[Navigation_Layout widget.
@@ -16,7 +16,7 @@ class Efl.Ui.Navigation_Layout (Efl.Ui.Layout.Object, Efl.Content)
get {
}
values {
- value: Efl.Ui.Layout.Object;
+ value: Efl.Ui.Layout;
[[The bar object located at the top area of the Navigation Layout.
]]
}
diff --git a/src/lib/elementary/efl_ui_navigation_layout_private.h b/src/lib/elementary/efl_ui_navigation_layout_private.h
index d80596110f..47d3e4464d 100644
--- a/src/lib/elementary/efl_ui_navigation_layout_private.h
+++ b/src/lib/elementary/efl_ui_navigation_layout_private.h
@@ -4,7 +4,7 @@
typedef struct _Efl_Ui_Navigation_Layout_Data Efl_Ui_Navigation_Layout_Data;
struct _Efl_Ui_Navigation_Layout_Data
{
- Efl_Ui_Layout_Object *bar;
+ Efl_Ui_Layout *bar;
};
#define EFL_UI_NAVIGATION_LAYOUT_DATA_GET_OR_RETURN(o, ptr, ...) \
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index 6f22a0ffb6..2f67cc7423 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -5,7 +5,7 @@ enum Efl.Ui.Pager_Loop
enabled
}
-class Efl.Ui.Pager (Efl.Ui.Layout.Object, Efl.Pack_Linear)
+class Efl.Ui.Pager (Efl.Ui.Layout, Efl.Pack_Linear)
{
[[Pager widget
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index 73abf1a911..62594f3b22 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Panes (Efl.Ui.Layout.Object, Efl.Ui.Direction,
+class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Ui.Direction,
Efl.Ui.Clickable)
{
[[Elementary panes class]]
diff --git a/src/lib/elementary/efl_ui_panes_part.eo b/src/lib/elementary/efl_ui_panes_part.eo
index b6a2138bbe..f7b800121f 100644
--- a/src/lib/elementary/efl_ui_panes_part.eo
+++ b/src/lib/elementary/efl_ui_panes_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Panes_Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Panes_Part (Efl.Ui.Layout_Part_Content)
{
[[Elementary Panes internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 5e74441b3c..16d8105190 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -8,7 +8,7 @@ enum Efl.Ui.Popup_Align {
bottom [[Popup aligned to bottom]]
}
-class Efl.Ui.Popup(Efl.Ui.Layout.Object, Efl.Content)
+class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content)
{
[[EFL UI popup class]]
methods {
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index d0f35d10cb..9a0efae288 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -143,7 +143,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
}
else
{
- cur_content = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj,
+ cur_content = efl_add(EFL_UI_LAYOUT_CLASS, obj,
efl_content_set(efl_part(obj, "efl.buttons"), efl_added));
}
diff --git a/src/lib/elementary/efl_ui_popup_alert_part.eo b/src/lib/elementary/efl_ui_popup_alert_part.eo
index 1ca02b96ff..a58abd8ecc 100644
--- a/src/lib/elementary/efl_ui_popup_alert_part.eo
+++ b/src/lib/elementary/efl_ui_popup_alert_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Popup_Alert_Part (Efl.Ui.Layout.Part_Text)
+class Efl.Ui.Popup_Alert_Part (Efl.Ui.Layout_Part_Text)
{
[[Efl UI Popup Alert internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo b/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo
index f41ac3bda5..0f38208d5d 100644
--- a/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo
+++ b/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Popup_Alert_Scroll_Part (Efl.Ui.Layout.Part, Efl.Content, Efl.Text)
+class Efl.Ui.Popup_Alert_Scroll_Part (Efl.Ui.Layout_Part, Efl.Content, Efl.Text)
{
[[Efl UI Popup Alert Scroll internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_popup_alert_text_part.eo b/src/lib/elementary/efl_ui_popup_alert_text_part.eo
index fce0a7b6c1..dcd20de969 100644
--- a/src/lib/elementary/efl_ui_popup_alert_text_part.eo
+++ b/src/lib/elementary/efl_ui_popup_alert_text_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Popup_Alert_Text_Part (Efl.Ui.Layout.Part, Efl.Content, Efl.Text)
+class Efl.Ui.Popup_Alert_Text_Part (Efl.Ui.Layout_Part, Efl.Content, Efl.Text)
{
[[Efl UI Popup Alert Text internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_popup_part_backwall.eo b/src/lib/elementary/efl_ui_popup_part_backwall.eo
index 94974d0ce1..164bf011a5 100644
--- a/src/lib/elementary/efl_ui_popup_part_backwall.eo
+++ b/src/lib/elementary/efl_ui_popup_part_backwall.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Popup_Part_Backwall (Efl.Ui.Layout.Part, Efl.File)
+class Efl.Ui.Popup_Part_Backwall (Efl.Ui.Layout_Part, Efl.File)
{
[[Efl UI Popup internal part backwall class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 86592eca61..dc296e269b 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format,
+class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
Efl.Ui.Direction, Efl.Access.Value, Efl.Ui.Translatable,
Efl.Text, Efl.Content, Efl.Text_Markup)
{
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
index 382980829b..faffc0582c 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout_Part_Content)
{
[[Elementary progressbar internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo
index c98152a720..1b687014bb 100644
--- a/src/lib/elementary/efl_ui_progressbar_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Part (Efl.Ui.Layout.Part, Efl.Ui.Range)
+class Efl.Ui.Progressbar_Part (Efl.Ui.Layout_Part, Efl.Ui.Range)
{
[[Elementary progressbar internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_radio_legacy_part.eo b/src/lib/elementary/efl_ui_radio_legacy_part.eo
index 666d3c2318..ceca6466e3 100644
--- a/src/lib/elementary/efl_ui_radio_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout_Part_Content)
{
[[Elementary radio internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 6f42bbb913..6f74aadf12 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -402,7 +402,7 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
- efl_ui_layout_object_theme_set(obj, "scroller", "base", efl_ui_widget_style_get(obj));
+ efl_ui_layout_theme_set(obj, "scroller", "base", efl_ui_widget_style_get(obj));
sd->smanager = efl_add(EFL_UI_SCROLL_MANAGER_CLASS, obj);
efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index e9765166c2..8444294757 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Scroller (Efl.Ui.Layout.Object,
+class Efl.Ui.Scroller (Efl.Ui.Layout,
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar,
Efl.Content)
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 0fe181a675..0fa7ad5f85 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Slider (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Direction,
+class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
Efl.Access.Value,
Efl.Access.Widget.Action,
Efl.Content)
diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo
index 55996b5c40..7bb4fa5728 100644
--- a/src/lib/elementary/efl_ui_spin.eo
+++ b/src/lib/elementary/efl_ui_spin.eo
@@ -5,7 +5,7 @@ struct Efl.Ui.Spin_Special_Value
label: string; [[String to replace]]
}
-class Efl.Ui.Spin (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format,
+class Efl.Ui.Spin (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
Efl.Access.Value, Efl.Access.Widget.Action)
{
[[A Spin.
diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo
index 65f8156789..86f4b8409f 100644
--- a/src/lib/elementary/efl_ui_stack.eo
+++ b/src/lib/elementary/efl_ui_stack.eo
@@ -18,7 +18,7 @@ struct Efl.Ui.Stack_Event_Deactivated {
content: Efl.Canvas.Object; [[Deactivated content.]]
}
-class Efl.Ui.Stack (Efl.Ui.Layout.Object)
+class Efl.Ui.Stack (Efl.Ui.Layout)
{
[[Stack widget.
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index eb328e311b..37578a70be 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -221,7 +221,7 @@ _tab_add(Eo *obj, const char *label, const char *icon)
ti->tab = NULL;
ti->label = eina_stringshare_add(label);
- tab = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj);
+ tab = efl_add(EFL_UI_LAYOUT_CLASS, obj);
icon_obj = elm_icon_add(tab);
diff --git a/src/lib/elementary/efl_ui_tab_bar.eo b/src/lib/elementary/efl_ui_tab_bar.eo
index 0f1c7314f4..95c42c4c3a 100644
--- a/src/lib/elementary/efl_ui_tab_bar.eo
+++ b/src/lib/elementary/efl_ui_tab_bar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tab_Bar (Efl.Ui.Layout.Object, Efl.Ui.Clickable)
+class Efl.Ui.Tab_Bar (Efl.Ui.Layout, Efl.Ui.Clickable)
{
[[Tab Bar class]]
methods {
diff --git a/src/lib/elementary/efl_ui_tab_page.eo b/src/lib/elementary/efl_ui_tab_page.eo
index 5238e8e6f3..f321d47e3a 100644
--- a/src/lib/elementary/efl_ui_tab_page.eo
+++ b/src/lib/elementary/efl_ui_tab_page.eo
@@ -8,7 +8,7 @@ struct Efl.Ui.Tab_Page_Tab_Changed_Event {
changed_info: Efl.Ui.Tab_Page_Tab_Changed;
}
-class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
+class Efl.Ui.Tab_Page (Efl.Ui.Layout, Efl.Content)
{
[[Tab Page class]]
methods {
diff --git a/src/lib/elementary/efl_ui_tab_page_part_tab.eo b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
index 8c2ce57be1..74d3449e90 100644
--- a/src/lib/elementary/efl_ui_tab_page_part_tab.eo
+++ b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout.Part, Efl.Text)
+class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout_Part, Efl.Text)
{
[[Tab_Page internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index c473b12444..9a7a28f8a5 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -401,7 +401,7 @@ _item_new(Efl_Ui_Tags_Data *sd,
if (!str) return NULL;
- layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj);
+ layout = efl_add(EFL_UI_LAYOUT_CLASS, obj);
if (!elm_widget_element_update(obj, layout, PART_NAME_BUTTON))
CRI("Failed to set layout!");
diff --git a/src/lib/elementary/efl_ui_tags.eo b/src/lib/elementary/efl_ui_tags.eo
index 637b9f81d8..256271a455 100644
--- a/src/lib/elementary/efl_ui_tags.eo
+++ b/src/lib/elementary/efl_ui_tags.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tags (Efl.Ui.Layout.Object, Efl.Text, Efl.Ui.Format)
+class Efl.Ui.Tags (Efl.Ui.Layout, Efl.Text, Efl.Ui.Format)
{
[[Elementary Tags class]]
methods {
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 9825e98eb6..711454d6ef 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -797,7 +797,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
_efl_ui_text_guide_update(obj, !sd->has_text);
efl_event_thaw(obj);
- efl_event_callback_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL);
+ efl_event_callback_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
evas_object_unref(obj);
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index af47765f56..0f4ab33a1e 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,7 +1,7 @@
/* FIXME - Text object must stop using elm_general! */
import elm_general;
-class Efl.Ui.Text (Efl.Ui.Layout.Object, Efl.Ui.Clickable,
+class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
Efl.Ui.Selectable, Efl.Text_Interactive)
{
diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo
index d506d2b901..917621cc10 100644
--- a/src/lib/elementary/efl_ui_textpath.eo
+++ b/src/lib/elementary/efl_ui_textpath.eo
@@ -4,7 +4,7 @@ enum Efl.Ui.Textpath_Direction {
ccw [[Counter-clockwise]]
}
-class Efl.Ui.Textpath (Efl.Ui.Layout.Object, Efl.Text, Efl.Gfx.Path)
+class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Text, Efl.Gfx.Path)
{
[[Efl Ui Textpath class]]
legacy_prefix: elm_textpath;
diff --git a/src/lib/elementary/efl_ui_textpath_part.eo b/src/lib/elementary/efl_ui_textpath_part.eo
index bf76088329..a60388000d 100644
--- a/src/lib/elementary/efl_ui_textpath_part.eo
+++ b/src/lib/elementary/efl_ui_textpath_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Textpath_Part (Efl.Ui.Layout.Part_Text)
+class Efl.Ui.Textpath_Part (Efl.Ui.Layout_Part_Text)
{
[[Efl UI Textpath internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_timepicker.eo b/src/lib/elementary/efl_ui_timepicker.eo
index 54fd2b6baa..dc2682d5fe 100644
--- a/src/lib/elementary/efl_ui_timepicker.eo
+++ b/src/lib/elementary/efl_ui_timepicker.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Timepicker (Efl.Ui.Layout.Object)
+class Efl.Ui.Timepicker (Efl.Ui.Layout)
{
[[Timepicker widget
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index bbbfde69fe..8659752570 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Video (Efl.Ui.Layout.Object, Efl.Player, Efl.Access.Widget.Action)
+class Efl.Ui.Video (Efl.Ui.Layout, Efl.Player, Efl.Access.Widget.Action)
{
[[Efl UI video class]]
legacy_prefix: elm_video;
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 717f8490c0..3ad54d31aa 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -237,7 +237,7 @@ _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_Object_Item *eo_it)
{
Elm_Widget_Item_Data *it = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
- if (efl_isa(it->view, EFL_UI_LAYOUT_OBJECT_CLASS))
+ if (efl_isa(it->view, EFL_UI_LAYOUT_CLASS))
str = edje_object_data_get(elm_layout_edje_get(it->view), "focus_highlight");
else
str = edje_object_data_get(it->view, "focus_highlight");
@@ -2839,7 +2839,7 @@ elm_widget_part_text_set(Eo *obj, const char *part, const char *label)
/* legacy support: combobox was special (internal entry is text object). */
if (efl_isa(obj, ELM_COMBOBOX_CLASS))
_elm_combobox_part_text_set(obj, part, label);
- else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
elm_layout_text_set(obj, part, label);
}
@@ -2849,7 +2849,7 @@ elm_widget_part_text_get(const Eo *obj, const char *part)
/* legacy support: combobox was special (internal entry is text object). */
if (efl_isa(obj, ELM_COMBOBOX_CLASS))
return _elm_combobox_part_text_get(obj, part);
- else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
return elm_layout_text_get(obj, part);
return NULL;
@@ -3504,7 +3504,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part")))
return;
}
- else if (obj && efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ else if (obj && efl_isa(obj, EFL_UI_LAYOUT_CLASS))
{
edje_obj = elm_layout_edje_get(obj);
if (!(target_hl_part = elm_layout_data_get(obj, "focus_part")))
@@ -5696,7 +5696,7 @@ EAPI void
elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content)
{
ELM_WIDGET_CHECK(obj);
- if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
{
elm_layout_content_set(obj, part, content);
return;
@@ -5714,7 +5714,7 @@ EAPI Evas_Object *
elm_widget_content_part_get(const Evas_Object *obj, const char *part)
{
ELM_WIDGET_CHECK(obj) NULL;
- if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
return elm_layout_content_get(obj, part);
if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
if (!part)
@@ -5729,7 +5729,7 @@ EAPI Evas_Object *
elm_widget_content_part_unset(Evas_Object *obj, const char *part)
{
ELM_WIDGET_CHECK(obj) NULL;
- if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
return elm_layout_content_unset(obj, part);
if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
if (!part)
@@ -5745,7 +5745,7 @@ elm_widget_signal_emit(Eo *obj, const char *emission, const char *source)
{
ELM_WIDGET_CHECK(obj);
- if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
elm_layout_signal_emit(obj, emission, source);
else if (evas_object_smart_type_check(obj, "elm_icon"))
{
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index 07f7b09477..8a9f4d3493 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
all = (1 << 3) - 1 [[All positions for left/center/right.]]
}
-class Elm.Actionslider (Efl.Ui.Layout.Object, Efl.Ui.Selectable, Efl.Ui.Legacy)
+class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable, Efl.Ui.Legacy)
{
[[An actionslider is a switcher for 2 or 3 labels
diff --git a/src/lib/elementary/elm_actionslider_part.eo b/src/lib/elementary/elm_actionslider_part.eo
index ef44426d23..dee607a949 100644
--- a/src/lib/elementary/elm_actionslider_part.eo
+++ b/src/lib/elementary/elm_actionslider_part.eo
@@ -1,4 +1,4 @@
-class Elm_Actionslider.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm_Actionslider.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary Actionslider internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 8905759303..79e8baac8c 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
bottom_right [[The arrow of the bubble points to the bottom right corner.]]
}
-class Elm.Bubble (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Legacy)
+class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
{
[[Speech bubble widget used in messaging applications]]
diff --git a/src/lib/elementary/elm_bubble_part.eo b/src/lib/elementary/elm_bubble_part.eo
index 44911d69c1..8af7ff2c50 100644
--- a/src/lib/elementary/elm_bubble_part.eo
+++ b/src/lib/elementary/elm_bubble_part.eo
@@ -1,4 +1,4 @@
-class Elm_Bubble.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm_Bubble.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary Bubble internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index c646313375..73d67b04ae 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -72,7 +72,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark.
with @Elm.Calendar.mark_del.
]]
-class Elm.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action,
+class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action,
Efl.Ui.Legacy)
{
[[Calendar widget
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index e01048d937..b292fa58d2 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -18,7 +18,7 @@ enum Elm.Clock.Edit_Mode
all = (1 << 6) - 1 [[All digits should be editable.]]
}
-class Elm.Clock (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
+class Elm.Clock (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
{
[[Digital clock widget
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 61431168a4..8f9ff0dc0f 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -4,7 +4,7 @@ import elm_interface_scrollable;
struct @extern Elm.Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
struct @extern Elm.Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
-class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text)
+class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text)
{
[[Elementary code widget]]
eo_prefix: elm_obj_code_widget;
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index 3b106dfde1..e8d719f819 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -12,7 +12,7 @@ enum Elm.Colorselector.Mode
all [[All possible color selector is displayed.]]
}
-class Elm.Colorselector (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition,
+class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Legacy)
{
[[Elementary colorselector class]]
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 8026cc020e..37cba0691b 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -1,4 +1,4 @@
-class Elm.Conformant (Efl.Ui.Layout.Object, Efl.Ui.Legacy)
+class Elm.Conformant (Efl.Ui.Layout, Efl.Ui.Legacy)
{
[[Elementary conformant class]]
legacy_prefix: elm_conformant;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index af3617b7f2..7199aa7f04 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
unknown [[Ctxpopup does not determine it's direction yet.]]
}
-class Elm.Ctxpopup (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary context popup class]]
legacy_prefix: elm_ctxpopup;
diff --git a/src/lib/elementary/elm_ctxpopup_part.eo b/src/lib/elementary/elm_ctxpopup_part.eo
index 53c5c05d5b..301cee9870 100644
--- a/src/lib/elementary/elm_ctxpopup_part.eo
+++ b/src/lib/elementary/elm_ctxpopup_part.eo
@@ -1,4 +1,4 @@
-class Elm.Ctxpopup.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Ctxpopup.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary contex popup internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index 13017f1b7c..56b35044fb 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -17,7 +17,7 @@ enum Elm.Dayselector.Day
max [[Sentinel value to indicate last enum field during iteration]]
}
-class Elm.Dayselector (Efl.Ui.Layout.Object, Efl.Ui.Legacy)
+class Elm.Dayselector (Efl.Ui.Layout, Efl.Ui.Legacy)
{
[[Elementary dayselector class]]
legacy_prefix: elm_dayselector;
diff --git a/src/lib/elementary/elm_dayselector_part.eo b/src/lib/elementary/elm_dayselector_part.eo
index 7ed920abb3..f48c5c7bd9 100644
--- a/src/lib/elementary/elm_dayselector_part.eo
+++ b/src/lib/elementary/elm_dayselector_part.eo
@@ -1,4 +1,4 @@
-class Elm.Dayselector.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Dayselector.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary dayselector internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c4a4344967..b4ad237ce8 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1007,7 +1007,7 @@ _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
evas_event_thaw(evas_object_evas_get(obj));
evas_event_thaw_eval(evas_object_evas_get(obj));
- efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL);
+ efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
evas_object_unref(obj);
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 7d98befedf..3275b0f1b4 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -3,7 +3,7 @@ import elm_general;
type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]]
type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]]
-class Elm.Entry (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clickable,
+class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Access.Widget.Action,
Efl.Ui.Legacy)
diff --git a/src/lib/elementary/elm_entry_part.eo b/src/lib/elementary/elm_entry_part.eo
index bf349b6347..8b33908264 100644
--- a/src/lib/elementary/elm_entry_part.eo
+++ b/src/lib/elementary/elm_entry_part.eo
@@ -1,4 +1,4 @@
-class Elm.Entry.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Entry.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary entry internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 5ebf4d0a9d..ffadc12390 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector (Efl.Ui.Layout.Object, Elm.Interface.Fileselector,
+class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector,
Efl.Access.Widget.Action, Efl.Ui.Focus.Composition,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
{
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 4e5a6a8002..29609f371c 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector_Entry (Efl.Ui.Layout.Object, Elm.Interface.Fileselector,
+class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
{
[[Elementary fileselector entry class]]
diff --git a/src/lib/elementary/elm_fileselector_entry_part.eo b/src/lib/elementary/elm_fileselector_entry_part.eo
index 383da59e96..3011f215ef 100644
--- a/src/lib/elementary/elm_fileselector_entry_part.eo
+++ b/src/lib/elementary/elm_fileselector_entry_part.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector.Entry.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Fileselector.Entry.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary fileselector entry internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_fileselector_part.eo b/src/lib/elementary/elm_fileselector_part.eo
index bdc00c7905..e32512b384 100644
--- a/src/lib/elementary/elm_fileselector_part.eo
+++ b/src/lib/elementary/elm_fileselector_part.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Fileselector.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary fileselector entry internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index 570c642567..e1533b0d07 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -1,4 +1,4 @@
-class Elm.Flipselector (Efl.Ui.Layout.Object, Efl.Ui.Range,
+class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Access.Widget.Action,
Efl.Ui.Selectable, Efl.Ui.Legacy)
{
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 671831a347..33d260f8e3 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -9,7 +9,7 @@ enum Elm.Gengrid.Reorder_Type
swap [[Swap reorder type]]
}
-class Elm.Gengrid (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable,
+class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable,
Efl.Ui.Clickable, Efl.Access.Widget.Action,
Efl.Access.Selection, Efl.Ui.Legacy)
{
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index d966024bcf..aaa183ad7f 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -453,7 +453,7 @@ _item_content_realize(Elm_Gen_Item *it,
ELM_WIDGET_DATA_GET_OR_RETURN(content, wd);
// FIXME : Layout need sizing eval before group calculate
- if (efl_class_get(content) == EFL_UI_LAYOUT_OBJECT_CLASS)
+ if (efl_class_get(content) == EFL_UI_LAYOUT_CLASS)
elm_layout_sizing_eval(content);
_widget_calculate_recursive(content);
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index c1317ae62d..3e8835d81e 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -1,6 +1,6 @@
import elm_general;
-class Elm.Genlist (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clickable,
+class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Access.Widget.Action, Efl.Access.Selection,
Efl.Ui.Selectable, Efl.Ui.Legacy)
{
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 35f744b9c6..5f6f633c77 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -7,7 +7,7 @@ enum Elm.Hover.Axis
both [[ELM_HOVER_AXIS_BOTH -- both.]]
}
-class Elm.Hover (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
+class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary hover class]]
diff --git a/src/lib/elementary/elm_hover_part.eo b/src/lib/elementary/elm_hover_part.eo
index 7bdb717ab0..7059f735af 100644
--- a/src/lib/elementary/elm_hover_part.eo
+++ b/src/lib/elementary/elm_hover_part.eo
@@ -1,4 +1,4 @@
-class Elm.Hover.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Hover.Part (Efl.Ui.Layout_Part_Legacy)
{
[[elementary hover internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 9916adcd74..3b6bd229a9 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,4 +1,4 @@
-class Elm.Index (Efl.Ui.Layout.Object, Efl.Ui.Direction,
+class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
{
[[elementary index class]]
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 82d7530cfa..0b6acf9bc1 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -1,4 +1,4 @@
-class Elm.Inwin (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy)
+class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy)
{
[[Elementary inwin class]]
legacy_prefix: elm_inwin;
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index 6e5e9dc0c9..6afa5ac497 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -8,7 +8,7 @@ enum Elm.Label.Slide_Mode
always [[Slide always.]]
}
-class Elm.Label (Efl.Ui.Layout.Object, Efl.Ui.Legacy)
+class Elm.Label (Efl.Ui.Layout, Efl.Ui.Legacy)
{
[[Elementary label class]]
legacy_prefix: elm_label;
diff --git a/src/lib/elementary/elm_label_part.eo b/src/lib/elementary/elm_label_part.eo
index e62729a056..9b866bca19 100644
--- a/src/lib/elementary/elm_label_part.eo
+++ b/src/lib/elementary/elm_label_part.eo
@@ -1,4 +1,4 @@
-class Elm_Label.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm_Label.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary button internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_layout.h b/src/lib/elementary/elm_layout.h
index d3205bc39b..a59fd7c650 100644
--- a/src/lib/elementary/elm_layout.h
+++ b/src/lib/elementary/elm_layout.h
@@ -168,7 +168,7 @@
#include <elm_layout_common.h>
#ifdef EFL_EO_API_SUPPORT
-#include <efl_ui_layout_object.eo.h>
+#include <efl_ui_layout.eo.h>
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include <elm_layout_legacy.h>
diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h
index a22f16e824..58dab5bcc9 100644
--- a/src/lib/elementary/elm_layout_legacy.h
+++ b/src/lib/elementary/elm_layout_legacy.h
@@ -712,4 +712,4 @@ EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const
*/
EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
-#include "efl_ui_layout_object.eo.legacy.h"
+#include "efl_ui_layout.eo.legacy.h"
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index f09c5299af..8d75422da1 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -1,6 +1,6 @@
import elm_general;
-class Elm.List (Efl.Ui.Layout.Object, Elm.Interface_Scrollable,
+class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
{
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index ec17c73f33..0b0b213b59 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1460,7 +1460,7 @@ elm_object_domain_translatable_part_text_set(Evas_Object *obj, const char *part,
{
if (!part)
part = efl_ui_widget_default_text_part_get(obj);
- else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE);
elm_widget_part_translatable_text_set(obj, part, text, domain);
@@ -1482,7 +1482,7 @@ elm_object_translatable_part_text_get(const Evas_Object *obj, const char *part)
{
if (!part)
part = efl_ui_widget_default_text_part_get(obj);
- else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
+ else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE);
return elm_widget_part_translatable_text_get(obj, part, NULL);
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index bb8b06239f..b78b8d6bf0 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -1,7 +1,7 @@
type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
-class Elm.Multibuttonentry (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Legacy)
+class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
{
[[Elementary multibuttonentry class]]
legacy_prefix: elm_multibuttonentry;
diff --git a/src/lib/elementary/elm_multibuttonentry_part.eo b/src/lib/elementary/elm_multibuttonentry_part.eo
index a0cafc541d..05d507aa2b 100644
--- a/src/lib/elementary/elm_multibuttonentry_part.eo
+++ b/src/lib/elementary/elm_multibuttonentry_part.eo
@@ -1,4 +1,4 @@
-class Elm.Multibuttonentry_Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Multibuttonentry_Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary multibuttonentry internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 47c41bdd5d..039cb0320b 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -1,4 +1,4 @@
-class Elm.Naviframe (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary naviframe class]]
legacy_prefix: elm_naviframe;
diff --git a/src/lib/elementary/elm_naviframe_part.eo b/src/lib/elementary/elm_naviframe_part.eo
index a84559f0c8..53e5174805 100644
--- a/src/lib/elementary/elm_naviframe_part.eo
+++ b/src/lib/elementary/elm_naviframe_part.eo
@@ -1,4 +1,4 @@
-class Elm.Naviframe.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Naviframe.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary naviframe internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index be8bdc5dda..d4fe178821 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -8,7 +8,7 @@ enum Elm.Panel.Orient
right [[Panel (dis)appears from the right]]
}
-class Elm.Panel (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
+class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary panel class]]
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index e8f607cc77..bc7c44017b 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -1,4 +1,4 @@
-class Elm.Player (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Player (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary player class]]
legacy_prefix: elm_player;
diff --git a/src/lib/elementary/elm_player_part.eo b/src/lib/elementary/elm_player_part.eo
index 1bbe7ee121..a09361d66c 100644
--- a/src/lib/elementary/elm_player_part.eo
+++ b/src/lib/elementary/elm_player_part.eo
@@ -1,4 +1,4 @@
-class Elm.Player.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Player.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary player internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 772504de9f..e0988f73a2 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -23,7 +23,7 @@ enum Elm.Popup.Orient
}
-class Elm.Popup (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary popup class]]
legacy_prefix: elm_popup;
diff --git a/src/lib/elementary/elm_popup_part.eo b/src/lib/elementary/elm_popup_part.eo
index ead1583579..cf03770f74 100644
--- a/src/lib/elementary/elm_popup_part.eo
+++ b/src/lib/elementary/elm_popup_part.eo
@@ -1,4 +1,4 @@
-class Elm.Popup.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Popup.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary popup internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 7824a4cc98..51842f6b09 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -1,4 +1,4 @@
-class Elm.Scroller (Efl.Ui.Layout.Object, Elm.Interface_Scrollable,
+class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Access.Widget.Action,
Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy)
{
diff --git a/src/lib/elementary/elm_scroller_part.eo b/src/lib/elementary/elm_scroller_part.eo
index de187cd09a..f038f7b241 100644
--- a/src/lib/elementary/elm_scroller_part.eo
+++ b/src/lib/elementary/elm_scroller_part.eo
@@ -1,4 +1,4 @@
-class Elm.Scroller.Part (Efl.Ui.Layout.Part_Legacy)
+class Elm.Scroller.Part (Efl.Ui.Layout_Part_Legacy)
{
[[Elementary scroller internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index f43efaefdc..76db9363cb 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -1,4 +1,4 @@
-class Elm.Segment_Control (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
+class Elm.Segment_Control (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
{
[[Elementary segment control class]]
legacy_prefix: elm_segment_control;
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index 136311d021..c29585d6b8 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -1,4 +1,4 @@
-class Elm.Separator (Efl.Ui.Layout.Object, Efl.Ui.Legacy)
+class Elm.Separator (Efl.Ui.Layout, Efl.Ui.Legacy)
{
[[Elementary separator class]]
legacy_prefix: elm_separator;
diff --git a/src/lib/elementary/elm_slider_part_indicator.eo b/src/lib/elementary/elm_slider_part_indicator.eo
index f54777bc1d..73698258b6 100644
--- a/src/lib/elementary/elm_slider_part_indicator.eo
+++ b/src/lib/elementary/elm_slider_part_indicator.eo
@@ -1,6 +1,6 @@
import efl_ui;
-class Elm.Slider_Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format)
+class Elm.Slider_Part_Indicator (Efl.Ui.Layout_Part, Efl.Ui.Format)
{
[[Elementary slider internal part class]]
data: null;
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index cdaf8d654a..b51ee63b71 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -1,6 +1,6 @@
type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]]
-class Elm.Slideshow (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Slideshow (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary slideshow class]]
eo_prefix: elm_obj_slideshow;
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index c5d1add14c..326354f641 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -1,4 +1,4 @@
-class Elm.Spinner (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Focus.Composition,
+class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition,
Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy)
{
[[Elementary spinner class]]
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index 3be7e43c92..674f2ec4ab 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -1,4 +1,4 @@
-class Elm.Thumb (Efl.Ui.Layout.Object, Efl.File, Efl.Ui.Clickable,
+class Elm.Thumb (Efl.Ui.Layout, Efl.File, Efl.Ui.Clickable,
Efl.Ui.Draggable, Efl.Ui.Legacy)
{
[[Elementary thumbnail class]]
diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h
index 5b871790ac..a8e92d566d 100644
--- a/src/lib/elementary/elm_widget_layout.h
+++ b/src/lib/elementary/elm_widget_layout.h
@@ -71,17 +71,17 @@ typedef struct _Elm_Layout_Smart_Data
Eina_Bool can_access : 1; /**< This is true when all text(including textblock) parts can be accessible by accessibility. */
Eina_Bool destructed_is : 1; /**< This flag indicates if Efl.Ui.Layout destructor was called. This is needed to avoid unnecessary calculation of subobject deletion during layout object's deletion. */
Eina_Bool file_set : 1; /**< This flag indicates if Efl.Ui.Layout source is set from a file*/
-} Efl_Ui_Layout_Object_Data;
+} Efl_Ui_Layout_Data;
/**
* @}
*/
#define EFL_UI_LAYOUT_DATA_GET(o, sd) \
- Efl_Ui_Layout_Object_Data * sd = efl_data_scope_get(o, EFL_UI_LAYOUT_OBJECT_CLASS)
+ Efl_Ui_Layout_Data * sd = efl_data_scope_get(o, EFL_UI_LAYOUT_CLASS)
#define EFL_UI_LAYOUT_CHECK(obj) \
- if (EINA_UNLIKELY(!efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))) \
+ if (EINA_UNLIKELY(!efl_isa(obj, EFL_UI_LAYOUT_CLASS))) \
return
#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 64071a5d18..9d308e1148 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -142,7 +142,7 @@ pub_eo_files = [
'efl_ui_stack.eo',
'efl_ui_image.eo',
'efl_ui_image_zoomable.eo',
- 'efl_ui_layout_object.eo',
+ 'efl_ui_layout.eo',
'efl_ui_nstate.eo',
'efl_ui_navigation_bar.eo',
'efl_ui_navigation_bar_part.eo',
@@ -771,7 +771,7 @@ elementary_src = [
'elm_interface_scrollable.c',
'elm_inwin.c',
'elm_label.c',
- 'efl_ui_layout_object.c',
+ 'efl_ui_layout.c',
'efl_ui_layout_pack.c',
'elm_list.c',
'elm_main.c',