From 958acfc1bd618d2a38ae414f07abcf8b0cdd9965 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 24 Jun 2016 13:41:51 +0900 Subject: [PATCH] Fix coding style Change-Id: I5aaec800de5f05182acf0303e67fd293d560b07e --- im_setting_list/input_method_setting_list.cpp | 7 ++-- .../input_method_setting_list_popup_view.cpp | 7 ++-- .../input_method_setting_list_ui.cpp | 34 ++++++------------- .../input_method_setting_selector_ui.cpp | 7 ++-- 4 files changed, 16 insertions(+), 39 deletions(-) diff --git a/im_setting_list/input_method_setting_list.cpp b/im_setting_list/input_method_setting_list.cpp index 7e59197..894df99 100644 --- a/im_setting_list/input_method_setting_list.cpp +++ b/im_setting_list/input_method_setting_list.cpp @@ -58,12 +58,9 @@ app_control(app_control_h app_control, void *data) res = app_control_get_extra_data(app_control, "caller", &type); if (APP_CONTROL_ERROR_NONE == res && NULL != type) { - if (strcmp(type, "settings") == 0) - { + if (strcmp(type, "settings") == 0) { ad->app_type = APP_TYPE_SETTING; - } - else if (strcmp(type, "settings_no_rotation") == 0) - { + } else if (strcmp(type, "settings_no_rotation") == 0) { ad->app_type = APP_TYPE_SETTING_NO_ROTATION; } } diff --git a/im_setting_list/input_method_setting_list_popup_view.cpp b/im_setting_list/input_method_setting_list_popup_view.cpp index 8ac7b4d..015442f 100644 --- a/im_setting_list/input_method_setting_list_popup_view.cpp +++ b/im_setting_list/input_method_setting_list_popup_view.cpp @@ -80,12 +80,9 @@ static void im_setting_list_load_active_ime_info(void) for (int i = 0; i < cnt; ++i) { SECURE_LOGD("%s %s %d %d %d\n", info[i].appid, info[i].label, info[i].is_enabled, info[i].is_preinstalled, info[i].has_option); - if (info[i].is_enabled && info[i].is_preinstalled) - { + if (info[i].is_enabled && info[i].is_preinstalled) { active_ime_info_list_preinstall.push_back(info[i]); - } - else if (info[i].is_enabled) - { + } else if (info[i].is_enabled) { active_ime_info_list_user.push_back(info[i]); } } diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp index 42aa708..f588f00 100644 --- a/im_setting_list/input_method_setting_list_ui.cpp +++ b/im_setting_list/input_method_setting_list_ui.cpp @@ -140,24 +140,18 @@ static void im_setting_list_load_ime_info(void) ime_info_s *info = NULL; g_ime_info_list.clear(); int cnt = isf_control_get_all_ime_info(&info); - if (info) - { + if (info) { for (int i = 0; i < cnt; ++i) { SECURE_LOGD("%s %s %d %d %d\n", info[i].appid, info[i].label, info[i].is_enabled, info[i].is_preinstalled, info[i].has_option); - if (info[i].is_preinstalled) - { + if (info[i].is_preinstalled) { ime_info_list_preinstall.push_back(info[i]); - } - else - { + } else { ime_info_list_user.push_back(info[i]); } } free(info); - } - else - { + } else { LOGD("isf_control_get_all_ime_info failed\n"); } im_setting_list_sort_ime_info(ime_info_list_preinstall, ime_info_list_user); @@ -244,8 +238,7 @@ static void _popup_back_cb(void *data, Evas_Object *obj, void *event_info) if (g_gen_item_data[index].chk_status) { im_setting_list_check_popup_cancel_cb(data, NULL, NULL); - } - else { + } else { evas_object_del(cb_data->popup); delete cb_data; } @@ -299,12 +292,9 @@ static void im_setting_list_check_button_change_cb(void *data, Evas_Object *obj, Eina_Bool state = g_gen_item_data[index].chk_status; - if (!state) - { + if (!state) { isf_control_set_enable_ime(g_ime_info_list[index].appid, state); - } - else - { + } else { im_setting_list_show_popup(data, obj, im_setting_list_check_popup_ok_cb, im_setting_list_check_popup_cancel_cb); } } @@ -363,14 +353,11 @@ static void im_setting_list_item_sel_cb(void *data, Evas_Object *obj, void *even } Eina_Bool state = g_gen_item_data[index].chk_status; - if (state) - { + if (state) { g_gen_item_data[index].chk_status = !state; isf_control_set_enable_ime(g_ime_info_list[index].appid, !state); elm_genlist_item_update(item); - } - else - { + } else { im_setting_list_show_popup(data, obj, im_setting_list_popup_ok_cb, im_setting_list_popup_cancel_cb); } } @@ -703,8 +690,7 @@ static void im_setting_list_add_ime(void *data) { if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) { item_data.chk_status = EINA_TRUE; - } - else { + } else { item_data.chk_status = g_ime_info_list[i].is_enabled; } g_gen_item_data.push_back(item_data); diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp index 884ab5f..9d746c2 100755 --- a/im_setting_selector/input_method_setting_selector_ui.cpp +++ b/im_setting_selector/input_method_setting_selector_ui.cpp @@ -123,12 +123,9 @@ static void im_setting_selector_load_ime_info(void) for (int i = 0; i < cnt; ++i) { SECURE_LOGD("%s %s %d %d %d\n", info[i].appid, info[i].label, info[i].is_enabled, info[i].is_preinstalled, info[i].has_option); - if (info[i].is_enabled && info[i].is_preinstalled) - { + if (info[i].is_enabled && info[i].is_preinstalled) { ime_info_list_preinstall.push_back(info[i]); - } - else if (info[i].is_enabled) - { + } else if (info[i].is_enabled) { ime_info_list_user.push_back(info[i]); } } -- 2.34.1