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

everything:declare this object as const 

The object is not meant to be moved, we only subscribe click events on
it, this isnt really changing the context where the api wants to declare
it const, so for now safe it everywhere as const and register /
unregister the callbacks with casts.
This commit is contained in:
Marcel Hollerbach 2017-08-17 18:37:38 +02:00 committed by Mike Blumenkrantz
parent 8545fc08be
commit 7aaa20f219
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/everything/e_mod_main.h
View File

@ -81,7 +81,7 @@ struct _Evry_Selector
Evas_Object *o_icon;
Evas_Object *o_thumb;
Evas_Object *event_object;
const Evas_Object *event_object;
Eina_Bool do_thumb;
Ecore_Timer *update_timer;

14
src/modules/everything/evry.c
View File

@ -1115,7 +1115,7 @@ _evry_selector_new(Evry_Window *win, int type)
Plugin_Config *pc;
Eina_List *l, *pcs = NULL;
Evry_Selector *sel = E_NEW(Evry_Selector, 1);
Evas_Object *o = NULL;
const Evas_Object *o = NULL;
sel->aggregator = evry_aggregator_new(type);
@ -1138,11 +1138,11 @@ _evry_selector_new(Evry_Window *win, int type)
if ((o = edje_object_part_object_get(win->o_main, sel->edje_part)))
{
sel->event_object = o;
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
evas_object_event_callback_add((Evas_Object*) o, EVAS_CALLBACK_MOUSE_DOWN,
_evry_selector_cb_down, sel);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
evas_object_event_callback_add((Evas_Object*) o, EVAS_CALLBACK_MOUSE_UP,
_evry_selector_cb_up, sel);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL,
evas_object_event_callback_add((Evas_Object*) o, EVAS_CALLBACK_MOUSE_WHEEL,
_evry_selector_cb_wheel, sel);
}
@ -1166,11 +1166,11 @@ _evry_selector_free(Evry_Selector *sel)
if (sel->event_object)
{
evas_object_event_callback_del_full(sel->event_object, EVAS_CALLBACK_MOUSE_DOWN,
evas_object_event_callback_del_full((Evas_Object*)sel->event_object, EVAS_CALLBACK_MOUSE_DOWN,
_evry_selector_cb_down, sel);
evas_object_event_callback_del_full(sel->event_object, EVAS_CALLBACK_MOUSE_UP,
evas_object_event_callback_del_full((Evas_Object*)sel->event_object, EVAS_CALLBACK_MOUSE_UP,
_evry_selector_cb_up, sel);
evas_object_event_callback_del_full(sel->event_object, EVAS_CALLBACK_MOUSE_WHEEL,
evas_object_event_callback_del_full((Evas_Object*)sel->event_object, EVAS_CALLBACK_MOUSE_WHEEL,
_evry_selector_cb_wheel, sel);
}