From aa7059eca40c02d8e4785f9b421162abe23a3dc2 Mon Sep 17 00:00:00 2001 From: JuWan Kim Date: Tue, 17 Mar 2015 11:56:16 +0900 Subject: [PATCH] Change c to cpp in ./ug/proxy/ Change-Id: Id26540561c151368479171e7b3f4802875ef0c7b Signed-off-by: JuWan Kim --- ug/proxy/CMakeLists.txt | 12 +++--- .../src/{connection_mgr.c => connection_mgr.cpp} | 2 +- ug/proxy/src/{main_view.c => main_view.cpp} | 50 +++++++++++----------- .../{ug_proxy_settings.c => ug_proxy_settings.cpp} | 18 +++++--- ug/proxy/src/{util.c => util.cpp} | 0 ug/proxy/src/{vconf_mgr.c => vconf_mgr.cpp} | 0 ug/proxy/src/{wifi_mgr.c => wifi_mgr.cpp} | 8 ++-- 7 files changed, 49 insertions(+), 41 deletions(-) rename ug/proxy/src/{connection_mgr.c => connection_mgr.cpp} (99%) rename ug/proxy/src/{main_view.c => main_view.cpp} (97%) rename ug/proxy/src/{ug_proxy_settings.c => ug_proxy_settings.cpp} (96%) rename ug/proxy/src/{util.c => util.cpp} (100%) rename ug/proxy/src/{vconf_mgr.c => vconf_mgr.cpp} (100%) rename ug/proxy/src/{wifi_mgr.c => wifi_mgr.cpp} (97%) diff --git a/ug/proxy/CMakeLists.txt b/ug/proxy/CMakeLists.txt index 33dd82d..333b6bc 100644 --- a/ug/proxy/CMakeLists.txt +++ b/ug/proxy/CMakeLists.txt @@ -47,12 +47,12 @@ 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_proxy_settings.c - src/main_view.c - src/vconf_mgr.c - src/connection_mgr.c - src/wifi_mgr.c - src/util.c + src/ug_proxy_settings.cpp + src/main_view.cpp + src/vconf_mgr.cpp + src/connection_mgr.cpp + src/wifi_mgr.cpp + src/util.cpp ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/ug/proxy/src/connection_mgr.c b/ug/proxy/src/connection_mgr.cpp similarity index 99% rename from ug/proxy/src/connection_mgr.c rename to ug/proxy/src/connection_mgr.cpp index 3726c84..ca7d628 100644 --- a/ug/proxy/src/connection_mgr.c +++ b/ug/proxy/src/connection_mgr.cpp @@ -154,7 +154,7 @@ int connection_mgr_get_profile_info(connection_h connection, CONNECTION_ITERATOR_TYPE_REGISTERED, &iter); if (ret != CONNECTION_ERROR_NONE) { _ERR("Fail to get profile iterator: %s.\n", - _convert_error_to_string(ret)); + _convert_error_to_string((connection_error_e) ret)); return RET_FAILED; } diff --git a/ug/proxy/src/main_view.c b/ug/proxy/src/main_view.cpp similarity index 97% rename from ug/proxy/src/main_view.c rename to ug/proxy/src/main_view.cpp index 4a1e9ae..173e89d 100644 --- a/ug/proxy/src/main_view.c +++ b/ug/proxy/src/main_view.cpp @@ -176,7 +176,7 @@ static struct _priv *_init_priv() { struct _priv *priv; - priv = calloc(1, sizeof(*priv)); + priv = (struct _priv *) calloc(1, sizeof(*priv)); if (!priv) { _ERR("calloc priv failed."); return NULL; @@ -230,8 +230,8 @@ static void _base_key_pressed_cb(void *data, Evas *evas, return; } - ev = ei; - priv = data; + ev = (Evas_Event_Key_Down *) ei; + priv = (struct _priv *) data; if (!ev->keyname) { _ERR("ev->keyname is NULL."); @@ -505,7 +505,7 @@ static void _ctxpopup_unfocused_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; _unset_layout_dim(priv); @@ -589,8 +589,8 @@ static void _ctxpopup_key_pressed_cb(void *data, Evas *evas, return; } - priv = data; - ev = ei; + priv = (struct _priv *) data; + ev = (Evas_Event_Key_Down *) ei; if (!ev->keyname) { _ERR("ev->keyname is NULL."); @@ -668,7 +668,7 @@ static void _method_none_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; _method_btn_click_proc(priv, METHOD_NONE); } @@ -691,7 +691,7 @@ static void _method_man_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; _method_btn_click_proc(priv, METHOD_MAN); } @@ -714,7 +714,7 @@ static void _method_auto_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; _method_btn_click_proc(priv, METHOD_AUTO); } @@ -748,7 +748,7 @@ static void _method_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; base = priv->base; ctxpopup = util_add_layout(base, UG_PROXY_EDJ_FILE, @@ -901,7 +901,7 @@ static void _value_key_pressed_cb(void *data, Evas *evas, return; } - ev = ei; + ev = (Evas_Event_Key_Down *) ei; if (!ev->keyname) { _ERR("ev->keyname is NULL."); @@ -1027,22 +1027,22 @@ static void _set_the_value(struct _priv *priv) } value1 = NULL; - btn = evas_object_data_get(priv->ctxpopup, IP_VALUE1); + btn = (Evas_Object *) evas_object_data_get(priv->ctxpopup, IP_VALUE1); if (btn) value1 = elm_object_text_get(btn); value2 = NULL; - btn = evas_object_data_get(priv->ctxpopup, IP_VALUE2); + btn = (Evas_Object *) evas_object_data_get(priv->ctxpopup, IP_VALUE2); if (btn) value2 = elm_object_text_get(btn); value3 = NULL; - btn = evas_object_data_get(priv->ctxpopup, IP_VALUE3); + btn = (Evas_Object *) evas_object_data_get(priv->ctxpopup, IP_VALUE3); if (btn) value3 = elm_object_text_get(btn); value4 = NULL; - btn = evas_object_data_get(priv->ctxpopup, IP_VALUE4); + btn = (Evas_Object *) evas_object_data_get(priv->ctxpopup, IP_VALUE4); if (btn) value4 = elm_object_text_get(btn); @@ -1080,8 +1080,8 @@ static void _value_ctxpopup_key_pressed_cb(void *data, Evas *evas, return; } - ev = ei; - priv = data; + ev = (Evas_Event_Key_Down *) ei; + priv = (struct _priv *) data; if (!ev->keyname) { _ERR("ev->keyname is NULL."); @@ -1176,7 +1176,7 @@ static void _proxy_ip_btn_clicked_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; _keep_btn_dim_focused(priv->proxy_btn); @@ -1206,8 +1206,8 @@ static void _entry_key_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."); @@ -1303,7 +1303,7 @@ static void _url_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; _create_input_entry(priv); } @@ -1580,7 +1580,7 @@ static void _ctxpopup_ok_btn_clicked_cb(void *data, return; } - priv = data; + priv = (struct _priv *) data; if (priv->ctxpopup) { evas_object_del(priv->ctxpopup); @@ -1857,7 +1857,7 @@ static void _ok_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; ret = _set_proxy(priv); if (ret != RET_SUCCESS) { @@ -1895,7 +1895,7 @@ static void _cancel_btn_clicked_cb(void *data, Evas_Object *obj, void *ev) return; } - priv = data; + priv = (struct _priv *) data; ug_destroy_me(priv->ug); } @@ -2058,7 +2058,7 @@ void destroy_main_view(Evas_Object *base) return; } - priv = evas_object_data_get(base, KEY_PRIV); + priv = (struct _priv *) evas_object_data_get(base, KEY_PRIV); if (!priv) return; diff --git a/ug/proxy/src/ug_proxy_settings.c b/ug/proxy/src/ug_proxy_settings.cpp similarity index 96% rename from ug/proxy/src/ug_proxy_settings.c rename to ug/proxy/src/ug_proxy_settings.cpp index 6ddb58c..b53faaa 100644 --- a/ug/proxy/src/ug_proxy_settings.c +++ b/ug/proxy/src/ug_proxy_settings.cpp @@ -25,6 +25,10 @@ #include "defs.h" #include "dbg.h" +#if defined (__cplusplus) +extern "C" { +#endif + struct _ug_data { Evas_Object *win; Evas_Object *base; @@ -62,12 +66,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_PROXY_EDJ_THEME); - win = ug_get_window(); + win = (Evas_Object *) ug_get_window(); if (!win) { _ERR("window get failed"); return NULL; @@ -158,7 +162,7 @@ static void _on_resume(ui_gadget_h ug, service_h service, void *priv) */ static void _on_destroy(ui_gadget_h ug, service_h service, void *priv) { - struct _ug_data *ugd = priv; + struct _ug_data *ugd = (struct _ug_data *) priv; if (!ug || !priv) { _ERR("Parameter error!"); @@ -245,7 +249,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; @@ -280,7 +284,11 @@ 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/proxy/src/util.c b/ug/proxy/src/util.cpp similarity index 100% rename from ug/proxy/src/util.c rename to ug/proxy/src/util.cpp diff --git a/ug/proxy/src/vconf_mgr.c b/ug/proxy/src/vconf_mgr.cpp similarity index 100% rename from ug/proxy/src/vconf_mgr.c rename to ug/proxy/src/vconf_mgr.cpp diff --git a/ug/proxy/src/wifi_mgr.c b/ug/proxy/src/wifi_mgr.cpp similarity index 97% rename from ug/proxy/src/wifi_mgr.c rename to ug/proxy/src/wifi_mgr.cpp index 88616a2..98eb1b1 100644 --- a/ug/proxy/src/wifi_mgr.c +++ b/ug/proxy/src/wifi_mgr.cpp @@ -150,7 +150,7 @@ int wifi_mgr_set_proxy_type(enum method_enum method) } ap = NULL; - ret = wifi_get_connected_ap(ap); + ret = wifi_get_connected_ap(&ap); if (ret != WIFI_ERROR_NONE) { _ERR("wifi_get_connected_ap() failed."); return ret; @@ -197,7 +197,7 @@ int wifi_mgr_get_proxy_type(enum method_enum *method) } ap = NULL; - ret = wifi_get_connected_ap(ap); + ret = wifi_get_connected_ap(&ap); if (ret != WIFI_ERROR_NONE) { _ERR("wifi_get_connected_ap() failed."); return ret; @@ -239,7 +239,7 @@ int wifi_mgr_set_proxy_address(const char *ip) int ret; ap = NULL; - ret = wifi_get_connected_ap(ap); + ret = wifi_get_connected_ap(&ap); if (ret != WIFI_ERROR_NONE) { _ERR("wifi_get_connected_ap() failed."); return ret; @@ -271,7 +271,7 @@ int wifi_mgr_get_proxy_address(char **ip) } ap = NULL; - ret = wifi_get_connected_ap(ap); + ret = wifi_get_connected_ap(&ap); if (ret != WIFI_ERROR_NONE) { _ERR("wifi_get_connected_ap() failed."); return ret; -- 2.7.4