From 8537923d2e58e3a4e1499bfa0317e7430fd71b41 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Thu, 17 Aug 2017 18:37:38 +0200 Subject: [PATCH] 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. --- src/modules/everything/e_mod_main.h | 2 +- src/modules/everything/evry.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h index 47fd345b0..6d3edd080 100644 --- a/src/modules/everything/e_mod_main.h +++ b/src/modules/everything/e_mod_main.h @@ -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; diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index c359af08c..671db8ff5 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -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); }