From 838d6c7adc3f8a0ceb502d2960632e986da20d52 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 24 Jun 2016 11:48:04 +0900 Subject: [PATCH] Fix coding style Change-Id: I09b795fd932070090f12e7326bc9fcfcfd2a623b --- src/legacy_support/web_helper_agent.cpp | 7 ++----- src/legacy_support/websocket.cpp | 2 -- src/sclcoreimpl.cpp | 2 +- src/sclcoreui-efl.cpp | 23 +++++++++++------------ 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/legacy_support/web_helper_agent.cpp b/src/legacy_support/web_helper_agent.cpp index 536ad27..1d3cfc5 100644 --- a/src/legacy_support/web_helper_agent.cpp +++ b/src/legacy_support/web_helper_agent.cpp @@ -67,7 +67,6 @@ CWebHelperAgent::CWebHelperAgent() CWebHelperAgent::~CWebHelperAgent() { - } bool CWebHelperAgent::init() @@ -82,7 +81,6 @@ bool CWebHelperAgent::exit() void CWebHelperAgent::signal(int sig) { - } void CWebHelperAgent::log(const char *str) @@ -182,9 +180,8 @@ std::string CMagicKeyManager::get_magic_key() const char magic_key_range_upper = 'Z'; unsigned int seed = time(NULL); - for(int loop = 0;loop < MAGIC_KEY_LENGTH;loop++) { - magic_key[loop] = (rand_r(&seed) % - (magic_key_range_upper - magic_key_range_lower)) + magic_key_range_lower; + for (int loop = 0;loop < MAGIC_KEY_LENGTH;loop++) { + magic_key[loop] = (rand_r(&seed) % (magic_key_range_upper - magic_key_range_lower)) + magic_key_range_lower; } magic_key[MAGIC_KEY_LENGTH] = '\0'; diff --git a/src/legacy_support/websocket.cpp b/src/legacy_support/websocket.cpp index 714f65e..3814e5f 100644 --- a/src/legacy_support/websocket.cpp +++ b/src/legacy_support/websocket.cpp @@ -108,7 +108,6 @@ static int callback_keyboard(struct lws *wsi, CWebHelperAgentWebSocket *agent = CWebHelperAgentWebSocket::get_current_instance(); switch (reason) { - case LWS_CALLBACK_ESTABLISHED: pss->session_id = ++last_session_id; LOGD("LWS_CALLBACK_ESTABLISHED : %p %d", g_ws_server_context, pss->session_id); @@ -883,7 +882,6 @@ void CWebHelperAgentWebSocket::wait_for_reply_message() pthread_mutex_lock(&g_ws_query_mutex); pthread_cond_timedwait(&g_ws_query_condition, &g_ws_query_mutex, &timeout); pthread_mutex_unlock(&g_ws_query_mutex); - } void CWebHelperAgentWebSocket::process_recved_messages() diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp index 5735208..268d2d4 100644 --- a/src/sclcoreimpl.cpp +++ b/src/sclcoreimpl.cpp @@ -272,7 +272,7 @@ void CSCLCoreImpl::on_run(const sclchar *uuid, const sclchar *display) m_core_ui.init(); m_connection.init(); - LOGD ("uuid : '%s', display : '%s'\n", uuid, display); + LOGD("uuid : '%s', display : '%s'\n", uuid, display); if (uuid && strlen(uuid) > 0) { if (m_uuid) { diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp index 310315d..3e5b15b 100644 --- a/src/sclcoreui-efl.cpp +++ b/src/sclcoreui-efl.cpp @@ -100,9 +100,9 @@ sclwindow CSCLCoreUIEFL::get_main_window() { if (m_initialized) { return m_main_window; - } - else + } else { return NULL; + } } void CSCLCoreUIEFL::set_keyboard_size_hints(SclSize portrait, SclSize landscape) @@ -370,16 +370,15 @@ check_evas_engine(struct WaylandKeyboard *wlkb) const char *env = getenv("ECORE_EVAS_ENGINE"); if (!env) { - if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_SHM)) + if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_SHM)) { env = "wayland_shm"; - else if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL)) + } else if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL)) { env = "wayland_egl"; - else { + } else { LOGW("ERROR: Ecore_Evas does must be compiled with support for Wayland engines\n"); goto err; } - } - else if (strcmp(env, "wayland_shm") != 0 && strcmp(env, "wayland_egl") != 0) { + } else if (strcmp(env, "wayland_shm") != 0 && strcmp(env, "wayland_egl") != 0) { LOGW("ERROR: ECORE_EVAS_ENGINE must be set to either 'wayland_shm' or 'wayland_egl'\n"); goto err; } @@ -607,9 +606,9 @@ sclwindow CSCLCoreUIEFL::create_option_window(SCLOptionWindowType type) LOGW("on_create_option_window() is not available\n"); return SCLWINDOW_INVALID; } - } - else + } else { return SCLWINDOW_INVALID; + } } /* Just in case the previous option window for setting application exists */ @@ -711,7 +710,7 @@ void CSCLCoreUIEFL::process_keyboard_ui_state_change(KEYBOARD_UI_STATE state) if (state == KEYBOARD_UI_STATE_WILL_SHOW) { evas_event_callback_add(evas_object_evas_get(NATIVE_WINDOW_CAST(m_main_window)), EVAS_CALLBACK_RENDER_PRE, _render_pre_cb, (void*)m_main_window); - _render_pre_timer = ecore_timer_add (RENDER_PRE_TIMEOUT, _render_pre_timeout, (void*)m_main_window); + _render_pre_timer = ecore_timer_add(RENDER_PRE_TIMEOUT, _render_pre_timeout, (void*)m_main_window); LOGD("Registered RENDER_PRE callback, _render_pre_cb() and a timer callback"); } else if (state == KEYBOARD_UI_STATE_DID_SHOW) { LOGD("Forcing keyboard window to render : %d", force_update_num); @@ -721,12 +720,12 @@ void CSCLCoreUIEFL::process_keyboard_ui_state_change(KEYBOARD_UI_STATE state) * manually, we are creating a half transparent box above the keyboard window. Need to find * more appropriate way to generate render event */ if (force_update_helper_obj) evas_object_del(force_update_helper_obj); - force_update_helper_obj = elm_bg_add (NATIVE_WINDOW_CAST(m_main_window)); + force_update_helper_obj = elm_bg_add(NATIVE_WINDOW_CAST(m_main_window)); evas_object_color_set(force_update_helper_obj, 255, 255, 255, 1); evas_object_resize(force_update_helper_obj, 1, 1); evas_object_move(force_update_helper_obj, force_update_num % 100, 0); evas_object_layer_set(force_update_helper_obj, EVAS_LAYER_MAX); - evas_object_show (force_update_helper_obj); + evas_object_show(force_update_helper_obj); force_update_num++; } else if (state == KEYBOARD_UI_STATE_WILL_HIDE) { if (force_update_helper_obj) evas_object_del(force_update_helper_obj); -- 2.7.4