From b120c24cdad70608a7ea7816109148432dd4b947 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 16 May 2017 16:21:04 +0900 Subject: [PATCH] Fix coding style Change-Id: I939546a2a70e20b9889be92db90afbe9fc78c403 Signed-off-by: Jihoon Kim --- ism/extras/efl_immodule/isf_imf_context.cpp | 3 +- ism/extras/efl_panel/isf_panel_efl.cpp | 14 +++----- ism/extras/efl_panel/isf_panel_utility.cpp | 1 - ism/extras/efl_panel/remote_input.cpp | 4 +-- ism/extras/efl_panel/websocketserver.cpp | 5 +-- ism/extras/gtk2_immodule/gtkimcontextscim.cpp | 2 -- ism/extras/kbd_mode_changer/main.cpp | 2 +- ism/modules/config/scim_simple_config.cpp | 1 - ism/modules/frontend/scim_socket_frontend.cpp | 37 ---------------------- ism/modules/imengine/scim_socket_imengine.cpp | 2 -- .../ecore_socket_panel_agent_module.cpp | 20 +----------- .../socket_config_server_panel_agent_module.cpp | 19 ----------- .../wayland/wayland_panel_agent_module.cpp | 1 - ism/src/isf_panel_agent_base.cpp | 4 +-- ism/src/isf_panel_agent_manager.h | 2 +- ism/src/isf_panel_agent_module.h | 1 - ism/src/isf_remote_client.cpp | 2 +- ism/src/scim_backend.cpp | 2 -- ism/src/scim_config_base.cpp | 1 - ism/src/scim_helper.cpp | 4 +-- ism/src/scim_helper_module.cpp | 1 - ism/src/scim_private.cpp | 1 - ism/src/scim_socket.cpp | 1 - ism/src/scim_transaction.cpp | 5 --- ism/src/scim_utility.cpp | 2 -- 25 files changed, 16 insertions(+), 121 deletions(-) diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp index 90b6afe..8575368 100644 --- a/ism/extras/efl_immodule/isf_imf_context.cpp +++ b/ism/extras/efl_immodule/isf_imf_context.cpp @@ -737,7 +737,7 @@ static Eina_Bool analyze_surrounding_text (Ecore_IMF_Context *ctx) { char *plain_str = NULL; - Eina_Unicode puncs[] = {'\n','.', '!', '?', 0x00BF /* ¿ */, 0x00A1 /* ¡ */, + Eina_Unicode puncs[] = {'\n', '.', '!', '?', 0x00BF /* ¿ */, 0x00A1 /* ¡ */, 0x3002 /* 。 */, 0x06D4 /* Urdu */, 0x0964 /* Hindi */, 0x0589 /* Armenian */, 0x17D4 /* Khmer */, 0x104A /* Myanmar */}; Eina_Unicode *ustr = NULL; @@ -1424,7 +1424,6 @@ isf_imf_context_focus_out (Ecore_IMF_Context *ctx) SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "(" << context_scim->id << ")...\n"; if (context_scim && context_scim->impl && context_scim == _focused_ic) { - WideString wstr = context_scim->impl->preedit_string; LOGD ("ctx : %p\n", ctx); diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index c3af24e..58b2acf 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -815,7 +815,7 @@ static Evas_Object* get_candidate (const String& str, Evas_Object *parent, int * tokenize_result = tokenize_tag (sub_splited_string [j], &image_data); if (tokenize_result && _candidate_image_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE && _candidate_text_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE) { _candidate_image [_candidate_image_count] = elm_image_add (parent); - snprintf (image_key, sizeof (image_key), "%d",_candidate_image_count); + snprintf (image_key, sizeof (image_key), "%d", _candidate_image_count); elm_image_file_set (_candidate_image [_candidate_image_count], image_data.path.c_str (), image_key); elm_image_animated_set (_candidate_image [_candidate_image_count], EINA_TRUE); elm_image_animated_play_set (_candidate_image [_candidate_image_count], EINA_TRUE); @@ -941,7 +941,7 @@ static Evas_Object* get_candidate (const String& str, Evas_Object *parent, int * evas_object_size_hint_weight_set (candidate_object_table_bg_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set (candidate_object_table_bg_rect, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_min_set (candidate_object_table_bg_rect, *total_width, _item_min_height); - elm_table_pack (candidate_object_table, candidate_object_table_bg_rect, 0, 0, *total_width ,_item_min_height); + elm_table_pack (candidate_object_table, candidate_object_table_bg_rect, 0, 0, *total_width, _item_min_height); evas_object_show (candidate_object_table_bg_rect); evas_object_size_hint_align_set (candidate_object_table, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -3648,7 +3648,6 @@ static void set_soft_candidate_geometry (int x, int y, int width, int height) set_keyboard_geometry_atom_info (_app_window, get_ise_geometry()); #endif _info_manager->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0); - } #if ISF_BUILD_CANDIDATE_UI @@ -5935,7 +5934,6 @@ static void slot_accept_connection (int fd) static void slot_close_connection (int fd) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - } /** @@ -6135,7 +6133,7 @@ static void slot_candidate_will_hide_ack (void) static void slot_set_keyboard_mode (int mode) { - LOGD ("slot_set_keyboard_mode called (TOOLBAR_MODE : %d)\n",mode); + LOGD ("slot_set_keyboard_mode called (TOOLBAR_MODE : %d)\n", mode); change_keyboard_mode ((TOOLBAR_MODE_T)mode); } @@ -6312,7 +6310,6 @@ static void slot_run_helper (const String &uuid, const String &config, const Str for (size_t i = 0; i < _ime_info.size (); ++i) { if (_ime_info[i].appid == uuid && _ime_info[i].module_name.length ()) { - if (scim_helper_path != String (SCIM_HELPER_LAUNCHER_PROGRAM)) { /* Check if IME with the same AppID is alive */ int status_ret = aul_app_get_status (uuid.c_str ()); @@ -6646,7 +6643,6 @@ static void change_keyboard_mode (TOOLBAR_MODE_T mode) LOGD ("Succeeded to set vconf key\n"); } #endif - } _config->reload (); } @@ -6956,9 +6952,9 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) ecore_x_e_window_rotation_app_set (elm_win_xwindow_get (_candidate_window), EINA_TRUE); _candidate_angle = (int)ev->data.l[0]; if (_candidate_angle == 90 || _candidate_angle == 270) { - evas_object_resize (_candidate_window, _candidate_land_width,_candidate_land_height_min); + evas_object_resize (_candidate_window, _candidate_land_width, _candidate_land_height_min); } else { - evas_object_resize (_candidate_window, _candidate_port_width,_candidate_port_height_min); + evas_object_resize (_candidate_window, _candidate_port_width, _candidate_port_height_min); } ui_candidate_window_rotate (_candidate_angle); ui_settle_candidate_window (); diff --git a/ism/extras/efl_panel/isf_panel_utility.cpp b/ism/extras/efl_panel/isf_panel_utility.cpp index 73d2464..586782f 100644 --- a/ism/extras/efl_panel/isf_panel_utility.cpp +++ b/ism/extras/efl_panel/isf_panel_utility.cpp @@ -152,7 +152,6 @@ void isf_get_helper_ises_in_languages (const std::vector &lang_list, std lang_name = scim_get_language_name_english (it->first); if (std::find (lang_list.begin (), lang_list.end (), lang_name) != lang_list.end ()) { for (size_t i = 0; i < it->second.size (); i++) { - if (_ime_info[it->second[i]].mode != TOOLBAR_HELPER_MODE) continue; // Avoid to add the same ISE diff --git a/ism/extras/efl_panel/remote_input.cpp b/ism/extras/efl_panel/remote_input.cpp index e898923..e04c1d9 100644 --- a/ism/extras/efl_panel/remote_input.cpp +++ b/ism/extras/efl_panel/remote_input.cpp @@ -86,7 +86,7 @@ static void find_keycode(struct xkb_keymap *keymap, xkb_keycode_t key, void *dat static int keycode_get_from_keysym(struct xkb_keymap *keymap, xkb_keysym_t keysym) { - keycode_map found_keycodes = {0,}; + keycode_map found_keycodes = {0, }; found_keycodes.keysym = keysym; xkb_keymap_key_for_each(keymap, find_keycode, &found_keycodes); @@ -339,7 +339,7 @@ bool Remote_Input::init_uinput_mouse_device() return false; } - if (ioctl(fd_uinput_mouse,UI_DEV_CREATE) < 0) { + if (ioctl(fd_uinput_mouse, UI_DEV_CREATE) < 0) { LOGW ("Fail to create keyboard uinput device\n"); return false; } diff --git a/ism/extras/efl_panel/websocketserver.cpp b/ism/extras/efl_panel/websocketserver.cpp index 0cb911c..f0d53c3 100644 --- a/ism/extras/efl_panel/websocketserver.cpp +++ b/ism/extras/efl_panel/websocketserver.cpp @@ -227,7 +227,6 @@ static int callback_http(struct lws *wsi, if (m != n) /* partial write, adjust */ lseek(pss->fd, m - n, SEEK_CUR); - } while (!lws_send_pipe_choked(wsi)); lws_callback_on_writable(wsi); break; @@ -335,7 +334,7 @@ callback_keyboard(struct lws *wsi, enum lws_callback_reasons reason, void *user, void *in, size_t len) { - LOGD(" %d",reason); + LOGD(" %d", reason); static int last_session_id = 0; const int bufsize = 512; int n = 0; @@ -345,7 +344,6 @@ callback_keyboard(struct lws *wsi, struct per_session_data__keyboard *pss = (struct per_session_data__keyboard *)user; WebSocketServer *agent = WebSocketServer::get_current_instance(); switch (reason) { - case LWS_CALLBACK_ESTABLISHED: pss->session_id = ++last_session_id; LOGD("LWS_CALLBACK_ESTABLISHED : %d", pss->session_id); @@ -444,7 +442,6 @@ void *process_ws_server(void *data) void log_func(int level, const char *line) { LOGD(" "); - } WebSocketServer::WebSocketServer() diff --git a/ism/extras/gtk2_immodule/gtkimcontextscim.cpp b/ism/extras/gtk2_immodule/gtkimcontextscim.cpp index 78c90e3..f72919e 100644 --- a/ism/extras/gtk2_immodule/gtkimcontextscim.cpp +++ b/ism/extras/gtk2_immodule/gtkimcontextscim.cpp @@ -1014,7 +1014,6 @@ gtk_im_context_scim_focus_out (GtkIMContext *context) } if (context_scim && context_scim->impl && context_scim == _focused_ic) { - WideString wstr = context_scim->impl->preedit_string; //sehwan added @@ -2730,7 +2729,6 @@ slot_forward_key_event (IMEngineInstanceBase *si, GdkEventKey gdkevent = keyevent_scim_to_gdk (ic, key, TRUE); if (!_fallback_instance->process_key_event (key) && !gtk_im_context_filter_keypress (GTK_IM_CONTEXT (ic->slave), &gdkevent)) { - // To avoid timing issue, we need emit the signal directly, rather than put the event into the queue. if (_focused_widget) { gboolean result; diff --git a/ism/extras/kbd_mode_changer/main.cpp b/ism/extras/kbd_mode_changer/main.cpp index e5050e6..e2dedc2 100644 --- a/ism/extras/kbd_mode_changer/main.cpp +++ b/ism/extras/kbd_mode_changer/main.cpp @@ -63,7 +63,7 @@ static void app_terminate (void *user_data) EXAPI int main (int argc, char *argv []) { - ui_app_lifecycle_callback_s event_callback = {0,}; + ui_app_lifecycle_callback_s event_callback = {0, }; event_callback.create = app_create; event_callback.terminate = app_terminate; diff --git a/ism/modules/config/scim_simple_config.cpp b/ism/modules/config/scim_simple_config.cpp index 18375ee..1d6246c 100644 --- a/ism/modules/config/scim_simple_config.cpp +++ b/ism/modules/config/scim_simple_config.cpp @@ -92,7 +92,6 @@ public: ~LockAdapter () { eina_lock_release (m_lock); } - }; SimpleConfig::SimpleConfig () diff --git a/ism/modules/frontend/scim_socket_frontend.cpp b/ism/modules/frontend/scim_socket_frontend.cpp index d63cbf1..83da5e9 100644 --- a/ism/modules/frontend/scim_socket_frontend.cpp +++ b/ism/modules/frontend/scim_socket_frontend.cpp @@ -676,7 +676,6 @@ SocketFrontEnd::get_surrounding_text (int id, WideString &text, int &cursor, int if (m_temp_trans.write_to_socket (socket_client) && m_temp_trans.read_from_socket (socket_client, m_socket_timeout)) { - int cmd; uint32 key; uint32 cur; @@ -700,7 +699,6 @@ SocketFrontEnd::get_surrounding_text (int id, WideString &text, int &cursor, int } } return ret; - } bool @@ -750,7 +748,6 @@ SocketFrontEnd::get_selection (int id, WideString &text) if (m_temp_trans.write_to_socket (socket_client) && m_temp_trans.read_from_socket (socket_client, m_socket_timeout)) { - int cmd; uint32 key; @@ -1449,7 +1446,6 @@ SocketFrontEnd::socket_delete_instance (int client_id) SCIM_DEBUG_FRONTEND (2) << " socket_delete_instance.\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " InstanceID (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1509,7 +1505,6 @@ SocketFrontEnd::socket_process_key_event (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (event)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") KeyEvent (" << event.code << "," << event.mask << ").\n"; @@ -1534,7 +1529,6 @@ SocketFrontEnd::socket_move_preedit_caret (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (caret)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") Caret (" << caret << ").\n"; @@ -1557,7 +1551,6 @@ SocketFrontEnd::socket_select_aux (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (item)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") Item (" << item << ").\n"; m_current_instance = (int) siid; @@ -1579,7 +1572,6 @@ SocketFrontEnd::socket_select_candidate (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (item)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") Item (" << item << ").\n"; m_current_instance = (int) siid; @@ -1601,7 +1593,6 @@ SocketFrontEnd::socket_update_lookup_table_page_size (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (size)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") PageSize (" << size << ").\n"; m_current_instance = (int) siid; @@ -1621,7 +1612,6 @@ SocketFrontEnd::socket_lookup_table_page_up (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_lookup_table_page_up.\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1641,7 +1631,6 @@ SocketFrontEnd::socket_lookup_table_page_down (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_lookup_table_page_down.\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1663,7 +1652,6 @@ SocketFrontEnd::socket_set_prediction_allow (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (allow)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1685,7 +1673,6 @@ SocketFrontEnd::socket_set_layout (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (layout)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1707,7 +1694,6 @@ SocketFrontEnd::socket_set_input_hint (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (input_hint)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1729,7 +1715,6 @@ SocketFrontEnd::socket_update_bidi_direction (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (bidi_direction)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1751,7 +1736,6 @@ SocketFrontEnd::socket_update_candidate_item_layout (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (row_items)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") RowSize (" << row_items.size () << ").\n"; m_current_instance = (int) siid; @@ -1773,7 +1757,6 @@ SocketFrontEnd::socket_update_cursor_position (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (cursor_pos)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") New cursor (" << cursor_pos << ").\n"; m_current_instance = (int) siid; @@ -1795,7 +1778,6 @@ SocketFrontEnd::socket_update_displayed_candidate_number (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (number)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") displayed candidate number (" << number << ").\n"; m_current_instance = (int) siid; @@ -1815,7 +1797,6 @@ SocketFrontEnd::socket_candidate_more_window_show (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << __func__ << "\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1835,7 +1816,6 @@ SocketFrontEnd::socket_candidate_more_window_hide (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << __func__ << "\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1857,7 +1837,6 @@ SocketFrontEnd::socket_longpress_candidate (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (index)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") index (" << index << ").\n"; m_current_instance = (int) siid; @@ -1880,7 +1859,6 @@ SocketFrontEnd::socket_set_imdata (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (&imdata, length)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ") length (" << length << ").\n"; m_current_instance = (int) siid; @@ -1905,7 +1883,6 @@ SocketFrontEnd::socket_set_autocapital_type (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (mode)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1925,7 +1902,6 @@ SocketFrontEnd::socket_reset_option (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_reset_option.\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1945,7 +1921,6 @@ SocketFrontEnd::socket_reset (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_reset.\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1965,7 +1940,6 @@ SocketFrontEnd::socket_focus_in (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_focus_in.\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -1985,7 +1959,6 @@ SocketFrontEnd::socket_focus_out (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_focus_out.\n"; if (m_receive_trans.get_data (siid)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -2007,7 +1980,6 @@ SocketFrontEnd::socket_trigger_property (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (property)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -2031,7 +2003,6 @@ SocketFrontEnd::socket_process_helper_event (int /*client_id*/) if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (helper_uuid) && m_receive_trans.get_data (trans)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -2052,7 +2023,6 @@ SocketFrontEnd::socket_update_client_capabilities (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_update_client_capabilities.\n"; if (m_receive_trans.get_data (siid) && m_receive_trans.get_data (cap)) { - SCIM_DEBUG_FRONTEND (3) << " SI (" << siid << ").\n"; m_current_instance = (int) siid; @@ -2065,7 +2035,6 @@ SocketFrontEnd::socket_update_client_capabilities (int /*client_id*/) } } - void SocketFrontEnd::socket_flush_config (int /*client_id*/) { @@ -2089,7 +2058,6 @@ SocketFrontEnd::socket_erase_config (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_erase_config.\n"; if (m_receive_trans.get_data (key)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; if (m_config->erase (key)) @@ -2205,7 +2173,6 @@ SocketFrontEnd::socket_set_config_string (int /*client_id*/) if (m_receive_trans.get_data (key) && m_receive_trans.get_data (value)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; SCIM_DEBUG_FRONTEND (3) << " Value (" << value << ").\n"; @@ -2224,7 +2191,6 @@ SocketFrontEnd::socket_get_config_int (int /*client_id*/) SCIM_DEBUG_FRONTEND (2) << " socket_get_config_int.\n"; if (m_receive_trans.get_data (key)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; int value; @@ -2248,7 +2214,6 @@ SocketFrontEnd::socket_set_config_int (int /*client_id*/) if (m_receive_trans.get_data (key) && m_receive_trans.get_data (value)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; SCIM_DEBUG_FRONTEND (3) << " Value (" << value << ").\n"; @@ -2291,7 +2256,6 @@ SocketFrontEnd::socket_set_config_bool (int /*client_id*/) if (m_receive_trans.get_data (key) && m_receive_trans.get_data (value)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; SCIM_DEBUG_FRONTEND (3) << " Value (" << value << ").\n"; @@ -2381,7 +2345,6 @@ SocketFrontEnd::socket_set_config_vector_string (int /*client_id*/) if (m_receive_trans.get_data (key) && m_receive_trans.get_data (vec)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; if (m_config->write (key, vec)) diff --git a/ism/modules/imengine/scim_socket_imengine.cpp b/ism/modules/imengine/scim_socket_imengine.cpp index 2461590..647bfe7 100644 --- a/ism/modules/imengine/scim_socket_imengine.cpp +++ b/ism/modules/imengine/scim_socket_imengine.cpp @@ -319,7 +319,6 @@ SocketIMEngineGlobal::load_icon (const String &icon) trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY && trans.get_data (&bufptr, filesize) && trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) { - String tempfile; String::size_type pos = icon.rfind (SCIM_PATH_DELIM); @@ -396,7 +395,6 @@ SocketFactory::create_peer_instance (const String &encoding) trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY && trans.get_data (val) && trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) { - si_peer_id = (int) val; } } diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp index dfd7c10..c061a3e 100644 --- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp +++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp @@ -200,7 +200,6 @@ private: m_send_trans.put_data((uint32) context_id); m_send_trans.put_command(SCIM_TRANS_CMD_PANEL_REQUEST_HELP); m_send_trans.write_to_socket(client_socket); - } void request_factory_menu(int client_id, uint32 context_id) { @@ -670,7 +669,6 @@ private: } void get_helper_return_key_disable(int client, uint32 context, const String& uuid, _OUT_ uint32& disabled) { - Socket client_socket(client); LOGD ("client id:%d", client); @@ -1313,7 +1311,6 @@ private: m_send_trans.put_data(nest_trans); m_send_trans.write_to_socket(socket_client); unlock(); - } void socket_helper_key_event(int client, uint32 context, int cmd, KeyEvent& key) { @@ -1447,11 +1444,9 @@ private: m_send_trans.put_data(caret); m_send_trans.write_to_socket(socket_client); unlock(); - } void update_preedit_caret(int client, uint32 focused_context, uint32 caret) { - LOGD ("client id:%d\n", client); Socket socket_client(client); @@ -1463,7 +1458,6 @@ private: m_send_trans.put_data(caret); m_send_trans.write_to_socket(socket_client); unlock(); - } void helper_attach_input_context_and_update_screen(int client, std::vector < std::pair >& helper_ic_index, uint32 current_screen) { @@ -1496,7 +1490,6 @@ private: m_send_trans.put_data(type); m_send_trans.put_data(value); m_send_trans.write_to_socket(client_socket); - } void send_private_command(int client, uint32 focused_context, String command) { @@ -1510,7 +1503,6 @@ private: m_send_trans.put_command(SCIM_TRANS_CMD_SEND_PRIVATE_COMMAND); m_send_trans.put_data(command); m_send_trans.write_to_socket(socket_client); - } void helper_all_update_spot_location(int client, uint32 context_id, String uuid, int x, int y) { @@ -1530,7 +1522,6 @@ private: Socket client_socket(client); m_send_trans.write_to_socket(client_socket); - } void helper_all_update_cursor_position(int client, uint32 context_id, String uuid, int cursor_pos) { @@ -1545,7 +1536,6 @@ private: Socket client_socket(client); m_send_trans.write_to_socket(client_socket); - } void helper_all_update_screen(int client, uint32 context_id, String uuid, int screen) { @@ -1564,7 +1554,6 @@ private: Socket client_socket(client); m_send_trans.write_to_socket(client_socket); - } void set_autocapital_type(int client, uint32 context, String uuid, int mode) { @@ -1838,7 +1827,6 @@ private: continue; } - else if (cmd == SCIM_TRANS_CMD_PANEL_REGISTER_INPUT_CONTEXT) { if (m_recv_trans.get_data(uuid)) { m_info_manager->register_input_context(client_id, context, uuid); @@ -1848,17 +1836,14 @@ private: continue; } - else if (cmd == SCIM_TRANS_CMD_PANEL_REMOVE_INPUT_CONTEXT) { m_info_manager->remove_input_context(client_id, context); continue; } - else if (cmd == SCIM_TRANS_CMD_PANEL_RESET_INPUT_CONTEXT) { m_info_manager->socket_reset_input_context(client_id, context); continue; } - else if (cmd == SCIM_TRANS_CMD_FOCUS_IN) { SCIM_DEBUG_MAIN(4) << " SCIM_TRANS_CMD_FOCUS_IN (" << "client:" << client_id << " context:" << context << ")\n"; @@ -1870,7 +1855,6 @@ private: continue; } - else if (cmd == ISM_TRANS_CMD_TURN_ON_LOG) { uint32 isOn; @@ -1882,7 +1866,6 @@ private: continue; } - else if (cmd == ISM_TRANS_CMD_SHOW_ISF_CONTROL) { m_info_manager->show_isf_panel(client_id); continue; @@ -2853,7 +2836,6 @@ private: LOGD ("PanelAgent::cmd = %d\n", cmd); if (cmd == ISM_TRANS_CMD_GET_ACTIVE_ISE) { - if (m_info_manager->check_privilege_by_sockfd(client_id, IMEMANAGER_PRIVILEGE)) { String default_uuid; m_info_manager->get_active_ise(client_id, default_uuid); @@ -3291,7 +3273,7 @@ private: int i = 0; std::vector::iterator IterPos; - for (IterPos = _read_handler_list.begin (); IterPos != _read_handler_list.end (); ++IterPos,++i) { + for (IterPos = _read_handler_list.begin (); IterPos != _read_handler_list.end (); ++IterPos, ++i) { if (ecore_main_fd_handler_fd_get (_read_handler_list[i]) == client.get_id()) { ::close (client.get_id ()); ecore_main_fd_handler_del (_read_handler_list[i]); diff --git a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp index 74fd7b1..a817cf1 100644 --- a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp +++ b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp @@ -295,13 +295,11 @@ private: _config->flush (); } else if (cmd == SCIM_TRANS_CMD_ERASE_CONFIG) { - String key; SCIM_DEBUG_FRONTEND (2) << " socket_erase_config.\n"; if (m_recv_trans.get_data (key)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; if (m_config_readonly) { LOGW ("sorry config readonly"); @@ -313,7 +311,6 @@ private: break; } } else if (cmd == SCIM_TRANS_CMD_RELOAD_CONFIG) { - SCIM_DEBUG_FRONTEND (2) << " socket_reload_config.\n"; Socket client_socket (client_id); m_send_trans.clear (); @@ -368,7 +365,6 @@ private: if (m_recv_trans.get_data (key) && m_recv_trans.get_data (value)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; SCIM_DEBUG_FRONTEND (3) << " Value (" << value << ").\n"; if (m_config_readonly) { @@ -396,7 +392,6 @@ private: SCIM_DEBUG_FRONTEND (2) << " socket_get_config_int.\n"; if (m_recv_trans.get_data (key)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; int value; @@ -418,7 +413,6 @@ private: } } else if (cmd == SCIM_TRANS_CMD_SET_CONFIG_INT) { - String key; uint32 value; @@ -426,7 +420,6 @@ private: if (m_recv_trans.get_data (key) && m_recv_trans.get_data (value)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; SCIM_DEBUG_FRONTEND (3) << " Value (" << value << ").\n"; if (m_config_readonly) { @@ -445,7 +438,6 @@ private: } } else if (cmd == SCIM_TRANS_CMD_GET_CONFIG_BOOL) { - String key; SCIM_DEBUG_FRONTEND (2) << " socket_get_config_bool.\n"; @@ -472,7 +464,6 @@ private: } } else if (cmd == SCIM_TRANS_CMD_SET_CONFIG_BOOL) { - String key; uint32 value; @@ -480,7 +471,6 @@ private: if (m_recv_trans.get_data (key) && m_recv_trans.get_data (value)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; SCIM_DEBUG_FRONTEND (3) << " Value (" << value << ").\n"; if (m_config_readonly) { @@ -496,7 +486,6 @@ private: LOGW ("wrong format of transaction\n"); break; } - } else if (cmd == SCIM_TRANS_CMD_GET_CONFIG_DOUBLE) { String key; @@ -526,7 +515,6 @@ private: } } else if (cmd == SCIM_TRANS_CMD_SET_CONFIG_DOUBLE) { - String key; String str; @@ -554,7 +542,6 @@ private: } } else if (cmd == SCIM_TRANS_CMD_GET_CONFIG_VECTOR_STRING) { - String key; SCIM_DEBUG_FRONTEND (2) << " socket_get_config_vector_string.\n"; @@ -581,7 +568,6 @@ private: } } else if (cmd == SCIM_TRANS_CMD_SET_CONFIG_VECTOR_STRING) { - String key; std::vector vec; @@ -589,7 +575,6 @@ private: if (m_recv_trans.get_data (key) && m_recv_trans.get_data (vec)) { - SCIM_DEBUG_FRONTEND (3) << " Key (" << key << ").\n"; if (m_config_readonly) { LOGW ("sorry config readonly"); @@ -604,9 +589,7 @@ private: LOGW ("wrong format of transaction\n"); break; } - } else if (cmd == SCIM_TRANS_CMD_GET_CONFIG_VECTOR_INT) { - String key; SCIM_DEBUG_FRONTEND (2) << " socket_get_config_vector_int.\n"; @@ -639,7 +622,6 @@ private: } } else if (cmd == SCIM_TRANS_CMD_SET_CONFIG_VECTOR_INT) { - String key; std::vector vec; @@ -667,7 +649,6 @@ private: LOGW ("wrong format of transaction\n"); break; } - } } diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp index d212002..5b1091e 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -2640,7 +2640,6 @@ _hide_preedit_string (int context, bool update_preedit) void initialize (void) { - LOGD ("Initializing Wayland ISF IMModule...\n"); // Get system language. diff --git a/ism/src/isf_panel_agent_base.cpp b/ism/src/isf_panel_agent_base.cpp index 591445b..fa2da75 100644 --- a/ism/src/isf_panel_agent_base.cpp +++ b/ism/src/isf_panel_agent_base.cpp @@ -493,7 +493,7 @@ void PanelAgentBase::helper_all_update_screen (int client, uint32 context, Strin //socket_helper_commit_string //SCIM_TRANS_CMD_COMMIT_STRING -void PanelAgentBase::commit_string (int client, uint32 context,const WideString& wstr) +void PanelAgentBase::commit_string (int client, uint32 context, const WideString& wstr) { LOGW ("not implemented for %s", m_name.c_str ()); } @@ -582,7 +582,7 @@ void PanelAgentBase::remote_forward_key_event (int client, uint32 context, const LOGW ("not implemented for %s", m_name.c_str ()); } -void PanelAgentBase::remote_commit_string (int client, uint32 context,const WideString& wstr) +void PanelAgentBase::remote_commit_string (int client, uint32 context, const WideString& wstr) { LOGW ("not implemented for %s", m_name.c_str ()); } diff --git a/ism/src/isf_panel_agent_manager.h b/ism/src/isf_panel_agent_manager.h index 80b4a2a..eec8799 100644 --- a/ism/src/isf_panel_agent_manager.h +++ b/ism/src/isf_panel_agent_manager.h @@ -355,7 +355,7 @@ public: void request_ise_hide(int client, uint32 context); void set_autocapital_type(int id, uint32 context_id, String uuid, int mode); void update_ise_geometry(int id, uint32 context_id, uint32 x, uint32 y, uint32 width, uint32 height); - void remote_update_preedit_string (int target_client, uint32 target_context, const WideString str, const WideString commit,const AttributeList &attrs, uint32 caret); + void remote_update_preedit_string (int target_client, uint32 target_context, const WideString str, const WideString commit, const AttributeList &attrs, uint32 caret); void remote_send_key_event (int target_client, uint32 target_context, const KeyEvent &key); void remote_forward_key_event (int target_client, uint32 target_context, const KeyEvent &key); void remote_commit_string (int target_client, uint32 target_context, const WideString& wstr); diff --git a/ism/src/isf_panel_agent_module.h b/ism/src/isf_panel_agent_module.h index 0b90852..3193d2f 100644 --- a/ism/src/isf_panel_agent_module.h +++ b/ism/src/isf_panel_agent_module.h @@ -140,7 +140,6 @@ public: * @return A smart pointer to the PanelAgent object, NULL if failed. */ PanelAgentPointer get_instance () const; - }; /** diff --git a/ism/src/isf_remote_client.cpp b/ism/src/isf_remote_client.cpp index a44651b..11c1d30 100644 --- a/ism/src/isf_remote_client.cpp +++ b/ism/src/isf_remote_client.cpp @@ -167,7 +167,7 @@ public: if (m_socket_remoteinput2panel.is_connected ()) close_connection (); - bool ret=false, ret2=false; + bool ret = false, ret2 = false; int count = 0; /* Try three times. */ diff --git a/ism/src/scim_backend.cpp b/ism/src/scim_backend.cpp index 058ee32..2a663bb 100644 --- a/ism/src/scim_backend.cpp +++ b/ism/src/scim_backend.cpp @@ -592,7 +592,6 @@ CommonBackEnd::add_module (const ConfigPointer &config, if (engine_module && engine_module->valid ()) { size_t number = engine_module->number_of_factories (); for (size_t j = 0; j < number; ++j) { - /* Try to load a IMEngine Factory. */ try { factory = engine_module->create_factory (j); @@ -606,7 +605,6 @@ CommonBackEnd::add_module (const ConfigPointer &config, if (std::find (m_impl->m_disabled_factories.begin (), m_impl->m_disabled_factories.end (), factory->get_uuid ()) == m_impl->m_disabled_factories.end ()) { - /* Add it into disabled list to prevent from loading again. */ /*m_impl->m_disabled_factories.push_back (factory->get_uuid ());*/ diff --git a/ism/src/scim_config_base.cpp b/ism/src/scim_config_base.cpp index bfefda3..bc29863 100644 --- a/ism/src/scim_config_base.cpp +++ b/ism/src/scim_config_base.cpp @@ -39,7 +39,6 @@ static ConfigPointer _create_config (const String &default_module) { if (!_scim_default_config_module.valid ()) { - String module; if (!default_module.length ()) diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp index 626ce13..b6514a6 100644 --- a/ism/src/scim_helper.cpp +++ b/ism/src/scim_helper.cpp @@ -669,7 +669,6 @@ HelperAgent::open_connection (const HelperInfo &info, while (!m_impl->socket.connect (address) && ++i < 10) { scim_usleep (200000); } - } ISF_LOG ("scim_socket_open_connection () is successful.\n"); @@ -2390,7 +2389,6 @@ HelperAgent::set_keyboard_ise_by_uuid (const String &uuid) const } for (size_t j = 0; j < engine_module->number_of_factories (); ++j) { - try { factory = engine_module->create_factory (j); if (factory.null () == false && factory->get_uuid () == uuid) @@ -2408,7 +2406,7 @@ HelperAgent::set_keyboard_ise_by_uuid (const String &uuid) const m_impl->si = factory->create_instance ("UTF-8", instance_count++); if (m_impl->si.null ()) { - LOGE ("create_instance %s failed",uuid.c_str ()); + LOGE ("create_instance %s failed", uuid.c_str ()); return; } diff --git a/ism/src/scim_helper_module.cpp b/ism/src/scim_helper_module.cpp index e0cba6c..d76d2e6 100644 --- a/ism/src/scim_helper_module.cpp +++ b/ism/src/scim_helper_module.cpp @@ -130,7 +130,6 @@ bool HelperModule::get_helper_info (unsigned int idx, HelperInfo &info) const { if (m_module.valid () && m_run_helper && module_name.length () > 0) { - std::vector ime_info_db; isf_db_select_all_ime_info (ime_info_db); for (std::vector::iterator iter = ime_info_db.begin (); iter != ime_info_db.end (); iter++) { diff --git a/ism/src/scim_private.cpp b/ism/src/scim_private.cpp index 64f0b9c..72628d5 100644 --- a/ism/src/scim_private.cpp +++ b/ism/src/scim_private.cpp @@ -47,7 +47,6 @@ namespace scim { class TextdomainInitializer { public: TextdomainInitializer () { - #ifdef HAVE_SETLOCALE char *locale = setlocale (LC_MESSAGES, 0); if (!locale || *locale == 'C') diff --git a/ism/src/scim_socket.cpp b/ism/src/scim_socket.cpp index 1281b3e..9b22054 100644 --- a/ism/src/scim_socket.cpp +++ b/ism/src/scim_socket.cpp @@ -995,7 +995,6 @@ SocketServer::run () for (i = 0; i < m_impl->max_fd + 1; i++) { if (FD_ISSET (i, &read_fds)) { - //New connection if (i == Socket::get_id ()) { client = Socket::accept (); diff --git a/ism/src/scim_transaction.cpp b/ism/src/scim_transaction.cpp index 0e6d158..28485df 100644 --- a/ism/src/scim_transaction.cpp +++ b/ism/src/scim_transaction.cpp @@ -284,7 +284,6 @@ Transaction::read_from_buffer (const void *buf, size_t bufsize) scim_bytestouint32 (cbuf) == 0 && scim_bytestouint32 (cbuf + sizeof (uint32)) == SCIM_TRANS_MAGIC && scim_bytestouint32 (cbuf + sizeof (uint32) * 2) <= bufsize - SCIM_TRANS_HEADER_SIZE) { - uint32 size = scim_bytestouint32 (cbuf + sizeof (uint32) * 2) + SCIM_TRANS_HEADER_SIZE; #ifdef ENABLE_CHECKMSG uint32 checksum = scim_bytestouint32 (cbuf + sizeof (uint32) * 3); @@ -841,7 +840,6 @@ TransactionReader::get_command (int &type) if (valid () && m_impl->m_holder->m_write_pos > m_impl->m_read_pos && m_impl->m_holder->m_buffer [m_impl->m_read_pos] == SCIM_TRANS_DATA_COMMAND) { - if (m_impl->m_holder->m_write_pos < (m_impl->m_read_pos + sizeof (uint32) + 1)) return false; @@ -862,7 +860,6 @@ TransactionReader::get_data (uint32 &val) if (valid () && m_impl->m_holder->m_write_pos > m_impl->m_read_pos && m_impl->m_holder->m_buffer [m_impl->m_read_pos] == SCIM_TRANS_DATA_UINT32) { - if (m_impl->m_holder->m_write_pos < (m_impl->m_read_pos + sizeof (uint32) + 1)) return false; @@ -883,7 +880,6 @@ TransactionReader::get_data (String &str) if (valid () && m_impl->m_holder->m_write_pos > m_impl->m_read_pos && m_impl->m_holder->m_buffer [m_impl->m_read_pos] == SCIM_TRANS_DATA_STRING) { - size_t len; size_t old_read_pos = m_impl->m_read_pos; @@ -918,7 +914,6 @@ TransactionReader::get_data (WideString &str) if (valid () && m_impl->m_holder->m_write_pos > m_impl->m_read_pos && m_impl->m_holder->m_buffer [m_impl->m_read_pos] == SCIM_TRANS_DATA_WSTRING) { - String mbs; size_t len; size_t old_read_pos = m_impl->m_read_pos; diff --git a/ism/src/scim_utility.cpp b/ism/src/scim_utility.cpp index 76f0bce..d754c79 100644 --- a/ism/src/scim_utility.cpp +++ b/ism/src/scim_utility.cpp @@ -330,7 +330,6 @@ utf8_mbstowcs (const char *str, int len) wstr.push_back (wc); str += un; sn += un; - } } return wstr; @@ -439,7 +438,6 @@ scim_get_locale_encoding (const String& locale) if (setlocale (LC_CTYPE, (vec[0] + "." + vec[1]).c_str ())) encoding = String (nl_langinfo (CODESET)); } - } setlocale (LC_CTYPE, last.c_str ()); -- 2.7.4