From 38bd156d08c950cae401b93a8126b9b1ed9bbb03 Mon Sep 17 00:00:00 2001 From: JuWan Kim Date: Tue, 17 Mar 2015 15:11:26 +0900 Subject: [PATCH] Change c to cpp in ./ug/wifi-direct/ Change-Id: Ibbe71bbc023ef039e8c1404999ed0a2c682d850e Signed-off-by: JuWan Kim --- ug/wifi-direct/CMakeLists.txt | 8 +- .../src/{ug_wifi_direct.c => ug_wifi_direct.cpp} | 18 ++- ug/wifi-direct/src/{util.c => util.cpp} | 0 .../src/{wifi_direct_mgr.c => wifi_direct_mgr.cpp} | 0 .../{wifi_direct_view.c => wifi_direct_view.cpp} | 134 ++++++++++----------- 5 files changed, 84 insertions(+), 76 deletions(-) rename ug/wifi-direct/src/{ug_wifi_direct.c => ug_wifi_direct.cpp} (94%) rename ug/wifi-direct/src/{util.c => util.cpp} (100%) rename ug/wifi-direct/src/{wifi_direct_mgr.c => wifi_direct_mgr.cpp} (100%) rename ug/wifi-direct/src/{wifi_direct_view.c => wifi_direct_view.cpp} (94%) diff --git a/ug/wifi-direct/CMakeLists.txt b/ug/wifi-direct/CMakeLists.txt index fa2b100..70d7899 100644 --- a/ug/wifi-direct/CMakeLists.txt +++ b/ug/wifi-direct/CMakeLists.txt @@ -49,10 +49,10 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -Wall -W SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}") SET(SRCS - src/ug_wifi_direct.c - src/wifi_direct_mgr.c - src/wifi_direct_view.c - src/util.c + src/ug_wifi_direct.cpp + src/wifi_direct_mgr.cpp + src/wifi_direct_view.cpp + src/util.cpp ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/ug/wifi-direct/src/ug_wifi_direct.c b/ug/wifi-direct/src/ug_wifi_direct.cpp similarity index 94% rename from ug/wifi-direct/src/ug_wifi_direct.c rename to ug/wifi-direct/src/ug_wifi_direct.cpp index 6a5d359..3553f50 100644 --- a/ug/wifi-direct/src/ug_wifi_direct.c +++ b/ug/wifi-direct/src/ug_wifi_direct.cpp @@ -24,6 +24,10 @@ #include "dbg.h" #include "wifi_direct_view.h" +#if defined (__cplusplus) +extern "C" { +#endif + struct _ug_data { Evas_Object *win; Evas_Object *base; @@ -55,12 +59,12 @@ static void *_on_create(ui_gadget_h ug, enum ug_mode mode, return NULL; } - ugd = priv; + ugd = (struct _ug_data *) priv; ugd->ug = ug; elm_theme_extension_add(NULL, UG_WIFI_DIRECT_EDJ_THEME); - win = ug_get_window(); + win = (Evas_Object *) ug_get_window(); if (!win) { _ERR("window get failed"); return NULL; @@ -70,7 +74,7 @@ static void *_on_create(ui_gadget_h ug, enum ug_mode mode, elm_win_focus_highlight_enabled_set(win, EINA_TRUE); elm_win_focus_highlight_style_set(win, "invisible"); - base = wifi_direct_view_create(win, ug); + base = (Evas_Object *) wifi_direct_view_create(win, ug); if (!base) { _ERR("add base layout failed."); return NULL; @@ -201,7 +205,7 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) if (!ops) return -1; - ugd = calloc(1, sizeof(*ugd)); + ugd = (struct _ug_data *) calloc(1, sizeof(*ugd)); if (!ugd) return -1; @@ -236,6 +240,10 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops) if (!ops) return; - ugd = ops->priv; + ugd = (struct _ug_data *) ops->priv; free(ugd); } + +#if defined (__cplusplus) +}; +#endif diff --git a/ug/wifi-direct/src/util.c b/ug/wifi-direct/src/util.cpp similarity index 100% rename from ug/wifi-direct/src/util.c rename to ug/wifi-direct/src/util.cpp diff --git a/ug/wifi-direct/src/wifi_direct_mgr.c b/ug/wifi-direct/src/wifi_direct_mgr.cpp similarity index 100% rename from ug/wifi-direct/src/wifi_direct_mgr.c rename to ug/wifi-direct/src/wifi_direct_mgr.cpp diff --git a/ug/wifi-direct/src/wifi_direct_view.c b/ug/wifi-direct/src/wifi_direct_view.cpp similarity index 94% rename from ug/wifi-direct/src/wifi_direct_view.c rename to ug/wifi-direct/src/wifi_direct_view.cpp index db7a9c2..eddad62 100644 --- a/ug/wifi-direct/src/wifi_direct_view.c +++ b/ug/wifi-direct/src/wifi_direct_view.cpp @@ -63,31 +63,11 @@ enum direct_swith_enum { DIRECT_OFF }; -const char *action_button[] = { - [ACTION_BTN_REFRESH] = TXT_REFRESH_BTN, - [ACTION_BTN_CLOSE] = TXT_CLOSE_BTN, - [ACTION_BTN_STOP] = TXT_STOP_BTN -}; - -const char *popup_button_on[] = { - [DIRECT_OFF] = TXT_OFF_BTN, - [DIRECT_ON] = TXT_ON_BTN -}; - -static char *popup_button_conn[] = { - [DIRECT_ON] = TXT_CONNECT, - [DIRECT_OFF] = TXT_DISCONNECT -}; - -static char *popup_button_req[] = { - [DIRECT_ON] = TXT_YES, - [DIRECT_OFF] = TXT_NO -}; - -static char *part_req[] = { - [DIRECT_ON] = PART_YES, - [DIRECT_OFF] = PART_NO -}; +const char *action_button[] = { TXT_REFRESH_BTN, TXT_CLOSE_BTN, TXT_STOP_BTN }; +const char *popup_button_on[] = { TXT_ON_BTN, TXT_OFF_BTN }; +static char *popup_button_conn[] = { TXT_CONNECT, TXT_DISCONNECT }; +static char *popup_button_req[] = { TXT_YES, TXT_NO }; +static char *part_req[] = { PART_YES, PART_NO }; static void _device_state_changed_cb(int errcode, wifi_direct_device_state_e state, void *data); @@ -103,11 +83,11 @@ static bool _discoverd_peers_cb( void *data); static struct wifi_direct_cbs cbs = { - .device_state_cb = _device_state_changed_cb, - .discovery_state_cb = _discovery_state_changed_cb, - .connection_state_cb = _connection_state_changed_cb, - .connected_peer_cb = _connected_peer_cb, - .discovered_peer_cb = _discoverd_peers_cb + _device_state_changed_cb, + _discovery_state_changed_cb, + _connection_state_changed_cb, + _connected_peer_cb, + _discoverd_peers_cb }; static void _fill_content_part(struct _priv *priv, Evas_Object *obj); @@ -124,7 +104,7 @@ static struct _priv *_init_priv(void) { struct _priv *priv; - priv = calloc(1, sizeof(*priv)); + priv = (struct _priv *) calloc(1, sizeof(*priv)); if (!priv) { _ERR("calloc failed."); return NULL; @@ -143,6 +123,7 @@ static struct _priv *_init_priv(void) static void _fini_priv(struct _priv *priv) { struct device_info *info; + void *obj; if (!priv) { _ERR("priv is already NULL."); @@ -150,8 +131,11 @@ static void _fini_priv(struct _priv *priv) } if (!priv->item_list) - EINA_LIST_FREE(priv->item_list, info) + EINA_LIST_FREE(priv->item_list, obj) + { + info = (struct device_info *) obj; free(info); + } if (priv->dim_ly) evas_object_del(priv->dim_ly); @@ -205,13 +189,14 @@ static void _refresh_btn_clicked_cb(void *data, { struct _priv *priv; struct device_info *info; + void *temp_obj; if (!data || !obj) { _ERR("The param is invalid.\n"); return; } - priv = data; + priv = (struct _priv *) data; if (priv->scan_ly) evas_object_hide(priv->scan_ly); @@ -219,8 +204,11 @@ static void _refresh_btn_clicked_cb(void *data, elm_genlist_clear(priv->genlist); if (priv->item_list) - EINA_LIST_FREE(priv->item_list, info) + EINA_LIST_FREE(priv->item_list, temp_obj) + { + info = (struct device_info *) temp_obj; free(info); + } _create_device_list_view(priv); } @@ -241,7 +229,7 @@ static void _close_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; if (!priv->ug) { _ERR("priv->ug is NULL."); @@ -346,7 +334,7 @@ static void _stop_btn_clicked_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; ret = wifi_direct_mgr_cancel_discovery(); if (ret != RET_SUCCESS) { @@ -497,8 +485,8 @@ static void _popup_back_pressed_cb(void *data, Evas *e, return; } - priv = data; - ev = ei; + priv = (struct _priv *) data; + ev = (Evas_Event_Key_Down *)ei; if (!ev->keyname) { _ERR("ev->keyname is NULL."); @@ -592,7 +580,7 @@ static void _item_conn_btn_clicked_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; gen_item = priv->popup_item; @@ -600,7 +588,7 @@ static void _item_conn_btn_clicked_cb(void *data, if (cur_idx < 0) return; - info = eina_list_nth(priv->item_list, cur_idx); + info = (struct device_info *) eina_list_nth(priv->item_list, cur_idx); if (!info) return; @@ -670,7 +658,7 @@ static void _genlist_item_select_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; if (!priv->dim_ly) { ret = _create_wifi_direct_dim(priv); @@ -682,7 +670,7 @@ static void _genlist_item_select_cb(void *data, evas_object_show(priv->dim_ly); - gen_item = event_info; + gen_item = (Elm_Object_Item *) event_info; priv->popup_item = gen_item; layout = util_add_layout(priv->base, UG_WIFI_DIRECT_EDJ_FILE, @@ -720,7 +708,7 @@ static void _genlist_item_select_cb(void *data, if (cur_idx < 0) return; - info = eina_list_nth(priv->item_list, cur_idx); + info = (struct device_info *) eina_list_nth(priv->item_list, cur_idx); if (!info) return; @@ -764,6 +752,7 @@ static Eina_Bool _is_peer_exist(struct _priv *priv, struct device_info *new_info) { struct device_info *cur_info; + void *obj; Eina_List *l; if (!priv || !new_info) { @@ -776,7 +765,8 @@ static Eina_Bool _is_peer_exist(struct _priv *priv, return EINA_FALSE; } - EINA_LIST_FOREACH(priv->item_list, l, cur_info) { + EINA_LIST_FOREACH(priv->item_list, l, obj) { + cur_info = (struct device_info *) obj; if (!strncmp(cur_info->mac_addr, new_info->mac_addr, WIFI_DIRECT_DEFAULT_BUF_LEN - 1)) return EINA_TRUE; @@ -796,9 +786,11 @@ static Eina_Bool _update_device_conn_state(struct _priv *priv, Eina_Bool conn) { struct device_info *cur_info; + void *obj; Eina_List *l; - EINA_LIST_FOREACH(priv->item_list, l, cur_info) { + EINA_LIST_FOREACH(priv->item_list, l, obj) { + cur_info = (struct device_info *) obj; if (!strncmp(cur_info->mac_addr, priv->req_addr, WIFI_DIRECT_DEFAULT_BUF_LEN - 1)) { cur_info->is_conn = conn; @@ -857,20 +849,24 @@ static void _process_discovery_start(struct wifi_direct_cbs cbs, int ret; struct _priv *priv; struct device_info *info; + void *obj; if (!data) { _ERR("Parameter error!"); return; } - priv = data; + priv = (struct _priv *) data; if (priv->genlist) elm_genlist_clear(priv->genlist); if (priv->item_list) - EINA_LIST_FREE(priv->item_list, info) + EINA_LIST_FREE(priv->item_list, obj) + { + info = (struct device_info *) obj; free(info); + } ret = wifi_direct_mgr_foreach_connected_peers( cbs.connected_peer_cb, data); @@ -920,7 +916,7 @@ static void _process_discovery_finished(void *data) return; } - priv = data; + priv = (struct _priv *) data; elm_object_part_content_unset(priv->base, PART_REFRESH_BTN); evas_object_hide(priv->btn_stop); @@ -948,7 +944,7 @@ static void _req_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; value = elm_object_text_get(obj); if (!value) { @@ -1065,7 +1061,7 @@ static void _process_connection_req(const char *addr, void *data) return; } - priv = data; + priv = (struct _priv *) data; ret = wifi_direct_mgr_get_wps_type(&is_pbc); if (ret != WIFI_DIRECT_ERROR_NONE) { @@ -1108,7 +1104,7 @@ static void _process_connection_prog(void *data) return; } - priv = data; + priv = (struct _priv *) data; if (priv->dim_ly) evas_object_show(priv->dim_ly); @@ -1148,7 +1144,7 @@ static Eina_Bool _connection_ind_cb(void *data) return ECORE_CALLBACK_CANCEL; } - priv = data; + priv = (struct _priv *) data; ret = wifi_direct_mgr_start_discovery(); if (ret != RET_SUCCESS) @@ -1174,7 +1170,7 @@ static void _process_connection_ind(void *data) return; } - priv = data; + priv = (struct _priv *) data; timer = ecore_timer_add(HANDLER_INTERVAL, _connection_ind_cb, priv); if (!timer) { @@ -1201,10 +1197,10 @@ static void _process_connection_rsp(void *data) return; } - priv = data; + priv = (struct _priv *) data; cur_index = priv->conn_idx; - info = eina_list_nth(priv->item_list, cur_index); + info = (struct device_info *) eina_list_nth(priv->item_list, cur_index); if (!info) return; @@ -1245,7 +1241,7 @@ static void _device_state_changed_cb(int errcode, return; } - priv = data; + priv = (struct _priv *) data; if (state != WIFI_DIRECT_DEVICE_STATE_ACTIVATED) { elm_genlist_clear(priv->genlist); @@ -1358,9 +1354,9 @@ static bool _connected_peer_cb( return EINA_FALSE; } - priv = data; + priv = (struct _priv *) data; - info = calloc(1, sizeof(*info)); + info = (struct device_info *) calloc(1, sizeof(*info)); if (!info) { _ERR("calloc failed."); return EINA_FALSE; @@ -1402,8 +1398,8 @@ static bool _discoverd_peers_cb( return EINA_FALSE; } - priv = data; - info = calloc(1, sizeof(*info)); + priv = (struct _priv *) data; + info = (struct device_info *) calloc(1, sizeof(*info)); if (!info) { _ERR("calloc failed."); return EINA_FALSE; @@ -1556,6 +1552,7 @@ static void _wifi_direct_select_btn_cb(void *data, { struct _priv *priv; struct device_info *info; + void *temp_obj; const char *value; int ret; @@ -1564,9 +1561,9 @@ static void _wifi_direct_select_btn_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; - value = elm_object_text_get(obj); + value = (const char *) elm_object_text_get(obj); if (!value) { _ERR("get text from network type btn is NULL."); return; @@ -1579,8 +1576,11 @@ static void _wifi_direct_select_btn_cb(void *data, elm_genlist_clear(priv->genlist); if (priv->item_list) - EINA_LIST_FREE(priv->item_list, info) + EINA_LIST_FREE(priv->item_list, temp_obj) + { + info = (struct device_info *) temp_obj; free(info); + } _create_device_list_view(priv); @@ -1641,7 +1641,7 @@ static void _wifi_direct_btn_clicked_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; if (!priv->dim_ly) { ret = _create_wifi_direct_dim(priv); @@ -1783,7 +1783,7 @@ static char *_item_label_get(void *data, Evas_Object *obj, return NULL; } - info = data; + info = (struct device_info *) data; memset(&buf_name, 0x00, WIFI_DIRECT_DEFAULT_BUF_LEN); if (!strcmp(part, TXT_ELM_TEXT)) { @@ -1939,8 +1939,8 @@ static void _base_layout_key_down_cb(void *data, return; } - priv = data; - ei = event_info; + priv = (struct _priv *) data; + ei = (Evas_Event_Key_Down *) event_info; if (!ei->keyname) { _ERR("ei->keyname is NULL."); -- 2.7.4