From 322ee6146c2c194766985391ffdfa52f9a87f04b Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 8 Aug 2016 11:26:39 +0900 Subject: [PATCH] Fix coding rule detected by coding rule checker Change-Id: I97425a1fd61292916c738d6c265ca8eafb874cd3 Signed-off-by: Jihoon Kim --- src/w-input-selector.cpp | 28 ++++++++++------------------ src/w-input-stt-tos.cpp | 8 +++----- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp index 4760a7a..f08b774 100755 --- a/src/w-input-selector.cpp +++ b/src/w-input-selector.cpp @@ -202,11 +202,9 @@ static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj, string path_ic; if(!strcmp(first_input_type, "input_voice")) { path_ic = path + "images/w_mode_stt_ic.png"; - } - else if(!strcmp(first_input_type, "input_emoticon")) { + } else if (!strcmp(first_input_type, "input_emoticon")) { path_ic = path + "images/Delta_w_mode_emoticon_ic.png"; - } - else if(!strcmp(first_input_type, "input_keyboard")) { + } else if (!strcmp(first_input_type, "input_keyboard")) { path_ic = path + "images/w_mode_keyboard_ic.png"; evas_object_propagate_events_set(btn, EINA_FALSE); } @@ -218,11 +216,9 @@ static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj, string path_ic; if(!strcmp(second_input_type, "input_voice")) { path_ic = path + "images/w_mode_stt_ic.png"; - } - else if(!strcmp(second_input_type, "input_emoticon")) { + } else if (!strcmp(second_input_type, "input_emoticon")) { path_ic = path + "images/Delta_w_mode_emoticon_ic.png"; - } - else if(!strcmp(second_input_type, "input_keyboard")) { + } else if (!strcmp(second_input_type, "input_keyboard")) { path_ic = path + "images/w_mode_keyboard_ic.png"; evas_object_propagate_events_set(btn, EINA_FALSE); } @@ -241,11 +237,9 @@ static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj, evas_object_layer_set(btn, 32000); if(!strcmp(first_input_type, "input_voice")) { evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data); - } - else if(!strcmp(first_input_type, "input_emoticon")) { + } else if (!strcmp(first_input_type, "input_emoticon")) { evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data); - } - else if(!strcmp(first_input_type, "input_keyboard")) { + } else if (!strcmp(first_input_type, "input_keyboard")) { evas_object_propagate_events_set(btn, EINA_FALSE); evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data); } @@ -253,11 +247,9 @@ static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj, evas_object_layer_set(btn, 32000); if(!strcmp(second_input_type, "input_voice")) { evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data); - } - else if(!strcmp(second_input_type, "input_emoticon")) { + } else if (!strcmp(second_input_type, "input_emoticon")) { evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data); - } - else if(!strcmp(second_input_type, "input_keyboard")) { + } else if (!strcmp(second_input_type, "input_keyboard")) { evas_object_propagate_events_set(btn, EINA_FALSE); evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data); } @@ -608,7 +600,7 @@ void _create_genlist_items(void* user_data) itc1->func.content_get = __ise_gl_2button_content_get; itc1->func.state_get = NULL; itc1->func.del = NULL; - }else{ + } else { itc1->item_style = "3button"; itc1->func.text_get = NULL; itc1->func.content_get = __ise_gl_3button_content_get; @@ -726,7 +718,7 @@ void _app_service(app_control_h service, void* user_data) ret = app_control_get_extra_data_array(service, APP_CONTROL_DATA_INPUT_TYPE, &input_type_array, &input_type_array_len); g_input_type_data.input_type_array = input_type_array; g_input_type_data.input_type_array_len = input_type_array_len; - }else{ + } else { ret = app_control_get_extra_data(service, APP_CONTROL_DATA_INPUT_TYPE, &context); if (ret == APP_CONTROL_ERROR_NONE) { if (!strcmp(context, "input_voice")) { diff --git a/src/w-input-stt-tos.cpp b/src/w-input-stt-tos.cpp index 67359d3..3ee5215 100755 --- a/src/w-input-stt-tos.cpp +++ b/src/w-input-stt-tos.cpp @@ -101,8 +101,8 @@ static void __bt_connection_result_cb(app_control_h request, app_control_h reply } } -void launch_bt_connection_popup(App_Data* data){ - +void launch_bt_connection_popup(App_Data* data) +{ PRINTFUNC(DLOG_DEBUG, "Need to launch BT connection popup"); app_control_h app_control; app_control_create(&app_control); @@ -114,7 +114,6 @@ void launch_bt_connection_popup(App_Data* data){ app_control_destroy(app_control); } - Eina_Bool set_tos_N66_agreed(Eina_Bool bSet) { int ret = vconf_set_bool(VCONFKEY_USER_AGREEMENT, bSet); @@ -385,7 +384,7 @@ static void _language_changed_cb(void *_data, Evas_Object *_obj, void *_event_in switch (index) { case 1: - snprintf(body_str, sizeof(body_str), gettext("LDS_IME_BODY_INFORMATION_PROVISION_AGREEMENT_P1_LEGALPHRASE_WC1"), " ","","",""); + snprintf(body_str, sizeof(body_str), gettext("LDS_IME_BODY_INFORMATION_PROVISION_AGREEMENT_P1_LEGALPHRASE_WC1"), " ", "", "", ""); terms = tagging(std::string(body_str)); terms = replaceAll(terms , std::string("\n"), std::string("
")); elm_entry_entry_set(elm_layout_content_get(_obj, "elm.swallow.content"), terms.c_str()); @@ -639,7 +638,6 @@ static void _response_n66_cb(void *data, Evas_Object *obj, void *event_info) static void _n66_language_changed_cb(void *_data, Evas_Object *_obj, void *_event_info) { - } Evas_Object *create_tos_n66_popup(void *data) -- 2.7.4