examples/c: clean up code after review.

Change-Id: I989e79ed22f9a9b4557fda74579e6e1c431779e4

diff --git a/src/examples/efl/c/page13.cpp b/src/examples/efl/c/page13.cpp
index 4c1e46d2c81a9d76b3dd34aa4f7128e6e749259b..3627d368b2ad7de85f100dbc2978a7e72fb103e6 100644 (file)
--- a/src/examples/efl/c/page13.cpp
+++ b/src/examples/efl/c/page13.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view13_prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        UI_VIEWMGR_VIEW_POP();
 }
 
 static void
-view13_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        create_page14();
 }
@@ -32,10 +32,20 @@ view13_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view13_load_cb(ui_view *view, void *data)
 {
-       Evas_Object *base_layout = ui_view_base_get(view);
+       Evas_Object *content = NULL;
+       Evas_Object *base = NULL;
 
-       Evas_Object *content = create_content(base_layout, "ViewMgr Demo<br>Fade Transition",
-                       view13_prev_btn_clicked_cb, view13_next_btn_clicked_cb);
+       //Get a base object from view.
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       //Create and set a main content.
+       content = create_content(base, "ViewMgr Demo<br>Fade Transition", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
 
        ui_standard_view_content_set(view, content, "Page13", NULL, NULL, NULL);
 
@@ -45,17 +55,28 @@ view13_load_cb(ui_view *view, void *data)
 void
 create_page13()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
 
-       lifecycle_callback.load = view13_load_cb;
+       //Create a view.
+       view = ui_standard_view_create("page13");
+       if (!view)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view");
+               return;
+       }
 
-       ui_view *view = ui_standard_view_create("page13");
+       //Set Fade Transition Effect.
        ui_view_transition_style_set(view, "fade");
 
-       int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL);
-       if (ret != 0)
+       //Set View Life-Cycle callbacks.
+       lifecycle_callback.load = view13_load_cb;
+       if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL)))
        {
-               //TODO
+               dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret);
+               ui_view_destroy(view);
+               return;
        }
 
        UI_VIEWMGR_VIEW_PUSH(view);

diff --git a/src/examples/efl/c/page14.cpp b/src/examples/efl/c/page14.cpp
index cfce6d5a2b347e70c5ffe1a75284a14055f36460..871c12585ee5dbd99b47d4b132ef3018f07e67ed 100644 (file)
--- a/src/examples/efl/c/page14.cpp
+++ b/src/examples/efl/c/page14.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view14_prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        UI_VIEWMGR_VIEW_POP();
 }
 
 static void
-view14_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        create_page15();
 }
@@ -32,10 +32,20 @@ view14_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view14_load_cb(ui_view *view, void *data)
 {
-       Evas_Object *base_layout = ui_view_base_get(view);
+       Evas_Object *content = NULL;
+       Evas_Object *base = NULL;
 
-       Evas_Object *content = create_content(base_layout, "ViewMgr Demo<br>None Transition",
-                       view14_prev_btn_clicked_cb, view14_next_btn_clicked_cb);
+       //Get a base object from view.
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       //Create and set a main content.
+       content = create_content(base, "ViewMgr Demo<br>None Transition", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
 
        ui_standard_view_content_set(view, content, "Page14", NULL, NULL, NULL);
 
@@ -45,17 +55,28 @@ view14_load_cb(ui_view *view, void *data)
 void
 create_page14()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
 
-       lifecycle_callback.load = view14_load_cb;
+       //Create a view.
+       view = ui_standard_view_create("page14");
+       if (!view)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view");
+               return;
+       }
 
-       ui_view *view = ui_standard_view_create("page14");
+       //Turn off Transition Effect.
        ui_view_transition_style_set(view, "none");
 
-       int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL);
-       if (ret != 0)
+       //Set View Life-Cycle callbacks.
+       lifecycle_callback.load = view14_load_cb;
+       if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL)))
        {
-               //TODO
+               dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret);
+               ui_view_destroy(view);
+               return;
        }
 
        UI_VIEWMGR_VIEW_PUSH(view);

diff --git a/src/examples/efl/c/page15.cpp b/src/examples/efl/c/page15.cpp
index 19616955b6ff19592e73c914d654eafd8461cbbb..ab6fbfd5d5fe1c36293fac8a5c78e753703bcedf 100644 (file)
--- a/src/examples/efl/c/page15.cpp
+++ b/src/examples/efl/c/page15.cpp
@@ -26,14 +26,25 @@ view15_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view15_load_cb(ui_view *view, void *data)
 {
-       Evas_Object *base_layout = ui_view_base_get(view);
+       Evas_Object *content = NULL;
+       Evas_Object *base = NULL;
 
-       Evas_Object *content = create_scrolling_content(base_layout);
+       //Get a base object from view.
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       //Create and set a main content.
+       content = create_scrolling_content(base);
+       if (!content) return false;
 
        ui_standard_view_content_set(view, content, "Page 15 Scroller In Viewmgr", NULL, NULL, NULL);
 
        //Title Right button
-       Elm_Button *right_btn = elm_button_add(base_layout);
+       Elm_Button *right_btn = elm_button_add(base);
        elm_object_text_set(right_btn, "Next");
        evas_object_smart_callback_add(right_btn, "clicked", view15_btn_clicked_cb, NULL);
 
@@ -45,16 +56,24 @@ view15_load_cb(ui_view *view, void *data)
 void
 create_page15()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
 
-       lifecycle_callback.load = view15_load_cb;
-
-       ui_view *view = ui_standard_view_create("page15");
+       view = ui_standard_view_create("page15");
+       if (!view)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view");
+               return;
+       }
 
-       int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL);
-       if (ret != 0)
+       //Set View Life-Cycle callbacks.
+       lifecycle_callback.load = view15_load_cb;
+       if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL)))
        {
-               //TODO
+               dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret);
+               ui_view_destroy(view);
+               return;
        }
 
        UI_VIEWMGR_VIEW_PUSH(view);

diff --git a/src/examples/efl/c/page16.cpp b/src/examples/efl/c/page16.cpp
index ee94220ce3d24e18eeeef2510ec9b2ab14af8d2c..568f5869bbe2e6d8e4faba76b150c667ee8de8a9 100644 (file)
--- a/src/examples/efl/c/page16.cpp
+++ b/src/examples/efl/c/page16.cpp
@@ -18,54 +18,62 @@
 #include "main.h"
 
 static void
-view16_prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        UI_VIEWMGR_VIEW_POP();
 }
 
 static void
-view16_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        UI_VIEWMGR_DEACTIVATE();
 }
 
 static void
-view16_title_show_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+title_show_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       ui_view *view = static_cast<ui_view *>(data);
+       ui_view *view = (ui_view *) data;
        ui_standard_view_title_visible_set(view, true, false);
 }
 
 static void
-view16_title_hide_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+title_hide_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       ui_view *view = static_cast<ui_view *>(data);
+       ui_view *view = (ui_view *) data;
        ui_standard_view_title_visible_set(view, false, false);
 }
 
 static void
-view16_title_show_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+title_show_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       ui_view *view = static_cast<ui_view *>(data);
+       ui_view *view = (ui_view *) data;
        ui_standard_view_title_visible_set(view, true, true);
 }
 
 static void
-view16_title_hide_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+title_hide_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       ui_view *view = static_cast<ui_view *>(data);
+       ui_view *view = (ui_view *) data;
        ui_standard_view_title_visible_set(view, false, true);
 }
 
 static bool
 view16_load_cb(ui_view *view, void *data)
 {
-       Evas_Object *base_layout = ui_view_base_get(view);
+       Evas_Object *content = NULL;
+       Evas_Object *base = NULL;
 
-       Evas_Object *content = create_title_handle_content(base_layout,
-                       view16_prev_btn_clicked_cb, view16_next_btn_clicked_cb,
-                       view16_title_show_btn_clicked_cb, view16_title_hide_btn_clicked_cb,
-                       view16_title_show_anim_btn_clicked_cb, view16_title_hide_anim_btn_clicked_cb, view);
+       //Get a base object from view.
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       //Create and set a main content.
+       content = create_title_handle_content(base, prev_btn_clicked_cb, next_btn_clicked_cb, title_show_btn_clicked_cb, title_hide_btn_clicked_cb, title_show_anim_btn_clicked_cb, title_hide_anim_btn_clicked_cb, view);
+       if (!content) return false;
 
        ui_standard_view_content_set(view, content, "Page16", NULL, NULL, NULL);
 
@@ -75,16 +83,25 @@ view16_load_cb(ui_view *view, void *data)
 void
 create_page16()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
 
-       lifecycle_callback.load = view16_load_cb;
-
-       ui_view *view = ui_standard_view_create("page16");
+       //Create a view.
+       view = ui_standard_view_create("page16");
+       if (!view)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view");
+               return;
+       }
 
-       int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL);
-       if (ret != 0)
+       //Set View Life-Cycle callbacks.
+       lifecycle_callback.load = view16_load_cb;
+       if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL)))
        {
-               //TODO
+               dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret);
+               ui_view_destroy(view);
+               return;
        }
 
        UI_VIEWMGR_VIEW_PUSH(view);