stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=47859e8bae300b458ba843c75a8b3ba5b3786b9b
commit 47859e8bae300b458ba843c75a8b3ba5b3786b9b Author: Elyes HAOUAS <[email protected]> Date: Wed May 13 19:26:50 2020 +0000 tree-wide: get rid of trailing whitespace (part 7) Remove trailing whitespaces Reviewed-by: Stefan Schmidt <[email protected]> Differential Revision: https://phab.enlightenment.org/D11827 --- src/modules/conf_paths/e_mod_main.c | 16 ++++----- .../e_int_config_powermanagement.c | 16 ++++----- src/modules/conf_performance/e_mod_main.c | 2 +- src/modules/conf_randr/e_int_config_randr2.c | 2 +- src/modules/conf_randr/e_mod_main.c | 4 +-- src/modules/conf_shelves/e_int_config_shelf.c | 2 +- src/modules/conf_shelves/e_mod_main.c | 14 ++++---- src/modules/conf_theme/e_int_config_borders.c | 2 +- src/modules/conf_theme/e_int_config_fonts.c | 4 +-- src/modules/conf_theme/e_int_config_scale.c | 42 +++++++++++----------- 10 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c index 7d3f4e501..6d6879221 100644 --- a/src/modules/conf_paths/e_mod_main.c +++ b/src/modules/conf_paths/e_mod_main.c @@ -14,15 +14,15 @@ E_API E_Module_Api e_modapi = E_API void * e_modapi_init(E_Module *m) { - e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, + e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); - e_configure_registry_item_add("advanced/search_directories", 50, - _("Search Directories"), NULL, - "preferences-directories", + e_configure_registry_item_add("advanced/search_directories", 50, + _("Search Directories"), NULL, + "preferences-directories", e_int_config_paths); e_configure_registry_item_add("advanced/environment_variables", 120, - _("Environment Variables"), NULL, - "preferences-variables", + _("Environment Variables"), NULL, + "preferences-variables", e_int_config_env); conf_module = m; @@ -34,9 +34,9 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; - while ((cfd = e_config_dialog_get("E", "advanced/environment_variables"))) + while ((cfd = e_config_dialog_get("E", "advanced/environment_variables"))) e_object_del(E_OBJECT(cfd)); - while ((cfd = e_config_dialog_get("E", "advanced/search_directories"))) + while ((cfd = e_config_dialog_get("E", "advanced/search_directories"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("advanced/environment_variables"); e_configure_registry_item_del("advanced/search_directories"); diff --git a/src/modules/conf_performance/e_int_config_powermanagement.c b/src/modules/conf_performance/e_int_config_powermanagement.c index 8b3e14d13..ab879f853 100644 --- a/src/modules/conf_performance/e_int_config_powermanagement.c +++ b/src/modules/conf_performance/e_int_config_powermanagement.c @@ -111,14 +111,14 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data Evas_Object *ob, *ol; E_Radio_Group *rmin, *rmax; int y; - + cfdata->powersave_min = e_config->powersave.min; cfdata->powersave_max = e_config->powersave.max; rmin = e_widget_radio_group_new((int*) &(cfdata->powersave_min)); rmax = e_widget_radio_group_new((int*) &(cfdata->powersave_max)); ol = e_widget_table_add(e_win_evas_win_get(evas), 0); - + y = 0; ob = e_widget_label_add(evas, _("Levels Allowed")); @@ -139,7 +139,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data 0.5, 0.5 //align ); - + y++; ob = e_widget_label_add(evas, _("Min")); e_widget_table_object_align_append(ol, ob, @@ -176,7 +176,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data 0.5, 0.5 //align ); y++; - + ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_NONE, rmin); e_widget_table_object_align_append(ol, ob, 0, y, //place @@ -215,7 +215,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data 0.5, 0.5 //align ); y++; - + ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_LOW, rmin); e_widget_table_object_align_append(ol, ob, 0, y, //place @@ -254,7 +254,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data 0.0, 0.5 //align ); y++; - + ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_MEDIUM, rmin); e_widget_table_object_align_append(ol, ob, 0, y, //place @@ -293,7 +293,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data 0.0, 0.5 //align ); y++; - + ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_HIGH, rmin); e_widget_table_object_align_append(ol, ob, 0, y, //place @@ -332,7 +332,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data 0.0, 0.5 //align ); y++; - + ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_EXTREME, rmin); e_widget_table_object_align_append(ol, ob, 0, y, //place diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c index c7c88c6bb..139e4e596 100644 --- a/src/modules/conf_performance/e_mod_main.c +++ b/src/modules/conf_performance/e_mod_main.c @@ -15,7 +15,7 @@ E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); - e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance); + e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance); e_configure_registry_item_add("advanced/powermanagement", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_powermanagement); conf_module = m; return m; diff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c index 5c3bdd109..1698e3b1e 100644 --- a/src/modules/conf_randr/e_int_config_randr2.c +++ b/src/modules/conf_randr/e_int_config_randr2.c @@ -474,7 +474,7 @@ _basic_screen_info_fill(E_Config_Dialog_Data *cfdata, E_Config_Randr2_Screen *cs { elm_check_state_set(cfdata->scale_custom_obj, EINA_TRUE); elm_object_disabled_set(cfdata->scale_value_obj, EINA_FALSE); - elm_slider_value_set(cfdata->scale_value_obj, + elm_slider_value_set(cfdata->scale_value_obj, _scale_for_multiplier(cs->scale_multiplier)); } else diff --git a/src/modules/conf_randr/e_mod_main.c b/src/modules/conf_randr/e_mod_main.c index 7667be912..b3500feb8 100644 --- a/src/modules/conf_randr/e_mod_main.c +++ b/src/modules/conf_randr/e_mod_main.c @@ -31,12 +31,12 @@ E_API void * e_modapi_init(E_Module *m) { /* create Screen configuration category - * + * * NB: If the category already exists, this function just returns */ e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display"); - /* add the randr dialog to the screen category and provide + /* add the randr dialog to the screen category and provide * the configure category with the function to call */ e_configure_registry_item_add("screen/screen_setup", 20, _("Screen Setup"), NULL, "preferences-system-screen-resolution", diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index aa14e7351..8482639b8 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -123,7 +123,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data E_Zone *zone; e_dialog_resizable_set(cfd->dia, 1); - + ol = e_widget_list_add(evas, 0, 0); zone = e_zone_current_get(); snprintf(buf, sizeof(buf), _("Configured Shelves: Display %d"), zone->num); diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c index 98cfca910..074a3d605 100644 --- a/src/modules/conf_shelves/e_mod_main.c +++ b/src/modules/conf_shelves/e_mod_main.c @@ -18,13 +18,13 @@ E_API E_Module_Api e_modapi = E_API void * e_modapi_init(E_Module *m) { - e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, + e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions"); - e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, - "preferences-desktop-shelf", + e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, + "preferences-desktop-shelf", e_int_config_shelf); - maug = - e_int_menus_menu_augmentation_add_sorted("config/1", _("Shelves"), + maug = + e_int_menus_menu_augmentation_add_sorted("config/1", _("Shelves"), _e_mod_menu_add, NULL, NULL, NULL); conf_module = m; @@ -43,7 +43,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) e_int_menus_menu_augmentation_del("config/1", maug); maug = NULL; } - while ((cfd = e_config_dialog_get("E", "extensions/shelves"))) + while ((cfd = e_config_dialog_get("E", "extensions/shelves"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("extensions/shelves"); e_configure_registry_category_del("extensions"); @@ -59,7 +59,7 @@ e_modapi_save(E_Module *m EINA_UNUSED) } /* menu item callback(s) */ -static void +static void _e_mod_run_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("extensions/shelves", NULL, NULL); diff --git a/src/modules/conf_theme/e_int_config_borders.c b/src/modules/conf_theme/e_int_config_borders.c index 173572f7f..8081cbbab 100644 --- a/src/modules/conf_theme/e_int_config_borders.c +++ b/src/modules/conf_theme/e_int_config_borders.c @@ -113,7 +113,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { - Eina_Bool remch = ((cfdata->remember_border && + Eina_Bool remch = ((cfdata->remember_border && !((cfdata->client->remember) && (cfdata->client->remember->apply & E_REMEMBER_APPLY_BORDER))) || (!cfdata->remember_border && cfdata->client && diff --git a/src/modules/conf_theme/e_int_config_fonts.c b/src/modules/conf_theme/e_int_config_fonts.c index 2609fd1d4..1ef71360a 100644 --- a/src/modules/conf_theme/e_int_config_fonts.c +++ b/src/modules/conf_theme/e_int_config_fonts.c @@ -720,7 +720,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_ ob = e_widget_font_preview_add (evas, _("English 012 #!? 日本語 にほんご ソフト 中文 華語 한국")); - + cfdata->gui.preview = ob; e_widget_table_object_append(ot, ob, 0, 2, 3, 1, 1, 0, 1, 0); @@ -920,7 +920,7 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj EINA_UNUSED) icon = e_icon_add(cfdata->evas); e_util_icon_theme_set(icon, "enlightenment"); } - + e_widget_ilist_nth_icon_set(cfdata->gui.class_list, e_widget_ilist_selected_get(cfdata->gui.class_list), icon); } } diff --git a/src/modules/conf_theme/e_int_config_scale.c b/src/modules/conf_theme/e_int_config_scale.c index 72d8ad5ae..77c4093a9 100644 --- a/src/modules/conf_theme/e_int_config_scale.c +++ b/src/modules/conf_theme/e_int_config_scale.c @@ -42,7 +42,7 @@ _scale_preview_sel_set(Evas_Object *ob, int sel) int v; Eina_List *l; E_Config_Dialog_Data *cfdata; - + cfdata = evas_object_data_get(ob, "cfdata"); rc = evas_object_data_get(ob, "rec"); if (sel) @@ -80,7 +80,7 @@ static void _scale_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *ob = data; - + _scale_preview_sel_set(ob, 1); } @@ -91,12 +91,12 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp const char *file; char buf[64]; int v; - + #define SZW 160 #define SZH 100 ob = e_widget_preview_add(e, SZW, SZH); e_widget_preview_vsize_set(ob, SZW, SZH); - + bg = edje_object_add(e_widget_preview_evas_get(ob)); file = e_bg_file_get(0, 0, 0); edje_object_file_set(bg, file, "e/desktop/background"); @@ -104,23 +104,23 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp evas_object_move(bg, 0, 0); evas_object_resize(bg, 640, 480); evas_object_show(bg); - + cm = edje_object_add(e_widget_preview_evas_get(ob)); e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/frame/default"); evas_object_move(cm, 16, 16); evas_object_resize(cm, 180 * sc, 70); evas_object_show(cm); - + bd = edje_object_add(e_widget_preview_evas_get(ob)); e_theme_edje_object_set(bd, "base/theme/borders", "e/widgets/border/default/border"); edje_object_part_swallow(cm, "e.swallow.content", bd); evas_object_show(bd); - + wb = edje_object_add(e_widget_preview_evas_get(ob)); e_theme_edje_object_set(wb, "base/theme/dialog", "e/widgets/dialog/main"); edje_object_part_swallow(bd, "e.swallow.client", wb); evas_object_show(wb); - + rc = evas_object_rectangle_add(e_widget_preview_evas_get(ob)); evas_object_move(rc, 0, 0); evas_object_resize(rc, 640, 480); @@ -136,27 +136,27 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp edje_object_part_text_set(bd, "e.text.title", tit); edje_object_signal_emit(bd, "e,state,focused", "e"); edje_object_signal_emit(bd, "e,state,shadow,on", "e"); - + edje_object_signal_emit(cm, "e,state,visible", "e"); edje_object_signal_emit(cm, "e,state,focus,on", "e"); - + edje_object_scale_set(bd, sc); edje_object_scale_set(cm, sc); edje_object_scale_set(bg, sc); edje_object_scale_set(wb, sc); - + evas_object_data_set(ob, "rec", rc); v = sc * 1000; evas_object_data_set(ob, "scale", (void *)(unsigned long)v); evas_object_data_set(ob, "scalep", scp); evas_object_data_set(ob, "dpi", (void *)(unsigned long)dpi); evas_object_data_set(ob, "cfdata", cfdata); - + evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_DOWN, _scale_down, ob); cfdata->obs = eina_list_append(cfdata->obs, ob); - + return ob; } @@ -243,14 +243,14 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data if ((dpi > 0) && (cfdata->base_dpi > 0)) sc = (double)dpi / (double)cfdata->base_dpi; - + ob = _scale_preview_new(cfdata, evas, sc, &(cfdata->factor), _("DPI Scaling"), EINA_TRUE); e_widget_table_object_align_append(o, ob, 0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5); if (cfdata->use_dpi) _scale_preview_sel_set(ob, 1); - + x = 1; -#define COL 3 +#define COL 3 #define SCALE_OP(v) do { \ ob = _scale_preview_new(cfdata, evas, v, &(cfdata->factor), NULL, EINA_FALSE); \ e_widget_table_object_align_append(o, ob, x, y, 1, 1, 0, 0, 0, 0, 0.5, 0.5); \ @@ -274,7 +274,7 @@ static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Action *a; - + if (cfdata->use_dpi) cfdata->use_mode = 1; else cfdata->use_mode = 0; @@ -296,7 +296,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) a = e_action_find("restart"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); - + return 1; } @@ -385,7 +385,7 @@ static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { E_Action *a; - + cfdata->use_custom = 0; cfdata->use_dpi = 0; if (cfdata->use_mode == 1) @@ -403,10 +403,10 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_win_no_reopen_set(cfd->dia->win, 1); e_remember_update(e_win_client_get(cfd->dia->win)); e_config_save_queue(); - + a = e_action_find("restart"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); - + return 1; } --
