From f4f85554e7c6842ccc9eb958ab6733a2bdf954a4 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 27 Jun 2014 23:36:05 +0100 Subject: Eolian classes: Fix according to namespace changes in efl. --- src/lib/elc_ctxpopup.eo | 6 +++--- src/lib/elc_fileselector.eo | 6 +++--- src/lib/elc_fileselector_button.eo | 6 +++--- src/lib/elc_fileselector_entry.eo | 6 +++--- src/lib/elc_hoversel.eo | 12 ++++++------ src/lib/elc_multibuttonentry.eo | 6 +++--- src/lib/elc_naviframe.eo | 8 ++++---- src/lib/elc_player.eo | 6 +++--- src/lib/elc_popup.eo | 6 +++--- src/lib/elm_access.eo | 4 ++-- src/lib/elm_actionslider.eo | 4 ++-- src/lib/elm_app_client.eo | 6 +++--- src/lib/elm_app_client_view.eo | 6 +++--- src/lib/elm_app_server.eo | 6 +++--- src/lib/elm_app_server_view.eo | 6 +++--- src/lib/elm_atspi_app_object.eo | 4 ++-- src/lib/elm_bg.eo | 4 ++-- src/lib/elm_box.eo | 6 +++--- src/lib/elm_bubble.eo | 4 ++-- src/lib/elm_button.eo | 6 +++--- src/lib/elm_calendar.eo | 8 ++++---- src/lib/elm_check.eo | 4 ++-- src/lib/elm_clock.eo | 6 +++--- src/lib/elm_colorselector.c | 2 +- src/lib/elm_colorselector.eo | 6 +++--- src/lib/elm_conformant.eo | 6 +++--- src/lib/elm_datetime.eo | 6 +++--- src/lib/elm_dayselector.eo | 6 +++--- src/lib/elm_diskselector.eo | 12 ++++++------ src/lib/elm_entry.eo | 18 +++++++++--------- src/lib/elm_flip.eo | 6 +++--- src/lib/elm_flipselector.eo | 6 +++--- src/lib/elm_frame.eo | 8 ++++---- src/lib/elm_gengrid.eo | 14 +++++++------- src/lib/elm_gengrid_pan.eo | 8 ++++---- src/lib/elm_genlist.eo | 14 +++++++------- src/lib/elm_genlist_pan.eo | 10 +++++----- src/lib/elm_gesture_layer.eo | 6 +++--- src/lib/elm_glview.eo | 8 ++++---- src/lib/elm_grid.eo | 6 +++--- src/lib/elm_hover.eo | 16 ++++++++-------- src/lib/elm_icon.eo | 6 +++--- src/lib/elm_image.eo | 24 ++++++++++++------------ src/lib/elm_index.eo | 6 +++--- src/lib/elm_interface_atspi_widget.eo | 6 +++--- src/lib/elm_interface_scrollable.eo | 8 ++++---- src/lib/elm_inwin.eo | 4 ++-- src/lib/elm_label.eo | 4 ++-- src/lib/elm_layout.c | 2 +- src/lib/elm_layout.eo | 10 +++++----- src/lib/elm_list.eo | 12 ++++++------ src/lib/elm_map.eo | 12 ++++++------ src/lib/elm_map_pan.eo | 8 ++++---- src/lib/elm_mapbuf.eo | 14 +++++++------- src/lib/elm_menu.eo | 10 +++++----- src/lib/elm_notify.eo | 14 +++++++------- src/lib/elm_pan.eo | 16 ++++++++-------- src/lib/elm_panel.eo | 6 +++--- src/lib/elm_panes.eo | 4 ++-- src/lib/elm_photo.eo | 8 ++++---- src/lib/elm_photocam.eo | 12 ++++++------ src/lib/elm_photocam_pan.eo | 8 ++++---- src/lib/elm_plug.eo | 4 ++-- src/lib/elm_prefs.eo | 6 +++--- src/lib/elm_progressbar.eo | 6 +++--- src/lib/elm_radio.eo | 6 +++--- src/lib/elm_route.eo | 6 +++--- src/lib/elm_scroller.eo | 10 +++++----- src/lib/elm_segment_control.eo | 6 +++--- src/lib/elm_separator.eo | 4 ++-- src/lib/elm_slider.eo | 8 ++++---- src/lib/elm_slideshow.eo | 6 +++--- src/lib/elm_spinner.eo | 6 +++--- src/lib/elm_systray.eo | 2 +- src/lib/elm_table.eo | 6 +++--- src/lib/elm_thumb.eo | 12 ++++++------ src/lib/elm_toolbar.eo | 12 ++++++------ src/lib/elm_video.eo | 6 +++--- src/lib/elm_web.eo | 6 +++--- src/lib/elm_widget.c | 2 +- src/lib/elm_widget.eo | 30 +++++++++++++++--------------- src/lib/elm_win.eo | 14 +++++++------- 82 files changed, 323 insertions(+), 323 deletions(-) diff --git a/src/lib/elc_ctxpopup.eo b/src/lib/elc_ctxpopup.eo index 8bc66f927..800db49a6 100644 --- a/src/lib/elc_ctxpopup.eo +++ b/src/lib/elc_ctxpopup.eo @@ -166,9 +166,9 @@ class Elm_Ctxpopup (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.del; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.del; + Evas.Object_Smart.add; Elm_Widget.parent.set; Elm_Widget.focus_direction; Elm_Widget.sub_object_add; diff --git a/src/lib/elc_fileselector.eo b/src/lib/elc_fileselector.eo index 9eed58bce..e69348522 100644 --- a/src/lib/elc_fileselector.eo +++ b/src/lib/elc_fileselector.eo @@ -36,9 +36,9 @@ class Elm_Fileselector (Elm_Layout, Elm_Interface_Fileselector) implements { class.constructor; class.destructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_next; Elm_Widget.focus_direction_manager_is; Elm_Widget.focus_direction; diff --git a/src/lib/elc_fileselector_button.eo b/src/lib/elc_fileselector_button.eo index 646b209b1..21d3e3f9a 100644 --- a/src/lib/elc_fileselector_button.eo +++ b/src/lib/elc_fileselector_button.eo @@ -97,9 +97,9 @@ class Elm_Fileselector_Button (Elm_Button, Elm_Interface_Fileselector) } } implements { - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Button.admits_autorepeat.get; Elm_Interface_Fileselector.selected_paths.get; diff --git a/src/lib/elc_fileselector_entry.eo b/src/lib/elc_fileselector_entry.eo index 776404dda..93b9df5aa 100644 --- a/src/lib/elc_fileselector_entry.eo +++ b/src/lib/elc_fileselector_entry.eo @@ -98,9 +98,9 @@ class Elm_Fileselector_Entry (Elm_Layout, Elm_Interface_Fileselector) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.del; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.del; + Evas.Object_Smart.add; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elc_hoversel.eo b/src/lib/elc_hoversel.eo index 663bd5c42..7101c09a1 100644 --- a/src/lib/elc_hoversel.eo +++ b/src/lib/elc_hoversel.eo @@ -1,4 +1,4 @@ -class Elm_Hoversel (Elm_Button, Evas_Selectable_Interface) +class Elm_Hoversel (Elm_Button, Evas.Selectable_Interface) { eo_prefix: elm_obj_hoversel; properties { @@ -139,11 +139,11 @@ class Elm_Hoversel (Elm_Button, Evas_Selectable_Interface) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.show; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.hide; + Evas.Object_Smart.show; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.parent.set; Elm_Widget.theme_apply; Elm_Widget.translate; diff --git a/src/lib/elc_multibuttonentry.eo b/src/lib/elc_multibuttonentry.eo index 69612f12d..07c2bcee3 100644 --- a/src/lib/elc_multibuttonentry.eo +++ b/src/lib/elc_multibuttonentry.eo @@ -254,9 +254,9 @@ class Elm_Multibuttonentry (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elc_naviframe.eo b/src/lib/elc_naviframe.eo index cc3f86e0c..d5f1e4300 100644 --- a/src/lib/elc_naviframe.eo +++ b/src/lib/elc_naviframe.eo @@ -255,10 +255,10 @@ class Elm_Naviframe (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.del; - Evas_Object_Smart.show; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.del; + Evas.Object_Smart.show; + Evas.Object_Smart.add; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elc_player.eo b/src/lib/elc_player.eo index a0a99007e..84ebbd415 100644 --- a/src/lib/elc_player.eo +++ b/src/lib/elc_player.eo @@ -3,9 +3,9 @@ class Elm_Player (Elm_Layout) eo_prefix: elm_obj_player; implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.event; Elm_Container.content_set; diff --git a/src/lib/elc_popup.eo b/src/lib/elc_popup.eo index eb9b2eab2..a13ebb9d6 100644 --- a/src/lib/elc_popup.eo +++ b/src/lib/elc_popup.eo @@ -158,9 +158,9 @@ class Elm_Popup (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.del; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.del; + Evas.Object_Smart.add; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.theme_apply; diff --git a/src/lib/elm_access.eo b/src/lib/elm_access.eo index cc04dc767..a4a26d838 100644 --- a/src/lib/elm_access.eo +++ b/src/lib/elm_access.eo @@ -4,8 +4,8 @@ eo_prefix: elm_obj_access; data: null; implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.activate; Elm_Widget.on_focus; } diff --git a/src/lib/elm_actionslider.eo b/src/lib/elm_actionslider.eo index e32a2421d..3de47831b 100644 --- a/src/lib/elm_actionslider.eo +++ b/src/lib/elm_actionslider.eo @@ -77,8 +77,8 @@ class Elm_Actionslider (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; Elm_Widget.theme_apply; diff --git a/src/lib/elm_app_client.eo b/src/lib/elm_app_client.eo index edc5b7882..6fafb9d0d 100644 --- a/src/lib/elm_app_client.eo +++ b/src/lib/elm_app_client.eo @@ -1,4 +1,4 @@ -class Elm_App_Client (Eo_Base) +class Elm_App_Client (Eo.Base) { legacy_prefix: null; eo_prefix: elm_app_client; @@ -52,8 +52,8 @@ class Elm_App_Client (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } events { view,created; /*@ Called when a view of this application is created. */ diff --git a/src/lib/elm_app_client_view.eo b/src/lib/elm_app_client_view.eo index 03d128f0a..fcc09b0d1 100644 --- a/src/lib/elm_app_client_view.eo +++ b/src/lib/elm_app_client_view.eo @@ -1,4 +1,4 @@ -class Elm_App_Client_View (Eo_Base) +class Elm_App_Client_View (Eo.Base) { legacy_prefix: null; eo_prefix: elm_app_client_view; @@ -111,8 +111,8 @@ class Elm_App_Client_View (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } events { state,changed; /*@ State of view changed. */ diff --git a/src/lib/elm_app_server.eo b/src/lib/elm_app_server.eo index 391996daa..21705ee0f 100644 --- a/src/lib/elm_app_server.eo +++ b/src/lib/elm_app_server.eo @@ -1,4 +1,4 @@ -class Elm_App_Server (Eo_Base) +class Elm_App_Server (Eo.Base) { legacy_prefix: null; eo_prefix: elm_app_server; @@ -90,8 +90,8 @@ class Elm_App_Server (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } events { terminate; /*@ Called when application must be terminated. */ diff --git a/src/lib/elm_app_server_view.eo b/src/lib/elm_app_server_view.eo index 789ff91bd..8ff591715 100644 --- a/src/lib/elm_app_server_view.eo +++ b/src/lib/elm_app_server_view.eo @@ -1,4 +1,4 @@ -class Elm_App_Server_View (Eo_Base) +class Elm_App_Server_View (Eo.Base) { legacy_prefix: null; eo_prefix: elm_app_server_view; @@ -101,8 +101,8 @@ class Elm_App_Server_View (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } events { resumed; /*@ Called when view must be resumed */ diff --git a/src/lib/elm_atspi_app_object.eo b/src/lib/elm_atspi_app_object.eo index 86129ff30..5371535db 100644 --- a/src/lib/elm_atspi_app_object.eo +++ b/src/lib/elm_atspi_app_object.eo @@ -1,8 +1,8 @@ -class Elm_Atspi_App_Object (Eo_Base, Elm_Interface_Atspi_Accessible) +class Elm_Atspi_App_Object (Eo.Base, Elm_Interface_Atspi_Accessible) { data: Elm_Atspi_App_Object_Data; implements { - Eo_Base.destructor; + Eo.Base.destructor; Elm_Interface_Atspi_Accessible.name.get; Elm_Interface_Atspi_Accessible.description.get; Elm_Interface_Atspi_Accessible.description.set; diff --git a/src/lib/elm_bg.eo b/src/lib/elm_bg.eo index 6e64a0f84..13e11418c 100644 --- a/src/lib/elm_bg.eo +++ b/src/lib/elm_bg.eo @@ -140,8 +140,8 @@ class Elm_Bg (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Layout.content_aliases.get; Elm_Layout.sizing_eval; } diff --git a/src/lib/elm_box.eo b/src/lib/elm_box.eo index 9f7878963..78a49779e 100644 --- a/src/lib/elm_box.eo +++ b/src/lib/elm_box.eo @@ -307,9 +307,9 @@ class Elm_Box (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_bubble.eo b/src/lib/elm_bubble.eo index afff9cbd1..900f40b1a 100644 --- a/src/lib/elm_bubble.eo +++ b/src/lib/elm_bubble.eo @@ -31,8 +31,8 @@ class Elm_Bubble (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_button.eo b/src/lib/elm_button.eo index ee063fa44..74f3e0c4e 100644 --- a/src/lib/elm_button.eo +++ b/src/lib/elm_button.eo @@ -1,4 +1,4 @@ -class Elm_Button (Elm_Layout, Evas_Clickable_Interface, +class Elm_Button (Elm_Layout, Evas.Clickable_Interface, Elm_Interface_Atspi_Widget_Action) { eo_prefix: elm_obj_button; @@ -98,8 +98,8 @@ class Elm_Button (Elm_Layout, Evas_Clickable_Interface, } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.activate; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_calendar.eo b/src/lib/elm_calendar.eo index 4d96c3229..aade220dd 100644 --- a/src/lib/elm_calendar.eo +++ b/src/lib/elm_calendar.eo @@ -395,10 +395,10 @@ class Elm_Calendar (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.calculate; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.calculate; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_check.eo b/src/lib/elm_check.eo index 6780f6966..502655db0 100644 --- a/src/lib/elm_check.eo +++ b/src/lib/elm_check.eo @@ -46,8 +46,8 @@ class Elm_Check (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.activate; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_clock.eo b/src/lib/elm_clock.eo index 27ca85cb5..97bdf8b1c 100644 --- a/src/lib/elm_clock.eo +++ b/src/lib/elm_clock.eo @@ -242,9 +242,9 @@ class Elm_Clock (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; Elm_Widget.access; diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index 5f3ee15af..dad612fdb 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1148,7 +1148,7 @@ _sub_obj_size_hints_set(Evas_Object *sobj, Evas_Coord minw = -1, minh = -1; elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh); - if (sobj && eo_isa(sobj, EDJE_CLASS)) + if (sobj && eo_isa(sobj, EDJE_OBJECT_CLASS)) edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh); evas_object_size_hint_min_set(sobj, minw, minh); evas_object_size_hint_max_set(sobj, -1, -1); diff --git a/src/lib/elm_colorselector.eo b/src/lib/elm_colorselector.eo index 8faec56b2..967902333 100644 --- a/src/lib/elm_colorselector.eo +++ b/src/lib/elm_colorselector.eo @@ -125,9 +125,9 @@ class Elm_Colorselector (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_conformant.eo b/src/lib/elm_conformant.eo index 364fd5cb1..4f3939fef 100644 --- a/src/lib/elm_conformant.eo +++ b/src/lib/elm_conformant.eo @@ -3,9 +3,9 @@ class Elm_Conformant (Elm_Layout) eo_prefix: elm_obj_conformant; implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.parent.set; Elm_Widget.theme_apply; Elm_Layout.content_aliases.get; diff --git a/src/lib/elm_datetime.eo b/src/lib/elm_datetime.eo index 94f63879f..9085ced95 100644 --- a/src/lib/elm_datetime.eo +++ b/src/lib/elm_datetime.eo @@ -320,9 +320,9 @@ class Elm_Datetime (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_dayselector.eo b/src/lib/elm_dayselector.eo index 38246bb87..9036b51e6 100644 --- a/src/lib/elm_dayselector.eo +++ b/src/lib/elm_dayselector.eo @@ -163,9 +163,9 @@ class Elm_Dayselector (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_direction_manager_is; Elm_Widget.translate; diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo index 6a4a5d5ff..ad7015be2 100644 --- a/src/lib/elm_diskselector.eo +++ b/src/lib/elm_diskselector.eo @@ -234,12 +234,12 @@ class Elm_Diskselector (Elm_Widget, Elm_Interface_Scrollable) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.member_add; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.member_add; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Widget.focus_next_manager_is; Elm_Widget.access; Elm_Widget.focus_next; diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo index 4aabb975d..22da1a579 100644 --- a/src/lib/elm_entry.eo +++ b/src/lib/elm_entry.eo @@ -1,4 +1,4 @@ -class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface, +class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface, Elm_Interface_Atspi_Text, Elm_Interface_Atspi_Editable_Text) { eo_prefix: elm_obj_entry; @@ -1158,14 +1158,14 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface, } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.move; - Evas_Object_Smart.member_add; - Evas_Object_Smart.add; - Evas_Object_Smart.resize; - Evas_Object_Smart.del; - Evas_Object_Smart.show; - Evas_Object_Smart.hide; + Eo.Base.constructor; + Evas.Object_Smart.move; + Evas.Object_Smart.member_add; + Evas.Object_Smart.add; + Evas.Object_Smart.resize; + Evas.Object_Smart.del; + Evas.Object_Smart.show; + Evas.Object_Smart.hide; Elm_Widget.activate; Elm_Widget.focus_direction_manager_is; Elm_Widget.theme_apply; diff --git a/src/lib/elm_flip.eo b/src/lib/elm_flip.eo index 5da3c75f4..15d929c8d 100644 --- a/src/lib/elm_flip.eo +++ b/src/lib/elm_flip.eo @@ -242,9 +242,9 @@ class Elm_Flip (Elm_Container) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_direction; Elm_Widget.sub_object_add; Elm_Widget.theme_apply; diff --git a/src/lib/elm_flipselector.eo b/src/lib/elm_flipselector.eo index 47a0c5c8e..8c98173d9 100644 --- a/src/lib/elm_flipselector.eo +++ b/src/lib/elm_flipselector.eo @@ -194,9 +194,9 @@ class Elm_Flipselector (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_frame.eo b/src/lib/elm_frame.eo index cf0ab87a4..ac8fc923b 100644 --- a/src/lib/elm_frame.eo +++ b/src/lib/elm_frame.eo @@ -1,4 +1,4 @@ -class Elm_Frame (Elm_Layout, Evas_Clickable_Interface) +class Elm_Frame (Elm_Layout, Evas.Clickable_Interface) { eo_prefix: elm_obj_frame; properties { @@ -63,10 +63,10 @@ class Elm_Frame (Elm_Layout, Evas_Clickable_Interface) } } implements { - Eo_Base.constructor; + Eo.Base.constructor; class.constructor; - Evas_Object_Smart.calculate; - Evas_Object_Smart.add; + Evas.Object_Smart.calculate; + Evas.Object_Smart.add; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo index 849fc2a4a..80007fb20 100644 --- a/src/lib/elm_gengrid.eo +++ b/src/lib/elm_gengrid.eo @@ -1,4 +1,4 @@ -class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface) +class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface) { eo_prefix: elm_obj_gengrid; properties { @@ -663,12 +663,12 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.member_add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.member_add; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_gengrid_pan.eo b/src/lib/elm_gengrid_pan.eo index 74f63301f..d6fa65a3b 100644 --- a/src/lib/elm_gengrid_pan.eo +++ b/src/lib/elm_gengrid_pan.eo @@ -3,10 +3,10 @@ class Elm_Gengrid_Pan (Elm_Pan) eo_prefix: elm_obj_gengrid_pan; implements { class.constructor; - Eo_Base.destructor; - Evas_Object_Smart.calculate; - Evas_Object_Smart.move; - Evas_Object_Smart.resize; + Eo.Base.destructor; + Evas.Object_Smart.calculate; + Evas.Object_Smart.move; + Evas.Object_Smart.resize; Elm_Pan.content_size.get; Elm_Pan.pos; Elm_Pan.pos_min.get; diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo index bca16617e..8e11e9f30 100644 --- a/src/lib/elm_genlist.eo +++ b/src/lib/elm_genlist.eo @@ -1,4 +1,4 @@ -class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface) +class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface) { eo_prefix: elm_obj_genlist; properties { @@ -729,12 +729,12 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.member_add; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.member_add; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.sub_object_add; diff --git a/src/lib/elm_genlist_pan.eo b/src/lib/elm_genlist_pan.eo index b0af7adcb..b574997eb 100644 --- a/src/lib/elm_genlist_pan.eo +++ b/src/lib/elm_genlist_pan.eo @@ -3,11 +3,11 @@ class Elm_Genlist_Pan (Elm_Pan) eo_prefix: elm_obj_genlist_pan; implements { class.constructor; - Eo_Base.destructor; - Evas_Object_Smart.calculate; - Evas_Object_Smart.move; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.destructor; + Evas.Object_Smart.calculate; + Evas.Object_Smart.move; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Pan.content_size.get; Elm_Pan.pos; Elm_Pan.pos_min.get; diff --git a/src/lib/elm_gesture_layer.eo b/src/lib/elm_gesture_layer.eo index c9505959f..8435448d3 100644 --- a/src/lib/elm_gesture_layer.eo +++ b/src/lib/elm_gesture_layer.eo @@ -153,9 +153,9 @@ class Elm_Gesture_Layer (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.disable; } diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo index b051112be..c17bd5fd4 100644 --- a/src/lib/elm_glview.eo +++ b/src/lib/elm_glview.eo @@ -165,10 +165,10 @@ class Elm_Glview (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Widget.on_focus; } events { diff --git a/src/lib/elm_grid.eo b/src/lib/elm_grid.eo index 47c166e64..fcb1a220b 100644 --- a/src/lib/elm_grid.eo +++ b/src/lib/elm_grid.eo @@ -74,9 +74,9 @@ class Elm_Grid (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_hover.eo b/src/lib/elm_hover.eo index a5bbc5468..50a06e5ba 100644 --- a/src/lib/elm_hover.eo +++ b/src/lib/elm_hover.eo @@ -1,4 +1,4 @@ -class Elm_Hover (Elm_Layout, Evas_Clickable_Interface) +class Elm_Hover (Elm_Layout, Evas.Clickable_Interface) { eo_prefix: elm_obj_hover; properties { @@ -70,13 +70,13 @@ class Elm_Hover (Elm_Layout, Evas_Clickable_Interface) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.del; - Evas_Object_Smart.hide; - Evas_Object_Smart.show; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.del; + Evas.Object_Smart.hide; + Evas.Object_Smart.show; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.sub_object_add; Elm_Widget.parent; diff --git a/src/lib/elm_icon.eo b/src/lib/elm_icon.eo index 790149240..dae3a5fc9 100644 --- a/src/lib/elm_icon.eo +++ b/src/lib/elm_icon.eo @@ -96,9 +96,9 @@ class Elm_Icon (Elm_Image) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Image.memfile.set; Elm_Image.sizing_eval; diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo index 0e52714cc..685e65e62 100644 --- a/src/lib/elm_image.eo +++ b/src/lib/elm_image.eo @@ -1,4 +1,4 @@ -class Elm_Image (Elm_Widget, Evas_Clickable_Interface, Elm_Interface_Atspi_Image) +class Elm_Image (Elm_Widget, Evas.Clickable_Interface, Elm_Interface_Atspi_Image) { eo_prefix: elm_obj_image; properties { @@ -534,17 +534,17 @@ class Elm_Image (Elm_Widget, Evas_Clickable_Interface, Elm_Interface_Atspi_Image } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.clip.set; - Evas_Object_Smart.clip_unset; - Evas_Object_Smart.show; - Evas_Object_Smart.color.set; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.member_add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.hide; + Evas.Object_Smart.clip.set; + Evas.Object_Smart.clip_unset; + Evas.Object_Smart.show; + Evas.Object_Smart.color.set; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.member_add; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.event; Elm_Interface_Atspi_Image.extents.get; diff --git a/src/lib/elm_index.eo b/src/lib/elm_index.eo index 08815b7a6..44266587b 100644 --- a/src/lib/elm_index.eo +++ b/src/lib/elm_index.eo @@ -348,9 +348,9 @@ class Elm_Index (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_interface_atspi_widget.eo b/src/lib/elm_interface_atspi_widget.eo index 4c042b013..672d212e3 100644 --- a/src/lib/elm_interface_atspi_widget.eo +++ b/src/lib/elm_interface_atspi_widget.eo @@ -1,10 +1,10 @@ -mixin Elm_Interface_Atspi_Widget (Elm_Interface_Atspi_Accessible, Elm_Interface_Atspi_Component, Eo_Base) +mixin Elm_Interface_Atspi_Widget (Elm_Interface_Atspi_Accessible, Elm_Interface_Atspi_Component, Eo.Base) { eo_prefix: elm_interface_atspi_widget; data: Elm_Interface_Atspi_Widget_Data; implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Elm_Interface_Atspi_Accessible.name.get; Elm_Interface_Atspi_Accessible.description.get; Elm_Interface_Atspi_Accessible.description.set; diff --git a/src/lib/elm_interface_scrollable.eo b/src/lib/elm_interface_scrollable.eo index e957158a9..4768d1551 100644 --- a/src/lib/elm_interface_scrollable.eo +++ b/src/lib/elm_interface_scrollable.eo @@ -1,4 +1,4 @@ -mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Object_Smart) +mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart) { legacy_prefix: null; eo_prefix: elm_interface_scrollable; @@ -512,10 +512,10 @@ mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Object_Smart) } } implements { - Eo_Base.constructor; + Eo.Base.constructor; class.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Evas.Object_Smart.add; + Evas.Object_Smart.del; } events { changed; diff --git a/src/lib/elm_inwin.eo b/src/lib/elm_inwin.eo index e355c11ee..70fd024f4 100644 --- a/src/lib/elm_inwin.eo +++ b/src/lib/elm_inwin.eo @@ -22,8 +22,8 @@ class Elm_Inwin (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.parent.set; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_label.eo b/src/lib/elm_label.eo index 0819bd7d4..63f85f93b 100644 --- a/src/lib/elm_label.eo +++ b/src/lib/elm_label.eo @@ -189,8 +189,8 @@ class Elm_Label (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; Elm_Widget.theme_apply; diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c index 6571ba8f0..bf52dd3eb 100644 --- a/src/lib/elm_layout.c +++ b/src/lib/elm_layout.c @@ -1676,7 +1676,7 @@ _elm_layout_eo_base_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNU eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); - if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_CLASS)) + if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_OBJECT_CLASS)) { Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *edje_group; diff --git a/src/lib/elm_layout.eo b/src/lib/elm_layout.eo index 241fe8063..50ba7d7c6 100644 --- a/src/lib/elm_layout.eo +++ b/src/lib/elm_layout.eo @@ -650,11 +650,11 @@ class Elm_Layout (Elm_Container) } implements { class.constructor; - Eo_Base.constructor; - Eo_Base.dbg_info_get; - Evas_Object_Smart.del; - Evas_Object_Smart.add; - Evas_Object_Smart.calculate; + Eo.Base.constructor; + Eo.Base.dbg_info_get; + Evas.Object_Smart.del; + Evas.Object_Smart.add; + Evas.Object_Smart.calculate; Elm_Widget.focus_direction; Elm_Widget.sub_object_add; Elm_Widget.theme_apply; diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo index c5aede3ea..18516bd6f 100644 --- a/src/lib/elm_list.eo +++ b/src/lib/elm_list.eo @@ -587,12 +587,12 @@ class Elm_List (Elm_Layout, Elm_Interface_Scrollable) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.member_add; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.member_add; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_map.eo b/src/lib/elm_map.eo index f0329ce15..4449266a3 100644 --- a/src/lib/elm_map.eo +++ b/src/lib/elm_map.eo @@ -765,12 +765,12 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.member_add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.member_add; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.on_focus; Elm_Widget.event; diff --git a/src/lib/elm_map_pan.eo b/src/lib/elm_map_pan.eo index f6c609c14..c562cf743 100644 --- a/src/lib/elm_map_pan.eo +++ b/src/lib/elm_map_pan.eo @@ -3,10 +3,10 @@ class Elm_Map_Pan (Elm_Pan) eo_prefix: elm_obj_map_pan; implements { class.constructor; - Eo_Base.destructor; - Evas_Object_Smart.calculate; - Evas_Object_Smart.move; - Evas_Object_Smart.resize; + Eo.Base.destructor; + Evas.Object_Smart.calculate; + Evas.Object_Smart.move; + Evas.Object_Smart.resize; Elm_Pan.content_size.get; Elm_Pan.pos; Elm_Pan.pos_min.get; diff --git a/src/lib/elm_mapbuf.eo b/src/lib/elm_mapbuf.eo index d39024201..676cefb32 100644 --- a/src/lib/elm_mapbuf.eo +++ b/src/lib/elm_mapbuf.eo @@ -177,13 +177,13 @@ class Elm_Mapbuf (Elm_Container) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.show; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.hide; + Evas.Object_Smart.show; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.sub_object_del; Elm_Container.content_get; diff --git a/src/lib/elm_menu.eo b/src/lib/elm_menu.eo index fe7f5862a..6bac7d08c 100644 --- a/src/lib/elm_menu.eo +++ b/src/lib/elm_menu.eo @@ -1,4 +1,4 @@ -class Elm_Menu (Elm_Widget, Evas_Clickable_Interface) +class Elm_Menu (Elm_Widget, Evas.Clickable_Interface) { eo_prefix: elm_obj_menu; properties { @@ -114,10 +114,10 @@ class Elm_Menu (Elm_Widget, Evas_Clickable_Interface) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.show; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.show; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.parent; Elm_Widget.theme_apply; Elm_Widget.translate; diff --git a/src/lib/elm_notify.eo b/src/lib/elm_notify.eo index 07f66e4bd..566732ecb 100644 --- a/src/lib/elm_notify.eo +++ b/src/lib/elm_notify.eo @@ -85,13 +85,13 @@ class Elm_Notify (Elm_Container) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.show; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.hide; + Evas.Object_Smart.show; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Widget.focus_direction; Elm_Widget.parent; Elm_Widget.theme_apply; diff --git a/src/lib/elm_pan.eo b/src/lib/elm_pan.eo index c53b31096..3517708f2 100644 --- a/src/lib/elm_pan.eo +++ b/src/lib/elm_pan.eo @@ -1,4 +1,4 @@ -class Elm_Pan (Evas_Smart_Clipped) +class Elm_Pan (Evas.Smart_Clipped) { eo_prefix: elm_obj_pan; data: Elm_Pan_Smart_Data; @@ -56,14 +56,14 @@ class Elm_Pan (Evas_Smart_Clipped) } } implements { - Eo_Base.constructor; + Eo.Base.constructor; class.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.show; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Evas.Object_Smart.hide; + Evas.Object_Smart.show; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; } events { changed; diff --git a/src/lib/elm_panel.eo b/src/lib/elm_panel.eo index 8a5e33a50..ecc48fe9f 100644 --- a/src/lib/elm_panel.eo +++ b/src/lib/elm_panel.eo @@ -57,9 +57,9 @@ class Elm_Panel (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_panes.eo b/src/lib/elm_panes.eo index 1b0dfca62..ae70e2e63 100644 --- a/src/lib/elm_panes.eo +++ b/src/lib/elm_panes.eo @@ -259,8 +259,8 @@ class Elm_Panes (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; Elm_Widget.theme_apply; diff --git a/src/lib/elm_photo.eo b/src/lib/elm_photo.eo index eb2039a90..a02f99872 100644 --- a/src/lib/elm_photo.eo +++ b/src/lib/elm_photo.eo @@ -1,4 +1,4 @@ -class Elm_Photo (Elm_Widget, Evas_Clickable_Interface, Evas_Draggable_Interface) +class Elm_Photo (Elm_Widget, Evas.Clickable_Interface, Evas.Draggable_Interface) { eo_prefix: elm_obj_photo; properties { @@ -107,9 +107,9 @@ class Elm_Photo (Elm_Widget, Evas_Clickable_Interface, Evas_Draggable_Interface) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; } events { diff --git a/src/lib/elm_photocam.eo b/src/lib/elm_photocam.eo index 1e64527b5..a9d46136e 100644 --- a/src/lib/elm_photocam.eo +++ b/src/lib/elm_photocam.eo @@ -224,12 +224,12 @@ class Elm_Photocam (Elm_Widget, Elm_Interface_Scrollable) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.member_add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.member_add; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.on_focus; Elm_Widget.event; diff --git a/src/lib/elm_photocam_pan.eo b/src/lib/elm_photocam_pan.eo index e3fc206ca..d45c31450 100644 --- a/src/lib/elm_photocam_pan.eo +++ b/src/lib/elm_photocam_pan.eo @@ -3,10 +3,10 @@ class Elm_Photocam_Pan (Elm_Pan) eo_prefix: elm_obj_photocam_pan; implements { class.constructor; - Eo_Base.destructor; - Evas_Object_Smart.calculate; - Evas_Object_Smart.move; - Evas_Object_Smart.resize; + Eo.Base.destructor; + Evas.Object_Smart.calculate; + Evas.Object_Smart.move; + Evas.Object_Smart.resize; Elm_Pan.content_size.get; Elm_Pan.pos; Elm_Pan.pos_min.get; diff --git a/src/lib/elm_plug.eo b/src/lib/elm_plug.eo index a6ab59ed1..55b312ae6 100644 --- a/src/lib/elm_plug.eo +++ b/src/lib/elm_plug.eo @@ -41,8 +41,8 @@ class Elm_Plug (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.theme_apply; Elm_Widget.on_focus; } diff --git a/src/lib/elm_prefs.eo b/src/lib/elm_prefs.eo index 96a94e7dc..cca3f6b3f 100644 --- a/src/lib/elm_prefs.eo +++ b/src/lib/elm_prefs.eo @@ -371,9 +371,9 @@ class Elm_Prefs (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.del; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.del; + Evas.Object_Smart.add; Elm_Widget.focus_next; } events { diff --git a/src/lib/elm_progressbar.eo b/src/lib/elm_progressbar.eo index 66711ca27..2352e0d68 100644 --- a/src/lib/elm_progressbar.eo +++ b/src/lib/elm_progressbar.eo @@ -277,9 +277,9 @@ class Elm_Progressbar (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_radio.eo b/src/lib/elm_radio.eo index d596d88be..22037c451 100644 --- a/src/lib/elm_radio.eo +++ b/src/lib/elm_radio.eo @@ -98,9 +98,9 @@ class Elm_Radio (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.activate; Elm_Widget.focus_next_manager_is; diff --git a/src/lib/elm_route.eo b/src/lib/elm_route.eo index 5f3c82a93..8535683f4 100644 --- a/src/lib/elm_route.eo +++ b/src/lib/elm_route.eo @@ -43,9 +43,9 @@ class Elm_Route (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; } diff --git a/src/lib/elm_scroller.eo b/src/lib/elm_scroller.eo index c4183d3be..ec8893c8e 100644 --- a/src/lib/elm_scroller.eo +++ b/src/lib/elm_scroller.eo @@ -77,11 +77,11 @@ class Elm_Scroller (Elm_Layout, Elm_Interface_Scrollable) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.member_add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.member_add; + Evas.Object_Smart.resize; Elm_Widget.theme_apply; Elm_Widget.activate; Elm_Widget.focus_next_manager_is; diff --git a/src/lib/elm_segment_control.eo b/src/lib/elm_segment_control.eo index 1a1d9fbba..57aea3021 100644 --- a/src/lib/elm_segment_control.eo +++ b/src/lib/elm_segment_control.eo @@ -194,9 +194,9 @@ class Elm_Segment_Control (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_separator.eo b/src/lib/elm_separator.eo index 3e6e2f5fb..4f597f7de 100644 --- a/src/lib/elm_separator.eo +++ b/src/lib/elm_separator.eo @@ -26,8 +26,8 @@ class Elm_Separator (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; + Eo.Base.constructor; + Evas.Object_Smart.add; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; Elm_Widget.theme_apply; diff --git a/src/lib/elm_slider.eo b/src/lib/elm_slider.eo index a1e7903be..ef21de44b 100644 --- a/src/lib/elm_slider.eo +++ b/src/lib/elm_slider.eo @@ -362,10 +362,10 @@ class Elm_Slider (Elm_Layout, Elm_Interface_Atspi_Value) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.calculate; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.calculate; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.activate; Elm_Widget.focus_next_manager_is; diff --git a/src/lib/elm_slideshow.eo b/src/lib/elm_slideshow.eo index ecf89eec9..40bf45af6 100644 --- a/src/lib/elm_slideshow.eo +++ b/src/lib/elm_slideshow.eo @@ -419,9 +419,9 @@ class Elm_Slideshow (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; Elm_Widget.event; diff --git a/src/lib/elm_spinner.eo b/src/lib/elm_spinner.eo index 85c245e4f..f3e54c4b2 100644 --- a/src/lib/elm_spinner.eo +++ b/src/lib/elm_spinner.eo @@ -363,9 +363,9 @@ class Elm_Spinner (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; diff --git a/src/lib/elm_systray.eo b/src/lib/elm_systray.eo index 0117c0725..69daff740 100644 --- a/src/lib/elm_systray.eo +++ b/src/lib/elm_systray.eo @@ -1,4 +1,4 @@ -class Elm_Systray (Eo_Base) +class Elm_Systray (Eo.Base) { eo_prefix: elm_obj_systray; data: null; diff --git a/src/lib/elm_table.eo b/src/lib/elm_table.eo index e6a972200..5ccb237f7 100644 --- a/src/lib/elm_table.eo +++ b/src/lib/elm_table.eo @@ -144,9 +144,9 @@ class Elm_Table (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_next; diff --git a/src/lib/elm_thumb.eo b/src/lib/elm_thumb.eo index 82b12ad8e..ba9063902 100644 --- a/src/lib/elm_thumb.eo +++ b/src/lib/elm_thumb.eo @@ -1,4 +1,4 @@ -class Elm_Thumb (Elm_Layout, Evas_Clickable_Interface) +class Elm_Thumb (Elm_Layout, Evas.Clickable_Interface) { eo_prefix: elm_obj_thumb; properties { @@ -330,11 +330,11 @@ class Elm_Thumb (Elm_Layout, Evas_Clickable_Interface) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.show; + Eo.Base.constructor; + Evas.Object_Smart.hide; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.show; } events { clicked; diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo index 96d0c7eaa..43e2024df 100644 --- a/src/lib/elm_toolbar.eo +++ b/src/lib/elm_toolbar.eo @@ -500,12 +500,12 @@ class Elm_Toolbar (Elm_Widget, Elm_Interface_Scrollable) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.member_add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.member_add; + Evas.Object_Smart.resize; Elm_Widget.focus_next_manager_is; Elm_Widget.access; Elm_Widget.focus_next; diff --git a/src/lib/elm_video.eo b/src/lib/elm_video.eo index 7b63da1c9..ac7a37918 100644 --- a/src/lib/elm_video.eo +++ b/src/lib/elm_video.eo @@ -203,9 +203,9 @@ class Elm_Video (Elm_Layout) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; Elm_Widget.event; diff --git a/src/lib/elm_web.eo b/src/lib/elm_web.eo index afc55f37e..fb7fc7685 100644 --- a/src/lib/elm_web.eo +++ b/src/lib/elm_web.eo @@ -667,9 +667,9 @@ class Elm_Web (Elm_Widget) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; Elm_Widget.theme_apply; Elm_Widget.on_focus; Elm_Widget.event; diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 283041a7b..65e3a96c6 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -3767,7 +3767,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj, const char *target_hl_part = NULL; const Evas_Object *edje_obj = NULL; - if (obj && eo_isa(obj, EDJE_CLASS)) + if (obj && eo_isa(obj, EDJE_OBJECT_CLASS)) { edje_obj = obj; if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part"))) diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo index 4c4657673..55e1769d7 100644 --- a/src/lib/elm_widget.eo +++ b/src/lib/elm_widget.eo @@ -1,4 +1,4 @@ -abstract Elm_Widget (Evas_Object_Smart, Elm_Interface_Atspi_Widget) +abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget) { eo_prefix: elm_obj_widget; data: Elm_Widget_Smart_Data; @@ -807,20 +807,20 @@ abstract Elm_Widget (Evas_Object_Smart, Elm_Interface_Atspi_Widget) } implements { class.constructor; - Eo_Base.constructor; - Eo_Base.dbg_info_get; - Evas_Object_Smart.hide; - Evas_Object_Smart.calculate; - Evas_Object_Smart.clip_unset; - Evas_Object_Smart.show; - Evas_Object_Smart.color.set; - Evas_Object_Smart.move; - Evas_Object_Smart.member_del; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.clip.set; - Evas_Object_Smart.member_add; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Eo.Base.dbg_info_get; + Evas.Object_Smart.hide; + Evas.Object_Smart.calculate; + Evas.Object_Smart.clip_unset; + Evas.Object_Smart.show; + Evas.Object_Smart.color.set; + Evas.Object_Smart.move; + Evas.Object_Smart.member_del; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.clip.set; + Evas.Object_Smart.member_add; + Evas.Object_Smart.resize; virtual.focus_direction; virtual.focus_next; virtual.parent_widget.get; diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo index 86d3f7d40..a2b12dbe0 100644 --- a/src/lib/elm_win.eo +++ b/src/lib/elm_win.eo @@ -1301,13 +1301,13 @@ class Elm_Win (Elm_Widget, Elm_Interface_Atspi_Window) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.show; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.hide; + Evas.Object_Smart.show; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; Elm_Widget.focus_direction; Elm_Widget.focus_next_manager_is; Elm_Widget.focus_direction_manager_is; -- cgit v1.2.1