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

Add UNUSED where needed. 

Remove unused variables.



SVN revision: 51452
This commit is contained in:
Christopher Michael 2010-08-19 21:19:24 +00:00
parent ee84be7253
commit 86b1e16283
3 changed files with 62 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/modules/comp/e_mod_comp.c
View File

@ -133,7 +133,7 @@ static void _e_mod_comp_win_hide(E_Comp_Win *cw);
static void _e_mod_comp_win_configure(E_Comp_Win *cw, int x, int y, int w, int h, int border);
static void
_e_mod_comp_cb_pending_after(void *data, E_Manager *man, E_Manager_Comp_Source *src)
_e_mod_comp_cb_pending_after(void *data __UNUSED__, E_Manager *man __UNUSED__, E_Manager_Comp_Source *src)
{
E_Comp_Win *cw = (E_Comp_Win *)src;
cw->pending_count--;
@ -486,7 +486,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
cw->native = 0;
if (!cw->xim)
{
if (cw->xim = ecore_x_image_new(cw->pw, cw->ph, cw->vis, cw->depth))
if ((cw->xim = ecore_x_image_new(cw->pw, cw->ph, cw->vis, cw->depth)))
e_mod_comp_update_add(cw->up, 0, 0, cw->pw, cw->ph);
}
r = e_mod_comp_update_rects_get(cw->up);
@ -582,7 +582,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
}
static void
_e_mod_comp_pre_swap(void *data, Evas *e)
_e_mod_comp_pre_swap(void *data, Evas *e __UNUSED__)
{
E_Comp *c = data;
@ -1031,14 +1031,14 @@ _e_mod_comp_done_defer(E_Comp_Win *cw)
}
static void
_e_mod_comp_show_done(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_mod_comp_show_done(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Comp_Win *cw = data;
_e_mod_comp_done_defer(cw);
}
static void
_e_mod_comp_hide_done(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_mod_comp_hide_done(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Comp_Win *cw = data;
_e_mod_comp_done_defer(cw);
@ -2032,7 +2032,7 @@ _e_mod_comp_win_reshape(E_Comp_Win *cw)
//////////////////////////////////////////////////////////////////////////
static Eina_Bool
_e_mod_comp_create(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_create(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Create *ev = event;
E_Comp_Win *cw;
@ -2047,7 +2047,7 @@ _e_mod_comp_create(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_destroy(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_destroy(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Destroy *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
@ -2058,7 +2058,7 @@ _e_mod_comp_destroy(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_show(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Show *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
@ -2069,7 +2069,7 @@ _e_mod_comp_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Hide *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
@ -2080,7 +2080,7 @@ _e_mod_comp_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_reparent(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_reparent(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Reparent *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
@ -2092,7 +2092,7 @@ _e_mod_comp_reparent(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_configure(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_configure(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Configure *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
@ -2124,7 +2124,7 @@ _e_mod_comp_configure(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_stack(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_stack(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Stack *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
@ -2135,14 +2135,14 @@ _e_mod_comp_stack(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_property(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
Ecore_X_Event_Window_Property *ev = event;
// Ecore_X_Event_Window_Property *ev = event;
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_e_mod_comp_message(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_message(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Client_Message *ev = event;
E_Comp_Win *cw = NULL;
@ -2174,7 +2174,7 @@ _e_mod_comp_message(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_shape(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_shape(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Shape *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
@ -2185,7 +2185,7 @@ _e_mod_comp_shape(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_damage(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_damage(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Damage *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_damage_find(ev->damage);
@ -2197,7 +2197,7 @@ _e_mod_comp_damage(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_damage_win(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_damage_win(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Window_Damage *ev = event;
Eina_List *l;
@ -2218,7 +2218,7 @@ _e_mod_comp_damage_win(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_randr(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
_e_mod_comp_randr(void *data __UNUSED__, int type __UNUSED__, __UNUSED__ void *event)
{
Eina_List *l;
E_Comp *c;
@ -2231,7 +2231,7 @@ _e_mod_comp_randr(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *e
}
static Eina_Bool
_e_mod_comp_bd_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_add(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Add *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2241,7 +2241,7 @@ _e_mod_comp_bd_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_del(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Remove *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2251,7 +2251,7 @@ _e_mod_comp_bd_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_show(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Show *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2262,7 +2262,7 @@ _e_mod_comp_bd_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Hide *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2273,7 +2273,7 @@ _e_mod_comp_bd_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_move(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Move *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2283,7 +2283,7 @@ _e_mod_comp_bd_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_resize(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Resize *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2293,7 +2293,7 @@ _e_mod_comp_bd_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_iconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_iconify(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Iconify *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2303,7 +2303,7 @@ _e_mod_comp_bd_iconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Uniconify *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2313,7 +2313,7 @@ _e_mod_comp_bd_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void *event
}
static Eina_Bool
_e_mod_comp_bd_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_urgent_change(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Urgent_Change *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2326,7 +2326,7 @@ _e_mod_comp_bd_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, void *e
}
static Eina_Bool
_e_mod_comp_bd_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_In *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2336,7 +2336,7 @@ _e_mod_comp_bd_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_mod_comp_bd_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_Out *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2346,7 +2346,7 @@ _e_mod_comp_bd_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event
}
static Eina_Bool
_e_mod_comp_bd_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_bd_property(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Property *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
@ -2358,7 +2358,7 @@ _e_mod_comp_bd_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
//////////////////////////////////////////////////////////////////////////
static Eina_Bool
_e_mod_comp_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_comp_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev = event;
@ -2382,21 +2382,21 @@ _e_mod_comp_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
//////////////////////////////////////////////////////////////////////////
static Evas *
_e_mod_comp_evas_get_func(void *data, E_Manager *man)
_e_mod_comp_evas_get_func(void *data, E_Manager *man __UNUSED__)
{
E_Comp *c = data;
return c->evas;
}
static void
_e_mod_comp_update_func(void *data, E_Manager *man)
_e_mod_comp_update_func(void *data, E_Manager *man __UNUSED__)
{
E_Comp *c = data;
_e_mod_comp_render_queue(c);
}
static const Eina_List *
_e_mod_comp_src_list_get_func(void *data, E_Manager *man)
_e_mod_comp_src_list_get_func(void *data, E_Manager *man __UNUSED__)
{
E_Comp *c = data;
E_Comp_Win *cw;
@ -2417,45 +2417,45 @@ _e_mod_comp_src_list_get_func(void *data, E_Manager *man)
}
static Evas_Object *
_e_mod_comp_src_image_get_func(void *data, E_Manager *man, E_Manager_Comp_Source *src)
_e_mod_comp_src_image_get_func(void *data __UNUSED__, E_Manager *man __UNUSED__, E_Manager_Comp_Source *src)
{
E_Comp *c = data;
// E_Comp *c = data;
E_Comp_Win *cw = (E_Comp_Win *)src;
if (!cw->c) return NULL;
return cw->obj;
}
static Evas_Object *
_e_mod_comp_src_shadow_get_func(void *data, E_Manager *man, E_Manager_Comp_Source *src)
_e_mod_comp_src_shadow_get_func(void *data __UNUSED__, E_Manager *man __UNUSED__, E_Manager_Comp_Source *src)
{
E_Comp *c = data;
// E_Comp *c = data;
E_Comp_Win *cw = (E_Comp_Win *)src;
if (!cw->c) return NULL;
return cw->shobj;
}
static Evas_Object *
_e_mod_comp_src_image_mirror_add_func(void *data, E_Manager *man, E_Manager_Comp_Source *src)
_e_mod_comp_src_image_mirror_add_func(void *data __UNUSED__, E_Manager *man __UNUSED__, E_Manager_Comp_Source *src)
{
E_Comp *c = data;
// E_Comp *c = data;
E_Comp_Win *cw = (E_Comp_Win *)src;
if (!cw->c) return NULL;
return _e_mod_comp_win_mirror_add(cw);
}
static Eina_Bool
_e_mod_comp_src_visible_get_func(void *data, E_Manager *man, E_Manager_Comp_Source *src)
_e_mod_comp_src_visible_get_func(void *data __UNUSED__, E_Manager *man __UNUSED__, E_Manager_Comp_Source *src)
{
E_Comp *c = data;
// E_Comp *c = data;
E_Comp_Win *cw = (E_Comp_Win *)src;
if (!cw->c) return 0;
return cw->visible;
}
static void
_e_mod_comp_src_hidden_set_func(void *data, E_Manager *man, E_Manager_Comp_Source *src, Eina_Bool hidden)
_e_mod_comp_src_hidden_set_func(void *data __UNUSED__, E_Manager *man __UNUSED__, E_Manager_Comp_Source *src, Eina_Bool hidden)
{
E_Comp *c = data;
// E_Comp *c = data;
E_Comp_Win *cw = (E_Comp_Win *)src;
if (!cw->c) return;
if (!cw->hidden_override == hidden) return;
@ -2473,9 +2473,9 @@ _e_mod_comp_src_hidden_set_func(void *data, E_Manager *man, E_Manager_Comp_Sourc
}
static Eina_Bool
_e_mod_comp_src_hidden_get_func(void *data, E_Manager *man, E_Manager_Comp_Source *src)
_e_mod_comp_src_hidden_get_func(void *data __UNUSED__, E_Manager *man __UNUSED__, E_Manager_Comp_Source *src)
{
E_Comp *c = data;
// E_Comp *c = data;
E_Comp_Win *cw = (E_Comp_Win *)src;
if (!cw->c) return 0;
return cw->hidden_override;

23
src/modules/comp/e_mod_config.c
View File

@ -189,9 +189,8 @@ _match_free(Match_Config *m)
}
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_Demo_Style_Item *ds_it;
Match_Config *m;
_comp_mod->config_dialog = NULL;
@ -216,7 +215,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
static void
_shadow_changed(void *data, Evas_Object *obj, void *event_info)
_shadow_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
Evas_Object *orec0;
@ -279,7 +278,7 @@ _style_demo(void *data)
}
static void
_style_selector_del(void *data, Evas *e, Evas_Object *o, void *event_info)
_style_selector_del(void *data __UNUSED__, Evas *e, Evas_Object *o, void *event_info __UNUSED__)
{
Eina_List *style_shadows, *style_list;
Ecore_Timer *timer;
@ -410,10 +409,10 @@ _style_selector(Evas *evas, int use_shadow, const char **source)
}
static void
_match_sel(void *data)
_match_sel(void *data __UNUSED__)
{
Match_Config *m = data;
E_Config_Dialog *cfd = m->cfd;
// Match_Config *m = data;
// E_Config_Dialog *cfd = m->cfd;
}
const char *
@ -540,7 +539,7 @@ _edit_ok(void *d1, void *d2)
}
static void
_create_edit_frame(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata, Match_Config *m)
_create_edit_frame(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata, Match_Config *m)
{
Evas_Object *tab, *of, *oi, *lb, *en, *bt, *tb, *tab2, *o, *sf, *li;
E_Radio_Group *rg;
@ -901,7 +900,7 @@ _but_edit(void *d1, void *d2)
}
static Evas_Object *
_create_match_editor(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata, Eina_List **matches, Evas_Object **il_ret)
_create_match_editor(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__, Eina_List **matches, Evas_Object **il_ret)
{
Evas_Object *tab, *il, *bt;
Match_Config *m;
@ -972,10 +971,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
{
Evas_Object *ob, *ol, *ol2, *of, *otb, *oi, *orec0, *tab;
E_Radio_Group *rg;
Eina_List *styles, *l;
char *style;
int n, sel;
Evas_Coord wmw, wmh;
orec0 = evas_object_rectangle_add(evas);
evas_object_name_set(orec0, "style_shadows");
@ -1146,7 +1141,7 @@ _match_dup2(Match_Config *m2, Match *m)
}
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
if ((cfdata->use_shadow != _comp_mod->conf->use_shadow) ||
(cfdata->lock_fps != _comp_mod->conf->lock_fps) ||

10
src/modules/comp/e_mod_main.c
View File

@ -3,7 +3,7 @@
#include "e_mod_config.h"
#include "e_mod_comp.h"
static Ecore_Event_Handler *init_done_handler = NULL;
//static Ecore_Event_Handler *init_done_handler = NULL;
//static int
//_e_init_done(void *data, int type, void *event)
@ -38,9 +38,11 @@ e_modapi_init(E_Module *m)
mod->module = m;
snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", e_module_dir_get(m));
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL, buf, e_int_config_comp_module);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance");
e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL,
buf, e_int_config_comp_module);
mod->conf_match_edd = E_CONFIG_DD_NEW("Comp_Match", Match);
#undef T
#undef D