enlightenment
/
enlightenment
6
7
Fork 9
Code Issues 19 Pull Requests Projects Releases Wiki Activity

shorter strings and passes -Wextra

Browse Source 
SVN revision: 46793
devs/princeamd/enlightenment-0.17-elive
Gustavo Sverzut Barbieri 13 years ago
parent d6f07a8672
commit c4c50f8505
4 changed files with 38 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/modules/conf_window_manipulation/e_int_config_window_geometry.c
  2. 25
      src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
  3. 14
      src/modules/conf_window_manipulation/e_int_config_window_stacking.c
  4. 4
      src/modules/conf_window_manipulation/e_mod_main.c

26
src/modules/conf_window_manipulation/e_int_config_window_geometry.c
Unescape View File

@ -74,7 +74,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
}
static void *
_create_data(E_Config_Dialog *cfd)
_create_data(E_Config_Dialog *cfd __UNUSED__)
{
/* Create cfdata - cfdata is a temporary block of config data that this
* dialog will be dealing with while configuring. it will be applied to
@ -88,7 +88,7 @@ _create_data(E_Config_Dialog *cfd)
}
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)
{
resistance_list = eina_list_free(resistance_list);
@ -99,7 +99,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
/**--APPLY--**/
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)
{
/* Actually take our cfdata settings and apply them in real life */
e_config->use_resist = cfdata->use_resist;
@ -119,7 +119,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
/**--GUI--**/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for an advanced dialog */
Evas_Object *o, *ob, *of;
@ -128,33 +128,33 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Resistance"), 0);
resistance_check = e_widget_check_add(evas, _("Resist moving or resizing a window over an obstacle"),
resistance_check = e_widget_check_add(evas, _("Resist obstacles"),
&(cfdata->use_resist));
e_widget_framelist_object_append(of, resistance_check);
ob = e_widget_label_add(evas, _("Resistance between windows:"));
ob = e_widget_label_add(evas, _("Other windows:"));
resistance_list = eina_list_append (resistance_list, ob);
e_widget_disabled_set(ob, !cfdata->use_resist); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0,
NULL, &(cfdata->window_resist), 200);
NULL, &(cfdata->window_resist), 100);
resistance_list = eina_list_append (resistance_list, ob);
e_widget_disabled_set(ob, !cfdata->use_resist); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Resistance at the edge of the screen:"));
ob = e_widget_label_add(evas, _("Edge of the screen:"));
resistance_list = eina_list_append (resistance_list, ob);
e_widget_disabled_set(ob, !cfdata->use_resist); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0,
NULL, &(cfdata->desk_resist), 200);
NULL, &(cfdata->desk_resist), 100);
resistance_list = eina_list_append (resistance_list, ob);
e_widget_disabled_set(ob, !cfdata->use_resist); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Resistance to desktop gadgets:"));
ob = e_widget_label_add(evas, _("Desktop gadgets:"));
resistance_list = eina_list_append (resistance_list, ob);
e_widget_disabled_set(ob, !cfdata->use_resist); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0,
NULL, &(cfdata->gadget_resist), 200);
NULL, &(cfdata->gadget_resist), 100);
resistance_list = eina_list_append (resistance_list, ob);
e_widget_disabled_set(ob, !cfdata->use_resist); // set state from saved config
e_widget_framelist_object_append(of, ob);
@ -173,12 +173,12 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
ob = e_widget_label_add(evas, _("Move by:"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 1, 255, 1, 0, NULL,
&(cfdata->border_keyboard.move.dx), 200);
&(cfdata->border_keyboard.move.dx), 100);
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Resize by:"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 1, 255, 1, 0, NULL,
&(cfdata->border_keyboard.resize.dx), 200);
&(cfdata->border_keyboard.resize.dx), 100);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);

25
src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
Unescape View File

@ -62,7 +62,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
}
static void *
_create_data(E_Config_Dialog *cfd)
_create_data(E_Config_Dialog *cfd __UNUSED__)
{
/* Create cfdata - cfdata is a temporary block of config data that this
* dialog will be dealing with while configuring. it will be applied to
@ -76,7 +76,7 @@ _create_data(E_Config_Dialog *cfd)
}
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)
{
/* Free the cfdata */
E_FREE(cfdata);
@ -84,7 +84,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
/**--APPLY--**/
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)
{
/* Actually take our cfdata settings and apply them in real life */
e_config->maximize_policy =
@ -94,7 +94,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
/* Actually take our cfdata settings and apply them in real life */
e_config->maximize_policy =
@ -107,7 +107,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
/**--GUI--**/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for a basic dialog */
Evas_Object *o, *ob, *of;
@ -131,7 +131,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
}
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for an advanced dialog */
Evas_Object *o, *ob, *of;
@ -166,13 +166,20 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
/* FIXME this should be default imho. no big deal if one resizes
a maximized window by mistake and then it's not maximized
anymore.. people will rather wonder why they cant shade
their window (hannes) */
their window (hannes)
k-s: often this also mean disable such border decoration, so makes sense.
I'd say it makes no sense to move/resize maximized windows :-)
*/
ob = e_widget_check_add(evas, _("Allow manipulation of maximized windows"),
&(cfdata->allow_manip));
e_widget_framelist_object_append(of, ob);
/* FIXME: does this option make any sense? use a shelf that is
above windows in this case! */
ob = e_widget_check_add(evas, _("Automatically move/resize windows on shelf autohide"),
above windows in this case!
k-s: it does, since the shelf may cover window contents. (not big deal)
*/
ob = e_widget_check_add(evas, _("Adjust windows on shelf hide"),
&(cfdata->border_fix_on_shelf_toggle));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);

14
src/modules/conf_window_manipulation/e_int_config_window_stacking.c
Unescape View File

@ -63,7 +63,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
}
static void *
_create_data(E_Config_Dialog *cfd)
_create_data(E_Config_Dialog *cfd __UNUSED__)
{
/* Create cfdata - cfdata is a temporary block of config data that this
* dialog will be dealing with while configuring. it will be applied to
@ -77,7 +77,7 @@ _create_data(E_Config_Dialog *cfd)
}
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)
{
autoraise_list = eina_list_free(autoraise_list);
@ -87,7 +87,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
/**--APPLY--**/
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)
{
/* Actually take our cfdata settings and apply them in real life */
e_config->use_auto_raise = cfdata->use_auto_raise;
@ -97,7 +97,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
/* Actually take our cfdata settings and apply them in real life */
e_config->use_auto_raise = cfdata->use_auto_raise;
@ -111,7 +111,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
/**--GUI--**/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for a basic dialog */
Evas_Object *o, *ob;
@ -130,7 +130,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
}
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for an advanced dialog */
Evas_Object *o, *ob, *of;
@ -147,7 +147,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_disabled_set(ob, !cfdata->use_auto_raise); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.1f sec"), 0.0, 9.9, 0.1, 0,
&(cfdata->auto_raise_delay), NULL, 200);
&(cfdata->auto_raise_delay), NULL, 100);
autoraise_list = eina_list_append (autoraise_list, ob);
e_widget_disabled_set(ob, !cfdata->use_auto_raise); // set state from saved config
e_widget_framelist_object_append(of, ob);

4
src/modules/conf_window_manipulation/e_mod_main.c
Unescape View File

@ -27,7 +27,7 @@ e_modapi_init(E_Module *m)
}
EAPI int
e_modapi_shutdown(E_Module *m)
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "windows/window_geometry"))) e_object_del(E_OBJECT(cfd));
@ -42,7 +42,7 @@ e_modapi_shutdown(E_Module *m)
}
EAPI int
e_modapi_save(E_Module *m)
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

Write Preview
Loading…
Cancel
Save