From: Mike Blumenkrantz Date: Wed, 9 Nov 2011 16:13:26 +0000 (+0000) Subject: formatting X-Git-Tag: submit/efl/20131021.015651~5390 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff70c9bda8af73177e5c0e36e33a4a1be5443a93;p=platform%2Fupstream%2Fenlightenment.git formatting SVN revision: 64994 --- diff --git a/src/modules/conf_randr/e_int_config_randr.c b/src/modules/conf_randr/e_int_config_randr.c index 873fe8c..9fa333e 100644 --- a/src/modules/conf_randr/e_int_config_randr.c +++ b/src/modules/conf_randr/e_int_config_randr.c @@ -103,9 +103,6 @@ _dialog_output_dialog_data_new(E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info dialog_data->output = output_info; } return dialog_data; - - free(dialog_data); - return NULL; } static void * diff --git a/src/modules/conf_randr/e_int_config_randr_arrangement.c b/src/modules/conf_randr/e_int_config_randr_arrangement.c index 9a49cb8..eb8d198 100644 --- a/src/modules/conf_randr/e_int_config_randr_arrangement.c +++ b/src/modules/conf_randr/e_int_config_randr_arrangement.c @@ -80,7 +80,7 @@ dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data) Eina_List *iter; E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data; - EINA_LIST_FOREACH (data->output_dialog_data_list, iter, dialog_data) + EINA_LIST_FOREACH(data->output_dialog_data_list, iter, dialog_data) { _dialog_subdialog_arrangement_output_dialog_data_fill(dialog_data); } @@ -108,7 +108,7 @@ dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas) fprintf(stderr, "CONF_RANDR: Arrangement subdialog added (%p).\n", subdialog); //only use information we can restore. - EINA_LIST_FOREACH (e_config_runtime_info->output_dialog_data_list, iter, output_dialog_data) + EINA_LIST_FOREACH(e_config_runtime_info->output_dialog_data_list, iter, output_dialog_data) { if ((!output_dialog_data->crtc && !output_dialog_data->output)) continue; @@ -200,7 +200,7 @@ _dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, lst = evas_object_smart_members_get(obj); //Calc average aspect ratio from all available monitors - EINA_LIST_FOREACH (lst, itr, output) + EINA_LIST_FOREACH(lst, itr, output) { if (output == e_config_runtime_info->gui.subdialogs.arrangement.clipper) continue; output_dialog_data = evas_object_data_get(output, "output_info"); @@ -289,7 +289,7 @@ _dialog_subdialog_arrangement_output_mouse_down_cb(void *data __UNUSED__, Evas * Eina_List *iter; Eina_Bool crtc_selected = EINA_FALSE; - EINA_LIST_FOREACH (evas_object_smart_members_get(evas_object_smart_parent_get(obj)), iter, element) + EINA_LIST_FOREACH(evas_object_smart_members_get(evas_object_smart_parent_get(obj)), iter, element) { if (e_config_runtime_info->gui.subdialogs.arrangement.clipper == obj) continue; if (element != obj) @@ -433,7 +433,7 @@ _dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj) dya = tmp; } //iterate crtc list - EINA_LIST_FOREACH (crtcs, li, crtc) + EINA_LIST_FOREACH(crtcs, li, crtc) { if ((crtc == obj) || (crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper)) continue; evas_object_geometry_get(crtc, &crtc_geo.x, &crtc_geo.y, &crtc_geo.w, &crtc_geo.h); @@ -526,7 +526,7 @@ dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config EINA_SAFETY_ON_NULL_RETURN(cfdata); - EINA_LIST_FREE (cfdata->output_dialog_data_list, dialog_data) + EINA_LIST_FREE(cfdata->output_dialog_data_list, dialog_data) { if (!dialog_data) continue; if (dialog_data->bg) @@ -551,7 +551,7 @@ _dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj) EINA_SAFETY_ON_FALSE_RETURN_VAL((dialog_data = evas_object_data_get(obj, "output_info")), NULL); evas_object_geometry_get(obj, &geo.x, &geo.y, &geo.w, &geo.h); - EINA_LIST_FOREACH (crtcs, iter, crtc) + EINA_LIST_FOREACH(crtcs, iter, crtc) { if ((crtc == obj) || (crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper)) continue; @@ -601,7 +601,7 @@ _dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj) if ((dialog_data->new_pos.x != 0) || (dialog_data->new_pos.y != 0)) { // Find neighbor object we can calculate our own coordinates from - EINA_LIST_FOREACH (neighbors, iter, crtc) + EINA_LIST_FOREACH(neighbors, iter, crtc) { evas_object_geometry_get(crtc, &neighbor_geo.x, &neighbor_geo.y, &neighbor_geo.w, &neighbor_geo.h); if (!(neighbor_info = evas_object_data_get(crtc, "output_info"))) continue; @@ -665,7 +665,7 @@ _dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj) { //Only wander all neighbors recursively, if they can use the current //element as reference for their position - EINA_LIST_FOREACH (neighbors, iter, crtc) + EINA_LIST_FOREACH(neighbors, iter, crtc) { neighbor_info = evas_object_data_get(crtc, "output_info"); if ((neighbor_info->new_pos.x == Ecore_X_Randr_Unset) @@ -695,7 +695,7 @@ dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dia //Create virtual borders around the displayed representations by finding //relative x and y as virtual 0x0 - EINA_LIST_FOREACH (crtcs, iter, crtc) + EINA_LIST_FOREACH(crtcs, iter, crtc) { if (crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper) continue; //Already reset values for upcoming calculation @@ -721,7 +721,7 @@ dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dia e_config_runtime_info->gui.subdialogs.arrangement.relative_zero.y = relz.y; if (top_left) _dialog_subdialog_arrangement_determine_positions_recursive(top_left); - EINA_LIST_FOREACH (crtcs, iter, crtc) + EINA_LIST_FOREACH(crtcs, iter, crtc) { if ((crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper) || !(odd = evas_object_data_get(crtc, "output_info")) || !odd->crtc || ((odd->new_pos.x == Ecore_X_Randr_Unset) || (odd->new_pos.y == Ecore_X_Randr_Unset))) continue; @@ -750,7 +750,7 @@ dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd __UNUSED__ Eina_List *iter; E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, output_dialog_data) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, output_dialog_data) { if ((output_dialog_data->previous_pos.x != output_dialog_data->new_pos.x) || (output_dialog_data->previous_pos.y != output_dialog_data->new_pos.y) @@ -767,7 +767,7 @@ dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (!odd->crtc || ((odd->new_pos.x == Ecore_X_Randr_Unset) || (odd->new_pos.y == Ecore_X_Randr_Unset))) continue; odd->previous_pos.x = odd->new_pos.x; @@ -785,7 +785,7 @@ dialog_subdialog_arrangement_discard_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (!odd->crtc || ((odd->previous_pos.x == Ecore_X_Randr_Unset) || (odd->previous_pos.y == Ecore_X_Randr_Unset))) continue; if (ecore_x_randr_crtc_pos_set(cfdata->manager->root, odd->crtc->xid, odd->previous_pos.x, odd->previous_pos.y)) diff --git a/src/modules/conf_randr/e_int_config_randr_orientation.c b/src/modules/conf_randr/e_int_config_randr_orientation.c index e3aeed3..eda1746 100644 --- a/src/modules/conf_randr/e_int_config_randr_orientation.c +++ b/src/modules/conf_randr/e_int_config_randr_orientation.c @@ -41,7 +41,7 @@ dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata) if (!cfdata || !cfdata->output_dialog_data_list) return EINA_FALSE; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { ci = odd->crtc; if (!ci || !ci->current_mode) continue; @@ -312,7 +312,7 @@ dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (!odd || ((int)odd->previous_orientation == Ecore_X_Randr_Unset)) continue; odd->previous_orientation = odd->new_orientation; @@ -328,7 +328,7 @@ dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (!odd->crtc || ((int)odd->previous_orientation == Ecore_X_Randr_Unset)) continue; if (ecore_x_randr_crtc_orientation_set(cfdata->manager->root, odd->crtc->xid, odd->previous_orientation)) diff --git a/src/modules/conf_randr/e_int_config_randr_policies.c b/src/modules/conf_randr/e_int_config_randr_policies.c index 593f1c2..c646427 100644 --- a/src/modules/conf_randr/e_int_config_randr_policies.c +++ b/src/modules/conf_randr/e_int_config_randr_policies.c @@ -43,7 +43,7 @@ dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_config_runtime_inf if (!e_config_runtime_info || !e_config_runtime_info->output_dialog_data_list) return EINA_FALSE; - EINA_LIST_FOREACH (e_config_runtime_info->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(e_config_runtime_info->output_dialog_data_list, iter, odd) { E_Randr_Output_Info *oi; if (odd->crtc) @@ -279,7 +279,7 @@ dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (!odd || ((int)odd->previous_policy == Ecore_X_Randr_Unset)) continue; odd->previous_policy = odd->new_policy; @@ -295,7 +295,7 @@ dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (!odd->crtc || ((int)odd->previous_policy == Ecore_X_Randr_Unset)) continue; odd->new_policy = odd->previous_policy; diff --git a/src/modules/conf_randr/e_int_config_randr_resolutions.c b/src/modules/conf_randr/e_int_config_randr_resolutions.c index 63c377c..3b60459 100644 --- a/src/modules/conf_randr/e_int_config_randr_resolutions.c +++ b/src/modules/conf_randr/e_int_config_randr_resolutions.c @@ -36,7 +36,7 @@ dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata) if (!cfdata || !cfdata->output_dialog_data_list) return EINA_FALSE; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (odd->previous_mode || odd->preferred_mode) { @@ -103,7 +103,7 @@ dialog_subdialog_resolutions_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dia fprintf(stderr, "CONF_RANDR: Trying to find a CRTC for output %x, %d crtcs are possible.\n", output_dialog_data->output->xid, eina_list_count(output_dialog_data->output->possible_crtcs)); output = &output_dialog_data->output->xid; noutputs = 1; - EINA_LIST_FOREACH (output_dialog_data->output->possible_crtcs, iter, crtc_iter) + EINA_LIST_FOREACH(output_dialog_data->output->possible_crtcs, iter, crtc_iter) { if (!crtc_iter->outputs) { @@ -189,7 +189,7 @@ dialog_subdialog_resolutions_update_list(Evas_Object *crtc) else modelist = output_dialog_data->output->modes; } - EINA_LIST_FOREACH (modelist, iter, mode_info) + EINA_LIST_FOREACH(modelist, iter, mode_info) { //calculate refresh rate if (!mode_info) continue; @@ -230,7 +230,7 @@ dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { if (odd && odd->new_mode && (odd->new_mode != odd->previous_mode)) { @@ -248,7 +248,7 @@ dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata) if (!cfdata) return; - EINA_LIST_FOREACH (cfdata->output_dialog_data_list, iter, odd) + EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) { //for now, there is no way to redisable an output during discartion if (!odd->crtc || !odd->previous_mode) continue;