examples/c: clean up code after review.

Change-Id: I6f29e3ba777a904c3289fded93f9c2fab60778da

diff --git a/src/examples/efl/c/page1.cpp b/src/examples/efl/c/page1.cpp
index 5b91dd354d8dab53af7257d20f60fde4b0e1afd2..2ebb6ca193333d0f6dd8d33068f4a715947e25ab 100644 (file)
--- a/src/examples/efl/c/page1.cpp
+++ b/src/examples/efl/c/page1.cpp
@@ -37,10 +37,20 @@ view1_load_cb(ui_view *view, void *data)
        Evas_Object *base = NULL;
 
        base = ui_view_base_get(view);
-       if (!base) return false;
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
 
        content = create_content(base, "ViewMgr Demo<br>Basic View", prev_btn_clicked_cb, next_btn_clicked_cb);
-       ui_standard_view_content_set(view, content, "Page1", NULL, NULL, NULL);
+       if (!content) return false;
+
+       if (!ui_standard_view_content_set(view, content, "Page1", NULL, NULL, NULL))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               return false;
+       }
 
        return true;
 }

diff --git a/src/examples/efl/c/page2.cpp b/src/examples/efl/c/page2.cpp
index a9b1dbd59f44416e1339efb1edd4173cf204e968..1459f8f7d0c12fc5b04ac313aaeac02c84aa35c5 100644 (file)
--- a/src/examples/efl/c/page2.cpp
+++ b/src/examples/efl/c/page2.cpp
@@ -36,9 +36,14 @@ view2_load_cb(ui_view *view, void *data)
        Evas_Object *base = NULL;
 
        base = ui_view_base_get(view);
-       if (!base) return false;
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
 
        content = create_content(base, "ViewMgr Demo<br>Title Buttons", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
 
        //Title left button
        Elm_Button *left_title_btn = elm_button_add(base);
@@ -46,9 +51,13 @@ view2_load_cb(ui_view *view, void *data)
 
        //Title right button
        Elm_Button *right_title_btn = elm_button_add(base);
-       elm_object_text_set(right_title_btn, "Done2221");
+       elm_object_text_set(right_title_btn, "Done");
 
-       ui_standard_view_content_set(view, content, "Page2", NULL, left_title_btn, right_title_btn);
+       if (!ui_standard_view_content_set(view, content, "Page2", NULL, left_title_btn, right_title_btn))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               return false;
+       }
 
        return true;
 }
@@ -68,7 +77,7 @@ create_page2()
        }
 
        lifecycle_callback.load = view2_load_cb;
-       if (!ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))
+       if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL)))
        {
                dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set() is failed. err = %d", ret);
                ui_view_destroy(view);

diff --git a/src/examples/efl/c/page3.cpp b/src/examples/efl/c/page3.cpp
index d62a84aec4c23ec3451e6bb7c210308f6df28fa6..f2bfc38aad28f048965f9ea9669c97a9e7b71044 100644 (file)
--- a/src/examples/efl/c/page3.cpp
+++ b/src/examples/efl/c/page3.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view3_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
-view3_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_page4();
 }
@@ -32,12 +32,24 @@ view3_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view3_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>Subtitle",
-                       view3_prev_btn_clicked_cb, view3_next_btn_clicked_cb);
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       content = create_content(base, "ViewMgr Demo<br>Subtitle", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
 
-       ui_standard_view_content_set(view, content, "Page3", "Subtitle", NULL, NULL);
+       if (!ui_standard_view_content_set(view, content, "Page3", "Subtitle", NULL, NULL))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               return false;
+       }
 
        return true;
 }
@@ -45,18 +57,24 @@ view3_load_cb(ui_view *view, void *data)
 void
 create_page3()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
 
-       lifecycle_callback.load = view3_load_cb;
-
-       ui_view *view = ui_standard_view_create("page3");
+       view = ui_standard_view_create("page3");
+       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)
+       lifecycle_callback.load = view3_load_cb;
+       if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL)))
        {
                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/page4.cpp b/src/examples/efl/c/page4.cpp
index 918b012c2a89c6359ab3be9e7f5c0bb7c99e2f62..e72c70300f703e401a58ca9cfa75b7a166e62b4e 100644 (file)
--- a/src/examples/efl/c/page4.cpp
+++ b/src/examples/efl/c/page4.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view4_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
-view4_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_page5();
 }
@@ -32,12 +32,25 @@ view4_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view4_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>Title Badge",
-                       view4_prev_btn_clicked_cb, view4_next_btn_clicked_cb);
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       content = create_content(base, "ViewMgr Demo<br>Title Badge", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
+
+       if (!ui_standard_view_content_set(view, content, "Page4 We put a long title here intentionally", NULL, NULL, NULL))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               return false;
+       }
 
-       ui_standard_view_content_set(view, content, "Page4 We put a long title here intentionally", NULL, NULL, NULL);
        ui_standard_view_title_badge_set(view, "999+");
 
        return true;
@@ -46,15 +59,23 @@ view4_load_cb(ui_view *view, void *data)
 void
 create_page4()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
-       lifecycle_callback.load = view4_load_cb;
 
-       ui_view *view = ui_standard_view_create("page4");
+       view = ui_standard_view_create("page4");
+       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)
+       lifecycle_callback.load = view4_load_cb;
+       if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL)))
        {
                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/page5.cpp b/src/examples/efl/c/page5.cpp
index 056ae93da261806c27cc7c39be33d4b4bda720a2..d96cf104ceedbd041460697f867f1ac4b4986bc8 100644 (file)
--- a/src/examples/efl/c/page5.cpp
+++ b/src/examples/efl/c/page5.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view5_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
-view5_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_page6();
 }
@@ -32,12 +32,24 @@ view5_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view5_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>Full View",
-                       view5_prev_btn_clicked_cb, view5_next_btn_clicked_cb);
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       content = create_content(base, "ViewMgr Demo<br>Full View", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
 
-       ui_view_content_set(view, content);
+       if (!ui_view_content_set(view, content))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               return false;
+       }
        ui_view_indicator_set(view, UI_VIEW_INDICATOR_HIDE);
 
        return true;
@@ -46,16 +58,23 @@ view5_load_cb(ui_view *view, void *data)
 void
 create_page5()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
 
-       lifecycle_callback.load = view5_load_cb;
-
-       ui_view *view = ui_view_create("page5");
+       view = ui_view_create("page5");
+       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)
+       lifecycle_callback.load = view5_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/page6.cpp b/src/examples/efl/c/page6.cpp
index 2c2dae195cfaacf9e5884cb8598cd7d34694f78b..46e300f4c7c63c7d4c8100f18fc77349745dfff2 100644 (file)
--- a/src/examples/efl/c/page6.cpp
+++ b/src/examples/efl/c/page6.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view6_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
-view6_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_page7();
 }
@@ -32,14 +32,27 @@ view6_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view6_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>Toolbar",
-                       view6_prev_btn_clicked_cb, view6_next_btn_clicked_cb);
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       content = create_content(base, "ViewMgr Demo<br>Toolbar", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
+
+       if (!ui_standard_view_content_set(view, content, "Page6", NULL, NULL, NULL))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               return false;
+       }
 
-       ui_standard_view_content_set(view, content, "Page6", NULL, NULL, NULL);
-       Elm_Toolbar *toolbar = create_toolbar(base_layout, "toolbar_with_title");
-       ui_standard_view_toolbar_set(view, toolbar);
+       Elm_Toolbar *toolbar = create_toolbar(base, "toolbar_with_title");
+       if (toolbar) ui_standard_view_toolbar_set(view, toolbar);
 
        return true;
 }
@@ -47,15 +60,23 @@ view6_load_cb(ui_view *view, void *data)
 void
 create_page6()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
-       lifecycle_callback.load = view6_load_cb;
 
-       ui_view *view = ui_standard_view_create("page6");
+       view = ui_standard_view_create("page6");
+       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)
+       lifecycle_callback.load = view6_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/page7.cpp b/src/examples/efl/c/page7.cpp
index 42e30f3257f08c6aede00517f222658afeb6209e..f114ca9cdfc7f761471bf09089de05ad7ebeb688 100644 (file)
--- a/src/examples/efl/c/page7.cpp
+++ b/src/examples/efl/c/page7.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view7_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
-view7_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_page8();
 }
@@ -32,14 +32,27 @@ view7_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 static bool
 view7_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>Navigationbarr",
-                       view7_prev_btn_clicked_cb, view7_next_btn_clicked_cb);
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               return false;
+       }
+
+       content = create_content(base, "ViewMgr Demo<br>Navigationbar",prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content) return false;
+
+       if (!ui_standard_view_content_set(view, content, "Page7", NULL, NULL, NULL))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               return false;
+       }
 
-       ui_standard_view_content_set(view, content, "Page7", NULL, NULL, NULL);
-       Elm_Toolbar *toolbar = create_toolbar(base_layout, "navigationbar");
-       ui_standard_view_toolbar_set(view, toolbar);
+       Elm_Toolbar *toolbar = create_toolbar(base, "navigationbar");
+       if (toolbar) ui_standard_view_toolbar_set(view, toolbar);
 
        return true;
 }
@@ -47,16 +60,23 @@ view7_load_cb(ui_view *view, void *data)
 void
 create_page7()
 {
+       int ret = 0;
+       ui_view *view = NULL;
        ui_view_lifecycle_callback_s lifecycle_callback = {0, };
 
-       lifecycle_callback.load = view7_load_cb;
-
-       ui_view *view = ui_standard_view_create("page7");
+       view = ui_standard_view_create("page7");
+       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)
+       lifecycle_callback.load = view7_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/page8.cpp b/src/examples/efl/c/page8.cpp
index 4e9de4205f87055c8d710bbef22d91a07dd6b5b1..c264b09141a2b73c3eccd1aef567c398f222070d 100644 (file)
--- a/src/examples/efl/c/page8.cpp
+++ b/src/examples/efl/c/page8.cpp
@@ -18,13 +18,13 @@
 #include "main.h"
 
 static void
-view8_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
-view8_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_page9();
 }
@@ -32,15 +32,43 @@ view8_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 void
 create_page8()
 {
-       ui_view *view = ui_standard_view_create("page8");
+       ui_view *view = NULL;
+       Evas_Object *base = NULL;
+       Evas_Object *content = NULL;
 
-       Evas_Object *base_layout = ui_view_base_get(view);
+       view = ui_standard_view_create("page8");
+       if (!view)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view");
+               return;
+       }
 
-       Evas_Object *content = create_content(base_layout, "ViewMgr Demo<br>Content Preload",
-                       view8_prev_btn_clicked_cb, view8_next_btn_clicked_cb);
+       base = ui_view_base_get(view);
+       if (!base)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object");
+               ui_view_destroy(view);
+               return;
+       }
 
+       content = create_content(base, "ViewMgr Demo<br>Content Preload", prev_btn_clicked_cb, next_btn_clicked_cb);
+       if (!content)
+       {
+               ui_view_destroy(view);
+               return;
+       }
+
+       if (!ui_standard_view_content_set(view, content, "Page8", NULL, NULL, NULL))
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content");
+               ui_view_destroy(view);
+               return;
+       }
+
+       //Don't delete view's content when this view popped.
+       //This is a show case for saving this content for reuse later.
        ui_view_removable_content_set(view, false);
-       ui_standard_view_content_set(view, content, "Page8", NULL, NULL, NULL);
+
 
        UI_VIEWMGR_VIEW_PUSH(view);
 }

diff --git a/src/examples/efl/cpp/page8.h b/src/examples/efl/cpp/page8.h
index 078d856988f0a7dad4d9710adeb9ff8f06866c1f..314969b2dab2c3341571ce8889dc3905510a71bd 100644 (file)
--- a/src/examples/efl/cpp/page8.h
+++ b/src/examples/efl/cpp/page8.h
@@ -35,9 +35,11 @@ public:
                                UI_VIEWMGR->push_view(new page9());
                        });
 
-               //Don't delete view's content when this view poped.
-               this->set_removable_content(false);
                this->set_content(content, "Page 8");
+
+               //Don't delete view's content when this view popped.
+               //This is a show case for saving this content for reuse later.
+               this->set_removable_content(false);
        }
        ~page8() {}
 };