c++ test fixes

- commented out code removed
- 'export' attribute name changed

Change-Id: I7d2bad47d4acffe907642047a70bc6e0b3eb95a4
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index 30fbc6acba79c7a708df13bb538839894bf05a86..f5386103400ca86d9b98a6f0f76f8544dddf0f2b 100755 (executable)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -313,7 +313,7 @@ char *get_path_from_args(void *data)
                setting_retvm_if(!path, NULL, "calloc failed");
                safeCopyStr(path, p, safeStrLen(p));
        }
-       /*SETTING_TRACE("get the ug['%s']", path);*/
+
        return path;
 }
 

diff --git a/setting-common/src/setting-common-data-slp-setting.c b/setting-common/src/setting-common-data-slp-setting.c
index 27caa16f61f53633e7adcb333f5bc1f027912cc4..83c0611b8f926d46943a68cf13d5b32d7c39aa79 100755 (executable)
--- a/setting-common/src/setting-common-data-slp-setting.c
+++ b/setting-common/src/setting-common-data-slp-setting.c
@@ -45,9 +45,9 @@ struct VconfNode {
        vconftype type; /** BOOL, INT, STRING */
        vconfval value; /** variable by union */
        /** method for exporting current state */
-       void (*export)(VconfNode *pnode, void *data);
+       void (*export_state)(VconfNode *pnode, void *data);
        /** method for importing state from cloud */
-       void (*import)(VconfNode *pnode, void *data);
+       void (*import_state)(VconfNode *pnode, void *data);
 };
 
 int get_vconf(VconfNode node, VconfNode *result);
@@ -818,15 +818,11 @@ int set_vconf(VconfNode node, VconfNode *result)
        *result = node;
        switch (node.type) {
        case eBOOL:
-               /*SETTING_TRACE("begin case eBOOL[%s=\"%d\"]", node.vconf_key,
-                * node.value.b); */
                ret = vconf_set_bool(node.vconf_key, node.value.b);
                result->type = eBOOL;
                result->value.b = node.value.b;
                break;
        case eINT:
-               /*SETTING_TRACE("begin case eINT[%s=\"%d\"]", node.vconf_key,
-                * node.value.i); */
                ret = vconf_set_int(node.vconf_key, node.value.i);
                result->type = eINT;
                result->value.i = node.value.i;
@@ -835,8 +831,6 @@ int set_vconf(VconfNode node, VconfNode *result)
                if (node.key == STR_SLP_LIST_PHONE_PASSWORD) {
                        ret = setting_store_init_password(node.value.c);
                } else {
-                       /*SETTING_TRACE("begin case eSTRING[%s=\"%s\"]",
-                        * node.vconf_key, node.value.c); */
                        ret = vconf_set_str(node.vconf_key, node.value.c);
                }
                result->type = eSTRING;
@@ -851,8 +845,7 @@ int set_vconf(VconfNode node, VconfNode *result)
                SETTING_TRACE_ERROR(">>>>>>>>>> Failed to set vconf[%s]",
                                node.vconf_key);
        }
-       /*SETTING_TRACE("KEY:%d VCONF_KEY=%s TYPE=%d VALUE=%d ", result->key,
-        * result->vconf_key, result->type, result->value.i); */
+
        return ret;
 }
 
@@ -1065,8 +1058,6 @@ int _langlist_destroy()
        while (li) {
                node = (setting_lang_entry *)eina_list_data_get(li);
                if (node) {
-                       /*SETTING_TRACE("destroy nodes : locale : %s title : %s",
-                        * node->locale, node->title); */
                        G_FREE(node->locale);
                        G_FREE(node->title);
                        G_FREE(node->mcc);
@@ -1135,8 +1126,6 @@ static void _parseLangListXML(char *docname)
                return;
        }
 
-       /*SETTING_TRACE("ROOT NODE : %s ", cur->name); */
-       /* make sure root node is "settings" */
        if (xmlStrcmp(cur->name, (const xmlChar *)"langlist")) {
                SETTING_TRACE(
                                "document of the wrong type, root node != settings");
@@ -1149,10 +1138,9 @@ static void _parseLangListXML(char *docname)
 
        /* save tree to file */
        if (doc != NULL) {
-               /*xmlSaveFormatFile (docname, doc, 1); */
                xmlFreeDoc(doc);
        }
-       /*xmlFreeDoc(doc); */
+
        return;
 }
 

diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c
index ccb997c0a42b6d2d72885efaff1359612dfe67de..038e062c96ba034108f1ada3188c4939e1b452cf 100644 (file)
--- a/setting-common/src/setting-common-draw-genlist.c
+++ b/setting-common/src/setting-common-draw-genlist.c
@@ -65,7 +65,6 @@ DEFINE_ITC1(SETTING_GENLIST_1ICON_STYLE, itc_1icon);
 DEFINE_ITC1("1text", itc_normal_1text);
 
 /********************************************************************/
-/*DEFINE_ITC1("2line.top", itc_2text_2); */
 DEFINE_ITC1(SETTING_GENLIST_2LINE_STYLE, itc_2text_2);
 /********************************************************************/
 
@@ -1080,7 +1079,6 @@ static void __rejected_char_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
 
-       /*SETTING_TRACE_DEBUG("Input char is not an Alphanumeric&Symbol."); */
        setting_create_popup(NULL, elm_object_parent_widget_get(obj), NULL,
                        _("IDS_ST_BODY_PASSWORD_CONTAINS_INVALID_CHARACTER_ABB"),
                        NULL, 0, false, false, 0);
@@ -1123,10 +1121,6 @@ static Evas_Object *__add_entry_without_layout(
                elm_entry_scrollable_set(entry, EINA_TRUE);
                elm_entry_single_line_set(entry, EINA_TRUE);
                elm_object_signal_emit(entry, "elm,state,scroll,enabled", "");
-       } else {
-               /*for multi-line editfield or entry, need to disable clear
-                * button,refer to P130802-3553*/
-               /*ea_editfield_clear_button_disabled_set(entry, EINA_TRUE); */
        }
 
        if (item_data->isPasswordFlag) {
@@ -1378,7 +1372,7 @@ static Setting_GenGroupItem_Data *setting_create_Gendial_field_groupitem(
                item_data->itc = (char *)g_strdup(itc->item_style);
 
        const char *insert_type = evas_object_data_get(genlist, "InsertType");
-       /* SETTING_TRACE("insert_type:%s", insert_type); */
+
        if (!gl_sel)
                gl_sel = _gl_Gendial_sel;
        if (0 == safeStrCmp(insert_type, "Insert before")) {

diff --git a/setting-common/src/setting-common-draw-naviframe.c b/setting-common/src/setting-common-draw-naviframe.c
index 5e8a7a64ff3fdb594cd52079a35af758c2884888..672bea9198dd814d8c60dc0590b47344dc8042fc 100644 (file)
--- a/setting-common/src/setting-common-draw-naviframe.c
+++ b/setting-common/src/setting-common-draw-naviframe.c
@@ -114,7 +114,6 @@ void setting_navi_items_update(Evas_Object *naviframe)
                        idx = 0;
                        while (it) {
                                next_it = elm_toolbar_item_next_get(it);
-                               /*text = (char *)elm_object_item_text_get(it);*/
                                elm_object_item_text_set(it, _(btn_str[idx]));
                                idx++;
                                it = next_it;

diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c
index b4c26574f0e0ac0e5217c7c384ef38783442c4f6..c24f62f9b77d2f3a0ac3822569bdba698aac1d80 100644 (file)
--- a/setting-common/src/setting-common-draw-popup.c
+++ b/setting-common/src/setting-common-draw-popup.c
@@ -125,7 +125,6 @@ EXPORT_PUBLIC void __setting_popup_lang_update(Evas_Object *popup)
                                "elm.swallow.content");
                if (eo_view) {
                        const char *eo_view_t = evas_object_type_get(eo_view);
-                       /*SETTING_TRACE("eo_view_t:%s", eo_view_t); */
                        if (!safeStrCmp("elm_genlist", eo_view_t))
                                elm_genlist_realized_items_update(eo_view);
                        else if (!safeStrCmp("elm_label", eo_view_t))
@@ -136,18 +135,15 @@ EXPORT_PUBLIC void __setting_popup_lang_update(Evas_Object *popup)
                                "elm.swallow.end");
                if (eo_view) {
                        const char *eo_view_t = evas_object_type_get(eo_view);
-                       /*SETTING_TRACE("eo_view_t:%s", eo_view_t); */
                        if (!safeStrCmp("elm_check", eo_view_t)) {
                                char *check_str = evas_object_data_get(popup,
                                                "check_str");
-                               /*SETTING_TRACE("check_str:%s", check_str); */
                                if (check_str)
                                        elm_object_text_set(eo_view,
                                                        _(check_str));
                        }
                }
        } else {
-               /*SETTING_TRACE("text:%s", text); */
                if (!isEmptyStr(text))
                        elm_object_text_set(popup, _(text));
        }
@@ -156,20 +152,11 @@ EXPORT_PUBLIC void __setting_popup_lang_update(Evas_Object *popup)
        int i = 0;
        Evas_Object *btn = NULL;
 
-       /*SETTING_TRACE("button1...:%s", evas_object_data_get(
-        * popup, "button1")); */
-       /*SETTING_TRACE("button2...:%s", evas_object_data_get(
-        * popup, "button2")); */
-       /*SETTING_TRACE("button3...:%s", evas_object_data_get(
-        * popup, "button3")); */
-
        for (; i < 3; i++) {
                btn = elm_object_part_content_get(popup, btn_part_str[i]);
-               /*SETTING_TRACE("btn:%p", btn); */
                if (btn) {
                        char *btn_str = evas_object_data_get(popup,
                                        btn_part_str[i]);
-                       /*SETTING_TRACE("btn_str:%s", btn_str); */
                        elm_object_text_set(btn, _(btn_str));
                }
        }

diff --git a/setting-common/src/setting-common-draw-searchbar.c b/setting-common/src/setting-common-draw-searchbar.c
index a1de2ff40126386e68523ae678fd6ab3aaf902a2..a02843c9580a88fb53cbdd1ee97ff2a8c62acc04 100755 (executable)
--- a/setting-common/src/setting-common-draw-searchbar.c
+++ b/setting-common/src/setting-common-draw-searchbar.c
@@ -142,12 +142,10 @@ static void ___searchbar_input_panel_event_cb(void *data,
 static void _popup_block_clicked_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       /*      elm_popup_dismiss(obj); */
 }
 
 static void _popup_hide_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       /*      elm_popup_dismiss(obj); */
 }
 
 static void _popup_timeout_cb(void *data, Evas_Object *obj, void *event_info)

diff --git a/setting-common/src/setting-common-draw-widget.c b/setting-common/src/setting-common-draw-widget.c
index b6826b98efca099ea8e57e6b520a586cd22fc11f..562acd9dde210379749e0891dd2874e6947c78a3 100644 (file)
--- a/setting-common/src/setting-common-draw-widget.c
+++ b/setting-common/src/setting-common-draw-widget.c
@@ -193,7 +193,6 @@ EXPORT_PUBLIC Evas_Object *setting_create_slider(
        } else {
                /* for brightness slider */
                elm_slider_indicator_show_set(slider, EINA_FALSE);
-               /*elm_object_style_set(slider, "tap_to_drag");*/
        }
 
        evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0);
@@ -289,7 +288,6 @@ EXPORT_PUBLIC
 Evas_Object *setting_create_image(Evas_Object *parent, const char *img_path)
 {
        Evas_Object *image = elm_image_add(parent);
-       /*SETTING_TRACE("icon_path:%s", icon_path); */
        elm_image_file_set(image, img_path, NULL);
        elm_image_resizable_set(image, EINA_TRUE, EINA_TRUE);
 
@@ -384,7 +382,6 @@ Evas_Object *setting_create_blank_rect_customize(
        evas_object_size_hint_min_set(
                        rect, ELM_SCALE_SIZE(w), ELM_SCALE_SIZE(h));
        evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, 0);
-       /*evas_object_color_set(rect, 0, 0, 0, 0); */
        evas_object_color_set(rect, 8, 8, 8, 8);
 
        return rect;
@@ -405,12 +402,9 @@ Evas_Object *setting_create_textbox(Evas_Object *parent, const char *content)
        evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, 0.0);
        evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, 0.5);
        elm_entry_single_line_set(obj, 0);
-       /* elm_entry_line_wrap_set(obj, 1); */
        elm_entry_editable_set(obj, 0);
        elm_entry_context_menu_disabled_set(obj, 1);
 
-       /* setting_disable_evas_object(obj); ***disable any events on entry */
-
        elm_entry_entry_set(obj, content);
        evas_object_show(obj);
        return obj;
@@ -451,7 +445,6 @@ Evas_Object *setting_create_bg(
        if (bg_style) elm_object_style_set(bg, bg_style);
        evas_object_size_hint_weight_set(
                        bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       /*elm_win_resize_object_add(win, bg); */
        evas_object_show(bg);
        return bg;
 }
@@ -605,7 +598,6 @@ char *setting_customize_text(
 {
        /*SETTING_TRACE_BEGIN; */
        retv_if(isEmptyStr(input_str), NULL);
-       /*SETTING_TRACE("input_str:%s, color:%s", input_str, color); */
        char speciliztion[MAX_SPECIALIZITION_LEN] = { 0, };
        /*<font_size=%d><align=middle><color=#9C9C9C>bbb</color></align>
         * </font_size> */
@@ -627,7 +619,6 @@ char *setting_customize_text(
                /*already has customed color,to replace color sub_string */
                if (p) {
                        p += strlen("<color=");
-                       /*memcpy(p, color, strlen(color)); */
                        char *q = (char *)color;
                        while ('\0' != p[0] && '\0' != q[0]) {
                                *p = *q;
@@ -673,7 +664,6 @@ char *setting_customize_text(
                                MAX_SPECIALIZITION_LEN);
        }
 
-       /*SETTING_TRACE("Exit %s, return :%s", __FUNCTION__, speciliztion); */
        return strdup(speciliztion);;
 }
 
@@ -709,7 +699,6 @@ setting_decorate_image_RGBA(Evas_Object *obj, int r, int g, int b, int a)
 EXPORT_PUBLIC void
 setting_protect_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       /*SETTING_TRACE("data:%p", data); */
        if (NULL != data) *((void **)data) = NULL;
 }
 

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 3a9793c18d74e9187470cb6dbf025ceb7191a563..27cf94191cfa4acd5adb3494bd0a4921835cca45 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -362,8 +362,6 @@ char *get_pa_select_network()
 
        ret = vconf_get_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, &state);
        if (ret == 0) {
-               /*SETTING_TRACE("VCONFKEY(%s) = %d",
-                * VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, state); */
                char name[MAX_COMMON_BUFFER_LEN] = { 0, };
                const char *kv = NULL;
 
@@ -467,8 +465,6 @@ bool isEmptyStr(const char *str)
 EXPORT_PUBLIC
 bool isSpaceStr(const char *str)
 {
-       /*if (NULL == str) */
-       /*      return TRUE; */
        while (str) {
                if (*str != '\0' && *str != ' ')
                        return FALSE;
@@ -685,8 +681,7 @@ char *cur_font_get()
                        SYSTEM_SETTINGS_KEY_FONT_TYPE, &font_name);
        if (SYSTEM_SETTINGS_ERROR_NONE != retcode)
                return NULL;
-       /*SETTING_TRACE("---------------- system-setting call : (%s) ",
-        * font_name); */
+
        return font_name;
 }
 
@@ -833,7 +828,6 @@ void font_size_set()
        }
 
        elm_config_all_flush();
-       /* elm_config_engine_set("software_x11"); //deprecated API */
        elm_config_save();
        elm_config_text_classes_list_free(text_classes);
        text_classes = NULL;
@@ -966,7 +960,7 @@ EXPORT_PUBLIC int app_group_launcher(const char *pkg_name)
 
        app_control_set_operation(service, APP_CONTROL_OPERATION_PICK);
        app_control_set_launch_mode(service, APP_CONTROL_LAUNCH_MODE_GROUP);
-       /*service_set_operation(service, SERVICE_OPERATION_DEFAULT); */
+
        if (path)
                app_control_set_app_id(service, path);