Refactoring: Using set_layout_file instead of elm_layout_file_set()

Change-Id: I05a4136c2b159519e270ac68784bbe08538de5c4
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index d7f7e2ca39869cd07d8de7fe98d46e1e2d042587..a8ab1681c30b82b87567e4f7f358912e493a1b8a 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -256,8 +256,7 @@ static void __popup_regulatory_info(void *data)
                        _("IDS_ST_BODY_REGULATORY_INFORMATION_ABB"));
        layout = elm_layout_add(popup);
 
-       char *theme = get_resource_path(SETTING_THEME_EDJ_NAME);
-       elm_layout_file_set(layout, theme, "popup_center_image");
+       set_layout_file(layout, SETTING_THEME_EDJ_NAME, "popup_center_image");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
        icon = elm_image_add(layout);
@@ -281,8 +280,6 @@ static void __popup_regulatory_info(void *data)
        evas_object_show(popup);
 
        free(buf);
-       free(theme);
-
        SETTING_TRACE_END;
 }
 

diff --git a/setting-accessibility/src/setting-accessibility-screen-reader-settings.c b/setting-accessibility/src/setting-accessibility-screen-reader-settings.c
index 7bd3d2abda46514f6ea1acf830cbd96dc4a78296..5672db4a58940604da4a2f31b27a25601f9c50f7 100755 (executable)
--- a/setting-accessibility/src/setting-accessibility-screen-reader-settings.c
+++ b/setting-accessibility/src/setting-accessibility-screen-reader-settings.c
@@ -243,7 +243,6 @@ static void _speech_rate_popup_create(void *data, void *item)
        Evas_Object *slider;
        Evas_Object *btn1, *btn2;
        int val = -1;
-       char *edje_path = get_resource_path(SETTINGS_EDJ);
 
        popup = elm_popup_add(ad->md.window);
        elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
@@ -256,8 +255,7 @@ static void _speech_rate_popup_create(void *data, void *item)
 
        /* layout */
        layout = elm_layout_add(popup);
-       elm_layout_file_set(layout, edje_path, "popup_text_slider_view_layout");
-       free(edje_path);
+       set_layout_file(layout, SETTINGS_EDJ, "popup_text_slider_view_layout");
 
        elm_object_part_text_set(layout, "elm.text.description",
                        _(DEVOPTION_STR_ACCESSIBILITY_SCREEN_READER_SETTINGS_SPEECH_RATE_POPUP_DESCRIPTION));

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c
index d9fbc3703e093ac3f10b19bd6ca6ee1ba8cfd77f..322a28f633e01f0e80189c915b1dad5040f566ac 100755 (executable)
--- a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c
@@ -188,18 +188,10 @@ static Evas_Object *__create_layout(Evas_Object *parent, const char *edj_file, c
 {
        SETTING_TRACE_BEGIN;
        Evas_Object *layout;
-       char *res_path;
-       char edj_path[PATH_MAX] = {0, };
        retvm_if(parent == NULL, NULL, "Input parameter is NULL");
 
-       res_path = app_get_resource_path();
-       if (res_path) {
-               snprintf(edj_path, sizeof(edj_path), "%s%s", res_path, edj_file);
-               free(res_path);
-       }
-
        layout = elm_layout_add(parent);
-       elm_layout_file_set(layout, edj_path, group);
+       set_layout_file(layout, edj_file, group);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_show(layout);
        SETTING_TRACE_END;

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-settings-set-value.c b/setting-accessibility/src/setting-accessibility-universal-switch-settings-set-value.c
index 71ddef19ea8c6e7bc9e1c8b6435c01ec34123206..475848bd00e59422b6e6ebd4ad361359eb6df97e 100755 (executable)
--- a/setting-accessibility/src/setting-accessibility-universal-switch-settings-set-value.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-settings-set-value.c
@@ -182,18 +182,10 @@ static Evas_Object *__create_layout(Evas_Object *parent, const char *layout_grp)
 {
        SETTING_TRACE_BEGIN;
        Evas_Object *layout;
-       char *res_path;
-       char edj_path[PATH_MAX] = {0, };
        retvm_if(parent == NULL || layout_grp == NULL, NULL, "Input parameter is NULL");
 
-       res_path = app_get_resource_path();
-       if (res_path) {
-               snprintf(edj_path, sizeof(edj_path), "%s%s", res_path, EDJ_SET_VALUE);
-               free(res_path);
-       }
-
        layout = elm_layout_add(parent);
-       elm_layout_file_set(layout, edj_path, layout_grp);
+       set_layout_file(layout, EDJ_SET_VALUE, layout_grp);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_show(layout);
        SETTING_TRACE_END;

diff --git a/setting-appmgr/src/setting-appmgr-runinfo.c b/setting-appmgr/src/setting-appmgr-runinfo.c
index ffa6ef97e2d89e78ef3e2c1cc361e6bf207ab8c7..342f658360f2e7fbea0daf0c880d28b6f5b55e54 100755 (executable)
--- a/setting-appmgr/src/setting-appmgr-runinfo.c
+++ b/setting-appmgr/src/setting-appmgr-runinfo.c
@@ -474,10 +474,9 @@ Evas_Object *appmgr_runinfo_apps_content_get(void *data, Evas_Object *genlist,
        app_t *app = data;
        char desc[APPMGR_MAX_STR_LEN] = {0};
 
-       char *theme = get_resource_path(SETTING_THEME_EDJ_NAME);
-
        layout = elm_layout_add(genlist);
-       elm_layout_file_set(layout, theme, "gl_custom_item_app_run");
+       set_layout_file(layout, SETTING_THEME_EDJ_NAME, "gl_custom_item_app_run");
+
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
@@ -492,8 +491,6 @@ Evas_Object *appmgr_runinfo_apps_content_get(void *data, Evas_Object *genlist,
        elm_object_part_text_set(layout, "elm.text2", desc);
        elm_object_part_text_set(layout, "elm.text.sub", app->sub_text);
 
-       free(theme);
-
        return layout;
 }
 
@@ -508,10 +505,8 @@ Evas_Object *appmgr_runinfo_title_get(void *data, Evas_Object *genlist,
 
        retv_if(data == NULL, NULL);
 
-       char *theme = get_resource_path(SETTING_THEME_EDJ_NAME);
-
        layout = elm_layout_add(genlist);
-       elm_layout_file_set(layout,theme, "gl_custom_item_app_run");
+       set_layout_file(layout, SETTING_THEME_EDJ_NAME, "gl_custom_item_app_run");
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
                                        EVAS_HINT_EXPAND);
@@ -533,7 +528,6 @@ Evas_Object *appmgr_runinfo_title_get(void *data, Evas_Object *genlist,
        /* TODO Implement with new API */
        elm_object_part_text_set(layout, "elm.text.sub2", "hh:mm:ss");
 
-       free(theme);
        return layout;
 }
 

diff --git a/setting-common/inc/setting-common-general-func.h b/setting-common/inc/setting-common-general-func.h
index cc5c4d6c8dbe69a49e9b7ef7c78d8c4d2e93d918..fb21ee06dc5d2c80cd3a8e90756ad925bc052a20 100755 (executable)
--- a/setting-common/inc/setting-common-general-func.h
+++ b/setting-common/inc/setting-common-general-func.h
@@ -76,6 +76,6 @@ char *get_resource_path(const char *name);
 char *get_data_path(char *name);
 char *get_shared_path(char *name);
 char *get_globaluser_data(char *name);
-bool set_layout_file(Evas_Object *layout, char *name, char *group);
+void set_layout_file(Evas_Object *layout, char *name, char *group);
 
 #endif                         /* __SETTING_COMMON_GENERAL_FUNC_H__ */

diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c
index 89e5cc3caf7f3bace70a736c7e99817effa671ca..250516550053ac5b5842ee5c0f034d1cb7d9d771 100644 (file)
--- a/setting-common/src/setting-common-draw-genlist.c
+++ b/setting-common/src/setting-common-draw-genlist.c
@@ -1246,8 +1246,7 @@ static Evas_Object *__add_entry_padding(Setting_GenGroupItem_Data *item_data,
        retv_if(!item_data || !parent, NULL);
        layout = elm_layout_add(parent);
 
-       char *theme = get_resource_path(SETTING_THEME_EDJ_NAME);
-       elm_layout_file_set(layout, theme, "entry_layout");
+       set_layout_file(layout, SETTING_THEME_EDJ_NAME, "entry_layout");
 
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1256,7 +1255,6 @@ static Evas_Object *__add_entry_padding(Setting_GenGroupItem_Data *item_data,
        entry = __add_entry_without_layout(item_data, parent);
        elm_object_part_content_set(layout, "elm.swallow.content", entry);
 
-       free(theme);
        return layout;
 }
 

diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c
index 9300d842693328702576fe959845ce51d51b93a7..9e07e619a66fd29833caaf7e0e8b365dc5d38e15 100644 (file)
--- a/setting-common/src/setting-common-draw-popup.c
+++ b/setting-common/src/setting-common-draw-popup.c
@@ -442,13 +442,9 @@ Evas_Object *setting_create_popup_with_progressbar(void *data,
 
        /* layout */
        layout = elm_layout_add(popup);
+       set_layout_file(layout, SETTING_THEME_EDJ_NAME, "processing_view_layout");
 
-       char *theme = get_resource_path(SETTING_THEME_EDJ_NAME);
-       elm_layout_file_set(layout, theme, "processing_view_layout");
-
-
-       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
-                       EVAS_HINT_EXPAND);
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        if (title)
                elm_object_part_text_set(popup, "title,text", _(title));
        if (text)
@@ -483,9 +479,6 @@ Evas_Object *setting_create_popup_with_progressbar(void *data,
        SETTING_TRACE("button3...:%s", evas_object_data_get(popup, "button3"));
 
        evas_object_show(popup);
-
-       free(theme);
-
        return popup;
 }
 

diff --git a/setting-common/src/setting-common-draw-searchbar.c b/setting-common/src/setting-common-draw-searchbar.c
index 3515498c85349bd0bb154785b579788d4c60292a..e0be4737c460d703687bb3ca883f5f21ebad54a1 100755 (executable)
--- a/setting-common/src/setting-common-draw-searchbar.c
+++ b/setting-common/src/setting-common-draw-searchbar.c
@@ -200,14 +200,12 @@ Evas_Object *setting_create_searchbar(void *data, Evas_Object *parent,
        setting_retvm_if(parent == NULL, NULL, "parent parameter is NULL");
        Evas_Object *searchbar_layout = elm_layout_add(parent);
 
-       char *theme = get_resource_path(SETTING_THEME_EDJ_NAME);
-       elm_layout_file_set(searchbar_layout, theme, "region_searchbar");
+       set_layout_file(searchbar_layout, SETTING_THEME_EDJ_NAME, "region_searchbar");
+
        elm_object_part_content_set(parent, "searchbar", searchbar_layout);
        Evas_Object *entry = elm_entry_add(searchbar_layout);
        elm_entry_single_line_set(entry, EINA_TRUE);
 
-       free(theme);
-
        if (change_cb) {
                evas_object_smart_callback_add(entry, "changed", change_cb,
                                data);

diff --git a/setting-common/src/setting-common-draw-widget.c b/setting-common/src/setting-common-draw-widget.c
index f0c0a3cb6399ac7c61e42b6ffe4b25af897ee8cd..8b8dfc6dd2a3688fb0a2fd621e00a183e80ffdb3 100644 (file)
--- a/setting-common/src/setting-common-draw-widget.c
+++ b/setting-common/src/setting-common-draw-widget.c
@@ -113,20 +113,8 @@ EXPORT_PUBLIC Evas_Object *setting_create_5step_slider(
 {
        char path_str[PATH_MAX] = {'\0',};
        Evas_Object *layout = elm_layout_add(parent);
-       char *app_res_path = app_get_resource_path();
 
-       snprintf(path_str, PATH_MAX, "%sedje/font-slider.edj", app_res_path);
-       free(app_res_path);
-
-       int r = elm_layout_file_set(layout, path_str,
-                       "elm/slider/horizontal/music/soundalive");
-
-       if (!r) {
-               SETTING_TRACE_ERROR("elm_layout_add failed : %s",
-                               "elm/slider/horizontal/music/soundalive");
-               evas_object_del(layout);
-               return NULL;
-       }
+       set_layout_file(layout, "edje/font-slider.edj", "elm/slider/horizontal/music/soundalive");
 
        /* "elm/slider/horizontal/default" */
        Evas_Object *slider = elm_slider_add(layout);

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 4ffe7b41bb95c3bc0d2a7740ea32bad505f38f09..4c94575f4d2c268f1f665871ec94de5aa94a58fc 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -1010,15 +1010,12 @@ char *get_shared_path(char *name)
 }
 
 EXPORT_PUBLIC
-bool set_layout_file(Evas_Object *layout, char *name, char *group)
+void set_layout_file(Evas_Object *layout, char *name, char *group)
 {
        char *path = get_resource_path(name);
        bool ret = elm_layout_file_set(layout, path, group);
        free(path);
        if (!ret) {
                SETTING_TRACE_ERROR("Failed to load edj file. Name: %s, group: %s", name, group);
-               return false;
        }
-
-       return true;
 }

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index 0353033608b1cbba089903d9837b58210cf9547a..4be4e70e9a81df02939bde5503d44198fd48f284 100755 (executable)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -222,13 +222,7 @@ static Evas_Object *_font_size_slider_get(void *data, Evas_Object *obj,
                        SETTING_TRACE("Add 5Step Slider");
 
                        Evas_Object *layout = elm_layout_add(obj);
-                       bool ret = set_layout_file(layout, EDJDIR"/setting-theme.edj", "font_slider");
-                       if (ret == EINA_TRUE) { /* error condition */
-                               SETTING_TRACE("elm_layout_file_set - OK");
-                       } else {
-                               SETTING_TRACE_ERROR(
-                                               "elm_layout_file_set - FAILED");
-                       }
+                       set_layout_file(layout, EDJDIR"/setting-theme.edj", "font_slider");
 
                        evas_object_size_hint_weight_set(layout,
                                        EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

diff --git a/setting-password/src/setting-password-simple.c b/setting-password/src/setting-password-simple.c
index fcc77965b7d72dfb8ffe70726cb506fc9d982898..82cdc4fffa7bd8b32a79cc8a821ba701f87e24a2 100644 (file)
--- a/setting-password/src/setting-password-simple.c
+++ b/setting-password/src/setting-password-simple.c
@@ -539,9 +539,7 @@ static int _view_create(void *cb)
        ret = view_init_wo_genlist(&ad->md, _("IDS_ST_BODY_SIMPLE_PASSWORD"));
        retv_if(ret != SETTING_RETURN_SUCCESS, ret);
 
-       char *path = get_resource_path(SETTING_THEME_EDJ_NAME);
-       elm_layout_file_set(ad->md.layout, path, "layout/simple_password");
-       free(path);
+       set_layout_file(ad->md.layout, SETTING_THEME_EDJ_NAME, "layout/simple_password");
 
        ad->sp_entry1 = elm_entry_add(ad->md.layout);
        elm_object_style_set(ad->sp_entry1 , "popup");

diff --git a/setting-storage/src/setting-storage-main.c b/setting-storage/src/setting-storage-main.c
index c481099b645833cd4164638fece02570011ee2a3..bac22b15c5a7b07e160a0c80b923aeaccdac0f88 100755 (executable)
--- a/setting-storage/src/setting-storage-main.c
+++ b/setting-storage/src/setting-storage-main.c
@@ -166,9 +166,7 @@ Evas_Object *storage_main_graph_get(void *data, Evas_Object *obj,
        /* Prepare layout for graph with texts */
        layout = elm_layout_add(obj);
 
-       char *path = get_resource_path(SETTING_EDJ_PATH"/storage-graph.edj");
-       retv_if(!elm_layout_file_set(layout, path, "STORAGE_GRAPH_GRP"), NULL);
-       free(path);
+       set_layout_file(layout, SETTING_EDJ_PATH"/storage-graph.edj", "STORAGE_GRAPH_GRP");
 
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
@@ -210,19 +208,11 @@ Evas_Object *storage_color_item_content_get(void *data, Evas_Object *obj,
        if (!strcmp(part, "elm.swallow.icon")) {
                Evas_Object *layout = elm_layout_add(obj);
 
-               char *path = get_resource_path(SETTING_THEME_EDJ_NAME);
-               result = elm_layout_file_set(layout, path, "storage_edge");
-               free(path);
-
+               set_layout_file(layout, SETTING_THEME_EDJ_NAME, "storage_edge");
 
                evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-               if (!result) {
-                       SETTING_TRACE_ERROR(" ERROR -- elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, storage_edge)");
-                       return NULL;
-               }
-
                switch (color) {
                case 1:
                        elm_object_signal_emit(layout, "elm,state,show,apps",

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index d3ee9cdbf748df3d10cd4ab2335bbec3e0486dbc..c43b14b45025b97b27add067081c8db7a0caf4ba 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -721,20 +721,10 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
        elm_box_padding_set(box1, ELM_SCALE_SIZE(15), ELM_SCALE_SIZE(5));
 
        Evas_Object *layout = elm_layout_add(box1);
-
-
-       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
-       Eina_Bool ret = elm_layout_file_set(layout, path,       "date_time_layout");
-       free(path);
+       set_layout_file(layout, EDJDIR"/setting-theme.edj", "date_time_layout");
 
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       if (ret == EINA_TRUE) { /* error condition */
-               SETTING_TRACE("elm_layout_file_set - OK --> date_time_layout");
-       } else {
-               SETTING_TRACE_ERROR("elm_layout_file_set - FAILED "
-                               "--> date_time_layout");
-       }
 
        elm_layout_content_set(layout, "date_field", btn_left);
        elm_layout_content_set(layout, "time_field", btn_right);