Add UNUSED where needed.

Fix a few harmless warnings about parens.
Fix warnings about comparison between signed and unsigned.



SVN revision: 51443
This commit is contained in:
Christopher Michael 2010-08-19 19:33:23 +00:00
parent d90e5b12b8
commit 7542136e82
8 changed files with 37 additions and 39 deletions

View File

@ -39,20 +39,20 @@ e_mod_illume_config_animation_show(E_Container *con, const char *params __UNUSED
/* local function prototypes */ /* local function prototypes */
static void * static void *
_e_mod_illume_config_animation_create(E_Config_Dialog *cfd) _e_mod_illume_config_animation_create(E_Config_Dialog *cfd __UNUSED__)
{ {
return NULL; return NULL;
} }
static void static void
_e_mod_illume_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_animation_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
if (_anim_change_timer) ecore_timer_del(_anim_change_timer); if (_anim_change_timer) ecore_timer_del(_anim_change_timer);
_anim_change_timer = NULL; _anim_change_timer = NULL;
} }
static Evas_Object * static Evas_Object *
_e_mod_illume_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_animation_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Evas_Object *list, *of, *ow; Evas_Object *list, *of, *ow;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -111,7 +111,7 @@ _e_mod_illume_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia
} }
static void static void
_e_mod_illume_config_animation_change(void *data, Evas_Object *obj, void *event) _e_mod_illume_config_animation_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
{ {
if (_anim_change_timer) ecore_timer_del(_anim_change_timer); if (_anim_change_timer) ecore_timer_del(_anim_change_timer);
_anim_change_timer = _anim_change_timer =
@ -119,7 +119,7 @@ _e_mod_illume_config_animation_change(void *data, Evas_Object *obj, void *event)
} }
static Eina_Bool static Eina_Bool
_e_mod_illume_config_animation_timeout(void *data) _e_mod_illume_config_animation_timeout(void *data __UNUSED__)
{ {
e_config_save_queue(); e_config_save_queue();
_anim_change_timer = NULL; _anim_change_timer = NULL;

View File

@ -7,7 +7,6 @@ static void _e_mod_illume_config_policy_free(E_Config_Dialog *cfd, E_Config_Dial
static Evas_Object *_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _e_mod_illume_config_policy_list_changed(void *data); static void _e_mod_illume_config_policy_list_changed(void *data);
static Eina_Bool _e_mod_illume_config_policy_change_timeout(void *data); static Eina_Bool _e_mod_illume_config_policy_change_timeout(void *data);
static Evas_Object *_e_mod_illume_config_policy_settings_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static Eina_List *_e_mod_illume_config_policy_policies_get(void); static Eina_List *_e_mod_illume_config_policy_policies_get(void);
static void _e_mod_illume_config_policy_policy_free(E_Illume_Policy *p); static void _e_mod_illume_config_policy_policy_free(E_Illume_Policy *p);
@ -16,7 +15,7 @@ Ecore_Timer *_policy_change_timer = NULL;
const char *_policy_name = NULL; const char *_policy_name = NULL;
void void
e_mod_illume_config_policy_show(E_Container *con, const char *params) e_mod_illume_config_policy_show(E_Container *con, const char *params __UNUSED__)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
E_Config_Dialog_View *v; E_Config_Dialog_View *v;
@ -40,20 +39,20 @@ e_mod_illume_config_policy_show(E_Container *con, const char *params)
/* local functions */ /* local functions */
static void * static void *
_e_mod_illume_config_policy_create(E_Config_Dialog *cfd) _e_mod_illume_config_policy_create(E_Config_Dialog *cfd __UNUSED__)
{ {
return NULL; return NULL;
} }
static void static void
_e_mod_illume_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_policy_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
if (_policy_change_timer) ecore_timer_del(_policy_change_timer); if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
_policy_change_timer = NULL; _policy_change_timer = NULL;
} }
static Evas_Object * static Evas_Object *
_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_policy_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Evas_Object *list, *ow; Evas_Object *list, *ow;
Eina_List *policies; Eina_List *policies;
@ -110,7 +109,7 @@ _e_mod_illume_config_policy_list_changed(void *data)
} }
static Eina_Bool static Eina_Bool
_e_mod_illume_config_policy_change_timeout(void *data) _e_mod_illume_config_policy_change_timeout(void *data __UNUSED__)
{ {
e_config_save_queue(); e_config_save_queue();
_policy_change_timer = NULL; _policy_change_timer = NULL;

View File

@ -44,20 +44,20 @@ e_mod_illume_config_windows_show(E_Container *con, const char *params __UNUSED__
/* local function prototypes */ /* local function prototypes */
static void * static void *
_e_mod_illume_config_windows_create(E_Config_Dialog *cfd) _e_mod_illume_config_windows_create(E_Config_Dialog *cfd __UNUSED__)
{ {
return NULL; return NULL;
} }
static void static void
_e_mod_illume_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_windows_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
if (_windows_change_timer) ecore_timer_del(_windows_change_timer); if (_windows_change_timer) ecore_timer_del(_windows_change_timer);
_windows_change_timer = NULL; _windows_change_timer = NULL;
} }
static Evas_Object * static Evas_Object *
_e_mod_illume_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_windows_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Evas_Object *list, *of, *ow; Evas_Object *list, *of, *ow;

View File

@ -110,7 +110,7 @@ e_modapi_init(E_Module *m)
} }
EAPI int EAPI int
e_modapi_shutdown(E_Module *m) e_modapi_shutdown(E_Module *m __UNUSED__)
{ {
E_Illume_Quickpanel *qp; E_Illume_Quickpanel *qp;
@ -142,7 +142,7 @@ e_modapi_shutdown(E_Module *m)
} }
EAPI int EAPI int
e_modapi_save(E_Module *m) e_modapi_save(E_Module *m __UNUSED__)
{ {
return e_mod_illume_config_save(); return e_mod_illume_config_save();
} }

View File

@ -75,7 +75,7 @@ e_mod_policy_init(void)
EINA_LIST_FOREACH(con->zones, zl, zone) EINA_LIST_FOREACH(con->zones, zl, zone)
{ {
E_Illume_Config_Zone *cz; E_Illume_Config_Zone *cz;
Ecore_X_Illume_Mode mode; Ecore_X_Illume_Mode mode = ECORE_X_ILLUME_MODE_SINGLE;
/* check for zone config */ /* check for zone config */
if (!(cz = e_illume_zone_config_get(zone->id))) if (!(cz = e_illume_zone_config_get(zone->id)))

View File

@ -167,13 +167,13 @@ _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__,
{ {
E_Zone *zone; E_Zone *zone;
if (zone = e_util_zone_window_find(ev->win)) if ((zone = e_util_zone_window_find(ev->win)))
{ {
E_Illume_Quickpanel *qp; E_Illume_Quickpanel *qp;
if (qp = e_illume_quickpanel_by_zone_get(zone)) if ((qp = e_illume_quickpanel_by_zone_get(zone)))
{ {
if (ev->data.l[0] == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF) if (ev->data.l[0] == (int)ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF)
_e_mod_quickpanel_hide(qp); _e_mod_quickpanel_hide(qp);
else else
e_mod_quickpanel_show(qp); e_mod_quickpanel_show(qp);
@ -184,11 +184,11 @@ _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__,
{ {
E_Zone *zone; E_Zone *zone;
if (zone = e_util_zone_window_find(ev->win)) if ((zone = e_util_zone_window_find(ev->win)))
{ {
E_Illume_Quickpanel *qp; E_Illume_Quickpanel *qp;
if (qp = e_illume_quickpanel_by_zone_get(zone)) if ((qp = e_illume_quickpanel_by_zone_get(zone)))
{ {
if (qp->visible) if (qp->visible)
_e_mod_quickpanel_hide(qp); _e_mod_quickpanel_hide(qp);
@ -240,7 +240,7 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void
if (!(zone = ev->border->zone)) return ECORE_CALLBACK_PASS_ON; if (!(zone = ev->border->zone)) return ECORE_CALLBACK_PASS_ON;
/* if this border should be on a different zone, get requested zone */ /* if this border should be on a different zone, get requested zone */
if (zone->num != ev->border->client.illume.quickpanel.zone) if ((int)zone->num != ev->border->client.illume.quickpanel.zone)
{ {
E_Container *con; E_Container *con;
int zn = 0; int zn = 0;
@ -291,7 +291,7 @@ _e_mod_quickpanel_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, v
if (!(zone = ev->border->zone)) return ECORE_CALLBACK_PASS_ON; if (!(zone = ev->border->zone)) return ECORE_CALLBACK_PASS_ON;
/* if this border should be on a different zone, get requested zone */ /* if this border should be on a different zone, get requested zone */
if (zone->num != ev->border->client.illume.quickpanel.zone) if ((int)zone->num != ev->border->client.illume.quickpanel.zone)
{ {
E_Container *con; E_Container *con;
int zn = 0; int zn = 0;

View File

@ -41,20 +41,20 @@ e_mod_illume_config_select_window(E_Illume_Select_Window_Type type)
} }
static void * static void *
_e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd) _e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd __UNUSED__)
{ {
return NULL; return NULL;
} }
static void static void
_e_mod_illume_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_select_window_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
if (_sw_change_timer) ecore_timer_del(_sw_change_timer); if (_sw_change_timer) ecore_timer_del(_sw_change_timer);
_sw_change_timer = NULL; _sw_change_timer = NULL;
} }
static Evas_Object * static Evas_Object *
_e_mod_illume_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _e_mod_illume_config_select_window_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Evas_Object *list, *ow; Evas_Object *list, *ow;
Eina_List *bds, *l; Eina_List *bds, *l;
@ -71,7 +71,7 @@ _e_mod_illume_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Co
e_widget_ilist_clear(ow); e_widget_ilist_clear(ow);
e_widget_ilist_go(ow); e_widget_ilist_go(ow);
if (bds = e_border_client_list()) if ((bds = e_border_client_list()))
{ {
for (i = 0, l = bds; l; l = l->next, i++) for (i = 0, l = bds; l; l = l->next, i++)
{ {

View File

@ -196,7 +196,7 @@ _policy_border_show_below(E_Border *bd)
if (bd->client.icccm.transient_for) if (bd->client.icccm.transient_for)
{ {
if (prev = e_border_find_by_client_window(bd->client.icccm.transient_for)) if ((prev = e_border_find_by_client_window(bd->client.icccm.transient_for)))
{ {
_policy_border_set_focus(prev); _policy_border_set_focus(prev);
return; return;
@ -440,7 +440,7 @@ _policy_zone_layout_keyboard(E_Border *bd, E_Illume_Config_Zone *cz)
layer = POL_KEYBOARD_LAYER; layer = POL_KEYBOARD_LAYER;
/* set layer if needed */ /* set layer if needed */
if (bd->layer != layer) e_border_layer_set(bd, layer); if ((int)bd->layer != layer) e_border_layer_set(bd, layer);
} }
static void static void
@ -602,7 +602,6 @@ _policy_zone_layout_fullscreen(E_Border *bd)
static void static void
_policy_zone_layout_app_single(E_Border *bd, E_Illume_Config_Zone *cz) _policy_zone_layout_app_single(E_Border *bd, E_Illume_Config_Zone *cz)
{ {
E_Border *home;
int ky, kh, ny, nh; int ky, kh, ny, nh;
if ((!bd) || (!cz)) return; if ((!bd) || (!cz)) return;
@ -1028,7 +1027,7 @@ _policy_border_add(E_Border *bd)
E_Border *ind; E_Border *ind;
/* try to get the Indicator on this zone */ /* try to get the Indicator on this zone */
if (ind = e_illume_border_indicator_get(bd->zone)) if ((ind = e_illume_border_indicator_get(bd->zone)))
{ {
/* we have the indicator, hide it if needed */ /* we have the indicator, hide it if needed */
if (ind->visible) e_illume_border_hide(ind); if (ind->visible) e_illume_border_hide(ind);
@ -1063,7 +1062,7 @@ _policy_border_del(E_Border *bd)
E_Border *ind; E_Border *ind;
/* try to get the Indicator on this zone */ /* try to get the Indicator on this zone */
if (ind = e_illume_border_indicator_get(bd->zone)) if ((ind = e_illume_border_indicator_get(bd->zone)))
{ {
/* we have the indicator, show it if needed */ /* we have the indicator, show it if needed */
if (!ind->visible) e_illume_border_show(ind); if (!ind->visible) e_illume_border_show(ind);
@ -1100,7 +1099,7 @@ _policy_border_del(E_Border *bd)
} }
void void
_policy_border_focus_in(E_Border *bd) _policy_border_focus_in(E_Border *bd __UNUSED__)
{ {
// printf("Border focus in: %s\n", bd->client.icccm.name); // printf("Border focus in: %s\n", bd->client.icccm.name);
} }
@ -1121,7 +1120,7 @@ _policy_border_focus_out(E_Border *bd)
{ {
E_Border *parent; E_Border *parent;
if (parent = e_illume_border_parent_get(bd)) if ((parent = e_illume_border_parent_get(bd)))
_policy_border_set_focus(parent); _policy_border_set_focus(parent);
} }
} }
@ -1140,7 +1139,7 @@ _policy_border_activate(E_Border *bd)
if (bd->stolen) return; if (bd->stolen) return;
/* conformant windows hide the softkey */ /* conformant windows hide the softkey */
if (sft = e_illume_border_softkey_get(bd->zone)) if ((sft = e_illume_border_softkey_get(bd->zone)))
{ {
if (e_illume_border_is_conformant(bd)) if (e_illume_border_is_conformant(bd))
{ {
@ -1480,7 +1479,7 @@ _policy_zone_mode_change(E_Zone *zone, Ecore_X_Atom mode)
E_Border *home; E_Border *home;
/* try to get a home window on this zone and remove it */ /* try to get a home window on this zone and remove it */
if (home = e_illume_border_home_get(zone)) if ((home = e_illume_border_home_get(zone)))
ecore_x_e_illume_home_del_send(home->client.win); ecore_x_e_illume_home_del_send(home->client.win);
} }
} }
@ -1576,7 +1575,7 @@ _policy_focus_back(E_Zone *zone)
else else
{ {
/* we've reached the end of the list. Set focus to first */ /* we've reached the end of the list. Set focus to first */
if (b = eina_list_nth(fl, 0)) if ((b = eina_list_nth(fl, 0)))
{ {
_policy_border_set_focus(b); _policy_border_set_focus(b);
break; break;
@ -1621,7 +1620,7 @@ _policy_focus_forward(E_Zone *zone)
else else
{ {
/* we've reached the end of the list. Set focus to first */ /* we've reached the end of the list. Set focus to first */
if (b = eina_list_nth(fl, 0)) if ((b = eina_list_nth(fl, 0)))
{ {
_policy_border_set_focus(b); _policy_border_set_focus(b);
break; break;