enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

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

This commit is contained in:
Tom Hacohen 2014-06-03 11:45:38 +01:00
parent 1a492e3786
commit f87b9900fa
4 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/bin/e_comp_object.c
View File

@ -4,7 +4,7 @@
#define UPDATE_MAX 512 // same as evas #define UPDATE_MAX 512 // same as evas
#define MY_CLASS E_COMP_OBJ_CLASS #define MY_CLASS E_COMP_OBJECT_CLASS
#define MY_CLASS_NAME "E_Comp_Object" #define MY_CLASS_NAME "E_Comp_Object"
#define MY_CLASS_NAME_LEGACY "e_comp_object" #define MY_CLASS_NAME_LEGACY "e_comp_object"
@ -1854,8 +1854,8 @@ _e_comp_object_smart_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
edje_object_signal_emit(obj, "e,state,unfocused", "e"); edje_object_signal_emit(obj, "e,state,unfocused", "e");
} }
static void EOLIAN static void
_e_comp_object_evas_smart_add(Eo *obj, E_Comp_Object *cw EINA_UNUSED) _e_comp_object_evas_object_smart_add(Eo *obj, E_Comp_Object *cw EINA_UNUSED)
{ {
eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
} }
@ -1931,8 +1931,8 @@ _e_comp_object_eo_base_constructor(Eo *obj, E_Comp_Object *cw EINA_UNUSED)
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME); ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
} }
static void EOLIAN static void
_e_comp_object_evas_smart_color_set(Eo *obj, E_Comp_Object *cw, int r, int g, int b, int a) _e_comp_object_evas_object_smart_color_set(Eo *obj, E_Comp_Object *cw, int r, int g, int b, int a)
{ {
eo_do_super(obj, MY_CLASS, evas_obj_smart_color_set(r, g, b, a)); eo_do_super(obj, MY_CLASS, evas_obj_smart_color_set(r, g, b, a));
evas_object_color_set(cw->clip, r, g, b, a); evas_object_color_set(cw->clip, r, g, b, a);
@ -1940,22 +1940,22 @@ _e_comp_object_evas_smart_color_set(Eo *obj, E_Comp_Object *cw, int r, int g, in
} }
static void EOLIAN static void
_e_comp_object_evas_smart_clip_set(Eo *obj, E_Comp_Object *cw, Evas_Object *clip) _e_comp_object_evas_object_smart_clip_set(Eo *obj, E_Comp_Object *cw, Evas_Object *clip)
{ {
eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_set(clip)); eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_set(clip));
evas_object_clip_set(cw->clip, clip); evas_object_clip_set(cw->clip, clip);
} }
static void EOLIAN static void
_e_comp_object_evas_smart_clip_unset(Eo *obj, E_Comp_Object *cw) _e_comp_object_evas_object_smart_clip_unset(Eo *obj, E_Comp_Object *cw)
{ {
eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_unset()); eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_unset());
evas_object_clip_unset(cw->clip); evas_object_clip_unset(cw->clip);
} }
static void EOLIAN static void
_e_comp_object_evas_smart_hide(Eo *obj, E_Comp_Object *cw) _e_comp_object_evas_object_smart_hide(Eo *obj, E_Comp_Object *cw)
{ {
eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
cw->visible = 0; cw->visible = 0;
@ -1969,8 +1969,8 @@ _e_comp_object_evas_smart_hide(Eo *obj, E_Comp_Object *cw)
e_comp_shape_queue(cw->comp); e_comp_shape_queue(cw->comp);
} }
static void EOLIAN static void
_e_comp_object_evas_smart_show(Eo *obj, E_Comp_Object *cw) _e_comp_object_evas_object_smart_show(Eo *obj, E_Comp_Object *cw)
{ {
E_Client *tmp; E_Client *tmp;
Eina_List *l; Eina_List *l;
@ -2012,8 +2012,8 @@ _e_comp_object_cb_mirror_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
cw->obj_mirror = eina_list_remove(cw->obj_mirror, obj); cw->obj_mirror = eina_list_remove(cw->obj_mirror, obj);
} }
static void EOLIAN static void
_e_comp_object_evas_smart_del(Eo *obj, E_Comp_Object *cw) _e_comp_object_evas_object_smart_del(Eo *obj, E_Comp_Object *cw)
{ {
Eina_List *l; Eina_List *l;
@ -2055,8 +2055,8 @@ _e_comp_object_evas_smart_del(Eo *obj, E_Comp_Object *cw)
eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
} }
static void EOLIAN static void
_e_comp_object_evas_smart_move(Eo *obj, E_Comp_Object *cw, int x, int y) _e_comp_object_evas_object_smart_move(Eo *obj, E_Comp_Object *cw, int x, int y)
{ {
eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
cw->x = x, cw->y = y; cw->x = x, cw->y = y;
@ -2068,8 +2068,8 @@ _e_comp_object_evas_smart_move(Eo *obj, E_Comp_Object *cw, int x, int y)
e_comp_shape_queue(cw->comp); e_comp_shape_queue(cw->comp);
} }
static void EOLIAN static void
_e_comp_object_evas_smart_resize(Eo *obj, E_Comp_Object *cw, int w, int h) _e_comp_object_evas_object_smart_resize(Eo *obj, E_Comp_Object *cw, int w, int h)
{ {
Eina_Bool first = EINA_FALSE; Eina_Bool first = EINA_FALSE;

18
src/bin/e_comp_object.eo
View File

@ -148,15 +148,15 @@ class E_Comp_Object (Edje)
implements { implements {
class::constructor; class::constructor;
Eo_Base::constructor; Eo_Base::constructor;
Evas_Smart::hide; Evas_Object_Smart::hide;
Evas_Smart::show; Evas_Object_Smart::show;
Evas_Smart::move; Evas_Object_Smart::move;
Evas_Smart::add; Evas_Object_Smart::add;
Evas_Smart::del; Evas_Object_Smart::del;
Evas_Smart::resize; Evas_Object_Smart::resize;
Evas_Smart::clip::set; Evas_Object_Smart::clip::set;
Evas_Smart::clip_unset; Evas_Object_Smart::clip_unset;
Evas_Smart::color::set; Evas_Object_Smart::color::set;
Edje::signal_callback_add; Edje::signal_callback_add;
Edje::signal_callback_del; Edje::signal_callback_del;
Edje::signal_emit; Edje::signal_emit;

38
src/bin/e_menu.c
View File

@ -750,7 +750,7 @@ e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub)
{ {
if (mi->submenu_object) if (mi->submenu_object)
{ {
if (eo_isa(mi->submenu_object, EDJE_OBJ_CLASS)) if (eo_isa(mi->submenu_object, EDJE_CLASS))
{ {
/* already have a correct submenu object, don't re-set it */ /* already have a correct submenu object, don't re-set it */
_e_menu_lock = EINA_FALSE; _e_menu_lock = EINA_FALSE;
@ -880,11 +880,11 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
edje_object_signal_emit(mi->bg_object, "e,state,on", "e"); edje_object_signal_emit(mi->bg_object, "e,state,on", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,on", "e"); edje_object_signal_emit(mi->icon_bg_object, "e,state,on", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS)) if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,on", "e"); edje_object_signal_emit(mi->label_object, "e,state,on", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS)) if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,on", "e"); edje_object_signal_emit(mi->submenu_object, "e,state,on", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS)) if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,on", "e"); edje_object_signal_emit(mi->toggle_object, "e,state,on", "e");
if (mi->menu->bg_object) if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "e,state,on", "e"); edje_object_signal_emit(mi->menu->bg_object, "e,state,on", "e");
@ -896,11 +896,11 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
edje_object_signal_emit(mi->bg_object, "e,state,off", "e"); edje_object_signal_emit(mi->bg_object, "e,state,off", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,off", "e"); edje_object_signal_emit(mi->icon_bg_object, "e,state,off", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS)) if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,off", "e"); edje_object_signal_emit(mi->label_object, "e,state,off", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS)) if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,off", "e"); edje_object_signal_emit(mi->submenu_object, "e,state,off", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS)) if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,off", "e"); edje_object_signal_emit(mi->toggle_object, "e,state,off", "e");
if (mi->menu->bg_object) if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "e,state,off", "e"); edje_object_signal_emit(mi->menu->bg_object, "e,state,off", "e");
@ -1010,17 +1010,17 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
edje_object_signal_emit(mi->bg_object, "e,state,selected", "e"); edje_object_signal_emit(mi->bg_object, "e,state,selected", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,selected", "e"); edje_object_signal_emit(mi->icon_bg_object, "e,state,selected", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS)) if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,selected", "e"); edje_object_signal_emit(mi->label_object, "e,state,selected", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS)) if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,selected", "e"); edje_object_signal_emit(mi->submenu_object, "e,state,selected", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS)) if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,selected", "e"); edje_object_signal_emit(mi->toggle_object, "e,state,selected", "e");
if (mi->icon_key) if (mi->icon_key)
{ {
if (mi->icon_object) if (mi->icon_object)
{ {
if (eo_isa(mi->icon_object, EDJE_OBJ_CLASS)) if (eo_isa(mi->icon_object, EDJE_CLASS))
edje_object_signal_emit(mi->icon_object, "e,state,selected", "e"); edje_object_signal_emit(mi->icon_object, "e,state,selected", "e");
else else
e_icon_selected_set(mi->icon_object, EINA_TRUE); e_icon_selected_set(mi->icon_object, EINA_TRUE);
@ -1039,17 +1039,17 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
edje_object_signal_emit(mi->bg_object, "e,state,unselected", "e"); edje_object_signal_emit(mi->bg_object, "e,state,unselected", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,unselected", "e"); edje_object_signal_emit(mi->icon_bg_object, "e,state,unselected", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS)) if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,unselected", "e"); edje_object_signal_emit(mi->label_object, "e,state,unselected", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS)) if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,unselected", "e"); edje_object_signal_emit(mi->submenu_object, "e,state,unselected", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS)) if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,unselected", "e"); edje_object_signal_emit(mi->toggle_object, "e,state,unselected", "e");
if (mi->icon_key) if (mi->icon_key)
{ {
if (mi->icon_object) if (mi->icon_object)
{ {
if (eo_isa(mi->icon_object, EDJE_OBJ_CLASS)) if (eo_isa(mi->icon_object, EDJE_CLASS))
edje_object_signal_emit(mi->icon_object, "e,state,unselected", "e"); edje_object_signal_emit(mi->icon_object, "e,state,unselected", "e");
else else
e_icon_selected_set(mi->icon_object, EINA_FALSE); e_icon_selected_set(mi->icon_object, EINA_FALSE);
@ -1085,9 +1085,9 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable)
mi->disable = 1; mi->disable = 1;
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,disable", "e"); edje_object_signal_emit(mi->icon_bg_object, "e,state,disable", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS)) if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,disable", "e"); edje_object_signal_emit(mi->label_object, "e,state,disable", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS)) if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,disable", "e"); edje_object_signal_emit(mi->toggle_object, "e,state,disable", "e");
} }
else else
@ -1095,9 +1095,9 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable)
mi->disable = 0; mi->disable = 0;
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,enable", "e"); edje_object_signal_emit(mi->icon_bg_object, "e,state,enable", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS)) if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,enable", "e"); edje_object_signal_emit(mi->label_object, "e,state,enable", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS)) if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,enable", "e"); edje_object_signal_emit(mi->toggle_object, "e,state,enable", "e");
} }
} }

4
src/modules/ibox/e_mod_main.c
View File

@ -649,11 +649,11 @@ _ibox_icon_signal_emit(IBox_Icon *ic, char *sig, char *src)
{ {
if (ic->o_holder) if (ic->o_holder)
edje_object_signal_emit(ic->o_holder, sig, src); edje_object_signal_emit(ic->o_holder, sig, src);
if (ic->o_icon && eo_isa(ic->o_icon, EDJE_OBJ_CLASS)) if (ic->o_icon && eo_isa(ic->o_icon, EDJE_CLASS))
edje_object_signal_emit(ic->o_icon, sig, src); edje_object_signal_emit(ic->o_icon, sig, src);
if (ic->o_holder2) if (ic->o_holder2)
edje_object_signal_emit(ic->o_holder2, sig, src); edje_object_signal_emit(ic->o_holder2, sig, src);
if (ic->o_icon2 && eo_isa(ic->o_icon2, EDJE_OBJ_CLASS)) if (ic->o_icon2 && eo_isa(ic->o_icon2, EDJE_CLASS))
edje_object_signal_emit(ic->o_icon2, sig, src); edje_object_signal_emit(ic->o_icon2, sig, src);
} }