Convert c to cpp except for ug files. 15/36215/1 accepted/tizen/tv/20150304.011909 submit/tizen_tv/20150303.130111
authorJuWan Kim <juwan.kim@samsung.com>
Tue, 3 Mar 2015 12:58:18 +0000 (21:58 +0900)
committerJuWan Kim <juwan.kim@samsung.com>
Tue, 3 Mar 2015 12:58:18 +0000 (21:58 +0900)
Change-Id: I4f93e8c8ac201f160c484f6df0a8dfedeb26cfd5
Signed-off-by: JuWan Kim <juwan.kim@samsung.com>
20 files changed:
CMakeLists.txt
include/def.h
src/data_wrapper.cpp [moved from src/data_wrapper.c with 95% similarity]
src/main.cpp [moved from src/main.c with 97% similarity]
src/parser.cpp [moved from src/parser.c with 98% similarity]
src/settings_provider.cpp [moved from src/settings_provider.c with 98% similarity]
src/timeout_handler.cpp [moved from src/timeout_handler.c with 97% similarity]
src/utils.cpp [moved from src/utils.c with 96% similarity]
src/view_bottomslider.cpp [moved from src/view_bottomslider.c with 94% similarity]
src/view_bottomsublist.cpp [moved from src/view_bottomsublist.c with 91% similarity]
src/view_device_manager.cpp [moved from src/view_device_manager.c with 90% similarity]
src/view_maincatalog.cpp [moved from src/view_maincatalog.c with 90% similarity]
src/view_need_pwd.cpp [moved from src/view_need_pwd.c with 91% similarity]
src/view_pwd_popup.cpp [moved from src/view_pwd_popup.c with 93% similarity]
src/view_resetpopup.cpp [moved from src/view_resetpopup.c with 94% similarity]
src/view_sublist.cpp [moved from src/view_sublist.c with 92% similarity]
src/view_system_clock.cpp [moved from src/view_system_clock.c with 91% similarity]
src/view_uigadget.cpp [moved from src/view_uigadget.c with 94% similarity]
src/view_upgrade_popup.cpp [moved from src/view_upgrade_popup.c with 90% similarity]
src/viewmgr.cpp [moved from src/viewmgr.c with 93% similarity]

index f58b1d2..8c1ed13 100644 (file)
@@ -78,24 +78,24 @@ ADD_DEFINITIONS("-DJSON_HELPER_FILE=\"${JSONHELPERFILE}\"")
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 ADD_EXECUTABLE(${PROJECT_NAME}
-       src/main.c
-       src/parser.c
-       src/data_wrapper.c
-       src/utils.c
-       src/viewmgr.c
-       src/view_maincatalog.c
-       src/view_uigadget.c
-       src/view_sublist.c
-       src/view_bottomsublist.c
-       src/view_bottomslider.c
-       src/settings_provider.c
-       src/view_pwd_popup.c
-       src/view_device_manager.c
-       src/view_resetpopup.c
-       src/view_upgrade_popup.c
-       src/view_system_clock.c
-       src/view_need_pwd.c
-       src/timeout_handler.c
+       src/main.cpp
+       src/viewmgr.cpp
+       src/parser.cpp
+       src/data_wrapper.cpp
+       src/utils.cpp
+       src/view_maincatalog.cpp
+       src/view_uigadget.cpp
+       src/view_sublist.cpp
+       src/view_bottomsublist.cpp
+       src/view_bottomslider.cpp
+       src/settings_provider.cpp
+       src/view_pwd_popup.cpp
+       src/view_device_manager.cpp
+       src/view_resetpopup.cpp
+       src/view_upgrade_popup.cpp
+       src/view_system_clock.cpp
+       src/view_need_pwd.cpp
+       src/timeout_handler.cpp
 )
 
 FOREACH (flag ${HOMEPANEL_PKGS_CFLAGS})
index 0e77d7e..cacc808 100644 (file)
 #define KEY_ENTER "Return"
 #define KEY_ENTER_REMOTE "KP_Enter"
 #define KEY_EXIT  "Exit"
-#define KEY_BACK "Escape"
 #define KEY_BACK_REMOTE "XF86Close"
 
 #define KEY_0 "0"
similarity index 95%
rename from src/data_wrapper.c
rename to src/data_wrapper.cpp
index 429ab45..4646c3b 100644 (file)
@@ -105,13 +105,15 @@ static void _free_slider_item(struct slideritem *item)
 static void _free_list_item(Eina_List *list)
 {
        struct listitem *litem;
+       void* obj;
 
        if (!list) {
                _ERR("Invalid argument");
                return;
        }
 
-       EINA_LIST_FREE(list, litem) {
+       EINA_LIST_FREE(list, obj) {
+               litem = (struct listitem *) obj;
                free(litem->display_name);
                free(litem->value);
                free(litem);
@@ -147,13 +149,15 @@ static void _free_uidata(struct uidata *data)
 static void _free_ui_args(Eina_List *list)
 {
        struct settingui_args *args;
+       void* obj;
 
        if (!list) {
                _ERR("Invalid argument");
                return;
        }
 
-       EINA_LIST_FREE(list, args) {
+       EINA_LIST_FREE(list, obj) {
+               args = (struct settingui_args *) obj;
                free(args->keyname);
                free(args->value);
                free(args);
@@ -187,15 +191,19 @@ static void _free_setting_ui(struct setting_ui *data)
 */
 static void _free_str_list(Eina_List *list)
 {
-       char *item;
+       void* obj;
+       char* item;
 
        if (!list) {
                _ERR("Invalid argument");
                return;
        }
 
-       EINA_LIST_FREE(list, item)
+       EINA_LIST_FREE(list, obj)
+       {
+               item = (char *) obj;
                free(item);
+       }
 }
 
 /**
@@ -214,7 +222,7 @@ static void _free_settingitem_cb(void *data)
                return;
        }
 
-       item = data;
+       item = (struct settingitem *)data;
 
        free(item->display_name);
        free(item->style);
@@ -274,7 +282,7 @@ static struct slideritem *_read_slider_data_from_json(
                return NULL;
        }
 
-       item = calloc(1, sizeof(struct slideritem));
+       item = (struct slideritem *) calloc(1, sizeof(struct slideritem));
        if (!item)
                return NULL;
 
@@ -338,7 +346,7 @@ static Eina_List *_read_list_data_from_json(
        list = NULL;
 
        for (i = 0; i < length; i++) {
-               item = calloc(1, sizeof(struct listitem));
+               item = (struct listitem *) calloc(1, sizeof(struct listitem));
                if (!item) {
                        _free_list_item(list);
                        return NULL;
@@ -396,13 +404,13 @@ static Eina_List *_get_settingui_args_list(
                        goto error;
                }
 
-               data = calloc(1, sizeof(*data));
+               data = (struct settingui_args *) calloc(1, sizeof(*data));
                if (!data) {
                        _ERR("Allocate memory failed");
                        goto error;
                }
 
-               data->keyname = calloc(1, sizeof(char) * ARRAY_SIZE);
+               data->keyname = (char *) calloc(1, sizeof(char) * ARRAY_SIZE);
                if (!data->keyname) {
                        _ERR("Allocate memory failed");
                        free(data);
@@ -450,7 +458,7 @@ static struct uidata *_get_datainfo_from_json(
                return NULL;
        }
 
-       data = calloc(1, sizeof(struct uidata));
+       data = (struct uidata *) calloc(1, sizeof(struct uidata));
        if (!data)
                return NULL;
 
@@ -547,7 +555,7 @@ static void _get_iteminfo_from_json(struct json_parser *jparser,
                                        jparser, buf);
                } else if (!strncmp(list[i], JSONSTR_SETTINGUI,
                                strlen(list[i]))) {
-                       item->setting_ui = calloc(1, sizeof(struct setting_ui));
+                       item->setting_ui = (struct setting_ui *) calloc(1, sizeof(struct setting_ui));
                        if (!item->setting_ui)
                                continue;
 
@@ -650,7 +658,7 @@ static struct settingitem *_get_settingitem_from_json(
                return NULL;
        }
 
-       item = calloc(1, sizeof(*item));
+       item = (struct settingitem *) calloc(1, sizeof(*item));
        if (!item)
                return NULL;
 
@@ -770,7 +778,7 @@ static int _write_settingitems_to_hash(Eina_Hash *hash,
                if (!newer)
                        continue;
 
-               existed = eina_hash_find(hash, list[i]);
+               existed = (struct settingitem *) eina_hash_find(hash, list[i]);
                if (!existed)
                        eina_hash_add(hash, list[i], newer);
                else
@@ -778,7 +786,7 @@ static int _write_settingitems_to_hash(Eina_Hash *hash,
        }
 
        newer = _get_settingitem_from_json(jparser, name);
-       existed = eina_hash_find(hash, name);
+       existed = (struct settingitem *) eina_hash_find(hash, name);
        if (!existed)
                eina_hash_add(hash, name, newer);
        else
@@ -846,7 +854,7 @@ struct settingmgr_data *viewmgr_data_init(void)
 {
        struct settingmgr_data *data;
 
-       data = calloc(1, sizeof(struct settingmgr_data));
+       data = (struct settingmgr_data *) calloc(1, sizeof(struct settingmgr_data));
        if (!data) {
                _ERR("calloc data failed\n");
                return NULL;
@@ -871,7 +879,8 @@ struct settingmgr_data *viewmgr_data_init(void)
 */
 void viewmgr_data_fini(struct settingmgr_data *data)
 {
-       char *node;
+       char* node;
+       void* obj;
 
        if (!data) {
                _ERR("Parameter error!");
@@ -881,8 +890,11 @@ void viewmgr_data_fini(struct settingmgr_data *data)
        _hash_fini(data->jsonhash);
 
        if (data->parsed_json_file) {
-               EINA_LIST_FREE(data->parsed_json_file, node)
+               EINA_LIST_FREE(data->parsed_json_file, obj)
+               {
+                       node = (char *) obj;
                        free(node);
+               }
        }
 
        free(data);
@@ -903,7 +915,7 @@ struct settingitem *viewmgr_data_get_settingitem(
        if (!name || !data)
                return NULL;
 
-       item = eina_hash_find(data->jsonhash, name);
+       item = (struct settingitem *) eina_hash_find(data->jsonhash, name);
 
        return item;
 }
@@ -918,7 +930,8 @@ struct settingitem *viewmgr_data_get_settingitem(
 int viewmgr_data_read_jsonfile_into_hash(
                struct settingmgr_data *data, const char *name)
 {
-       char *tmp;
+       char* tmp;
+       void* obj;
        const char *style, *ui_name;
        struct settingitem *item;
        Eina_Hash *hash;
@@ -945,7 +958,8 @@ int viewmgr_data_read_jsonfile_into_hash(
        if (style && ui_name && !strncmp(style, STYLE_UIGADGET, strlen(style)))
                return 0;
 
-       EINA_LIST_FOREACH(list, l, tmp) {
+       EINA_LIST_FOREACH(list, l, obj) {
+               tmp = (char *) obj;
                if (!strncmp(tmp, name, BUF_SIZE))
                        flag = 0;
        }
@@ -978,6 +992,7 @@ struct settingview_data *viewmgr_data_build_view(
        Eina_List *list, *l;
        struct settingitem *item;
        const char *node;
+       void* obj;
        struct settingview_data *vdata;
 
        if (!sdata || !name) {
@@ -998,7 +1013,8 @@ struct settingview_data *viewmgr_data_build_view(
        list = settingitem_get_subitems(vdata->parentitem);
        if (list) {
                vdata->childitems = eina_array_new(1);
-               EINA_LIST_FOREACH(list, l, node) {
+               EINA_LIST_FOREACH(list, l, obj) {
+                       node = (const char *) obj;
                        item = viewmgr_data_get_settingitem(sdata, node);
                        if (!item) {
                                _ERR("childitem not found, continuing");
@@ -1444,7 +1460,7 @@ Eina_List *viewdata_get_childitems_list(struct settingview_data *view)
        list = NULL;
        cnt = eina_list_count(subitems);
        for (i = 0; i < cnt; i++) {
-               subitem = eina_array_data_get(view->childitems, i);
+               subitem = (struct settingitem *) eina_array_data_get(view->childitems, i);
                list = eina_list_append(list, subitem);
        }
 
@@ -1477,7 +1493,7 @@ struct settingview_data *viewdata_allocate(void)
 {
        struct settingview_data *vdata;
 
-       vdata = calloc(1, sizeof(*vdata));
+       vdata = (struct settingview_data *) calloc(1, sizeof(*vdata));
        if (!vdata) {
                _ERR("Allocate memory failed\n");
                return NULL;
@@ -1520,6 +1536,7 @@ Eina_List *settingitem_get_slider_group_list(struct settingitem *item,
        Eina_List *l, *group, *result;
        struct settingitem *sitem;
        const char *node;
+       void* obj;
        int found;
 
        if (!item || !sdata || !name) {
@@ -1533,7 +1550,8 @@ Eina_List *settingitem_get_slider_group_list(struct settingitem *item,
 
        found = 0;
 
-       EINA_LIST_FOREACH(group, l, node) {
+       EINA_LIST_FOREACH(group, l, obj) {
+               node = (const char *) obj;
                if (!strncmp(name, node, strlen(name))) {
                        found = 1;
                        break;
@@ -1545,7 +1563,8 @@ Eina_List *settingitem_get_slider_group_list(struct settingitem *item,
 
        result = NULL;
 
-       EINA_LIST_FOREACH(group, l, node) {
+       EINA_LIST_FOREACH(group, l, obj) {
+               node = (const char *) obj;
                sitem = viewmgr_data_get_settingitem(sdata, node);
                if (_check_slider_item(sitem))
                        result = eina_list_append(result, node);
similarity index 97%
rename from src/main.c
rename to src/main.cpp
index b2868fa..1eab3d0 100644 (file)
@@ -53,7 +53,7 @@ static void _refresh(void *priv)
        if (!priv)
                return;
 
-       data = priv;
+       data = (struct _appdata *)priv;
 
        if (!data->mgr)
                return;
@@ -103,7 +103,7 @@ static bool _create(void *data)
        Evas_Object *win;
        int r;
 
-       ad = data;
+       ad = (struct _appdata *)data;
        if (!ad)
                return false;
 
@@ -151,7 +151,7 @@ static void _terminate(void *data)
                return;
        }
 
-       ad = data;
+       ad = (struct _appdata *)data;
 
        settingmgr_fini(ad->mgr);
 
@@ -210,7 +210,7 @@ static void _app_control(app_control_h app_control, void *data)
        if (!data)
                return;
 
-       ad = data;
+       ad = (struct _appdata *)data;
        param = NULL;
 
        if (ad->app_control) {
@@ -275,7 +275,7 @@ static void _lang_changed(void *data)
                return;
        }
 
-       ad = data;
+       ad = (struct _appdata *)data;
        if (!ad->mgr)
                return;
 
similarity index 98%
rename from src/parser.c
rename to src/parser.cpp
index a5df745..2da0aef 100644 (file)
@@ -102,7 +102,7 @@ struct json_parser *parser_init(const char *path)
                return NULL;
        }
 
-       jparser = calloc(1, sizeof(*jparser));
+       jparser = (struct json_parser *) calloc(1, sizeof(*jparser));
        if (!jparser)
                return NULL;
 
@@ -464,7 +464,7 @@ char *parser_get_string_value_from_json(struct json_parser *jparser,
                return NULL;
        }
 
-       result = calloc(1, sizeof(char) * ARRAY_SIZE);
+       result = (char *) calloc(1, sizeof(char) * ARRAY_SIZE);
        if (!result) {
                g_free(output);
                return NULL;
@@ -526,7 +526,7 @@ Eina_List *parser_get_string_list_from_json(struct json_parser *jparser,
 
        list = NULL;
        for (i = 0; i < cnt; i++) {
-               result = calloc(1, sizeof(char) * ARRAY_SIZE);
+               result = (char *) calloc(1, sizeof(char) * ARRAY_SIZE);
                if (!result) {
                        free(arr[0]);
                        free(arr);
similarity index 98%
rename from src/settings_provider.c
rename to src/settings_provider.cpp
index 8e9ad3c..0334ec2 100644 (file)
@@ -167,6 +167,7 @@ struct sleeptimer_data {
        //tvtimer_h timer;
 };
 
+#if 0
 static unsigned int sleeptimer_value[] = {
        0,
        30,
@@ -176,6 +177,7 @@ static unsigned int sleeptimer_value[] = {
        150,
        180
 };
+#endif
 
 /**
 *  An timer foreach iteration callback for tvtimer_foreach_item.
@@ -301,6 +303,7 @@ static enum item_type _find_type(const char *key)
        return result;
 }
 
+#if 0
 /**
 *  Find array index according to given array value and size.
 *
@@ -326,6 +329,7 @@ static int _find_index(unsigned int *array, int size, int val, int *index)
 
        return -1;
 }
+#endif
 
 /**
 *  Set data with integer value.
@@ -400,7 +404,7 @@ static int _set_int(const char *key, int val)
 static int _get_int(const char *key, int *val)
 {
        enum item_type type;
-       int status, size, index;
+       int status;
 
        if (!key || !val) {
                _ERR("Invalid argument");
@@ -438,6 +442,7 @@ static int _get_int(const char *key, int *val)
                        break;
 
 #if 0
+               int size, idex;
                size = _ARRAY_SIZE(speakersettings_item);
                if (_find_index(speakersettings_item,
                                size, *val, &index) == -1) {
@@ -714,7 +719,7 @@ char *provider_get_list_value(struct settingitem *item)
                return NULL;
        }
 
-       result = calloc(1, ARRAY_SIZE);
+       result = (char *) calloc(1, ARRAY_SIZE);
        if (!result) {
                _ERR("Fail to allocate memory");
                return NULL;
@@ -827,6 +832,7 @@ char *provider_get_selected_display_name(struct settingitem *item)
        const char *val, *disp;
        Eina_List *list, *tmp;
        struct listitem *litem;
+       void* obj;
 
        if (!item) {
                _ERR("Invalid argument");
@@ -847,7 +853,8 @@ char *provider_get_selected_display_name(struct settingitem *item)
 
        disp = NULL;
 
-       EINA_LIST_FOREACH(list, tmp, litem) {
+       EINA_LIST_FOREACH(list, tmp, obj) {
+               litem = (struct listitem *) obj;
                val = listitem_get_value(litem);
                if (val && !strncmp(sel, val, strlen(sel))) {
                        disp = listitem_get_display_name(litem);
@@ -856,7 +863,7 @@ char *provider_get_selected_display_name(struct settingitem *item)
        }
 
        if (!disp)
-               disp = listitem_get_display_name(eina_list_nth(list, 0));
+               disp = listitem_get_display_name((struct listitem *) eina_list_nth(list, 0));
 
        provider_release_list_value(sel);
 
similarity index 97%
rename from src/timeout_handler.c
rename to src/timeout_handler.cpp
index 66c4734..e516484 100644 (file)
@@ -52,7 +52,7 @@ static Eina_Bool _event_occrued_cb(void *data, int type, void *event)
                return EINA_FALSE;
        }
 
-       handler = data;
+       handler = (struct timeout_handler *) data;
 
        ecore_timer_reset(handler->timer);
 
@@ -143,7 +143,7 @@ struct timeout_handler *timeout_handler_init(double val)
 {
        struct timeout_handler *data;
 
-       data = calloc(1, sizeof(*data));
+       data = (struct timeout_handler *) calloc(1, sizeof(*data));
        if (!data) {
                _ERR("Fail to allocate memory for timeout handler");
                return NULL;
similarity index 96%
rename from src/utils.c
rename to src/utils.cpp
index 20c2378..39f52c3 100644 (file)
@@ -36,8 +36,8 @@ static void _set_focus_down(Eina_Array *btns, int p, int n)
        if (!btns)
                return;
 
-       cur = eina_array_data_get(btns, p);
-       next = eina_array_data_get(btns, n);
+       cur = (Evas_Object *) eina_array_data_get(btns, p);
+       next = (Evas_Object *) eina_array_data_get(btns, n);
 
        if (!cur || !next)
                return;
@@ -61,8 +61,8 @@ static void _set_focus_up(Eina_Array *btns, int p, int n)
        if (!btns)
                return;
 
-       cur = eina_array_data_get(btns, p);
-       next = eina_array_data_get(btns, n);
+       cur = (Evas_Object *) eina_array_data_get(btns, p);
+       next = (Evas_Object *) eina_array_data_get(btns, n);
 
        if (!cur || !next)
                return;
@@ -357,7 +357,7 @@ void utils_set_focus_directions(Eina_Array *btns, int cnt)
                return;
 
        if (cnt == 1) {
-               btn = eina_array_data_get(btns, 0);
+               btn = (Evas_Object *) eina_array_data_get(btns, 0);
                if (!btn)
                        return;
 
similarity index 94%
rename from src/view_bottomslider.c
rename to src/view_bottomslider.cpp
index edd63ba..8a94e11 100644 (file)
@@ -70,12 +70,19 @@ static void _hide(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_BOTTOM_SLIDER,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .hide_view = 1
+       VCLASS_TITLE_BOTTOM_SLIDER,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       1
 };
 
 /**
similarity index 91%
rename from src/view_bottomsublist.c
rename to src/view_bottomsublist.cpp
index 4de5038..1da0a12 100644 (file)
@@ -70,12 +70,19 @@ static void _hide(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_BOTTOM_SUBLIST,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .hide_view = 1
+       VCLASS_TITLE_BOTTOM_SUBLIST,
+       _create,
+       _show,
+       NULL, // pause
+       NULL, // resume
+       NULL, // refresh
+       NULL, // update
+       _hide,
+       _destroy,
+       NULL, // lang_changed
+       NULL, // frozen
+       NULL, // active
+       1
 };
 
 /**
similarity index 90%
rename from src/view_device_manager.c
rename to src/view_device_manager.cpp
index 5e49c07..ce71c56 100644 (file)
@@ -45,12 +45,19 @@ static void _hide(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_DEVICE_MANAGER,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .hide_view = 0
+       VCLASS_TITLE_DEVICE_MANAGER,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 struct setting_class *view_device_manager_get_vclass(void)
similarity index 90%
rename from src/view_maincatalog.c
rename to src/view_maincatalog.cpp
index 2fda8e7..f1e1e58 100644 (file)
@@ -111,21 +111,21 @@ static void _subitem_key_pressed_cb(void *data, Evas *e,
        if (!data || !ei || !obj)
                return;
 
-       ev = ei;
+       ev = (Evas_Event_Key_Down *) ei;
        if (!ev->keyname)
                return;
 
-       priv = data;
+       priv = (struct _view_data *)data;
 
        if (!strcmp(ev->keyname, KEY_LEFT) || !strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
-               pb = evas_object_data_get(obj, PROGRESS_BAR_DATA);
+               pb = (Evas_Object *) evas_object_data_get(obj, PROGRESS_BAR_DATA);
                if (pb)
                        elm_object_signal_emit(pb,
                                        SIG_UNCTRL_PB_UNFOCUSED, SRC_PB_PROG);
 
                _move_from_subitem_to_main_item(priv, obj);
        } else if (!strncmp(ev->keyname, KEY_DOWN, strlen(ev->keyname))) {
-               pb = evas_object_data_get(obj, PROGRESS_BAR_DATA);
+               pb = (Evas_Object *)evas_object_data_get(obj, PROGRESS_BAR_DATA);
                if (pb)
                        elm_object_signal_emit(pb,
                                        SIG_UNCTRL_PB_UNFOCUSED, SRC_PB_PROG);
@@ -137,12 +137,12 @@ static void _subitem_key_pressed_cb(void *data, Evas *e,
                        return;
                }
 
-               pb = evas_object_data_get(next, PROGRESS_BAR_DATA);
+               pb = (Evas_Object *)evas_object_data_get(next, PROGRESS_BAR_DATA);
                if (pb)
                        elm_object_signal_emit(pb,
                                        SIG_UNCTRL_PB_FOCUSED, SRC_PB_PROG);
        } else if (!strncmp(ev->keyname, KEY_UP, strlen(ev->keyname))) {
-               pb = evas_object_data_get(obj, PROGRESS_BAR_DATA);
+               pb = (Evas_Object *)evas_object_data_get(obj, PROGRESS_BAR_DATA);
                if (pb)
                        elm_object_signal_emit(pb,
                                        SIG_UNCTRL_PB_UNFOCUSED, SRC_PB_PROG);
@@ -153,7 +153,7 @@ static void _subitem_key_pressed_cb(void *data, Evas *e,
                        return;
                }
 
-               pb = evas_object_data_get(next, PROGRESS_BAR_DATA);
+               pb = (Evas_Object *)evas_object_data_get(next, PROGRESS_BAR_DATA);
                if (pb)
                        elm_object_signal_emit(pb,
                                        SIG_UNCTRL_PB_FOCUSED, SRC_PB_PROG);
@@ -333,7 +333,7 @@ static int _push_bottom_slider_view(struct _view_data *data,
                return -1;
        }
 
-       pb = evas_object_data_get(obj, PROGRESS_BAR_DATA);
+       pb = (Evas_Object *)evas_object_data_get(obj, PROGRESS_BAR_DATA);
        if (pb)
                elm_object_signal_emit(pb,
                                SIG_UNCTRL_PB_UNFOCUSED, SRC_PB_PROG);
@@ -598,12 +598,12 @@ static void _submenu_item_clicked(void *data, Evas_Object *obj)
                return;
        }
 
-       priv = data;
+       priv = (struct _view_data *) data;
 
        if (priv->focus_status != FOCUS_SUB_ITEM)
                return;
 
-       item = evas_object_data_get(obj, SUBITEM_DATA_ID);
+       item =(struct settingitem *)  evas_object_data_get(obj, SUBITEM_DATA_ID);
        if (!item) {
                _ERR("Get sub item failed");
                return;
@@ -684,7 +684,7 @@ static void _subitem_btn_clicked_cb(void *data,
                return;
        }
 
-       priv = data;
+       priv = (struct _view_data *)data;
 
        _submenu_item_clicked(priv, obj);
 
@@ -961,6 +961,7 @@ static void _draw_subitem_with_style(Evas_Object *base, Evas_Object *obj,
 static void _release_subitems(struct _view_data *data)
 {
        Evas_Object *btn;
+       void* obj;
        Eina_Array_Iterator a;
        unsigned int i;
 
@@ -970,8 +971,11 @@ static void _release_subitems(struct _view_data *data)
        }
 
        if (data->sub_item_btn) {
-               EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, btn, a)
+               EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, obj, a)
+               {
+                       btn = (Evas_Object *) obj;
                        evas_object_del(btn);
+               }
                eina_array_free(data->sub_item_btn);
        }
 
@@ -992,6 +996,7 @@ static void _release_subitems(struct _view_data *data)
 static int _refresh_subitems(struct _view_data *data)
 {
        Evas_Object *btn;
+       void* obj;
        Eina_Array_Iterator a;
        unsigned int i;
        struct settingitem *item;
@@ -1002,8 +1007,9 @@ static int _refresh_subitems(struct _view_data *data)
                return -1;
        }
 
-       EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, btn, a) {
-               item = evas_object_data_get(btn, SUBITEM_DATA_ID);
+       EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, obj, a) {
+               btn = (Evas_Object *) obj;
+               item = (struct settingitem *)evas_object_data_get(btn, SUBITEM_DATA_ID);
                style = settingitem_get_style(item);
                if (style)
                        _draw_subitem_with_style(data->base, btn, style, item);
@@ -1047,7 +1053,7 @@ static void _subitem_btn_mouse_in_cb(void *data, Evas *e,
        if (!obj || !data)
                return;
 
-       priv = data;
+       priv = (struct _view_data *)data;
 
        elm_object_focus_set(obj, EINA_TRUE);
 
@@ -1064,13 +1070,13 @@ static void _subitem_btn_mouse_in_cb(void *data, Evas *e,
                                        MAIN_BTN_HIGHLIGHT, MAIN_BTN);
        }
 
-       pb = evas_object_data_get(priv->focused_sub_item_btn,
+       pb =(Evas_Object *) evas_object_data_get(priv->focused_sub_item_btn,
                        PROGRESS_BAR_DATA);
        if (pb)
                elm_object_signal_emit(pb, SIG_UNCTRL_PB_UNFOCUSED,
                                SRC_PB_PROG);
 
-       pb = evas_object_data_get(obj, PROGRESS_BAR_DATA);
+       pb = (Evas_Object *)evas_object_data_get(obj, PROGRESS_BAR_DATA);
        if (pb)
                elm_object_signal_emit(pb, SIG_UNCTRL_PB_FOCUSED, SRC_PB_PROG);
 
@@ -1090,6 +1096,7 @@ static int _draw_subitems(struct _view_data *data, const char *name)
        Evas_Object *box, *btn, *tmp;
        struct settingview_data *view;
        struct settingitem *item;
+       void* obj;
        Eina_List *list, *l;
        int cnt;
        Eina_Array_Iterator a;
@@ -1122,7 +1129,11 @@ static int _draw_subitems(struct _view_data *data, const char *name)
        enabled = eina_array_new(1);
        if (!data->sub_item_btn || !enabled) {
                _ERR("Create Eina Array failed\n");
-               EINA_LIST_FREE(list, item);
+               EINA_LIST_FREE(list, obj);
+               {
+                       item = (struct settingitem *) obj;
+                       free(item);
+               }
                if (view)
                        viewdata_release(view);
                return -1;
@@ -1131,22 +1142,34 @@ static int _draw_subitems(struct _view_data *data, const char *name)
        box = utils_add_box(data->base);
        if (!box) {
                _ERR("Add box failed\n");
-               EINA_LIST_FREE(list, item);
+               EINA_LIST_FREE(list, obj);
+               {
+                       item = (struct settingitem *) obj;
+                       free(item);
+               }
                eina_array_free(data->sub_item_btn);
                if (view)
                        viewdata_release(view);
                return -1;
        }
 
-       EINA_LIST_FOREACH(list, l, item) {
+       EINA_LIST_FOREACH(list, l, obj) {
+               item = (struct settingitem *) obj;
                btn = utils_add_btn(data->base, SUBITEMBTN_STYLE,
                                settingitem_get_display_name(item), EINA_FALSE);
                if (!btn) {
                        _ERR("Add btn failed");
                        evas_object_del(box);
-                       EINA_LIST_FREE(list, item);
-                       EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, tmp, a)
+                       EINA_LIST_FREE(list, obj);
+                       {
+                               item = (struct settingitem *) obj;
+                               free(item);
+                       }
+                       EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, obj, a)
+                       {
+                               tmp = (Evas_Object *) obj;
                                evas_object_del(tmp);
+                       }
                        eina_array_free(data->sub_item_btn);
                        if (view)
                                viewdata_release(view);
@@ -1188,7 +1211,11 @@ static int _draw_subitems(struct _view_data *data, const char *name)
 
        utils_set_focus_directions(enabled, eina_array_count(enabled));
 
-       EINA_LIST_FREE(list, item);
+       EINA_LIST_FREE(list, obj);
+       {
+               item = (struct settingitem *) obj;
+               free(item);
+       }
        eina_array_free(enabled);
 
        return 0;
@@ -1214,7 +1241,7 @@ static void _move_from_main_item_to_subitem(struct _view_data *data,
        data->focus_status = FOCUS_SUB_ITEM;
 
        for (i = 0; i < data->sub_item_count; i++) {
-               btn = eina_array_data_get(data->sub_item_btn, i);
+               btn = (Evas_Object *) eina_array_data_get(data->sub_item_btn, i);
                if (!btn) {
                        _ERR("Get subitem btn failed\n");
                        data->focus_status = FOCUS_MAIN_ITEM;
@@ -1230,7 +1257,7 @@ static void _move_from_main_item_to_subitem(struct _view_data *data,
                return;
        }
 
-       pb = evas_object_data_get(btn, PROGRESS_BAR_DATA);
+       pb = (Evas_Object *)evas_object_data_get(btn, PROGRESS_BAR_DATA);
        if (pb)
                elm_object_signal_emit(pb, SIG_UNCTRL_PB_FOCUSED, SRC_PB_PROG);
 
@@ -1266,11 +1293,11 @@ static void _main_setting_key_pressed_cb(void *data, Evas *e,
        if (!data || !ei || !obj)
                return;
 
-       ev = ei;
+       ev = (Evas_Event_Key_Down *)ei;
        if (!ev->keyname)
                return;
 
-       priv = data;
+       priv = (struct _view_data *)data;
 
        if (!strcmp(ev->keyname, KEY_DOWN)) {
                icon = elm_object_part_content_get(obj,
@@ -1303,7 +1330,7 @@ static void _main_setting_key_pressed_cb(void *data, Evas *e,
 
                _release_subitems(priv);
 
-               name = evas_object_data_get(next, SETTING_ID);
+               name =(const char *) evas_object_data_get(next, SETTING_ID);
                if (name)
                        _draw_subitems(priv, name);
        } else if (!strcmp(ev->keyname, KEY_UP)) {
@@ -1337,7 +1364,7 @@ static void _main_setting_key_pressed_cb(void *data, Evas *e,
 
                _release_subitems(priv);
 
-               name = evas_object_data_get(next, SETTING_ID);
+               name =(const char *) evas_object_data_get(next, SETTING_ID);
                if (name)
                        _draw_subitems(priv, name);
        } else if (!strcmp(ev->keyname, KEY_RIGHT)) {
@@ -1369,7 +1396,7 @@ static void _mainitem_btn_mouse_in_cb(void *data, Evas *e,
                return;
        }
 
-       priv = data;
+       priv = (struct _view_data *)data;
 
        if (priv->focus_status == FOCUS_SUB_ITEM)
                _move_from_subitem_to_main_item(priv,
@@ -1386,7 +1413,7 @@ static void _mainitem_btn_mouse_in_cb(void *data, Evas *e,
 
        _release_subitems(priv);
 
-       name = evas_object_data_get(obj, SETTING_ID);
+       name =(const char *) evas_object_data_get(obj, SETTING_ID);
        if (name)
                _draw_subitems(priv, name);
 
@@ -1429,7 +1456,7 @@ static void _mainitem_btn_clicked_cb(void *data,
                return;
        }
 
-       priv = data;
+       priv = (struct _view_data *)data;
        _move_from_main_item_to_subitem(priv, obj);
 }
 
@@ -1462,7 +1489,7 @@ static int _add_icon_btns(struct _view_data *data, Eina_List *list)
                        return -1;
                }
 
-               item = eina_list_nth(list, i);
+               item = (struct settingitem *) eina_list_nth(list, i);
                if (item) {
                        name = settingitem_get_display_name(item);
                        elm_object_text_set(btn,
@@ -1520,6 +1547,7 @@ static int _draw_main_items(struct _view_data *data)
        Eina_List *list;
        int cnt, i;
        Eina_Array_Iterator a;
+       void* obj;
 
        if (!data || !data->base)
                return -1;
@@ -1573,15 +1601,15 @@ static int _draw_main_items(struct _view_data *data)
        elm_object_part_content_set(data->base, MAIN_VIEW_ICON_SWALLOW, box);
 
        if (!data->item_path) {
-               btn = eina_array_data_get(btns, 0);
+               btn = (Evas_Object *)eina_array_data_get(btns, 0);
                if (!btn)
                        goto error;
 
                if (_draw_subitems(data,
-                               evas_object_data_get(btn, SETTING_ID)) == -1)
+                               (const char *) evas_object_data_get(btn, SETTING_ID)) == -1)
                        goto error;
 
-               icon = eina_array_data_get(icons, 0);
+               icon = (Evas_Object *)eina_array_data_get(icons, 0);
                if (!icon) {
                        if (data->subsetting_view)
                                viewdata_release(data->subsetting_view);
@@ -1605,12 +1633,18 @@ static int _draw_main_items(struct _view_data *data)
 error:
        evas_object_del(box);
        viewdata_free_childitems_list(list);
-       EINA_ARRAY_ITER_NEXT(btns, i, tmp, a)
+       EINA_ARRAY_ITER_NEXT(btns, i, obj, a)
+       {
+               tmp = (Evas_Object *) obj;
                evas_object_del(tmp);
+       }
        eina_array_free(btns);
 
-       EINA_ARRAY_ITER_NEXT(icons, i, tmp, a)
+       EINA_ARRAY_ITER_NEXT(icons, i, obj, a)
+       {
+               tmp = (Evas_Object *) obj;
                evas_object_del(tmp);
+       }
        eina_array_free(icons);
 
        return -1;
@@ -1635,7 +1669,7 @@ static void _view_anim_finish(void *data, Evas_Object *obj,
        if (!data)
                return;
 
-       priv = data;
+       priv = (struct _view_data *)data;
 
        _draw_main_items(priv);
        _DBG("END =========================================================");
@@ -1655,6 +1689,7 @@ void _move_focus_on_subitem(struct _view_data *data)
        unsigned int i;
        Evas_Object *icon, *subbtn, *pb;
        Eina_Array *subbtns;
+       void* obj;
        Eina_Array_Iterator a;
        struct settingitem *item;
 
@@ -1663,10 +1698,11 @@ void _move_focus_on_subitem(struct _view_data *data)
 
        subbtns = data->sub_item_btn;
 
-       path = eina_array_data_get(data->item_path, 0);
+       path = (const char*) eina_array_data_get(data->item_path, 0);
 
-       EINA_ARRAY_ITER_NEXT(subbtns, i, subbtn, a) {
-               item = evas_object_data_get(subbtn, SUBITEM_DATA_ID);
+       EINA_ARRAY_ITER_NEXT(subbtns, i, obj, a) {
+               subbtn = (Evas_Object *) obj;
+               item = (struct settingitem *) evas_object_data_get(subbtn, SUBITEM_DATA_ID);
                id = settingitem_get_id(item);
                if (!id)
                        return;
@@ -1687,7 +1723,7 @@ void _move_focus_on_subitem(struct _view_data *data)
                                        MAINICONBTN_FOCUSED_ON_SUBITEM,
                                        MAINICONBTN_MAIN_ITEM_SOURCE);
 
-                       pb = evas_object_data_get(subbtn, PROGRESS_BAR_DATA);
+                       pb = (Evas_Object *) evas_object_data_get(subbtn, PROGRESS_BAR_DATA);
                        if (pb)
                                elm_object_signal_emit(pb,
                                                SIG_UNCTRL_PB_FOCUSED,
@@ -1719,8 +1755,8 @@ static void _change_buttons_name(Eina_List *list,
        }
 
        for (i = 0; i < cnt; i++) {
-               item = eina_list_nth(list, i);
-               btn = eina_array_data_get(btns, i);
+               item = (struct settingitem *)eina_list_nth(list, i);
+               btn = (Evas_Object *)eina_array_data_get(btns, i);
                if (!item || !btn)
                        return;
 
@@ -1758,7 +1794,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       data = calloc(1, sizeof(*data));
+       data = (struct _view_data *) calloc(1, sizeof(*data));
        if (!data)
                return NULL;
 
@@ -1812,6 +1848,7 @@ static void _show(Evas_Object *base)
        unsigned int cnt, i;
        const char *name, *path;
        Evas_Object *btn, *icon;
+       void* obj;
        Eina_Array *btns;
        Eina_Array_Iterator a;
 
@@ -1820,7 +1857,7 @@ static void _show(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _view_data *) evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("evas object data get failed. id: %s", DATA_ID);
                return;
@@ -1833,20 +1870,21 @@ static void _show(Evas_Object *base)
 
                cnt = eina_array_count(data->item_path);
                if (cnt > 1) {
-                       path = eina_array_data_get(data->item_path, cnt - 2);
+                       path = (const char *) eina_array_data_get(data->item_path, cnt - 2);
                        if (!path)
                                return;
                }
 
-               EINA_ARRAY_ITER_NEXT(btns, i, btn, a) {
-                       name = evas_object_data_get(btn, SETTING_ID);
+               EINA_ARRAY_ITER_NEXT(btns, i, obj, a) {
+                       btn = (Evas_Object *) obj;
+                       name = (const char *) evas_object_data_get(btn, SETTING_ID);
                        if (!name)
                                return;
 
                        if (!strncmp(name, path, ARRAY_SIZE)) {
                                _draw_subitems(data, name);
 
-                               icon = eina_array_data_get(
+                               icon = (Evas_Object *)eina_array_data_get(
                                                data->main_icon_base, i);
                                if (icon)
                                        elm_object_signal_emit(icon,
@@ -1899,18 +1937,20 @@ static void _refresh(Evas_Object *base)
        struct settingitem *item;
        Eina_Array_Iterator a;
        Evas_Object *btn, *pb, *icon;
+       void* obj;
 
        if (!base)
                return;
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _view_data *) evas_object_data_get(base, DATA_ID);
        if (!data)
                return;
 
-       sld = evas_object_data_del(base, SELECTED_ITEM_ID);
+       sld = (char *) evas_object_data_del(base, SELECTED_ITEM_ID);
        if (sld) {
-               EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, btn, a) {
-                       item = evas_object_data_get(btn, SUBITEM_DATA_ID);
+               EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, obj, a) {
+                       btn = (Evas_Object *) obj;
+                       item = (struct settingitem *) evas_object_data_get(btn, SUBITEM_DATA_ID);
                        id = settingitem_get_id(item);
                        if (!id)
                                continue;
@@ -1938,7 +1978,7 @@ static void _refresh(Evas_Object *base)
                if (_refresh_subitems(data) == -1)
                        _ERR("Refresh subitems failed");
 
-               pb = evas_object_data_get(data->focused_sub_item_btn,
+               pb = (Evas_Object *) evas_object_data_get(data->focused_sub_item_btn,
                                PROGRESS_BAR_DATA);
                if (pb)
                        elm_object_signal_emit(pb,
@@ -1961,6 +2001,7 @@ static void _destroy(Evas_Object *base)
        struct _view_data *data;
        Eina_Array_Iterator a;
        Evas_Object *tmp;
+       void* obj;
        unsigned int i;
 
        if (!base) {
@@ -1968,23 +2009,32 @@ static void _destroy(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _view_data *) evas_object_data_get(base, DATA_ID);
 
        if (data->sub_item_btn) {
-               EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, tmp, a)
+               EINA_ARRAY_ITER_NEXT(data->sub_item_btn, i, obj, a)
+               {
+                       tmp = (Evas_Object *) obj;
                        evas_object_del(tmp);
+               }
                eina_array_free(data->sub_item_btn);
        }
 
        if (data->main_item_btn) {
-               EINA_ARRAY_ITER_NEXT(data->main_item_btn, i, tmp, a)
+               EINA_ARRAY_ITER_NEXT(data->main_item_btn, i, obj, a)
+               {
+                       tmp = (Evas_Object *) obj;
                        evas_object_del(tmp);
+               }
                eina_array_free(data->main_item_btn);
        }
 
        if (data->main_icon_base) {
-               EINA_ARRAY_ITER_NEXT(data->main_icon_base, i, tmp, a)
+               EINA_ARRAY_ITER_NEXT(data->main_icon_base, i, obj, a)
+               {
+                       tmp = (Evas_Object *) obj;
                        evas_object_del(tmp);
+               }
                eina_array_free(data->main_icon_base);
        }
 
@@ -2016,7 +2066,7 @@ static void _lang_changed(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _view_data *) evas_object_data_get(base, DATA_ID);
        if (!data)
                return;
 
@@ -2051,7 +2101,7 @@ static void _frozen(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _view_data *)evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Fail to get mainview data");
                return;
@@ -2077,7 +2127,7 @@ static void _active(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _view_data *)evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Fail to get mainview data");
                return;
@@ -2088,16 +2138,19 @@ static void _active(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_MAIN_VIEW,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .refresh = _refresh,
-       .frozen = _frozen,
-       .active = _active,
-       .lang_changed = _lang_changed,
-       .hide_view = 0
+       VCLASS_TITLE_MAIN_VIEW,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       _refresh,
+       NULL,
+       _hide,
+       _destroy,
+       _lang_changed,
+       _frozen,
+       _active,
+       0
 };
 
 /**
similarity index 91%
rename from src/view_need_pwd.c
rename to src/view_need_pwd.cpp
index ca484a6..88104c3 100644 (file)
@@ -173,7 +173,7 @@ static void _cancel_btn_clicked_cb(void *priv, Evas_Object *obj,
        if (!priv || !obj)
                return;
 
-       data = priv;
+       data = (struct _chnllock_data *) priv;
 
        settingmgr_view_pop(data->mgr);
 }
@@ -253,7 +253,7 @@ static void _push_next_view(struct _chnllock_data *data)
        if (!list)
                return;
 
-       item = eina_list_nth(list, 0);
+       item = (struct settingitem *) eina_list_nth(list, 0);
        if (!item)
                return;
 
@@ -288,12 +288,12 @@ static void _key_down_cb(void *priv, Evas *e, Evas_Object *obj,
        if (!priv || !ei || !obj)
                return;
 
-       data = priv;
+       data = (struct _chnllock_data *)priv;
        array = data->array;
        if (!array)
                return;
 
-       event = ei;
+       event = (Evas_Event_Key_Down *) ei;
        keyname = event->keyname;
        if (!keyname)
                return;
@@ -345,14 +345,14 @@ static void _key_down_cb(void *priv, Evas *e, Evas_Object *obj,
                                elm_object_part_text_set(data->base,
                                                PART_UPTEXT, text);
 
-                               entry = eina_array_data_get(array, PWD_ENTRY_0);
+                               entry = (Evas_Object *) eina_array_data_get(array, PWD_ENTRY_0);
                                if (!entry)
                                        return;
 
                                elm_object_focus_set(entry, EINA_TRUE);
 
                                for (i = PWD_ENTRY_0; i < PWD_ENTRY_MAX; i++) {
-                                       entry = eina_array_data_get(array, i);
+                                       entry = (Evas_Object *)eina_array_data_get(array, i);
                                        if (!entry)
                                                return;
 
@@ -382,19 +382,19 @@ static void _set_entry_directions(Eina_Array *array,
                return;
 
        for (idx = PWD_ENTRY_0; idx < PWD_ENTRY_3; idx++) {
-               entry = eina_array_data_get(array, idx);
+               entry = (Evas_Object *)eina_array_data_get(array, idx);
                if (!entry)
                        return;
 
                elm_object_focus_next_object_set(entry,
-                               eina_array_data_get(array, idx + 1),
+                               (Evas_Object *)eina_array_data_get(array, idx + 1),
                                ELM_FOCUS_NEXT);
                elm_object_focus_next_object_set(entry,
                                cancel_btn, ELM_FOCUS_DOWN);
        }
 
        elm_object_focus_next_object_set(cancel_btn,
-                       eina_array_data_get(array, PWD_ENTRY_0),
+                       (Evas_Object *)eina_array_data_get(array, PWD_ENTRY_0),
                        ELM_FOCUS_UP);
 }
 
@@ -496,9 +496,9 @@ static int _add_view_entries(struct _chnllock_data *data)
                                _key_down_cb, data);
        }
 
-       elm_object_focus_allow_set(eina_array_data_get(array, PWD_ENTRY_0),
+       elm_object_focus_allow_set((Evas_Object*) eina_array_data_get(array, PWD_ENTRY_0),
                        EINA_TRUE);
-       elm_object_focus_set(eina_array_data_get(array, PWD_ENTRY_0),
+       elm_object_focus_set((Evas_Object *)eina_array_data_get(array, PWD_ENTRY_0),
                        EINA_TRUE);
 
        elm_object_part_content_set(data->base, SWALLOW_CONTENT_AREA, box);
@@ -528,7 +528,7 @@ static void _ctxpopup_dismissed(void *priv, Evas_Object *obj,
        if (!priv || !obj)
                return;
 
-       data = priv;
+       data = (struct _chnllock_data *) priv;
        if (!data->base || !data->mgr)
                return;
 
@@ -568,13 +568,13 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       data = calloc(1, sizeof(*data));
+       data = (struct _chnllock_data *) calloc(1, sizeof(*data));
        if (!data) {
                _ERR("calloc memory for _priv_data failed.");
                return NULL;
        }
 
-       tmp = prev;
+       tmp = (struct obj_geometry_data *) prev;
 
        data->win = win;
        data->gd = *tmp;
@@ -587,7 +587,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
 
        data->bg = bg;
 
-       ctxpopup = utils_add_ctxpopup(win, CHANGE_PWD_CTXPOPUP_STYLE);
+       ctxpopup = utils_add_ctxpopup(win, (char *)CHANGE_PWD_CTXPOPUP_STYLE);
        if (!ctxpopup) {
                _ERR("add ctxpopup failed.");
                goto error;
@@ -655,7 +655,7 @@ static void _show(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, CHNLLOCK_DATA_ID);
+       data = (struct _chnllock_data *) evas_object_data_get(base, CHNLLOCK_DATA_ID);
        if (!data) {
                _ERR("get data from base failed. ID: %s.", CHNLLOCK_DATA_ID);
                return;
@@ -680,7 +680,7 @@ static void _destroy(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, CHNLLOCK_DATA_ID);
+       data = (struct _chnllock_data *) evas_object_data_get(base, CHNLLOCK_DATA_ID);
        if (!data) {
                _ERR("get data from base failed. ID: %s.", CHNLLOCK_DATA_ID);
                return;
@@ -703,7 +703,7 @@ static void _hide(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, CHNLLOCK_DATA_ID);
+       data = (struct _chnllock_data *) evas_object_data_get(base, CHNLLOCK_DATA_ID);
        if (!data)
                return;
 
@@ -726,7 +726,7 @@ static void _refresh(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, CHNLLOCK_DATA_ID);
+       data = (struct _chnllock_data *) evas_object_data_get(base, CHNLLOCK_DATA_ID);
        if (!data)
                return;
 
@@ -737,12 +737,19 @@ static void _refresh(Evas_Object *base)
 * view class of channel lock view.
 */
 struct setting_class _vclass = {
-       .title = VCLASS_TITLE_NEED_PASSCODE,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .refresh = _refresh
+       VCLASS_TITLE_NEED_PASSCODE,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       _refresh,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 /**
similarity index 93%
rename from src/view_pwd_popup.c
rename to src/view_pwd_popup.cpp
index 4c60f04..3ecbc5c 100644 (file)
@@ -176,7 +176,7 @@ static void _cancelbtn_clicked_cb(void *priv, Evas_Object *obj, void *ev)
        if (!priv || !obj)
                return;
 
-       data = priv;
+       data = (struct _pwd_data *) priv;
 
        settingmgr_view_pop(data->mgr);
 }
@@ -196,7 +196,7 @@ static Evas_Object *_add_pwd_cancel_btn(struct _pwd_data *data)
                return NULL;
 
        btn = utils_add_btn(data->base, PWD_BASIC_BTN,
-                       utils_get_translation_str(MSGID_CANCEL), EINA_TRUE);
+                       utils_get_translation_str((const char *) MSGID_CANCEL), EINA_TRUE);
        if (!btn) {
                _ERR("utils add button failed.");
                return NULL;
@@ -230,12 +230,12 @@ static void _set_entry_directions(Eina_Array *array, Evas_Object *cancel_btn)
                return;
 
        for (i = ENTRY_0; i < ENTRY_3; i++) {
-               en = eina_array_data_get(array, i);
+               en = (Evas_Object *) eina_array_data_get(array, i);
                if (!en)
                        return;
 
                elm_object_focus_next_object_set(en,
-                               eina_array_data_get(array, i + 1),
+                               (Evas_Object *) eina_array_data_get(array, i + 1),
                                ELM_FOCUS_NEXT);
                elm_object_focus_next_object_set(en, en, ELM_FOCUS_LEFT);
                elm_object_focus_next_object_set(en, en, ELM_FOCUS_RIGHT);
@@ -244,7 +244,7 @@ static void _set_entry_directions(Eina_Array *array, Evas_Object *cancel_btn)
                                ELM_FOCUS_DOWN);
        }
 
-       lasten = eina_array_data_get(array, ENTRY_3);
+       lasten = (Evas_Object *) eina_array_data_get(array, ENTRY_3);
        elm_object_focus_next_object_set(lasten, lasten, ELM_FOCUS_UP);
        elm_object_focus_next_object_set(lasten, cancel_btn, ELM_FOCUS_DOWN);
        elm_object_focus_next_object_set(lasten, lasten, ELM_FOCUS_LEFT);
@@ -255,7 +255,7 @@ static void _set_entry_directions(Eina_Array *array, Evas_Object *cancel_btn)
        elm_object_focus_next_object_set(cancel_btn, cancel_btn,
                        ELM_FOCUS_RIGHT);
        elm_object_focus_next_object_set(cancel_btn,
-                       eina_array_data_get(array, ENTRY_0), ELM_FOCUS_UP);
+                       (Evas_Object *) eina_array_data_get(array, ENTRY_0), ELM_FOCUS_UP);
        elm_object_focus_next_object_set(cancel_btn, cancel_btn,
                        ELM_FOCUS_DOWN);
 }
@@ -355,7 +355,7 @@ static void _reset_pwd(struct _pwd_data *data)
 
        array = data->array;
 
-       first = eina_array_data_get(array, ENTRY_0);
+       first = (Evas_Object *) eina_array_data_get(array, ENTRY_0);
        if (!first)
                return;
 
@@ -363,7 +363,7 @@ static void _reset_pwd(struct _pwd_data *data)
        elm_object_focus_next_object_set(data->cancel_btn, first, ELM_FOCUS_UP);
 
        for (i = ENTRY_0; i < ENTRY_MAX; i++) {
-               btn = eina_array_data_get(array, i);
+               btn = (Evas_Object *)eina_array_data_get(array, i);
                if (!btn)
                        return;
 
@@ -466,12 +466,12 @@ static void _entry_keypress_cb(void *priv, Evas *e,
        if (!priv || !ei || !obj)
                return;
 
-       data = priv;
+       data = (struct _pwd_data *) priv;
        array = data->array;
        if (!array)
                return;
 
-       event = ei;
+       event = (Evas_Event_Key_Down *) ei;
        keyname = event->keyname;
        if (!keyname)
                return;
@@ -663,9 +663,9 @@ static int _add_pwd_entry(struct _pwd_data *data)
        elm_object_part_content_set(data->base, SWALLOW_CONTENT_AREA, box);
 
        elm_object_focus_allow_set(
-                       eina_array_data_get(array, ENTRY_0), EINA_TRUE);
+                       (Evas_Object *) eina_array_data_get(array, ENTRY_0), EINA_TRUE);
        elm_object_focus_set(
-                       eina_array_data_get(array, ENTRY_0), EINA_TRUE);
+                       (Evas_Object *)eina_array_data_get(array, ENTRY_0), EINA_TRUE);
 
        _set_entry_directions(array, data->cancel_btn);
 
@@ -692,7 +692,7 @@ static void _ctxpopup_dismissed(void *priv, Evas_Object *obj,
        if (!priv || !obj)
                return;
 
-       data = priv;
+       data = (struct _pwd_data *) priv;
 
        if (!data->base || !data->mgr)
                return;
@@ -735,7 +735,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       data = calloc(1, sizeof(*data));
+       data = (struct _pwd_data *)calloc(1, sizeof(*data));
        if (!data) {
                _ERR("calloc _change_passcode_data failed.");
                return NULL;
@@ -751,7 +751,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                goto error;
        }
 
-       ctxpopup = utils_add_ctxpopup(win, CHANGE_PWD_CTXPOPUP_STYLE);
+       ctxpopup = utils_add_ctxpopup(win, (char *) CHANGE_PWD_CTXPOPUP_STYLE);
        if (!ctxpopup) {
                _ERR("add ctxpopup failed.");
                goto error;
@@ -821,7 +821,7 @@ static void _show(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, PWD_DATA_ID);
+       data = (struct _pwd_data *)evas_object_data_get(base, PWD_DATA_ID);
        if (!data) {
                _ERR("get data from base failed. ID: %s.", PWD_DATA_ID);
                return;
@@ -844,7 +844,7 @@ static void _destroy(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, PWD_DATA_ID);
+       data = (struct _pwd_data *)evas_object_data_get(base, PWD_DATA_ID);
        if (!data) {
                _ERR("get data from base failed. ID: %s.", PWD_DATA_ID);
                return;
@@ -867,7 +867,7 @@ static void _hide(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, PWD_DATA_ID);
+       data = (struct _pwd_data *)evas_object_data_get(base, PWD_DATA_ID);
        if (!data) {
                _ERR("get data from base failed. ID: %s.",
                                PWD_DATA_ID);
@@ -882,11 +882,19 @@ static void _hide(Evas_Object *base)
 * view class of change passcode view.
 */
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_CHANGE_PASSCODE,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide
+       VCLASS_TITLE_CHANGE_PASSCODE,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 /**
similarity index 94%
rename from src/view_resetpopup.c
rename to src/view_resetpopup.cpp
index b1d315e..cf99bde 100644 (file)
@@ -70,12 +70,19 @@ static void _hide(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_RESET_POPUP,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .hide_view = 0
+       VCLASS_TITLE_RESET_POPUP,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 /**
similarity index 92%
rename from src/view_sublist.c
rename to src/view_sublist.cpp
index a5110f2..67fe5ed 100644 (file)
@@ -150,7 +150,7 @@ static void _set_selected_value(struct _sublist_data *data,
                return;
        }
 
-       val = evas_object_data_get(obj, ITEMID);
+       val = (char *) evas_object_data_get(obj, ITEMID);
        if (val) {
                r = provider_set_list_value(item, val);
                if (r == -1)
@@ -175,7 +175,7 @@ static void _scroller_bottom_cb(void *data, Evas_Object *obj, void *event)
                return;
        }
 
-       priv = data;
+       priv = (struct _sublist_data *) data;
 
        elm_object_signal_emit(priv->ctxpopup, SUBLIST_SHOW_UP_ARROW, "");
 }
@@ -197,7 +197,7 @@ static void _scroller_top_cb(void *data, Evas_Object *obj, void *event)
                return;
        }
 
-       priv = data;
+       priv = (struct _sublist_data *) data;
 
        elm_object_signal_emit(priv->ctxpopup, SUBLIST_SHOW_DOWN_ARROW, "");
 }
@@ -219,7 +219,7 @@ static void _scroll_event_cb(void *data, Evas_Object *obj, void *event)
                return;
        }
 
-       priv = data;
+       priv = (struct _sublist_data *) data;
 
        elm_object_signal_emit(priv->ctxpopup, SUBLIST_SHOW_BOTH_ARROW, "");
 }
@@ -242,9 +242,9 @@ static void _subitem_focus_in_cb(void *data, Evas_Object *obj, void *ev)
                return;
        }
 
-       priv = data;
+       priv = (struct _sublist_data *) data;
 
-       val = evas_object_data_get(obj, ITEMID);
+       val = (char *) evas_object_data_get(obj, ITEMID);
        if (!val) {
                _ERR("Get value from btn failed\n");
                return;
@@ -284,9 +284,9 @@ static void _subitem_focus_out_cb(void *data, Evas_Object *obj, void *ev)
                return;
        }
 
-       priv = data;
+       priv = (struct _sublist_data *)data;
 
-       val = evas_object_data_get(obj, ITEMID);
+       val = (char *) evas_object_data_get(obj, ITEMID);
        if (!val) {
                _ERR("Get value from btn failed\n");
                return;
@@ -323,7 +323,7 @@ static void _subitem_btn_clicked_cb(void *data, Evas_Object *obj, void *ev)
        if (!data || !obj)
                return;
 
-       priv = data;
+       priv = (struct _sublist_data *)data;
 
        _set_selected_value(priv, obj);
 
@@ -346,7 +346,7 @@ static void _ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *ev)
        if (!data)
                return;
 
-       priv = data;
+       priv = (struct _sublist_data *)data;
 
        _exit_view(priv);
 }
@@ -370,8 +370,8 @@ static void _subitem_key_pressed_cb(void *data, Evas *e,
        if (!data || !ei)
                return;
 
-       ev = ei;
-       priv = data;
+       ev = (Evas_Event_Key_Down *) ei;
+       priv = (struct _sublist_data *)data;
 
        if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                _exit_view(priv);
@@ -450,6 +450,7 @@ static int _draw_ctxpopup_layout(struct _sublist_data *data)
 static int _draw_list_items(struct _sublist_data *data, Eina_List *list)
 {
        struct listitem *ldata;
+       void* obj;
        Eina_List *l;
        Eina_Array *btns;
        Eina_Array_Iterator a;
@@ -480,15 +481,19 @@ static int _draw_list_items(struct _sublist_data *data, Eina_List *list)
        j = 0;
        check = 0;
 
-       EINA_LIST_FOREACH(list, l, ldata) {
+       EINA_LIST_FOREACH(list, l, obj) {
+               ldata = (struct listitem *) obj;
                name = listitem_get_display_name(ldata);
 
-               btn = utils_add_btn(data->popup_box, CTXPOPUPBTN_STYLE,
+               btn = utils_add_btn(data->popup_box, (char *) CTXPOPUPBTN_STYLE,
                                name, EINA_TRUE);
                if (!btn) {
                        _ERR("Add button failed\n");
-                       EINA_ARRAY_ITER_NEXT(btns, j, tmp, a)
+                       EINA_ARRAY_ITER_NEXT(btns, j, obj, a)
+                       {
+                               tmp = (Evas_Object *) obj;
                                evas_object_del(tmp);
+                       }
                        eina_array_free(btns);
                        provider_release_list_value(sel);
                        return -1;
@@ -630,7 +635,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       data = calloc(1, sizeof(*data));
+       data = (struct _sublist_data *) calloc(1, sizeof(*data));
        if (!data) {
                _ERR("Unable to allocate memory\n");
                return NULL;
@@ -644,7 +649,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
 
        elm_layout_file_set(base, EDJ_FILE, SUBLIST_VIEW_PAGE);
 
-       ctxpopup = utils_add_ctxpopup(win, SUBLIST_CTXPOPUP_STYLE1);
+       ctxpopup = utils_add_ctxpopup(win, (char *) SUBLIST_CTXPOPUP_STYLE1);
        if (!ctxpopup) {
                _ERR("Fail to add ctxpopup");
                evas_object_del(base);
@@ -655,7 +660,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
        evas_object_smart_callback_add(ctxpopup, SIG_CTXPOPUP_DISMISSED,
                        _ctxpopup_dismissed_cb, data);
 
-       data->geometry_data = prev;
+       data->geometry_data = (struct obj_geometry_data *) prev;
 
        data->mgr = mgr;
        data->win = win;
@@ -695,7 +700,7 @@ static void _show(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _sublist_data *) evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Get sublist data failed\n");
                return;
@@ -718,7 +723,7 @@ static void _destroy(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _sublist_data *) evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Invalid arguments");
                evas_object_del(data->ctxpopup);
@@ -751,7 +756,7 @@ static void _hide(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _sublist_data *) evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Invalid arguments");
                return;
@@ -762,12 +767,19 @@ static void _hide(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_SUBLIST,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .hide_view = 0
+       VCLASS_TITLE_SUBLIST,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 /**
similarity index 91%
rename from src/view_system_clock.c
rename to src/view_system_clock.cpp
index d43c344..bb313fb 100644 (file)
@@ -156,7 +156,7 @@ static void _set_selected_value(struct _sysclk_data *data, Evas_Object *obj)
                return;
        }
 
-       selval = evas_object_data_get(obj, ITEMID);
+       selval = (char *) evas_object_data_get(obj, ITEMID);
        if (selval) {
                ret = provider_set_list_value(item, selval);
                if (ret != 0)
@@ -184,9 +184,9 @@ static void _subitem_focusin_cb(void *priv, Evas_Object *obj, void *ev)
                return;
        }
 
-       data = priv;
+       data = (struct _sysclk_data *) priv;
 
-       value = evas_object_data_get(obj, ITEMID);
+       value = (char *) evas_object_data_get(obj, ITEMID);
        if (!value) {
                _ERR("Get value from btn failed\n");
                return;
@@ -229,9 +229,9 @@ static void _subitem_focusout_cb(void *priv, Evas_Object *obj, void *ev)
                return;
        }
 
-       data = priv;
+       data = (struct _sysclk_data *) priv;
 
-       value = evas_object_data_get(obj, ITEMID);
+       value = (char *) evas_object_data_get(obj, ITEMID);
        if (!value) {
                _ERR("Get value from btn failed\n");
                return;
@@ -274,11 +274,11 @@ static void _subitem_clicked_cb(void *priv, Evas_Object *obj, void *ev)
        if (!priv || !obj)
                return;
 
-       data = priv;
+       data = (struct _sysclk_data *) priv;
 
        _set_selected_value(data, obj);
 
-       value = evas_object_data_get(obj, ITEMID);
+       value = (char *) evas_object_data_get(obj, ITEMID);
        if (!value) {
                _ERR("get value from obj failed. DATA_ID: %s", ITEMID);
                return;
@@ -293,7 +293,7 @@ static void _subitem_clicked_cb(void *priv, Evas_Object *obj, void *ev)
                        return;
                }
 
-               item = eina_list_nth(list, CLOCK_ITEM);
+               item = (struct settingitem *) eina_list_nth(list, CLOCK_ITEM);
                if (!item) {
                        _ERR("there is no clock_mode item in list.");
                        return;
@@ -338,8 +338,8 @@ static void _subitem_keypress_cb(void *priv, Evas *e,
        if (!priv || !ei)
                return;
 
-       data = priv;
-       ev = ei;
+       data = (struct _sysclk_data *) priv;
+       ev = (Evas_Event_Key_Down *) ei;
 
        if (!ev->keyname)
                return;
@@ -364,6 +364,7 @@ static int _add_sysclk_sublist_item(struct _sysclk_data *data,
        Eina_Array *array;
        Eina_Array_Iterator aiter;
        struct listitem *li;
+       void* obj;
        Eina_List *iter;
        const char *disp, *value;
        int idx, i, j;
@@ -391,14 +392,15 @@ static int _add_sysclk_sublist_item(struct _sysclk_data *data,
        }
 
        i = idx = 0;
-       EINA_LIST_FOREACH(list, iter, li) {
+       EINA_LIST_FOREACH(list, iter, obj) {
+               li = (struct listitem *) obj;
                disp = listitem_get_display_name(li);
                if (!disp) {
                        _ERR("display name of list item is null.");
                        goto error;
                }
 
-               btn = utils_add_btn(box, CTXPOPUPBTN_STYLE, disp, EINA_TRUE);
+               btn = utils_add_btn(box, (char *) CTXPOPUPBTN_STYLE, disp, EINA_TRUE);
                if (!btn) {
                        _ERR("utils add button failed.");
                        goto error;
@@ -444,7 +446,8 @@ static int _add_sysclk_sublist_item(struct _sysclk_data *data,
        return 0;
 
 error:
-       EINA_ARRAY_ITER_NEXT(array, j, del_btn, aiter) {
+       EINA_ARRAY_ITER_NEXT(array, j, obj, aiter) {
+               del_btn = (Evas_Object *) obj;
                if (del_btn)
                        evas_object_del(del_btn);
        }
@@ -551,7 +554,7 @@ static void _ctxpopup_dismissed(void *priv, Evas_Object *obj,
        if (!priv || !obj)
                return;
 
-       data = priv;
+       data = (struct _sysclk_data *) priv;
 
        _hide(data->base);
 
@@ -583,8 +586,8 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       ugd = prev;
-       ogd = evas_object_data_get(ugd->cur_btn, DATA_ID);
+       ugd = (struct evas_obj_data *) prev;
+       ogd = (struct obj_geometry_data *) evas_object_data_get(ugd->cur_btn, DATA_ID);
 
        win = settingmgr_get_win(mgr);
        if (!win) {
@@ -592,7 +595,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       data = calloc(1, sizeof(*data));
+       data = (struct _sysclk_data *) calloc(1, sizeof(*data));
        if (!data) {
                _ERR("Unable to allocate memory.");
                return NULL;
@@ -608,7 +611,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
 
        elm_layout_file_set(base, EDJ_FILE, SUBLIST_VIEW_PAGE);
 
-       ctxpopup = utils_add_ctxpopup(win, SUBLIST_CTXPOPUP_STYLE1);
+       ctxpopup = utils_add_ctxpopup(win, (char *) SUBLIST_CTXPOPUP_STYLE1);
        if (!ctxpopup) {
                _ERR("Fail to add ctxpopup");
                evas_object_del(base);
@@ -655,7 +658,7 @@ static void _show(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _sysclk_data *) evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Get sublist data failed\n");
                return;
@@ -679,7 +682,7 @@ static void _destroy(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _sysclk_data *)evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Invalid arguments");
                evas_object_del(data->ctxpopup);
@@ -715,7 +718,7 @@ static void _hide(Evas_Object *base)
        if (!base)
                return;
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _sysclk_data *)evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Invalid arguments");
                return;
@@ -741,7 +744,7 @@ static void _refresh(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _sysclk_data *)evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("data get failed. DATA_ID: %s", DATA_ID);
                return;
@@ -754,13 +757,19 @@ static void _refresh(Evas_Object *base)
 * view class of system clock view.
 */
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_SYSTEM_CLOCK,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .refresh = _refresh,
-       .hide_view = 0
+       VCLASS_TITLE_SYSTEM_CLOCK,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       _refresh,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 /**
similarity index 94%
rename from src/view_uigadget.c
rename to src/view_uigadget.cpp
index 2dd2767..adeca90 100644 (file)
@@ -101,6 +101,7 @@ static void _show_item_btns(Evas_Object *box)
 {
        Eina_List *list, *l;
        Evas_Object *btn;
+       void* obj;
 
        if (!box)
                return;
@@ -111,8 +112,11 @@ static void _show_item_btns(Evas_Object *box)
                return;
        }
 
-       EINA_LIST_FOREACH(list, l, btn)
+       EINA_LIST_FOREACH(list, l, obj)
+       {
+               btn = (Evas_Object *) obj;
                evas_object_show(btn);
+       }
 
        eina_list_free(list);
 }
@@ -134,7 +138,7 @@ static void _ug_destroy_cb(ui_gadget_h ug, void *priv)
                return;
        }
 
-       data = priv;
+       data = (struct _data *) priv;
 
        _show_item_btns(data->subitem_box);
 
@@ -200,6 +204,7 @@ static void _hide_item_btns(Evas_Object *box)
 {
        Eina_List *list, *l;
        Evas_Object *btn;
+       void* obj;
 
        if (!box) {
                _ERR("item box is null.");
@@ -212,8 +217,11 @@ static void _hide_item_btns(Evas_Object *box)
                return;
        }
 
-       EINA_LIST_FOREACH(list, l, btn)
+       EINA_LIST_FOREACH(list, l, obj)
+       {
+               btn = (Evas_Object *) obj;
                evas_object_hide(btn);
+       }
 
        eina_list_free(list);
 }
@@ -239,7 +247,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       param = prev;
+       param = (struct evas_obj_data *) prev;
 
        _hide_item_btns(param->subitem_box);
 
@@ -249,7 +257,7 @@ static Evas_Object *_create(struct setting_mgr *mgr,
                return NULL;
        }
 
-       data = calloc(1, sizeof(struct _data));
+       data = (struct _data *) calloc(1, sizeof(struct _data));
        if (!data) {
                _ERR("calloc struct _data failed.");
                return NULL;
@@ -317,7 +325,7 @@ static void _destroy(Evas_Object *base)
                return;
        }
 
-       data = evas_object_data_get(base, DATA_ID);
+       data = (struct _data *) evas_object_data_get(base, DATA_ID);
        if (!data) {
                _ERR("Fail to get uglauncher data");
                return;
@@ -334,12 +342,19 @@ static void _destroy(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_UG,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide,
-       .hide_view = 0
+       VCLASS_TITLE_UG,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 /**
similarity index 90%
rename from src/view_upgrade_popup.c
rename to src/view_upgrade_popup.cpp
index 7a58b89..075b1e5 100644 (file)
@@ -38,11 +38,19 @@ static void _hide(Evas_Object *base)
 }
 
 static struct setting_class _vclass = {
-       .title = VCLASS_TITLE_UPGRADE,
-       .create = _create,
-       .show = _show,
-       .destroy = _destroy,
-       .hide = _hide
+       VCLASS_TITLE_UPGRADE,
+       _create,
+       _show,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       _hide,
+       _destroy,
+       NULL,
+       NULL,
+       NULL,
+       0
 };
 
 struct setting_class *view_upgrade_popup_get_vclass(void)
similarity index 93%
rename from src/viewmgr.c
rename to src/viewmgr.cpp
index 4bd4f6e..1d7077e 100644 (file)
@@ -197,13 +197,15 @@ void _hide_view_in_list(struct setting_mgr *mgr)
 {
        Eina_List *l;
        struct _settinginfo *sinfo;
+       void* obj;
 
        if (!mgr) {
                _ERR("Invalid arguments\n");
                return;
        }
 
-       EINA_LIST_FOREACH(mgr->view_list, l, sinfo) {
+       EINA_LIST_FOREACH(mgr->view_list, l, obj) {
+               sinfo = (struct _settinginfo *) obj;
                if (sinfo->sclass->hide)
                        sinfo->sclass->hide(sinfo->base);
        }
@@ -219,13 +221,15 @@ void _show_view_in_list(struct setting_mgr *mgr)
 {
        Eina_List *l;
        struct _settinginfo *sinfo;
+       void* obj;
 
        if (!mgr) {
                _ERR("Invalid arguments\n");
                return;
        }
 
-       EINA_LIST_FOREACH(mgr->view_list, l, sinfo) {
+       EINA_LIST_FOREACH(mgr->view_list, l, obj) {
+               sinfo = (struct _settinginfo *) obj;
                if (sinfo->sclass->show)
                        sinfo->sclass->show(sinfo->base);
        }
@@ -241,13 +245,15 @@ void _destroy_views_in_list(struct setting_mgr *mgr)
 {
        Eina_List *l;
        struct _settinginfo *sinfo;
+       void* obj;
 
        if (!mgr) {
                _ERR("Invalid arguments\n");
                return;
        }
 
-       EINA_LIST_FOREACH(mgr->view_list, l, sinfo) {
+       EINA_LIST_FOREACH(mgr->view_list, l, obj) {
+               sinfo = (struct _settinginfo *) obj;
                if (sinfo->sclass->destroy)
                        sinfo->sclass->destroy(sinfo->base);
        }
@@ -263,13 +269,15 @@ void _frozen_view_in_list(struct setting_mgr *mgr)
 {
        Eina_List *l;
        struct _settinginfo *sinfo;
+       void* obj;
 
        if (!mgr) {
                _ERR("Invalid argument");
                return;
        }
 
-       EINA_LIST_REVERSE_FOREACH(mgr->view_list, l, sinfo) {
+       EINA_LIST_REVERSE_FOREACH(mgr->view_list, l, obj) {
+               sinfo = (struct _settinginfo *)obj;
                if (sinfo->sclass->frozen)
                        sinfo->sclass->frozen(sinfo->base);
        }
@@ -285,13 +293,15 @@ void _active_view_in_list(struct setting_mgr *mgr)
 {
        Eina_List *l;
        struct _settinginfo *sinfo;
+       void* obj;
 
        if (!mgr) {
                _ERR("Invalid argument");
                return;
        }
 
-       EINA_LIST_REVERSE_FOREACH(mgr->view_list, l, sinfo) {
+       EINA_LIST_REVERSE_FOREACH(mgr->view_list, l, obj) {
+               sinfo = (struct _settinginfo *)obj;
                if (sinfo->sclass->active)
                        sinfo->sclass->active(sinfo->base);
        }
@@ -312,7 +322,7 @@ struct setting_mgr *settingmgr_init(Evas_Object *win)
        if (!win)
                return NULL;
 
-       mgr = calloc(1, sizeof(*mgr));
+       mgr = (struct setting_mgr *)calloc(1, sizeof(*mgr));
        if (!mgr)
                return NULL;
 
@@ -350,6 +360,7 @@ struct setting_mgr *settingmgr_init(Evas_Object *win)
 void settingmgr_fini(struct setting_mgr *mgr)
 {
        struct _settinginfo *sinfo;
+       void* obj;
 
        if (!mgr) {
                _ERR("Parameter error!");
@@ -359,8 +370,11 @@ void settingmgr_fini(struct setting_mgr *mgr)
        _hide_view_in_list(mgr);
        _destroy_views_in_list(mgr);
 
-       EINA_LIST_FREE(mgr->view_list, sinfo)
+       EINA_LIST_FREE(mgr->view_list, obj)
+       {
+               sinfo = (struct _settinginfo *)obj;
                free(sinfo);
+       }
 
        if (mgr->item_path)
                eina_array_free(mgr->item_path);
@@ -395,7 +409,7 @@ int settingmgr_view_push(struct setting_mgr *mgr,
 
        mgr->depth++;
 
-       sinfo = calloc(1, sizeof(*sinfo));
+       sinfo = (struct _settinginfo *)calloc(1, sizeof(*sinfo));
        if (!sinfo)
                return -1;
 
@@ -464,7 +478,7 @@ void settingmgr_view_pop(struct setting_mgr *mgr)
        }
 
        mgr->depth--;
-       sinfo = eina_list_data_get(mgr->view_list);
+       sinfo = (struct _settinginfo *) eina_list_data_get(mgr->view_list);
        if (!sinfo) {
                _DBG("get sinfo failed\n");
                return;
@@ -477,7 +491,7 @@ void settingmgr_view_pop(struct setting_mgr *mgr)
        item = NULL;
 
        if (!strncmp(title, VCLASS_TITLE_BOTTOM_SLIDER, strlen(title)))
-               item = evas_object_data_del(sinfo->base, SELECTED_ITEM_ID);
+               item = (char *)evas_object_data_del(sinfo->base, SELECTED_ITEM_ID);
 
        if (sclass->destroy && sinfo->base)
                sclass->destroy(sinfo->base);
@@ -488,7 +502,7 @@ void settingmgr_view_pop(struct setting_mgr *mgr)
        if (!mgr->view_list)
                return;
 
-       prev = eina_list_data_get(mgr->view_list);
+       prev = (struct _settinginfo *) eina_list_data_get(mgr->view_list);
        if (!prev || !prev->sclass)
                return;
 
@@ -624,7 +638,7 @@ int settingmgr_launch_item(struct setting_mgr *mgr,
        cnt = eina_array_count(path);
 
        for (i = cnt - PATH_FACTOR; i > 0; i--)
-               settingmgr_view_push(mgr, eina_array_data_get(path, i), NULL);
+               settingmgr_view_push(mgr,(const char *) eina_array_data_get(path, i), NULL);
 
        return 0;
 }
@@ -660,7 +674,7 @@ void settingmgr_view_refresh(struct setting_mgr *mgr)
        if (!mgr || !mgr->view_list)
                return;
 
-       info = eina_list_data_get(mgr->view_list);
+       info = (struct _settinginfo *) eina_list_data_get(mgr->view_list);
        if (!info)
                return;
 
@@ -794,13 +808,15 @@ void settingmgr_lang_changed(struct setting_mgr *mgr)
 {
        struct _settinginfo *sinfo;
        Eina_List *l;
+       void* obj;
 
        if (!mgr || !mgr->view_list) {
                _ERR("Invalid argument");
                return;
        }
 
-       EINA_LIST_FOREACH(mgr->view_list, l, sinfo) {
+       EINA_LIST_FOREACH(mgr->view_list, l, obj) {
+               sinfo = (struct _settinginfo *) obj;
                if (!sinfo || !sinfo->sclass) {
                        _ERR("settings info is NULL");
                        return;