From b9321c22e0bf1744b7fe2b6fee96215186ff3139 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 20 Nov 2017 20:21:32 +0900 Subject: [PATCH] Remove unused local variables Change-Id: Icbe7870f541f765fc606d1a110667f2bc407ff43 Signed-off-by: Jihoon Kim --- ism/extras/efl_panel/isf_panel_efl.cpp | 9 +++------ ism/src/isf_info_manager.cpp | 18 ++++++++---------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index 980784b..0742b37 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -4580,7 +4580,6 @@ static void slot_update_factory_info (const PanelFactoryInfo &info) SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; String ise_name = info.name; - String ise_icon = info.icon; String old_ise = _info_manager->get_current_ise_name (); #if ISF_BUILD_CANDIDATE_UI @@ -5789,10 +5788,10 @@ static int _find_appid_from_category (const pkgmgrinfo_appinfo_h handle, void *u static void slot_show_helper_ise_list (void) { // Launch IME List application; e.g., org.tizen.inputmethod-setting-list - int ret; char *app_id = NULL; #ifdef HAVE_PKGMGR_INFO pkgmgrinfo_appinfo_filter_h handle; + int ret; if (ime_list_app.length() < 1) { ret = pkgmgrinfo_appinfo_filter_create (&handle); @@ -5826,10 +5825,10 @@ static void slot_show_helper_ise_list (void) static void slot_show_helper_ise_selector (void) { // Launch IME Selector application; e.g., org.tizen.inputmethod-setting-selector - int ret; char *app_id = NULL; #ifdef HAVE_PKGMGR_INFO pkgmgrinfo_appinfo_filter_h handle; + int ret; if (ime_selector_app.length() < 1) { ret = pkgmgrinfo_appinfo_filter_create(&handle); @@ -6481,8 +6480,6 @@ static void slot_run_helper (const String &uuid, const String &config, const Str ISF_SAVE_LOG ("time:%ld pid:%d %s %s uuid(%s)\n", time (0), getpid (), __FILE__, __func__, uuid.c_str ()); - String strConfig = config; - String strDisplay = display; String scim_helper_path; delete_ise_check_pid_alive_timer(); @@ -7459,7 +7456,6 @@ int main (int argc, char *argv []) String config_name = String ("simple"); String display_name = String (); char buf[256] = {0}; - char *lang_str = NULL; #ifdef HAVE_ECOREX Ecore_Event_Handler *xclient_message_handler = NULL; @@ -7697,6 +7693,7 @@ int main (int argc, char *argv []) check_time ("load_config"); #ifdef HAVE_VCONF + char *lang_str; lang_str = vconf_get_str (VCONFKEY_LANGSET); set_language_and_locale (lang_str); if (lang_str) diff --git a/ism/src/isf_info_manager.cpp b/ism/src/isf_info_manager.cpp index 476493b..44b6a02 100644 --- a/ism/src/isf_info_manager.cpp +++ b/ism/src/isf_info_manager.cpp @@ -1610,8 +1610,6 @@ public: void get_ise_language_locale (int client_id, _OUT_ char** data, _OUT_ size_t& len) { SCIM_DEBUG_MAIN (4) << __func__ << "\n"; LOGD (""); - Transaction trans; - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) { HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); @@ -3631,7 +3629,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD (""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); /* If the get_surrounding_text was received when there is no client available, @@ -3650,7 +3648,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD (""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); if (client_info.type == FRONTEND_CLIENT) { @@ -3663,7 +3661,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD (""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); if (client_info.type == FRONTEND_CLIENT) { @@ -3676,7 +3674,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD (""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); if (client_info.type == FRONTEND_CLIENT) { @@ -3929,7 +3927,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD (""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); if (client_info.type == FRONTEND_CLIENT) { @@ -3942,7 +3940,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD (""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); if (client_info.type == FRONTEND_CLIENT) { @@ -3970,7 +3968,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD (""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); if (client_info.type == FRONTEND_CLIENT) { @@ -3983,7 +3981,7 @@ client context helpers: %d, helpers uuid count: %d", LOGD(""); int focused_client; uint32 focused_context; - String focused_uuid = get_focused_context (focused_client, focused_context); + get_focused_context (focused_client, focused_context); ClientInfo client_info = socket_get_client_info (focused_client); if (client_info.type == FRONTEND_CLIENT) { -- 2.7.4