Elm: Update code to use the new class names generated by eolian.

This commit is contained in:
Tom Hacohen 2014-06-03 11:35:28 +01:00
parent b3b5b83cf1
commit efa41c7d75
210 changed files with 674 additions and 674 deletions

View File

@ -82,7 +82,7 @@ test_systray(void *data EINA_UNUSED,
elm_menu_item_add(it, it2, NULL, "item 2", _menu_clicked, "item 2");
// Status Notifier Item Handler
item = eo_add(ELM_OBJ_SYSTRAY_CLASS, win);
item = eo_add(ELM_SYSTRAY_CLASS, win);
eo_do(item, elm_obj_systray_icon_name_set("elementary"));
eo_do(item, elm_obj_systray_att_icon_name_set("elementary"));
eo_do(item, elm_obj_systray_menu_set(it));

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_widget_ctxpopup.h"
#define MY_CLASS ELM_OBJ_CTXPOPUP_CLASS
#define MY_CLASS ELM_CTXPOPUP_CLASS
#define MY_CLASS_NAME "Elm_Ctxpopup"
#define MY_CLASS_NAME_LEGACY "elm_ctxpopup"
@ -216,7 +216,7 @@ _base_geometry_calc(Evas_Object *obj,
evas_object_geometry_get
(sd->parent, &hover_area.x, &hover_area.y, &hover_area.w,
&hover_area.h);
if (sd->parent && eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
if (sd->parent && eo_isa(sd->parent, ELM_WIN_CLASS))
hover_area.x = hover_area.y = 0;
evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
@ -1073,7 +1073,7 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd)
}
EOLIAN static void
_elm_ctxpopup_evas_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
_elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -1126,7 +1126,7 @@ _elm_ctxpopup_evas_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
}
EOLIAN static void
_elm_ctxpopup_evas_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
_elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
{
Elm_Ctxpopup_Item *it;
@ -1195,7 +1195,7 @@ _elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *pare
//Update Background
evas_object_geometry_get(parent, &x, &y, &w, &h);
if (parent && eo_isa(parent, ELM_OBJ_WIN_CLASS))
if (parent && eo_isa(parent, ELM_WIN_CLASS))
x = y = 0;
evas_object_move(sd->bg, x, y);
evas_object_resize(sd->bg, w, h);

View File

@ -167,8 +167,8 @@ class Elm_Ctxpopup (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::del;
Evas_Smart::add;
Evas_Object_Smart::del;
Evas_Object_Smart::add;
Elm_Widget::parent::set;
Elm_Widget::focus_direction;
Elm_Widget::sub_object_add;

View File

@ -14,7 +14,7 @@
#include "elm_interface_fileselector.h"
#include "elm_widget_fileselector.h"
#define MY_CLASS ELM_OBJ_FILESELECTOR_CLASS
#define MY_CLASS ELM_FILESELECTOR_CLASS
#define MY_CLASS_NAME "Elm_Fileselector"
#define MY_CLASS_NAME_LEGACY "elm_fileselector"
@ -1336,7 +1336,7 @@ _resource_deleted(void *data, int type EINA_UNUSED, void *ev)
}
EOLIAN static void
_elm_fileselector_evas_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
_elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
{
Evas_Object *ic, *bt, *en, *pb;
@ -1445,7 +1445,7 @@ _elm_fileselector_evas_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
}
EOLIAN static void
_elm_fileselector_evas_smart_del(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd)
_elm_fileselector_evas_object_smart_del(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd)
{
Elm_Fileselector_Filter *filter;
char *path;

View File

@ -37,8 +37,8 @@ class Elm_Fileselector (Elm_Layout, Elm_Interface_Fileselector)
class::constructor;
class::destructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::focus_next;
Elm_Widget::focus_direction_manager_is;
Elm_Widget::focus_direction;

View File

@ -7,7 +7,7 @@
#include "elm_interface_fileselector.h"
#include "elm_widget_fileselector_button.h"
#define MY_CLASS ELM_OBJ_FILESELECTOR_BUTTON_CLASS
#define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS
#define MY_CLASS_NAME "Elm_Fileselector_Button"
#define MY_CLASS_NAME_LEGACY "elm_fileselector_button"
@ -164,7 +164,7 @@ _button_clicked(void *data,
}
EOLIAN static void
_elm_fileselector_button_evas_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv)
_elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -187,7 +187,7 @@ _elm_fileselector_button_evas_smart_add(Eo *obj, Elm_Fileselector_Button_Data *p
}
EOLIAN static void
_elm_fileselector_button_evas_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
_elm_fileselector_button_evas_object_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
{
eina_stringshare_del(sd->window_title);
eina_stringshare_del(sd->fsd.path);

View File

@ -98,8 +98,8 @@ class Elm_Fileselector_Button (Elm_Button, Elm_Interface_Fileselector)
}
implements {
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Button::admits_autorepeat::get;
Elm_Interface_Fileselector::selected_paths::get;

View File

@ -8,7 +8,7 @@
#include "elm_interface_fileselector.h"
#include "elm_widget_fileselector_entry.h"
#define MY_CLASS ELM_OBJ_FILESELECTOR_ENTRY_CLASS
#define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS
#define MY_CLASS_NAME "Elm_Fileselector_Entry"
#define MY_CLASS_NAME_LEGACY "elm_fileselector_entry"
@ -269,7 +269,7 @@ _elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_En
}
EOLIAN static void
_elm_fileselector_entry_evas_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
_elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -326,7 +326,7 @@ _elm_fileselector_entry_evas_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *pri
}
EOLIAN static void
_elm_fileselector_entry_evas_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd)
_elm_fileselector_entry_evas_object_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd)
{
free(sd->path);

View File

@ -99,8 +99,8 @@ class Elm_Fileselector_Entry (Elm_Layout, Elm_Interface_Fileselector)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::del;
Evas_Smart::add;
Evas_Object_Smart::del;
Evas_Object_Smart::add;
Elm_Widget::theme_apply;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_hoversel.h"
#define MY_CLASS ELM_OBJ_HOVERSEL_CLASS
#define MY_CLASS ELM_HOVERSEL_CLASS
#define MY_CLASS_NAME "Elm_Hoversel"
#define MY_CLASS_NAME_LEGACY "elm_hoversel"
@ -277,7 +277,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
}
EOLIAN static void
_elm_hoversel_evas_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
_elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -291,7 +291,7 @@ _elm_hoversel_evas_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_hoversel_evas_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
_elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
{
Elm_Hoversel_Item *item;
@ -308,14 +308,14 @@ _elm_hoversel_evas_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
}
EOLIAN static void
_elm_hoversel_evas_smart_show(Eo *obj, Elm_Hoversel_Data *sd)
_elm_hoversel_evas_object_smart_show(Eo *obj, Elm_Hoversel_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
evas_object_show(sd->hover);
}
EOLIAN static void
_elm_hoversel_evas_smart_hide(Eo *obj, Elm_Hoversel_Data *sd)
_elm_hoversel_evas_object_smart_hide(Eo *obj, Elm_Hoversel_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
evas_object_hide(sd->hover);

View File

@ -140,10 +140,10 @@ class Elm_Hoversel (Elm_Button, Evas_Selectable_Interface)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::hide;
Evas_Smart::show;
Evas_Smart::add;
Evas_Smart::del;
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;

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_multibuttonentry.h"
#define MY_CLASS ELM_OBJ_MULTIBUTTONENTRY_CLASS
#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS
#define MY_CLASS_NAME "Elm_Multibuttonentry"
#define MY_CLASS_NAME_LEGACY "elm_multibuttonentry"
@ -1461,7 +1461,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
_elm_multibuttonentry_evas_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
_elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -1491,7 +1491,7 @@ _elm_multibuttonentry_evas_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
}
EOLIAN static void
_elm_multibuttonentry_evas_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd)
_elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd)
{
Elm_Multibuttonentry_Item *item;

View File

@ -255,8 +255,8 @@ class Elm_Multibuttonentry (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;

View File

@ -7,7 +7,7 @@
#include "elm_widget_naviframe.h"
#include "elm_widget_container.h"
#define MY_CLASS ELM_OBJ_NAVIFRAME_CLASS
#define MY_CLASS ELM_NAVIFRAME_CLASS
#define MY_CLASS_NAME "Elm_Naviframe"
#define MY_CLASS_NAME_LEGACY "elm_naviframe"
@ -1304,7 +1304,7 @@ _elm_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Naviframe_Dat
}
EOLIAN static void
_elm_naviframe_evas_smart_add(Eo *obj, Elm_Naviframe_Data *priv)
_elm_naviframe_evas_object_smart_add(Eo *obj, Elm_Naviframe_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -1344,7 +1344,7 @@ _pop_transition_cb(void *data)
}
EOLIAN static void
_elm_naviframe_evas_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
_elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
{
Elm_Naviframe_Item *it;
@ -1370,7 +1370,7 @@ _elm_naviframe_evas_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
//Show only the top item view
EOLIAN static void
_elm_naviframe_evas_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
_elm_naviframe_evas_object_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
{
Elm_Naviframe_Item *top;

View File

@ -256,9 +256,9 @@ class Elm_Naviframe (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::del;
Evas_Smart::show;
Evas_Smart::add;
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;

View File

@ -9,7 +9,7 @@
#include "elm_widget_layout.h"
#include "elm_widget_player.h"
#define MY_CLASS ELM_OBJ_PLAYER_CLASS
#define MY_CLASS ELM_PLAYER_CLASS
#define MY_CLASS_NAME "Elm_Player"
#define MY_CLASS_NAME_LEGACY "elm_player"
@ -620,7 +620,7 @@ end:
}
EOLIAN static void
_elm_player_evas_smart_add(Eo *obj, Elm_Player_Data *priv)
_elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv)
{
char buf[256];
@ -688,7 +688,7 @@ _elm_player_evas_smart_add(Eo *obj, Elm_Player_Data *priv)
}
EOLIAN static void
_elm_player_evas_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
_elm_player_evas_object_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}

View File

@ -4,8 +4,8 @@ class Elm_Player (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Widget::event;
Elm_Container::content_set;

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_popup.h"
#define MY_CLASS ELM_OBJ_POPUP_CLASS
#define MY_CLASS ELM_POPUP_CLASS
#define MY_CLASS_NAME "Elm_Popup"
#define MY_CLASS_NAME_LEGACY "elm_popup"
@ -215,7 +215,7 @@ _items_remove(Elm_Popup_Data *sd)
}
EOLIAN static void
_elm_popup_evas_smart_del(Eo *obj, Elm_Popup_Data *sd)
_elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd)
{
unsigned int i;
@ -1478,7 +1478,7 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec
}
EOLIAN static void
_elm_popup_evas_smart_add(Eo *obj, Elm_Popup_Data *priv)
_elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
char style[1024];

View File

@ -159,8 +159,8 @@ class Elm_Popup (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::del;
Evas_Smart::add;
Evas_Object_Smart::del;
Evas_Object_Smart::add;
Elm_Widget::focus_direction;
Elm_Widget::focus_next_manager_is;
Elm_Widget::theme_apply;

View File

@ -5,7 +5,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#define MY_CLASS ELM_OBJ_ACCESS_CLASS
#define MY_CLASS ELM_ACCESS_CLASS
#define MY_CLASS_NAME "Elm_Access"
#define MY_CLASS_NAME_LEGACY "elm_access"
@ -35,7 +35,7 @@ static Evas_Object * _elm_access_add(Evas_Object *parent);
static void _access_object_unregister(Evas_Object *obj);
EOLIAN static void
_elm_access_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED)
_elm_access_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);

View File

@ -5,7 +5,7 @@ eo_prefix: elm_obj_access;
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Widget::activate;
Elm_Widget::on_focus;
}

View File

@ -8,7 +8,7 @@
#include "elm_widget_actionslider.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_ACTIONSLIDER_CLASS
#define MY_CLASS ELM_ACTIONSLIDER_CLASS
#define MY_CLASS_NAME "Elm_Actionslider"
#define MY_CLASS_NAME_LEGACY "elm_actionslider"
@ -453,7 +453,7 @@ _elm_actionslider_elm_layout_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_U
}
EOLIAN static void
_elm_actionslider_evas_smart_add(Eo *obj, Elm_Actionslider_Data *priv)
_elm_actionslider_evas_object_smart_add(Eo *obj, Elm_Actionslider_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

View File

@ -78,7 +78,7 @@ class Elm_Actionslider (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;
Elm_Widget::theme_apply;

View File

@ -7,7 +7,7 @@
#include "elm_widget_bg.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_BG_CLASS
#define MY_CLASS ELM_BG_CLASS
#define MY_CLASS_NAME "Elm_Bg"
#define MY_CLASS_NAME_LEGACY "elm_bg"
@ -99,7 +99,7 @@ _on_resize(void *data,
}
EOLIAN static void
_elm_bg_evas_smart_add(Eo *obj, Elm_Bg_Data *priv)
_elm_bg_evas_object_smart_add(Eo *obj, Elm_Bg_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());

View File

@ -141,7 +141,7 @@ class Elm_Bg (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Layout::content_aliases::get;
Elm_Layout::sizing_eval;
}

View File

@ -7,7 +7,7 @@
#include "els_box.h"
#include "elm_widget_box.h"
#define MY_CLASS ELM_OBJ_BOX_CLASS
#define MY_CLASS ELM_BOX_CLASS
#define MY_CLASS_NAME "Elm_Box"
#define MY_CLASS_NAME_LEGACY "elm_box"
@ -368,7 +368,7 @@ _transition_layout_animation_exec(Evas_Object *obj,
}
EOLIAN static void
_elm_box_evas_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
_elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_widget_resize_object_set(obj,
@ -395,7 +395,7 @@ _elm_box_evas_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_box_evas_smart_del(Eo *obj, Elm_Box_Data *sd)
_elm_box_evas_object_smart_del(Eo *obj, Elm_Box_Data *sd)
{
Eina_List *l;
Evas_Object *child;

View File

@ -308,8 +308,8 @@ class Elm_Box (Elm_Widget)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::focus_direction;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;

View File

@ -7,7 +7,7 @@
#include "elm_widget_bubble.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_BUBBLE_CLASS
#define MY_CLASS ELM_BUBBLE_CLASS
#define MY_CLASS_NAME "Elm_Bubble"
#define MY_CLASS_NAME_LEGACY "elm_bubble"
@ -171,7 +171,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
_elm_bubble_evas_smart_add(Eo *obj, Elm_Bubble_Data *priv)
_elm_bubble_evas_object_smart_add(Eo *obj, Elm_Bubble_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

View File

@ -32,7 +32,7 @@ class Elm_Bubble (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Widget::focus_direction;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;

View File

@ -7,7 +7,7 @@
#include "elm_widget_button.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_BUTTON_CLASS
#define MY_CLASS ELM_BUTTON_CLASS
// ATSPI Accessibility
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
@ -275,7 +275,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
_elm_button_evas_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
_elm_button_evas_object_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

View File

@ -99,7 +99,7 @@ class Elm_Button (Elm_Layout, Evas_Clickable_Interface,
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Widget::activate;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_calendar.h"
#define MY_CLASS ELM_OBJ_CALENDAR_CLASS
#define MY_CLASS ELM_CALENDAR_CLASS
#define MY_CLASS_NAME "Elm_Calendar"
#define MY_CLASS_NAME_LEGACY "elm_calendar"
@ -924,7 +924,7 @@ _elm_calendar_elm_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_
}
EOLIAN static void
_elm_calendar_evas_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED)
_elm_calendar_evas_object_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED)
{
elm_layout_freeze(obj);
@ -951,7 +951,7 @@ _style_changed(void *data,
}
EOLIAN static void
_elm_calendar_evas_smart_add(Eo *obj, Elm_Calendar_Data *priv)
_elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv)
{
time_t weekday = 259200; /* Just the first sunday since epoch */
time_t current_time;
@ -1037,7 +1037,7 @@ _elm_calendar_evas_smart_add(Eo *obj, Elm_Calendar_Data *priv)
}
EOLIAN static void
_elm_calendar_evas_smart_del(Eo *obj, Elm_Calendar_Data *sd)
_elm_calendar_evas_object_smart_del(Eo *obj, Elm_Calendar_Data *sd)
{
int i;
Elm_Calendar_Mark *mark;

View File

@ -396,9 +396,9 @@ class Elm_Calendar (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::calculate;
Evas_Smart::add;
Evas_Smart::del;
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;

View File

@ -7,7 +7,7 @@
#include "elm_widget_check.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_CHECK_CLASS
#define MY_CLASS ELM_CHECK_CLASS
#define MY_CLASS_NAME "Elm_Check"
#define MY_CLASS_NAME_LEGACY "elm_check"
@ -282,7 +282,7 @@ _on_check_toggle(void *data,
}
EOLIAN static void
_elm_check_evas_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
_elm_check_evas_object_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

View File

@ -47,7 +47,7 @@ class Elm_Check (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Widget::activate;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_clock.h"
#define MY_CLASS ELM_OBJ_CLOCK_CLASS
#define MY_CLASS ELM_CLOCK_CLASS
#define MY_CLASS_NAME "Elm_Clock"
#define MY_CLASS_NAME_LEGACY "elm_clock"
@ -650,7 +650,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
_elm_clock_evas_smart_add(Eo *obj, Elm_Clock_Data *priv)
_elm_clock_evas_object_smart_add(Eo *obj, Elm_Clock_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -688,7 +688,7 @@ _elm_clock_evas_smart_add(Eo *obj, Elm_Clock_Data *priv)
}
EOLIAN static void
_elm_clock_evas_smart_del(Eo *obj, Elm_Clock_Data *sd)
_elm_clock_evas_object_smart_del(Eo *obj, Elm_Clock_Data *sd)
{
ecore_timer_del(sd->ticker);

View File

@ -243,8 +243,8 @@ class Elm_Clock (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;
Elm_Widget::access;

View File

@ -1837,7 +1837,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
par = elm_widget_parent_widget_get(obj);
if (par) top = elm_widget_top_get(par);
}
if (top && (eo_isa(top, ELM_OBJ_WIN_CLASS)))
if (top && (eo_isa(top, ELM_WIN_CLASS)))
xwin = elm_win_xwindow_get(top);
}
if (!xwin)
@ -2245,7 +2245,7 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
if (elm_widget_is(obj))
{
Evas_Object *win = elm_widget_top_get(obj);
if (win && eo_isa(win, ELM_OBJ_WIN_CLASS))
if (win && eo_isa(win, ELM_WIN_CLASS))
elm_win_rotation_set(dragwin, elm_win_rotation_get(win));
}
@ -3460,7 +3460,7 @@ _wl_elm_widget_window_get(Evas_Object *obj)
{
top = elm_widget_top_get(obj);
if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
if (top && (eo_isa(top, ELM_OBJ_WIN_CLASS)))
if (top && (eo_isa(top, ELM_WIN_CLASS)))
win = elm_win_wl_window_get(top);
}
if (!win)

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_colorselector.h"
#define MY_CLASS ELM_OBJ_COLORSELECTOR_CLASS
#define MY_CLASS ELM_COLORSELECTOR_CLASS
#define MY_CLASS_NAME "Elm_Colorselector"
#define MY_CLASS_NAME_LEGACY "elm_colorselector"
@ -1144,7 +1144,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_OBJ_CLASS))
if (sobj && eo_isa(sobj, EDJE_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);
@ -1488,7 +1488,7 @@ _palette_colors_load(Evas_Object *obj)
}
EOLIAN static void
_elm_colorselector_evas_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
_elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
{
const char *hpadstr, *vpadstr;
unsigned int h_pad = DEFAULT_HOR_PAD;
@ -1579,7 +1579,7 @@ _elm_colorselector_evas_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
}
EOLIAN static void
_elm_colorselector_evas_smart_del(Eo *obj, Elm_Colorselector_Data *sd)
_elm_colorselector_evas_object_smart_del(Eo *obj, Elm_Colorselector_Data *sd)
{
int i = 0;
void *tmp[4];

View File

@ -126,8 +126,8 @@ class Elm_Colorselector (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;

View File

@ -7,7 +7,7 @@
#include "elm_widget_conform.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_CONFORMANT_CLASS
#define MY_CLASS ELM_CONFORMANT_CLASS
#define MY_CLASS_NAME "Elm_Conformant"
#define MY_CLASS_NAME_LEGACY "elm_conformant"
@ -889,7 +889,7 @@ _on_prop_change(void *data,
#endif
EOLIAN static void
_elm_conformant_evas_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
_elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -910,7 +910,7 @@ _elm_conformant_evas_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_conformant_evas_smart_del(Eo *obj, Elm_Conformant_Data *sd)
_elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
{
Evas_Object *top;

View File

@ -4,8 +4,8 @@ class Elm_Conformant (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::parent::set;
Elm_Widget::theme_apply;
Elm_Layout::content_aliases::get;

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_container.h"
#define MY_CLASS ELM_OBJ_CONTAINER_CLASS
#define MY_CLASS ELM_CONTAINER_CLASS
#define MY_CLASS_NAME "Elm_Container"

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_datetime.h"
#define MY_CLASS ELM_OBJ_DATETIME_CLASS
#define MY_CLASS ELM_DATETIME_CLASS
#define MY_CLASS_NAME "Elm_Datetime"
#define MY_CLASS_NAME_LEGACY "elm_datetime"
@ -774,7 +774,7 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
}
EOLIAN static void
_elm_datetime_evas_smart_add(Eo *obj, Elm_Datetime_Data *priv)
_elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv)
{
Datetime_Field *field;
int idx;
@ -840,7 +840,7 @@ _elm_datetime_evas_smart_add(Eo *obj, Elm_Datetime_Data *priv)
}
EOLIAN static void
_elm_datetime_evas_smart_del(Eo *obj, Elm_Datetime_Data *sd)
_elm_datetime_evas_object_smart_del(Eo *obj, Elm_Datetime_Data *sd)
{
Datetime_Field *tmp;
unsigned int idx;

View File

@ -321,8 +321,8 @@ class Elm_Datetime (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;

View File

@ -7,7 +7,7 @@
#include "elm_widget_dayselector.h"
#include "elm_widget_container.h"
#define MY_CLASS ELM_OBJ_DAYSELECTOR_CLASS
#define MY_CLASS ELM_DAYSELECTOR_CLASS
#define MY_CLASS_NAME "Elm_Dayselector"
#define MY_CLASS_NAME_LEGACY "elm_dayselector"
@ -399,7 +399,7 @@ _items_create(Evas_Object *obj)
}
EOLIAN static void
_elm_dayselector_evas_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
_elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -420,7 +420,7 @@ _elm_dayselector_evas_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
}
EOLIAN static void
_elm_dayselector_evas_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
_elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
{
Elm_Dayselector_Item *it;

View File

@ -164,8 +164,8 @@ class Elm_Dayselector (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Widget::focus_direction_manager_is;
Elm_Widget::translate;

View File

@ -9,7 +9,7 @@
#define DISPLAY_ITEM_NUM_MIN 3
#define MY_CLASS ELM_OBJ_DISKSELECTOR_CLASS
#define MY_CLASS ELM_DISKSELECTOR_CLASS
#define MY_CLASS_NAME "Elm_Diskselector"
#define MY_CLASS_NAME_LEGACY "elm_diskselector"
@ -1238,7 +1238,7 @@ _round_items_add(Elm_Diskselector_Data *sd)
}
EOLIAN static void
_elm_diskselector_evas_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
_elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
{
Evas *evas;
Evas_Object *blank, *edje;
@ -1315,7 +1315,7 @@ _elm_diskselector_evas_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
}
EOLIAN static void
_elm_diskselector_evas_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
_elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
{
Elm_Diskselector_Item *it;
Eina_List *l;
@ -1391,7 +1391,7 @@ _elm_diskselector_evas_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
}
EOLIAN static void
_elm_diskselector_evas_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -1399,7 +1399,7 @@ _elm_diskselector_evas_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord
}
EOLIAN static void
_elm_diskselector_evas_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -1407,7 +1407,7 @@ _elm_diskselector_evas_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coo
}
EOLIAN static void
_elm_diskselector_evas_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
_elm_diskselector_evas_object_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));

View File

@ -235,11 +235,11 @@ class Elm_Diskselector (Elm_Widget, Elm_Interface_Scrollable)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::member_add;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_Smart::resize;
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;

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_widget_entry.h"
#define MY_CLASS ELM_OBJ_ENTRY_CLASS
#define MY_CLASS ELM_ENTRY_CLASS
#define MY_CLASS_NAME "Elm_Entry"
#define MY_CLASS_NAME_LEGACY "elm_entry"
@ -1052,7 +1052,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd)
Eina_Bool top_is_win = EINA_FALSE;
top = elm_widget_top_get(obj);
if (top && eo_isa(top, ELM_OBJ_WIN_CLASS))
if (top && eo_isa(top, ELM_WIN_CLASS))
top_is_win = EINA_TRUE;
if (!sd->editable) return EINA_FALSE;
@ -1731,7 +1731,7 @@ _mouse_up_cb(void *data,
top = elm_widget_top_get(data);
if (top)
{
if (eo_isa(top, ELM_OBJ_WIN_CLASS))
if (eo_isa(top, ELM_WIN_CLASS))
top_is_win = EINA_TRUE;
if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand &&
@ -3272,7 +3272,7 @@ _end_handler_mouse_move_cb(void *data,
}
EOLIAN static void
_elm_entry_evas_smart_add(Eo *obj, Elm_Entry_Data *priv)
_elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv)
{
#ifdef HAVE_ELEMENTARY_X
Evas_Object *top;
@ -3473,7 +3473,7 @@ _create_selection_handlers(Evas_Object *obj, Elm_Entry_Data *sd)
}
EOLIAN static void
_elm_entry_evas_smart_del(Eo *obj, Elm_Entry_Data *sd)
_elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd)
{
Elm_Entry_Context_Menu_Item *it;
Elm_Entry_Item_Provider *ip;
@ -3550,7 +3550,7 @@ _elm_entry_evas_smart_del(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static void
_elm_entry_evas_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -3563,7 +3563,7 @@ _elm_entry_evas_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord
}
EOLIAN static void
_elm_entry_evas_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -3572,7 +3572,7 @@ _elm_entry_evas_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coo
}
EOLIAN static void
_elm_entry_evas_smart_show(Eo *obj, Elm_Entry_Data *sd)
_elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
@ -3581,7 +3581,7 @@ _elm_entry_evas_smart_show(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static void
_elm_entry_evas_smart_hide(Eo *obj, Elm_Entry_Data *sd)
_elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
@ -3590,7 +3590,7 @@ _elm_entry_evas_smart_hide(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static void
_elm_entry_evas_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
_elm_entry_evas_object_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));

View File

@ -1158,13 +1158,13 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::move;
Evas_Smart::member_add;
Evas_Smart::add;
Evas_Smart::resize;
Evas_Smart::del;
Evas_Smart::show;
Evas_Smart::hide;
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;

View File

@ -7,7 +7,7 @@
#include "elm_widget_flip.h"
#include "elm_widget_container.h"
#define MY_CLASS ELM_OBJ_FLIP_CLASS
#define MY_CLASS ELM_FLIP_CLASS
#define MY_CLASS_NAME "Elm_Flip"
#define MY_CLASS_NAME_LEGACY "elm_flip"
@ -1798,7 +1798,7 @@ _elm_flip_elm_container_content_unset(Eo *obj EINA_UNUSED, Elm_Flip_Data *_pd EI
}
EOLIAN static void
_elm_flip_evas_smart_add(Eo *obj, Elm_Flip_Data *priv)
_elm_flip_evas_object_smart_add(Eo *obj, Elm_Flip_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -1841,7 +1841,7 @@ _elm_flip_evas_smart_add(Eo *obj, Elm_Flip_Data *priv)
}
EOLIAN static void
_elm_flip_evas_smart_del(Eo *obj, Elm_Flip_Data *sd)
_elm_flip_evas_object_smart_del(Eo *obj, Elm_Flip_Data *sd)
{
ecore_animator_del(sd->animator);
_state_slices_clear(sd);

View File

@ -243,8 +243,8 @@ class Elm_Flip (Elm_Container)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::focus_direction;
Elm_Widget::sub_object_add;
Elm_Widget::theme_apply;

View File

@ -6,7 +6,7 @@
#include "elm_priv.h"
#include "elm_widget_flipselector.h"
#define MY_CLASS ELM_OBJ_FLIPSELECTOR_CLASS
#define MY_CLASS ELM_FLIPSELECTOR_CLASS
#define MY_CLASS_NAME "Elm_Flipselector"
#define MY_CLASS_NAME_LEGACY "elm_flipselector"
@ -549,7 +549,7 @@ _signal_val_change_stop(void *data,
}
EOLIAN static void
_elm_flipselector_evas_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
_elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -575,7 +575,7 @@ _elm_flipselector_evas_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
}
EOLIAN static void
_elm_flipselector_evas_smart_del(Eo *obj, Elm_Flipselector_Data *sd)
_elm_flipselector_evas_object_smart_del(Eo *obj, Elm_Flipselector_Data *sd)
{
sd->deleting = EINA_TRUE;

View File

@ -195,8 +195,8 @@ class Elm_Flipselector (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;

View File

@ -7,7 +7,7 @@
#include "elm_widget_frame.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_FRAME_CLASS
#define MY_CLASS ELM_FRAME_CLASS
#define MY_CLASS_NAME "Elm_Frame"
#define MY_CLASS_NAME_LEGACY "elm_frame"
@ -142,7 +142,7 @@ _on_frame_clicked(void *data,
/* using deferred sizing evaluation, just like the parent */
EOLIAN static void
_elm_frame_evas_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
_elm_frame_evas_object_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
{
ELM_LAYOUT_DATA_GET(obj, ld);
@ -155,7 +155,7 @@ _elm_frame_evas_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
}
EOLIAN static void
_elm_frame_evas_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
_elm_frame_evas_object_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

View File

@ -65,8 +65,8 @@ class Elm_Frame (Elm_Layout, Evas_Clickable_Interface)
implements {
Eo_Base::constructor;
class::constructor;
Evas_Smart::calculate;
Evas_Smart::add;
Evas_Object_Smart::calculate;
Evas_Object_Smart::add;
Elm_Widget::focus_direction;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;

View File

@ -8,12 +8,12 @@
#include "elm_widget_gengrid.h"
#include "elm_interface_scrollable.h"
#define MY_PAN_CLASS ELM_OBJ_GENGRID_PAN_CLASS
#define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS
#define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan"
#define MY_PAN_CLASS_NAME_LEGACY "elm_gengrid_pan"
#define MY_CLASS ELM_OBJ_GENGRID_CLASS
#define MY_CLASS ELM_GENGRID_CLASS
#define MY_CLASS_NAME "Elm_Gengrid"
#define MY_CLASS_NAME_LEGACY "elm_gengrid"
@ -269,14 +269,14 @@ _elm_gengrid_pan_eo_base_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
}
EOLIAN static void
_elm_gengrid_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
_elm_gengrid_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
{
ecore_job_del(psd->wsd->calc_job);
psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
}
EOLIAN static void
_elm_gengrid_pan_evas_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
_elm_gengrid_pan_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
{
Evas_Coord ow, oh;
@ -1346,7 +1346,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
}
EOLIAN static void
_elm_gengrid_pan_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd)
_elm_gengrid_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd)
{
Evas_Coord cx = 0, cy = 0;
Elm_Gen_Item *it;
@ -3119,7 +3119,7 @@ _elm_gengrid_elm_layout_sizing_eval(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *_pd E
}
EOLIAN static void
_elm_gengrid_evas_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
_elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
{
Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
Elm_Gengrid_Pan_Data *pan_data;
@ -3185,7 +3185,7 @@ _elm_gengrid_evas_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
}
EOLIAN static void
_elm_gengrid_evas_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
{
elm_gengrid_clear(obj);
eo_unref(sd->pan_obj);
@ -3198,7 +3198,7 @@ _elm_gengrid_evas_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
}
EOLIAN static void
_elm_gengrid_evas_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -3206,7 +3206,7 @@ _elm_gengrid_evas_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_C
}
EOLIAN static void
_elm_gengrid_evas_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -3214,7 +3214,7 @@ _elm_gengrid_evas_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas
}
EOLIAN static void
_elm_gengrid_evas_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
_elm_gengrid_evas_object_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));

View File

@ -664,11 +664,11 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_Smart::member_add;
Evas_Smart::resize;
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;

View File

@ -4,9 +4,9 @@ class Elm_Gengrid_Pan (Elm_Pan)
implements {
class::constructor;
Eo_Base::destructor;
Evas_Smart::calculate;
Evas_Smart::move;
Evas_Smart::resize;
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;

View File

@ -11,12 +11,12 @@
#include "elm_widget_genlist.h"
#include "elm_interface_scrollable.h"
#define MY_PAN_CLASS ELM_OBJ_GENLIST_PAN_CLASS
#define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS
#define MY_PAN_CLASS_NAME "Elm_Genlist_Pan"
#define MY_PAN_CLASS_NAME_LEGACY "elm_genlist_pan"
#define MY_CLASS ELM_OBJ_GENLIST_CLASS
#define MY_CLASS ELM_GENLIST_CLASS
#define MY_CLASS_NAME "Elm_Genlist"
#define MY_CLASS_NAME_LEGACY "elm_genlist"
@ -192,7 +192,7 @@ _elm_genlist_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_D
}
EOLIAN static void
_elm_genlist_pan_evas_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
_elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
{
ecore_job_del(psd->resize_job);
@ -200,7 +200,7 @@ _elm_genlist_pan_evas_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
}
EOLIAN static void
_elm_genlist_pan_evas_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
_elm_genlist_pan_evas_object_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
{
psd->wsd->pan_changed = EINA_TRUE;
evas_object_smart_changed(obj);
@ -217,7 +217,7 @@ _elm_genlist_pan_smart_resize_job(void *data)
}
EOLIAN static void
_elm_genlist_pan_evas_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
_elm_genlist_pan_evas_object_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
{
Evas_Coord ow, oh;
@ -2176,7 +2176,7 @@ _item_block_realize(Item_Block *itb)
}
EOLIAN static void
_elm_genlist_pan_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_Data *psd)
_elm_genlist_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_Data *psd)
{
Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0;
@ -5211,7 +5211,7 @@ _elm_genlist_looping_down_cb(void *data,
EOLIAN static void
_elm_genlist_evas_smart_add(Eo *obj, Elm_Genlist_Data *priv)
_elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Elm_Genlist_Pan_Data *pan_data;
@ -5293,7 +5293,7 @@ _elm_genlist_evas_smart_add(Eo *obj, Elm_Genlist_Data *priv)
}
EOLIAN static void
_elm_genlist_evas_smart_del(Eo *obj, Elm_Genlist_Data *sd)
_elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd)
{
int i;
@ -5320,7 +5320,7 @@ _elm_genlist_evas_smart_del(Eo *obj, Elm_Genlist_Data *sd)
}
EOLIAN static void
_elm_genlist_evas_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -5328,7 +5328,7 @@ _elm_genlist_evas_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_C
}
EOLIAN static void
_elm_genlist_evas_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -5338,7 +5338,7 @@ _elm_genlist_evas_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas
}
EOLIAN static void
_elm_genlist_evas_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
_elm_genlist_evas_object_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));

View File

@ -730,11 +730,11 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::member_add;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_Smart::resize;
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;

View File

@ -4,10 +4,10 @@ class Elm_Genlist_Pan (Elm_Pan)
implements {
class::constructor;
Eo_Base::destructor;
Evas_Smart::calculate;
Evas_Smart::move;
Evas_Smart::del;
Evas_Smart::resize;
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;

View File

@ -5,7 +5,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#define MY_CLASS ELM_OBJ_GESTURE_LAYER_CLASS
#define MY_CLASS ELM_GESTURE_LAYER_CLASS
#define MY_CLASS_NAME "Elm_Gesture_Layer"
#define MY_CLASS_NAME_LEGACY "elm_gesture_layer"
@ -3729,7 +3729,7 @@ _elm_gesture_layer_elm_widget_disable(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_
}
EOLIAN static void
_elm_gesture_layer_evas_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
_elm_gesture_layer_evas_object_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -3762,7 +3762,7 @@ _elm_gesture_layer_evas_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type);
EOLIAN static void
_elm_gesture_layer_evas_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd)
_elm_gesture_layer_evas_object_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd)
{
Pointer_Event *data;
int i;

View File

@ -154,8 +154,8 @@ class Elm_Gesture_Layer (Elm_Widget)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::disable;
}

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_widget_glview.h"
#define MY_CLASS ELM_OBJ_GLVIEW_CLASS
#define MY_CLASS ELM_GLVIEW_CLASS
#define MY_CLASS_NAME "Elm_Glview"
#define MY_CLASS_NAME_LEGACY "elm_glview"
@ -73,7 +73,7 @@ _glview_update_surface(Evas_Object *obj)
}
EOLIAN static void
_elm_glview_evas_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_glview_evas_object_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -179,7 +179,7 @@ _set_render_policy_callback(Evas_Object *obj)
}
EOLIAN static void
_elm_glview_evas_smart_add(Eo *obj, Elm_Glview_Data *priv)
_elm_glview_evas_object_smart_add(Eo *obj, Elm_Glview_Data *priv)
{
Evas_Object *img;
@ -235,7 +235,7 @@ _elm_glview_evas_smart_add(Eo *obj, Elm_Glview_Data *priv)
}
EOLIAN static void
_elm_glview_evas_smart_del(Eo *obj, Elm_Glview_Data *sd)
_elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd)
{
// Call delete func if it's registered
if (sd->del_func)

View File

@ -166,9 +166,9 @@ class Elm_Glview (Elm_Widget)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Smart::resize;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Evas_Object_Smart::resize;
Elm_Widget::on_focus;
}
events {

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_widget_grid.h"
#define MY_CLASS ELM_OBJ_GRID_CLASS
#define MY_CLASS ELM_GRID_CLASS
#define MY_CLASS_NAME "Elm_Grid"
#define MY_CLASS_NAME_LEGACY "elm_grid"
@ -114,7 +114,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
}
EOLIAN static void
_elm_grid_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED)
_elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Object *grid;
@ -133,7 +133,7 @@ _elm_grid_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_grid_evas_smart_del(Eo *obj, void *_pd EINA_UNUSED)
_elm_grid_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED)
{
Eina_List *l;
Evas_Object *child;

View File

@ -75,8 +75,8 @@ class Elm_Grid (Elm_Widget)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::focus_direction;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_widget_hover.h"
#define MY_CLASS ELM_OBJ_HOVER_CLASS
#define MY_CLASS ELM_HOVER_CLASS
#define MY_CLASS_NAME "Elm_Hover"
#define MY_CLASS_NAME_LEGACY "elm_hover"
@ -131,7 +131,7 @@ _elm_hover_left_space_calc(Elm_Hover_Data *sd,
if (sd->parent)
{
evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
if (eo_isa(sd->parent, ELM_WIN_CLASS))
{
x = 0;
y = 0;
@ -313,7 +313,7 @@ _elm_hover_elm_layout_sizing_eval(Eo *obj, Elm_Hover_Data *sd)
if (sd->parent)
{
evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
if (eo_isa(sd->parent, ELM_WIN_CLASS))
{
x = 0;
y = 0;
@ -520,7 +520,7 @@ _hov_dismiss_cb(void *data,
}
EOLIAN static void
_elm_hover_evas_smart_add(Eo *obj, Elm_Hover_Data *priv)
_elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *priv)
{
unsigned int i;
@ -551,7 +551,7 @@ _elm_hover_evas_smart_add(Eo *obj, Elm_Hover_Data *priv)
}
EOLIAN static void
_elm_hover_evas_smart_del(Eo *obj, Elm_Hover_Data *sd)
_elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd)
{
sd->on_del = EINA_TRUE;
@ -571,7 +571,7 @@ _elm_hover_evas_smart_del(Eo *obj, Elm_Hover_Data *sd)
}
EOLIAN static void
_elm_hover_evas_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
_elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -579,7 +579,7 @@ _elm_hover_evas_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord
}
EOLIAN static void
_elm_hover_evas_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
_elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -587,7 +587,7 @@ _elm_hover_evas_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coor
}
EOLIAN static void
_elm_hover_evas_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
_elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
@ -595,7 +595,7 @@ _elm_hover_evas_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_hover_evas_smart_hide(Eo *obj, Elm_Hover_Data *sd)
_elm_hover_evas_object_smart_hide(Eo *obj, Elm_Hover_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());

View File

@ -71,12 +71,12 @@ class Elm_Hover (Elm_Layout, Evas_Clickable_Interface)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::del;
Evas_Smart::hide;
Evas_Smart::show;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::resize;
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;

View File

@ -11,7 +11,7 @@
#define NON_EXISTING (void *)-1
static const char *icon_theme = NULL;
#define MY_CLASS ELM_OBJ_ICON_CLASS
#define MY_CLASS ELM_ICON_CLASS
#define MY_CLASS_NAME "Elm_Icon"
#define MY_CLASS_NAME_LEGACY "elm_icon"
@ -349,7 +349,7 @@ static void
_edje_signals_free(Elm_Icon_Data *sd)
{
Edje_Signal_Data *esd;
Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_OBJ_IMAGE_CLASS);
Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_IMAGE_CLASS);
EINA_LIST_FREE(sd->edje_signals, esd)
{
@ -367,7 +367,7 @@ _elm_icon_elm_image_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
{
Evas_Object *pclip;
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
@ -565,7 +565,7 @@ _elm_icon_thumb_resize_cb(void *data,
}
EOLIAN static void
_elm_icon_evas_smart_add(Eo *obj, Elm_Icon_Data *priv)
_elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -576,7 +576,7 @@ _elm_icon_evas_smart_add(Eo *obj, Elm_Icon_Data *priv)
}
EOLIAN static void
_elm_icon_evas_smart_del(Eo *obj, Elm_Icon_Data *sd)
_elm_icon_evas_object_smart_del(Eo *obj, Elm_Icon_Data *sd)
{
eina_stringshare_del(sd->stdicon);
@ -604,7 +604,7 @@ _elm_icon_signal_emit(Evas_Object *obj,
const char *source)
{
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
if (!id->edje) return;
@ -622,7 +622,7 @@ _elm_icon_signal_callback_add(Evas_Object *obj,
Edje_Signal_Data *esd;
ELM_ICON_DATA_GET(obj, sd);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
if (!id->edje) return;
@ -653,7 +653,7 @@ _elm_icon_signal_callback_del(Evas_Object *obj,
Eina_List *l;
ELM_ICON_DATA_GET(obj, sd);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
if (!id->edje) return NULL;

View File

@ -97,8 +97,8 @@ class Elm_Icon (Elm_Image)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Image::memfile::set;
Elm_Image::sizing_eval;

View File

@ -12,7 +12,7 @@
#define FMT_SIZE_T "%zu"
#define MY_CLASS ELM_OBJ_IMAGE_CLASS
#define MY_CLASS ELM_IMAGE_CLASS
#define MY_CLASS_NAME "Elm_Image"
#define MY_CLASS_NAME_LEGACY "elm_image"
@ -418,7 +418,7 @@ _elm_image_drag_n_drop_cb(void *elm_obj,
}
EOLIAN static void
_elm_image_evas_smart_add(Eo *obj, Elm_Image_Data *priv)
_elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -452,7 +452,7 @@ _elm_image_evas_smart_add(Eo *obj, Elm_Image_Data *priv)
}
EOLIAN static void
_elm_image_evas_smart_del(Eo *obj, Elm_Image_Data *sd)
_elm_image_evas_object_smart_del(Eo *obj, Elm_Image_Data *sd)
{
ecore_timer_del(sd->anim_timer);
evas_object_del(sd->img);
@ -465,7 +465,7 @@ _elm_image_evas_smart_del(Eo *obj, Elm_Image_Data *sd)
}
EOLIAN static void
_elm_image_evas_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_image_evas_object_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -478,7 +478,7 @@ _elm_image_evas_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord
}
EOLIAN static void
_elm_image_evas_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_image_evas_object_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -492,7 +492,7 @@ _elm_image_evas_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coo
}
EOLIAN static void
_elm_image_evas_smart_show(Eo *obj, Elm_Image_Data *sd)
_elm_image_evas_object_smart_show(Eo *obj, Elm_Image_Data *sd)
{
sd->show = EINA_TRUE;
if (sd->preloading) return;
@ -505,7 +505,7 @@ _elm_image_evas_smart_show(Eo *obj, Elm_Image_Data *sd)
}
EOLIAN static void
_elm_image_evas_smart_hide(Eo *obj, Elm_Image_Data *sd)
_elm_image_evas_object_smart_hide(Eo *obj, Elm_Image_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
@ -516,7 +516,7 @@ _elm_image_evas_smart_hide(Eo *obj, Elm_Image_Data *sd)
}
EOLIAN static void
_elm_image_evas_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member)
_elm_image_evas_object_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
@ -525,7 +525,7 @@ _elm_image_evas_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *membe
}
EOLIAN static void
_elm_image_evas_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a)
_elm_image_evas_object_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_color_set(r, g, b, a));
@ -535,7 +535,7 @@ _elm_image_evas_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b
}
EOLIAN static void
_elm_image_evas_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip)
_elm_image_evas_object_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_set(clip));
@ -544,7 +544,7 @@ _elm_image_evas_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip)
}
EOLIAN static void
_elm_image_evas_smart_clip_unset(Eo *obj, Elm_Image_Data *sd)
_elm_image_evas_object_smart_clip_unset(Eo *obj, Elm_Image_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_unset());

View File

@ -535,16 +535,16 @@ class Elm_Image (Elm_Widget, Evas_Clickable_Interface, Elm_Interface_Atspi_Image
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::hide;
Evas_Smart::clip::set;
Evas_Smart::clip_unset;
Evas_Smart::show;
Evas_Smart::color::set;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_Smart::member_add;
Evas_Smart::resize;
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;

View File

@ -9,7 +9,7 @@
#include "elm_widget_layout.h"
#include "elm_widget_index.h"
#define MY_CLASS ELM_OBJ_INDEX_CLASS
#define MY_CLASS ELM_INDEX_CLASS
#define MY_CLASS_NAME "Elm_Index"
#define MY_CLASS_NAME_LEGACY "elm_index"
@ -871,7 +871,7 @@ _index_resize_cb(void *data EINA_UNUSED,
}
EOLIAN static void
_elm_index_evas_smart_add(Eo *obj, Elm_Index_Data *priv)
_elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv)
{
Evas_Object *o;
Evas_Coord minw = 0, minh = 0;
@ -949,7 +949,7 @@ _elm_index_evas_smart_add(Eo *obj, Elm_Index_Data *priv)
}
EOLIAN static void
_elm_index_evas_smart_del(Eo *obj, Elm_Index_Data *sd)
_elm_index_evas_object_smart_del(Eo *obj, Elm_Index_Data *sd)
{
Elm_Index_Omit *o;

View File

@ -349,8 +349,8 @@ class Elm_Index (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::theme_apply;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;

View File

@ -38,7 +38,7 @@ _elm_interface_atspi_widget_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Interfa
pd->role = ELM_ATSPI_ROLE_UNKNOWN;
// Elm_Widget_Access_Object can only be constructed on top of Elm_Widget
assert(eo_isa(obj, ELM_OBJ_WIDGET_CLASS));
assert(eo_isa(obj, ELM_WIDGET_CLASS));
evas_object_smart_callback_add(obj, "focused", _on_focus_change, (void*)1);
evas_object_smart_callback_add(obj, "unfocused", _on_focus_change, NULL);
@ -109,7 +109,7 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_children_get(Eo *obj
Elm_Widget_Smart_Data *wd;
Evas_Object *widget;
wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
wd = eo_data_scope_get(obj, ELM_WIDGET_CLASS);
if (!wd) return NULL;
EINA_LIST_FOREACH(wd->subobjs, l, widget)

View File

@ -49,7 +49,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_keybinding_get(Eo
Elm_Config_Binding_Key *binding;
int tmp = 0;
if (!eo_isa(obj, ELM_OBJ_WIDGET_CLASS))
if (!eo_isa(obj, ELM_WIDGET_CLASS))
return NULL;
eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get());

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_interface_scrollable.h"
#define MY_PAN_CLASS ELM_OBJ_PAN_CLASS
#define MY_PAN_CLASS ELM_PAN_CLASS
#define MY_PAN_CLASS_NAME "Elm_Pan"
#define MY_PAN_CLASS_NAME_LEGACY "elm_pan"
@ -86,7 +86,7 @@ _elm_pan_update(Elm_Pan_Smart_Data *psd)
}
EOLIAN static void
_elm_pan_evas_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
_elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
{
eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_add());
@ -94,7 +94,7 @@ _elm_pan_evas_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
}
EOLIAN static void
_elm_pan_evas_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
_elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
{
_elm_pan_content_set(obj, NULL);
@ -102,7 +102,7 @@ _elm_pan_evas_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y)
_elm_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y)
{
psd->x = x;
psd->y = y;
@ -111,7 +111,7 @@ _elm_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coor
}
EOLIAN static void
_elm_pan_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h)
_elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h)
{
psd->w = w;
psd->h = h;
@ -121,7 +121,7 @@ _elm_pan_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Co
}
EOLIAN static void
_elm_pan_evas_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
_elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
{
eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_show());
@ -130,7 +130,7 @@ _elm_pan_evas_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
}
EOLIAN static void
_elm_pan_evas_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
_elm_pan_evas_object_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
{
eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_hide());
@ -4291,7 +4291,7 @@ _elm_interface_scrollable_movement_block_get(Eo *obj EINA_UNUSED, Elm_Scrollable
}
EOLIAN static void
_elm_interface_scrollable_evas_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
_elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
{
memset(sid, 0, sizeof(*sid));
@ -4326,7 +4326,7 @@ _elm_interface_scrollable_evas_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface
}
EOLIAN static void
_elm_interface_scrollable_evas_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
_elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
{
eo_do_super(obj, MY_SCROLLABLE_INTERFACE, evas_obj_smart_del());

View File

@ -1,4 +1,4 @@
mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Smart)
mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Object_Smart)
{
legacy_prefix: null;
eo_prefix: elm_interface_scrollable;
@ -514,8 +514,8 @@ mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Smart)
implements {
Eo_Base::constructor;
class::constructor;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
}
events {
changed;

View File

@ -8,7 +8,7 @@
#include "elm_widget_inwin.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_WIN_INWIN_CLASS
#define MY_CLASS ELM_INWIN_CLASS
#define MY_CLASS_NAME "Elm_Inwin"
#define MY_CLASS_NAME_LEGACY "elm_inwin"
@ -63,7 +63,7 @@ _elm_inwin_elm_widget_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Elm
}
EOLIAN static void
_elm_inwin_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED)
_elm_inwin_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -107,7 +107,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
eo_do(obj, parent = eo_parent_get());
if (parent && !eo_isa(parent, ELM_OBJ_WIN_CLASS))
if (parent && !eo_isa(parent, ELM_WIN_CLASS))
{
eo_error_set(obj); /* *has* to have a parent window */
return;

View File

@ -23,7 +23,7 @@ class Elm_Inwin (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Widget::parent::set;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;

View File

@ -8,7 +8,7 @@
#include "elm_widget_layout.h"
#include "elm_widget_label.h"
#define MY_CLASS ELM_OBJ_LABEL_CLASS
#define MY_CLASS ELM_LABEL_CLASS
#define MY_CLASS_NAME "Elm_Label"
#define MY_CLASS_NAME_LEGACY "elm_label"
@ -353,7 +353,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
}
EOLIAN static void
_elm_label_evas_smart_add(Eo *obj, Elm_Label_Data *priv)
_elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

View File

@ -190,7 +190,7 @@ class Elm_Label (Elm_Layout)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::add;
Evas_Object_Smart::add;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_direction_manager_is;
Elm_Widget::theme_apply;

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_widget_layout.h"
#define MY_CLASS ELM_OBJ_LAYOUT_CLASS
#define MY_CLASS ELM_LAYOUT_CLASS
#define MY_CLASS_NAME "Elm_Layout"
#define MY_CLASS_NAME_LEGACY "elm_layout"
@ -729,7 +729,7 @@ _on_size_evaluate_signal(void *data,
}
EOLIAN static void
_elm_layout_evas_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
_elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
Evas_Object *edje;
@ -750,7 +750,7 @@ _elm_layout_evas_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
}
EOLIAN static void
_elm_layout_evas_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
_elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
{
Elm_Layout_Sub_Object_Data *sub_d;
Elm_Layout_Sub_Object_Cursor *pc;
@ -808,7 +808,7 @@ _elm_layout_evas_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
/* rewrite or extend this one on your derived class as to suit your
* needs */
EOLIAN static void
_elm_layout_evas_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
_elm_layout_evas_object_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
{
if (sd->needs_size_calc)
{
@ -1672,7 +1672,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_OBJ_CLASS))
if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_CLASS))
{
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
const char *file, *edje_group;

View File

@ -652,9 +652,9 @@ class Elm_Layout (Elm_Container)
class::constructor;
Eo_Base::constructor;
Eo_Base::dbg_info_get;
Evas_Smart::del;
Evas_Smart::add;
Evas_Smart::calculate;
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;

View File

@ -8,7 +8,7 @@
#include "elm_widget_list.h"
#include "elm_interface_scrollable.h"
#define MY_CLASS ELM_OBJ_LIST_CLASS
#define MY_CLASS ELM_LIST_CLASS
#define MY_CLASS_NAME "Elm_List"
#define MY_CLASS_NAME_LEGACY "elm_list"
@ -2202,7 +2202,7 @@ _elm_list_elm_widget_focus_next(Eo *obj, Elm_List_Data *sd, Elm_Focus_Direction
}
EOLIAN static void
_elm_list_evas_smart_add(Eo *obj, Elm_List_Data *priv)
_elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv)
{
Evas_Coord minw, minh;
@ -2268,7 +2268,7 @@ _elm_list_evas_smart_add(Eo *obj, Elm_List_Data *priv)
}
EOLIAN static void
_elm_list_evas_smart_del(Eo *obj, Elm_List_Data *sd)
_elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd)
{
const Eina_List *l;
Elm_List_Item *it;
@ -2315,7 +2315,7 @@ _elm_list_evas_smart_del(Eo *obj, Elm_List_Data *sd)
}
EOLIAN static void
_elm_list_evas_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -2323,7 +2323,7 @@ _elm_list_evas_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y
}
EOLIAN static void
_elm_list_evas_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -2331,7 +2331,7 @@ _elm_list_evas_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord
}
EOLIAN static void
_elm_list_evas_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
_elm_list_evas_object_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));

View File

@ -588,11 +588,11 @@ class Elm_List (Elm_Layout, Elm_Interface_Scrollable)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::member_add;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_Smart::resize;
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;

View File

@ -8,12 +8,12 @@
#include "elm_widget_map.h"
#include "elm_interface_scrollable.h"
#define MY_PAN_CLASS ELM_OBJ_MAP_PAN_CLASS
#define MY_PAN_CLASS ELM_MAP_PAN_CLASS
#define MY_PAN_CLASS_NAME "Elm_Map_Pan"
#define MY_PAN_CLASS_NAME_LEGACY "elm_map_pan"
#define MY_CLASS ELM_OBJ_MAP_CLASS
#define MY_CLASS ELM_MAP_CLASS
#define MY_CLASS_NAME "Elm_Map"
#define MY_CLASS_NAME_LEGACY "elm_map"
@ -3814,7 +3814,7 @@ _elm_map_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Map_Pan_Data *psd
}
EOLIAN static void
_elm_map_pan_evas_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED)
_elm_map_pan_evas_object_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED)
{
_sizing_eval(psd->wsd->obj);
elm_map_zoom_mode_set(psd->wobj, psd->wsd->mode);
@ -3822,7 +3822,7 @@ _elm_map_pan_evas_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA
}
EOLIAN static void
_elm_map_pan_evas_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
_elm_map_pan_evas_object_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
{
Evas_Coord w, h;
@ -3836,7 +3836,7 @@ _elm_map_pan_evas_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
}
EOLIAN static void
_elm_map_pan_evas_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
_elm_map_pan_evas_object_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
{
evas_object_smart_changed(obj);
}
@ -3986,7 +3986,7 @@ _elm_map_elm_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *sr
}
EOLIAN static void
_elm_map_evas_smart_add(Eo *obj, Elm_Map_Data *priv)
_elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv)
{
Evas_Coord minw, minh;
Elm_Map_Pan_Data *pan_data;
@ -4095,7 +4095,7 @@ _elm_map_evas_smart_add(Eo *obj, Elm_Map_Data *priv)
}
EOLIAN static void
_elm_map_evas_smart_del(Eo *obj, Elm_Map_Data *sd)
_elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd)
{
Elm_Map_Route *r;
Elm_Map_Name *na;
@ -4156,7 +4156,7 @@ _elm_map_evas_smart_del(Eo *obj, Elm_Map_Data *sd)
}
EOLIAN static void
_elm_map_evas_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -4164,7 +4164,7 @@ _elm_map_evas_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
}
EOLIAN static void
_elm_map_evas_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -4172,7 +4172,7 @@ _elm_map_evas_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h
}
EOLIAN static void
_elm_map_evas_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
_elm_map_evas_object_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));

View File

@ -766,11 +766,11 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_Smart::member_add;
Evas_Smart::resize;
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;

View File

@ -4,9 +4,9 @@ class Elm_Map_Pan (Elm_Pan)
implements {
class::constructor;
Eo_Base::destructor;
Evas_Smart::calculate;
Evas_Smart::move;
Evas_Smart::resize;
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;

View File

@ -8,7 +8,7 @@
#include "elm_widget_mapbuf.h"
#include "elm_widget_container.h"
#define MY_CLASS ELM_OBJ_MAPBUF_CLASS
#define MY_CLASS ELM_MAPBUF_CLASS
#define MY_CLASS_NAME "Elm_Mapbuf"
#define MY_CLASS_NAME_LEGACY "elm_mapbuf"
@ -150,7 +150,7 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd)
}
EOLIAN static void
_elm_mapbuf_evas_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
_elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -160,7 +160,7 @@ _elm_mapbuf_evas_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coo
}
EOLIAN static void
_elm_mapbuf_evas_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
_elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -170,7 +170,7 @@ _elm_mapbuf_evas_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_C
}
EOLIAN static void
_elm_mapbuf_evas_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
_elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
@ -179,7 +179,7 @@ _elm_mapbuf_evas_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
}
EOLIAN static void
_elm_mapbuf_evas_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd)
_elm_mapbuf_evas_object_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
@ -240,7 +240,7 @@ _elm_mapbuf_elm_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd, const char
}
EOLIAN static void
_elm_mapbuf_evas_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
_elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
{
ELM_SAFE_FREE(priv->idler, ecore_idler_del);
ELM_SAFE_FREE(priv->map, evas_map_free);
@ -249,7 +249,7 @@ _elm_mapbuf_evas_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
}
EOLIAN static void
_elm_mapbuf_evas_smart_add(Eo *obj, Elm_Mapbuf_Data *priv)
_elm_mapbuf_evas_object_smart_add(Eo *obj, Elm_Mapbuf_Data *priv)
{
Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj));
int i;

View File

@ -178,12 +178,12 @@ class Elm_Mapbuf (Elm_Container)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::hide;
Evas_Smart::show;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_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;
Elm_Widget::theme_apply;
Elm_Widget::sub_object_del;
Elm_Container::content_get;

View File

@ -7,7 +7,7 @@
#include "elm_priv.h"
#include "elm_widget_menu.h"
#define MY_CLASS ELM_OBJ_MENU_CLASS
#define MY_CLASS ELM_MENU_CLASS
#define MY_CLASS_NAME "Elm_Menu"
#define MY_CLASS_NAME_LEGACY "elm_menu"
@ -103,7 +103,7 @@ _submenu_sizing_eval(Elm_Menu_Item *parent_it)
evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2);
evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh);
evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph);
if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
if (eo_isa(sd->parent, ELM_WIN_CLASS))
{
px = 0;
py = 0;
@ -165,7 +165,7 @@ _sizing_eval(Evas_Object *obj)
evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p);
evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2);
if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
if (eo_isa(sd->parent, ELM_WIN_CLASS))
{
x2 = 0;
y2 = 0;
@ -189,7 +189,7 @@ _sizing_eval(Evas_Object *obj)
evas_object_size_hint_max_set(sd->location, bw, h_p);
elm_hover_target_set(sd->hv, sd->location);
hover = eo_data_scope_get(sd->hv, ELM_OBJ_WIDGET_CLASS);
hover = eo_data_scope_get(sd->hv, ELM_WIDGET_CLASS);
edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL,
NULL, &bw, &bh);
evas_object_size_hint_min_set(obj, bw, bh);
@ -522,7 +522,7 @@ _unblock_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
}
EOLIAN static void
_elm_menu_evas_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
_elm_menu_evas_object_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
{
evas_object_show(sd->hv);
}
@ -634,7 +634,7 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
}
EOLIAN static void
_elm_menu_evas_smart_add(Eo *obj, Elm_Menu_Data *priv)
_elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -660,7 +660,7 @@ _elm_menu_evas_smart_add(Eo *obj, Elm_Menu_Data *priv)
}
EOLIAN static void
_elm_menu_evas_smart_del(Eo *obj, Elm_Menu_Data *sd)
_elm_menu_evas_object_smart_del(Eo *obj, Elm_Menu_Data *sd)
{
Elm_Menu_Item *item;

View File

@ -115,9 +115,9 @@ class Elm_Menu (Elm_Widget, Evas_Clickable_Interface)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::show;
Evas_Smart::add;
Evas_Smart::del;
Evas_Object_Smart::show;
Evas_Object_Smart::add;
Evas_Object_Smart::del;
Elm_Widget::parent;
Elm_Widget::theme_apply;
Elm_Widget::translate;

View File

@ -8,7 +8,7 @@
#include "elm_widget_notify.h"
#include "elm_widget_container.h"
#define MY_CLASS ELM_OBJ_NOTIFY_CLASS
#define MY_CLASS ELM_NOTIFY_CLASS
#define MY_CLASS_NAME "Elm_Notify"
#define MY_CLASS_NAME_LEGACY "elm_notify"
@ -112,7 +112,7 @@ _sizing_eval(Evas_Object *obj)
if (!sd->parent) return;
evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
if (eo_isa(sd->parent, ELM_WIN_CLASS))
{
x = 0;
y = 0;
@ -214,7 +214,7 @@ _restack_cb(void *data EINA_UNUSED,
}
EOLIAN static void
_elm_notify_evas_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
_elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
@ -222,7 +222,7 @@ _elm_notify_evas_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coo
}
EOLIAN static void
_elm_notify_evas_smart_move(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
_elm_notify_evas_object_smart_move(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
@ -268,7 +268,7 @@ _timer_init(Evas_Object *obj,
}
EOLIAN static void
_elm_notify_evas_smart_show(Eo *obj, Elm_Notify_Data *sd)
_elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd)
{
sd->had_hidden = EINA_FALSE;
sd->in_timeout = EINA_FALSE;
@ -281,7 +281,7 @@ _elm_notify_evas_smart_show(Eo *obj, Elm_Notify_Data *sd)
}
EOLIAN static void
_elm_notify_evas_smart_hide(Eo *obj, Elm_Notify_Data *sd)
_elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data *sd)
{
const char *hide_signal;
@ -419,7 +419,7 @@ _hide_finished_cb(void *data,
}
EOLIAN static void
_elm_notify_evas_smart_add(Eo *obj, Elm_Notify_Data *priv)
_elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv)
{
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -440,7 +440,7 @@ _elm_notify_evas_smart_add(Eo *obj, Elm_Notify_Data *priv)
}
EOLIAN static void
_elm_notify_evas_smart_del(Eo *obj, Elm_Notify_Data *sd)
_elm_notify_evas_object_smart_del(Eo *obj, Elm_Notify_Data *sd)
{
edje_object_signal_callback_del_full
(sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj);

View File

@ -86,12 +86,12 @@ class Elm_Notify (Elm_Container)
implements {
class::constructor;
Eo_Base::constructor;
Evas_Smart::hide;
Evas_Smart::show;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_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;
Elm_Widget::focus_direction;
Elm_Widget::parent;
Elm_Widget::theme_apply;

View File

@ -58,12 +58,12 @@ class Elm_Pan (Evas_Smart_Clipped)
implements {
Eo_Base::constructor;
class::constructor;
Evas_Smart::hide;
Evas_Smart::show;
Evas_Smart::move;
Evas_Smart::add;
Evas_Smart::del;
Evas_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;

View File

@ -9,7 +9,7 @@
#include "els_box.h"
#define MY_CLASS ELM_OBJ_PANEL_CLASS
#define MY_CLASS ELM_PANEL_CLASS
#define MY_CLASS_NAME "Elm_Panel"
#define MY_CLASS_NAME_LEGACY "elm_panel"
@ -33,7 +33,7 @@ _mirrored_set(Evas_Object *obj,
{
ELM_PANEL_DATA_GET(obj, sd);
if ((sd->content) && (eo_isa(sd->content, ELM_OBJ_WIDGET_CLASS)))
if ((sd->content) && (eo_isa(sd->content, ELM_WIDGET_CLASS)))
elm_widget_mirrored_set(sd->content, rtl);
elm_panel_orient_set(obj, elm_panel_orient_get(obj));
}
@ -318,7 +318,7 @@ _elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *
}
EOLIAN static void
_elm_panel_evas_smart_add(Eo *obj, Elm_Panel_Data *priv)
_elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -365,7 +365,7 @@ _elm_panel_evas_smart_add(Eo *obj, Elm_Panel_Data *priv)
}
EOLIAN static void
_elm_panel_evas_smart_del(Eo *obj, Elm_Panel_Data *sd)
_elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd)
{
Evas_Object *child;
Eina_List *l;

Some files were not shown because too many files have changed in this diff Show More