From 4f9de358ddfc34078764ce9e2e61b16df41e0da2 Mon Sep 17 00:00:00 2001 From: Woochan Lee Date: Tue, 1 Nov 2016 19:44:23 +0900 Subject: [PATCH] Define UI_VIEWMGR error types. Change-Id: I4339f55e9f55165198c4f1731caf2ec6671d15a5 --- src/examples/efl/c/main.cpp | 6 +-- src/examples/efl/c/page1.cpp | 8 +-- src/examples/efl/c/page10.cpp | 12 ++--- src/examples/efl/c/page11.cpp | 12 ++--- src/examples/efl/c/page12.cpp | 14 +++--- src/examples/efl/c/page13.cpp | 10 ++-- src/examples/efl/c/page14.cpp | 10 ++-- src/examples/efl/c/page15.cpp | 6 +-- src/examples/efl/c/page16.cpp | 10 ++-- src/examples/efl/c/page2.cpp | 10 ++-- src/examples/efl/c/page3.cpp | 8 +-- src/examples/efl/c/page4.cpp | 8 +-- src/examples/efl/c/page5.cpp | 10 ++-- src/examples/efl/c/page6.cpp | 8 +-- src/examples/efl/c/page7.cpp | 8 +-- src/examples/efl/c/page8.cpp | 8 +-- src/examples/efl/c/page9.cpp | 16 +++--- src/include/efl/UiBaseKeyListener.h | 8 +-- src/include/efl/UiBaseView.h | 20 ++++---- src/include/efl/UiBaseViewmgr.h | 32 ++++++------ src/include/efl/mobile/UiKeyListener.h | 6 +-- src/include/efl/mobile/UiMenu.h | 12 ++--- src/include/efl/mobile/UiPopup.h | 12 ++--- src/include/efl/mobile/UiStandardView.h | 42 ++++++++-------- src/include/efl/mobile/c/ui_application.h | 18 +++---- src/include/efl/mobile/c/ui_menu.h | 16 +++--- src/include/efl/mobile/c/ui_popup.h | 20 ++++---- src/include/efl/mobile/c/ui_standard_view.h | 48 +++++++++--------- src/include/efl/mobile/c/ui_view.h | 34 ++++++------- src/include/efl/mobile/c/ui_viewmgr.h | 32 ++++++------ src/include/interface/UiIfaceApp.h | 8 +-- src/include/interface/UiIfaceOverlay.h | 2 +- src/include/interface/UiIfaceTypes.h | 15 ++++++ src/include/interface/UiIfaceView.h | 18 +++---- src/include/interface/UiIfaceViewmgr.h | 36 +++++++------- src/lib/efl/UiBaseKeyListener.cpp | 14 +++--- src/lib/efl/UiBaseView.cpp | 24 ++++----- src/lib/efl/UiBaseViewmgr.cpp | 18 +++---- src/lib/efl/mobile/UiKeyListener.cpp | 8 +-- src/lib/efl/mobile/UiMenu.cpp | 16 +++--- src/lib/efl/mobile/UiPopup.cpp | 20 ++++---- src/lib/efl/mobile/UiStandardView.cpp | 38 +++++++-------- src/lib/efl/mobile/c/ui_application.cpp | 17 +++---- src/lib/efl/mobile/c/ui_menu.cpp | 22 ++++----- src/lib/efl/mobile/c/ui_popup.cpp | 26 +++++----- src/lib/efl/mobile/c/ui_standard_view.cpp | 14 +++--- src/lib/efl/mobile/c/ui_view.cpp | 54 ++++++++++----------- src/lib/efl/mobile/c/ui_viewmgr.cpp | 6 +-- src/lib/interface/UiIfaceOverlay.cpp | 2 +- src/lib/interface/UiIfaceView.cpp | 18 +++---- src/lib/interface/UiIfaceViewmgr.cpp | 52 ++++++++++---------- 51 files changed, 453 insertions(+), 439 deletions(-) diff --git a/src/examples/efl/c/main.cpp b/src/examples/efl/c/main.cpp index c528952..0d09827 100644 --- a/src/examples/efl/c/main.cpp +++ b/src/examples/efl/c/main.cpp @@ -35,7 +35,7 @@ main(int argc, char *argv[]) //Initialize ui_app. ui_app initializes basic resources including ui_viewmgr internally. ret = ui_application_init(PACKAGE, LOCALE_DIR); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_init() is failed, ret = %d", ret); return 0; @@ -43,7 +43,7 @@ main(int argc, char *argv[]) //Run ui_app. Now it requests to run an application mainloop. ret = ui_application_run(argc, argv, events, 2, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_run() is failed, ret = %d", ret); return 0; @@ -51,7 +51,7 @@ main(int argc, char *argv[]) //Terminate ui_app. Remove all ui_app resources. ret = ui_application_term(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_term() is failed ret = %d", ret); return 0; diff --git a/src/examples/efl/c/page1.cpp b/src/examples/efl/c/page1.cpp index 156ce9c..e110030 100644 --- a/src/examples/efl/c/page1.cpp +++ b/src/examples/efl/c/page1.cpp @@ -22,7 +22,7 @@ prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { //FIXME: deactivate??? or ui_app deactivate??? or ui_viewmgr pop??? int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -55,7 +55,7 @@ view1_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -83,7 +83,7 @@ create_page1() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view1_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -92,7 +92,7 @@ create_page1() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page10.cpp b/src/examples/efl/c/page10.cpp index b709b95..ef625d1 100644 --- a/src/examples/efl/c/page10.cpp +++ b/src/examples/efl/c/page10.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -63,14 +63,14 @@ view10_rotate_cb(ui_standard_view *view, void *user_data) ret = ui_view_set_indicator(view, UI_VIEW_INDICATOR_OPTIMAL); } - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_indicator() is failed. err = %d", ret); } //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -104,7 +104,7 @@ create_page10() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view10_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -113,14 +113,14 @@ create_page10() //Set Rotation callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_ROTATE, view10_rotate_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); } //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page11.cpp b/src/examples/efl/c/page11.cpp index 55bf03f..7922f1d 100644 --- a/src/examples/efl/c/page11.cpp +++ b/src/examples/efl/c/page11.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -54,7 +54,7 @@ view11_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -109,7 +109,7 @@ view11_menu_cb(ui_view *view, void *user_data) elm_ctxpopup_item_append(ctxpopup, "Dialer", NULL, ctxpopup_item_select_cb, NULL); ret = ui_menu_set_content(menu, ctxpopup); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_menu_set_content() is failed. err = %d", ret); return false; @@ -134,7 +134,7 @@ create_page11() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view11_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -143,14 +143,14 @@ create_page11() //Set Menu callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_MENU, view11_menu_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); } //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page12.cpp b/src/examples/efl/c/page12.cpp index b4c8881..7936d99 100644 --- a/src/examples/efl/c/page12.cpp +++ b/src/examples/efl/c/page12.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -55,7 +55,7 @@ popup_dismissed_cb(void *data, Eo *obj, void *event_info) ui_popup *popup = (ui_popup *) data; ret = ui_popup_destroy(popup); - if (!ret != TIZEN_ERROR_NONE) + if (!ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_popup_destroy() is failed. err = %d", ret); } @@ -101,7 +101,7 @@ view12_btn_clicked(void *data, Eo *obj, void *event_info) //Set elm popup as a ui_popup content. ret = ui_popup_set_content(popup, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_popup_set_content() is failed. err = %d", ret); ui_popup_destroy(popup); @@ -109,7 +109,7 @@ view12_btn_clicked(void *data, Eo *obj, void *event_info) } ret = ui_popup_activate(popup); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_popup_activate() is failed. err = %d", ret); ui_popup_destroy(popup); @@ -144,7 +144,7 @@ view12_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -174,7 +174,7 @@ create_page12() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view12_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -183,7 +183,7 @@ create_page12() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page13.cpp b/src/examples/efl/c/page13.cpp index 25a34fc..870dca3 100644 --- a/src/examples/efl/c/page13.cpp +++ b/src/examples/efl/c/page13.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -54,7 +54,7 @@ view13_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -82,14 +82,14 @@ create_page13() //Set Fade Transition Effect. ret = ui_view_set_transition_style(view, "fade"); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_transition_style() is failed. err = %d", ret); } //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view13_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -98,7 +98,7 @@ create_page13() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page14.cpp b/src/examples/efl/c/page14.cpp index b2a4517..989b735 100644 --- a/src/examples/efl/c/page14.cpp +++ b/src/examples/efl/c/page14.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -54,7 +54,7 @@ view14_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -82,14 +82,14 @@ create_page14() //Turn off Transition Effect. ret = ui_view_set_transition_style(view, "none"); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_transition_style() is failed. err = %d", ret); } //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view14_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -98,7 +98,7 @@ create_page14() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page15.cpp b/src/examples/efl/c/page15.cpp index 2f6fc52..e9a81ff 100644 --- a/src/examples/efl/c/page15.cpp +++ b/src/examples/efl/c/page15.cpp @@ -49,7 +49,7 @@ view15_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -77,7 +77,7 @@ create_page15() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view15_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -86,7 +86,7 @@ create_page15() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page16.cpp b/src/examples/efl/c/page16.cpp index e116a2f..c4c3bf7 100644 --- a/src/examples/efl/c/page16.cpp +++ b/src/examples/efl/c/page16.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -31,7 +31,7 @@ static void next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_deactivate(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_deactivate() is failed. err = %d", ret); } @@ -86,7 +86,7 @@ view16_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -114,7 +114,7 @@ create_page16() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view16_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -123,7 +123,7 @@ create_page16() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page2.cpp b/src/examples/efl/c/page2.cpp index e16314f..872d655 100644 --- a/src/examples/efl/c/page2.cpp +++ b/src/examples/efl/c/page2.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -63,14 +63,14 @@ view2_load_cb(ui_standard_view *view, void *user_data) //Set available rotation only "0, 90" of this view const int rots[2] = { 0, 90 }; ret = ui_view_set_available_rotations(view, rots, 2); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_available_rotations() is failed. err = %d", ret); } //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -100,7 +100,7 @@ create_page2() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view2_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -109,7 +109,7 @@ create_page2() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() 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 d63be21..ed6bcf5 100644 --- a/src/examples/efl/c/page3.cpp +++ b/src/examples/efl/c/page3.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -54,7 +54,7 @@ view3_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -83,7 +83,7 @@ create_page3() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view3_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -92,7 +92,7 @@ create_page3() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page4.cpp b/src/examples/efl/c/page4.cpp index 7561907..467c8cb 100644 --- a/src/examples/efl/c/page4.cpp +++ b/src/examples/efl/c/page4.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -54,7 +54,7 @@ view4_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -83,7 +83,7 @@ create_page4() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view4_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -92,7 +92,7 @@ create_page4() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page5.cpp b/src/examples/efl/c/page5.cpp index 818ec9b..ad45cb6 100644 --- a/src/examples/efl/c/page5.cpp +++ b/src/examples/efl/c/page5.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -54,7 +54,7 @@ view5_load_cb(ui_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -63,7 +63,7 @@ view5_load_cb(ui_view *view, void *user_data) //Hide Indicator ret = ui_view_set_indicator(view, UI_VIEW_INDICATOR_HIDE); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_indicator() is failed. err = %d", ret); } @@ -87,7 +87,7 @@ create_page5() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view5_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -96,7 +96,7 @@ create_page5() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page6.cpp b/src/examples/efl/c/page6.cpp index defde81..646c60e 100644 --- a/src/examples/efl/c/page6.cpp +++ b/src/examples/efl/c/page6.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -57,7 +57,7 @@ view6_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -86,7 +86,7 @@ create_page6() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view6_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -95,7 +95,7 @@ create_page6() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page7.cpp b/src/examples/efl/c/page7.cpp index 615f3cd..f3c299b 100644 --- a/src/examples/efl/c/page7.cpp +++ b/src/examples/efl/c/page7.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -57,7 +57,7 @@ view7_load_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -85,7 +85,7 @@ create_page7() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view7_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -94,7 +94,7 @@ create_page7() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page8.cpp b/src/examples/efl/c/page8.cpp index 9bdb9c1..1dead4c 100644 --- a/src/examples/efl/c/page8.cpp +++ b/src/examples/efl/c/page8.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -68,7 +68,7 @@ create_page8() //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -80,7 +80,7 @@ create_page8() //Don't delete view's content when this view popped. //This is a show case for saving this content for reuse later. ret = ui_view_set_removable_content(view, false); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_removable_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -89,7 +89,7 @@ create_page8() //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/examples/efl/c/page9.cpp b/src/examples/efl/c/page9.cpp index 5ee5838..19aeade 100644 --- a/src/examples/efl/c/page9.cpp +++ b/src/examples/efl/c/page9.cpp @@ -21,7 +21,7 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { int ret = ui_viewmgr_pop_view(); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); } @@ -54,7 +54,7 @@ view9_portrait_cb(ui_standard_view *view, void *user_data) //Set Main Content ret = ui_view_set_content(view, content); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_content() is failed. err = %d", ret); ui_view_destroy(view); @@ -65,7 +65,7 @@ view9_portrait_cb(ui_standard_view *view, void *user_data) //Set indicator ret = ui_view_set_indicator(view, UI_VIEW_INDICATOR_DEFAULT); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_indicator() is failed. err = %d", ret); } @@ -99,7 +99,7 @@ view9_landscape_cb(ui_standard_view *view, void *user_data) //Set indicator ret = ui_view_set_indicator(view, UI_VIEW_INDICATOR_OPTIMAL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_indicator() is failed. err = %d", ret); } @@ -134,7 +134,7 @@ create_page9() //Set View Load callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LOAD, view9_load_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); ui_view_destroy(view); @@ -143,21 +143,21 @@ create_page9() //Set Portrait callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_PORTRAIT, view9_portrait_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); } //Set Landscape callback. ret = ui_view_set_event_cb(view, UI_VIEW_EVENT_LANDSCAPE, view9_landscape_cb, NULL); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_set_event_cb() is failed. err = %d", ret); } //Push view. ret = ui_viewmgr_push_view(view); - if (ret != TIZEN_ERROR_NONE) + if (ret != UI_VIEWMGR_ERROR_NONE) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_push_view() is failed. err = %d", ret); ui_view_destroy(view); diff --git a/src/include/efl/UiBaseKeyListener.h b/src/include/efl/UiBaseKeyListener.h index 8978df8..931dca6 100644 --- a/src/include/efl/UiBaseKeyListener.h +++ b/src/include/efl/UiBaseKeyListener.h @@ -51,9 +51,9 @@ protected: * @note It makes evas_object_rectangle and add key up callback to grab key event. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED Current view manager system is not set up. - * @retval #TIZEN_ERROR_UNKNOWN Fails to manipulates Eo resources. Please check Log messages. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Current view manager system is not set up. + * @retval #UI_VIEWMGR_ERROR_UNKNOWN Fails to manipulates Eo resources. Please check Log messages. * * @see term() */ @@ -65,7 +65,7 @@ protected: * @note Delete key grabber(evas_object_rectangle). * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NONE Successful * * @see init() */ diff --git a/src/include/efl/UiBaseView.h b/src/include/efl/UiBaseView.h index 90f4d13..076e4ef 100644 --- a/src/include/efl/UiBaseView.h +++ b/src/include/efl/UiBaseView.h @@ -47,7 +47,7 @@ public: * @param[in] content a new content. It allows @c nullptr for canceling the previous content. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NONE Successful */ virtual int setContent(Eo *content) override; @@ -74,9 +74,9 @@ public: * * @return @c 0 on success, otherwise a negative error value. * - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a indicator is not valid. - * @retval #TIZEN_ERROR_NOT_PERMITTED Current view manager system is not set up. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a indicator is not valid. + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Current view manager system is not set up. */ virtual int setIndicator(UiViewIndicator indicator) override; @@ -90,10 +90,10 @@ public: * @param[in] count The number of arrays of rotations. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER If @a count is less than 1 or @a rotations is invalid pointer. - * @retval #TIZEN_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #TIZEN_ERROR_NOT_PERMITTED Current view manager system is not set up. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER If @a count is less than 1 or @a rotations is invalid pointer. + * @retval #UI_VIEWMGR_ERROR_OUT_OF_MEMORY Out of Memory + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Current view manager system is not set up. */ virtual int setAvailableRotations(const int *rotations, unsigned int count) override; @@ -122,8 +122,8 @@ protected: * @param[in] block @c true, when blocking is enabled, otherwise @c false. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_SUPPORTED The system doesn't support event blocking feature. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED The system doesn't support event blocking feature. */ virtual int setEventBlock(bool block) override; diff --git a/src/include/efl/UiBaseViewmgr.h b/src/include/efl/UiBaseViewmgr.h index b9dcc8e..e4e7b41 100644 --- a/src/include/efl/UiBaseViewmgr.h +++ b/src/include/efl/UiBaseViewmgr.h @@ -45,9 +45,9 @@ public: * on initialization time. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS Already activated - * @retval #TIZEN_ERROR_NOT_PERMITTED Can't be activated. (ie, view manager has zero views.) + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS Already activated + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Can't be activated. (ie, view manager has zero views.) * * @see deactivate() */ @@ -60,8 +60,8 @@ public: * current window in order that application go background. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS Already deactivated + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS Already deactivated * * @see activate() */ @@ -78,8 +78,8 @@ public: * @param[in] view A view to insert in the viewmgr view list. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. * * @see activated() * @see insertViewBefore() @@ -97,9 +97,9 @@ public: * the application will be terminated. It's up to system configuration. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED No more views to pop. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS On a certain profile, it may not allow to pop multiple views at the same time. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED No more views to pop. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS On a certain profile, it may not allow to pop multiple views at the same time. * * @see deactivate() * @see pushView() @@ -113,9 +113,9 @@ public: * @param[in] before A view that will be just inserted after @a view. If you pass @c nullptr, @a view will be inserted at the front of the view list. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. */ virtual int insertViewBefore(UiBaseView *view, UiBaseView *before); @@ -126,9 +126,9 @@ public: * @param[in] after A view that will be just inserted before the @a view. If you pass @c nullptr, @a view will be inserted at the end of the view list. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. */ virtual int insertViewAfter(UiBaseView *view, UiBaseView *after); diff --git a/src/include/efl/mobile/UiKeyListener.h b/src/include/efl/mobile/UiKeyListener.h index c57bb27..2724ca3 100644 --- a/src/include/efl/mobile/UiKeyListener.h +++ b/src/include/efl/mobile/UiKeyListener.h @@ -45,9 +45,9 @@ public: * @note Add menu key to target of key grabber. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED Current view manager system is not set up. - * @retval #TIZEN_ERROR_UNKNOWN Fails to manipulates Eo resources. Please check Log messages. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Current view manager system is not set up. + * @retval #UI_VIEWMGR_ERROR_UNKNOWN Fails to manipulates Eo resources. Please check Log messages. */ virtual int init() override; diff --git a/src/include/efl/mobile/UiMenu.h b/src/include/efl/mobile/UiMenu.h index c2b3e61..5047cf4 100644 --- a/src/include/efl/mobile/UiMenu.h +++ b/src/include/efl/mobile/UiMenu.h @@ -42,8 +42,8 @@ public: * @note It makes menu state as show. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED UiMenu instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED UiMenu instance is not set up yet. * * @see deactivate() */ @@ -55,8 +55,8 @@ public: * @note It makes menu state as hide. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED UiMenu instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED UiMenu instance is not set up yet. * * @see activate() */ @@ -68,8 +68,8 @@ public: * @param[in] ctxpopup ctxpopup object. It allows @c nullptr for canceling the previous content. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a ctxpopup is not a type of Elm_Ctxpopup. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a ctxpopup is not a type of Elm_Ctxpopup. */ virtual int setContent(Elm_Ctxpopup* ctxpopup) override; diff --git a/src/include/efl/mobile/UiPopup.h b/src/include/efl/mobile/UiPopup.h index 2f51dcb..7d2e62f 100644 --- a/src/include/efl/mobile/UiPopup.h +++ b/src/include/efl/mobile/UiPopup.h @@ -54,8 +54,8 @@ public: * @note It makes popup state as show. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED UiPopup instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED UiPopup instance is not set up yet. * * @see deactivate() */ @@ -67,8 +67,8 @@ public: * @note It makes popup state as hide. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED UiPopup instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED UiPopup instance is not set up yet. * * @see activate() */ @@ -80,8 +80,8 @@ public: * @param[in] popup popup object. It allows @c nullptr for canceling the previous content. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a popup is not a type of Elm_Popup. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a popup is not a type of Elm_Popup. */ virtual int setContent(Elm_Popup* popup) override; diff --git a/src/include/efl/mobile/UiStandardView.h b/src/include/efl/mobile/UiStandardView.h index 363c0a4..3c7c353 100644 --- a/src/include/efl/mobile/UiStandardView.h +++ b/src/include/efl/mobile/UiStandardView.h @@ -53,8 +53,8 @@ public: * @param[in] title title_label The label in the title area. The name of the title label part is "elm.text.title" * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setContent(Eo *content); @@ -64,8 +64,8 @@ public: * @param[in] text The label in the title badge area. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setTitleBadge(const char *text); @@ -75,8 +75,8 @@ public: * @param[in] text The label in the subtitle area. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setSubtitle(const char *text); @@ -86,9 +86,9 @@ public: * @param[in] title_left_btn The button in the left part of title area. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS if @a titleLeftBtn is same with the existing one. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS if @a titleLeftBtn is same with the existing one. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setTitleLeftBtn(Elm_Button *titleLeftBtn); @@ -98,9 +98,9 @@ public: * @param[in] title_right_btn The button in the right part of title area. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS if @a titleRightBtn is same with the existing one. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS if @a titleRightBtn is same with the existing one. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setTitleRightBtn(Elm_Button *titleRightBtn); @@ -110,8 +110,8 @@ public: * @param[in] text The label in the title area. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setTitle(const char *text); @@ -121,9 +121,9 @@ public: * @param[in] toolbar Toolbar object. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS if @a toolbar is already existing. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS if @a toolbar is already existing. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setToolbar(Elm_Toolbar *toolbar); @@ -134,8 +134,8 @@ public: * @param[in] anim title area will be shown with animation if the given param is @c true, otherwise title area will be shown without animation. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ int setTitleVisible(bool visible, bool anim); @@ -220,8 +220,8 @@ protected: * * @return @c 0 on success, otherwise a negative error value. * - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_SUPPORTED The system doesn't support event blocking feature. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED The system doesn't support event blocking feature. */ virtual int setEventBlock(bool block) override; diff --git a/src/include/efl/mobile/c/ui_application.h b/src/include/efl/mobile/c/ui_application.h index 3c11739..41c7f1d 100644 --- a/src/include/efl/mobile/c/ui_application.h +++ b/src/include/efl/mobile/c/ui_application.h @@ -65,9 +65,9 @@ typedef struct * @param[in] locale_dir The path of locale directory * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS Initialization was already done. - * @retval #TIZEN_ERROR_OUT_OF_MEMORY Fails to allocate memory. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS Initialization was already done. + * @retval #UI_VIEWMGR_ERROR_OUT_OF_MEMORY Fails to allocate memory. * * @see ui_application_term() * @see ui_application_run() @@ -85,11 +85,11 @@ EAPI int ui_application_init(const char *pkg, const char *locale_dir); * @param[in] user_data User data for event callbacks * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER Invalid parameters - * @retval #TIZEN_ERROR_APPLICATION The application is illegally launched, not launched by the launch system. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS The main loop already starts. - * @retval #TIZEN_ERROR_NOT_PERMITTED If Initialization was not performed yet. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER Invalid parameters + * @retval #UI_VIEWMGR_ERROR_APPLICATION The application is illegally launched, not launched by the launch system. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS The main loop already starts. + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED If Initialization was not performed yet. * * @pre Call ui_application_init() before calling this function. * @@ -105,7 +105,7 @@ EAPI int ui_application_run(int argc, char **argv, ui_application_event_s *event * @since_tizen 3.0 * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NONE Successful * * @pre Call ui_application_init() before calling this function. * diff --git a/src/include/efl/mobile/c/ui_menu.h b/src/include/efl/mobile/c/ui_menu.h index 519cfa9..b73db06 100644 --- a/src/include/efl/mobile/c/ui_menu.h +++ b/src/include/efl/mobile/c/ui_menu.h @@ -20,8 +20,8 @@ extern "C" { * @param[in] ctxpopup ctxpopup object. It allows @c NULL for canceling the previous content * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a menu is invalid or @a content is not a type of Elm_Ctxpopup. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a menu is invalid or @a content is not a type of Elm_Ctxpopup. * * @see ui_menu_get_content() * @see ui_menu_unset_content() @@ -62,9 +62,9 @@ EAPI Elm_Ctxpopup *ui_menu_unset_content(ui_menu *menu); * @param[in] menu An ui_menu instance * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED menu instance is not set up yet. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a menu is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED menu instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a menu is invalid. * * @see ui_menu_deactivate() */ @@ -78,9 +78,9 @@ EAPI int ui_menu_activate(ui_menu *menu); * @param[in] menu An ui_menu instance * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED menu instance is not set up yet. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a menu is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED menu instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a menu is invalid. * * @see ui_menu_activate() */ diff --git a/src/include/efl/mobile/c/ui_popup.h b/src/include/efl/mobile/c/ui_popup.h index f6dbb91..7b787b4 100644 --- a/src/include/efl/mobile/c/ui_popup.h +++ b/src/include/efl/mobile/c/ui_popup.h @@ -34,8 +34,8 @@ EAPI ui_popup *ui_popup_create(ui_view *view); * @param[in] popup An ui_popup instance * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a popup is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a popup is invalid. * * @see ui_popup_create() */ @@ -49,8 +49,8 @@ EAPI int ui_popup_destroy(ui_popup *popup); * @param[in] content popup object. It allows @c NULL for canceling the previous content * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a popup is invalid or @a content is not a type of Elm_Popup. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a popup is invalid or @a content is not a type of Elm_Popup. * * @see ui_popup_get_content() * @see ui_popup_unset_content() @@ -91,9 +91,9 @@ EAPI Elm_Popup *ui_popup_unset_content(ui_popup *popup); * @param[in] popup An ui_popup instance * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED popup instance is not set up yet. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a popup is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED popup instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a popup is invalid. * * @see ui_popup_deactivate() * @see ui_popup_get_activated() @@ -108,9 +108,9 @@ EAPI int ui_popup_activate(ui_popup *popup); * @param[in] popup An ui_popup instance * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED popup instance is not set up yet. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a popup is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED popup instance is not set up yet. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a popup is invalid. * * @see ui_popup_activate() * @see ui_popup_get_activated() diff --git a/src/include/efl/mobile/c/ui_standard_view.h b/src/include/efl/mobile/c/ui_standard_view.h index 72e9f5a..a60d051 100644 --- a/src/include/efl/mobile/c/ui_standard_view.h +++ b/src/include/efl/mobile/c/ui_standard_view.h @@ -33,9 +33,9 @@ EAPI ui_standard_view *ui_standard_view_create(const char *name); * @param[in] text The label in the title area * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. * * @see ui_standard_view_get_title() */ @@ -49,9 +49,9 @@ EAPI int ui_standard_view_set_title(ui_standard_view *view, const char *text); * @param[in] text The label in the subtitle area * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. * * @see ui_standard_view_get_sub_title() */ @@ -65,9 +65,9 @@ EAPI int ui_standard_view_set_sub_title(ui_standard_view *view, const char *text * @param[in] text The label in the title badge area * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. * * @see ui_standard_view_get_title_badge() */ @@ -81,10 +81,10 @@ EAPI int ui_standard_view_set_title_badge(ui_standard_view *view, const char *ba * @param[in] title_right_btn The button in the right part of title area * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS if @a title_right_btn is same with the existing one. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS if @a title_right_btn is same with the existing one. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. * * @see ui_standard_view_get_title_right_btn() * @see ui_standard_view_unset_title_right_btn() @@ -125,10 +125,10 @@ EAPI Elm_Button *ui_standard_view_unset_title_right_btn(ui_standard_view *view); * @param[in] title_left_btn The button in the left part of title area * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS if @a title_left_btn is same with the existing one. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS if @a title_left_btn is same with the existing one. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. * * @see ui_standard_view_get_title_left_btn() * @see ui_standard_view_unset_title_left_btn() @@ -169,10 +169,10 @@ EAPI Elm_Button *ui_standard_view_unset_title_left_btn(ui_standard_view *view); * @param[in] toolbar Toolbar object * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS if @a toolbar is already existing. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS if @a toolbar is already existing. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. * * @see ui_standard_view_get_toolbar() * @see ui_standard_view_unset_toolbar() @@ -214,9 +214,9 @@ EAPI Elm_Toolbar *ui_standard_view_unset_toolbar(ui_standard_view *view); * @param[in] anim title area will be shown with animation if the given param is @c true, otherwise title area will be shown without animation * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. - * @retval #TIZEN_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE Instance is corrupted. Maybe base object is broken. */ EAPI int ui_standard_view_set_title_visible(ui_standard_view *view, bool visible, bool anim); diff --git a/src/include/efl/mobile/c/ui_view.h b/src/include/efl/mobile/c/ui_view.h index 9e29b89..b385b91 100644 --- a/src/include/efl/mobile/c/ui_view.h +++ b/src/include/efl/mobile/c/ui_view.h @@ -83,8 +83,8 @@ EAPI ui_view *ui_view_create(const char *name); * @param[in] content A new content. It allows @c NULL for canceling the previous content * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. * * @see ui_view_get_content() * @see ui_view_unset_content() @@ -127,8 +127,8 @@ EAPI Eo *ui_view_unset_content(ui_view *view); * @param[in] user_data The user data to be passed to the given @a event_callback functions * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER if @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER if @a view is invalid. * * @see ui_view_event_type_e */ @@ -153,9 +153,9 @@ EAPI Eo* ui_view_get_base(ui_view *view); * @param[in] indicator The mode to set, one of #ui_view_indicator * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER Invalid Parameters. - * @retval #TIZEN_ERROR_NOT_PERMITTED Current view manager system is not set up. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER Invalid Parameters. + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Current view manager system is not set up. * * @see ui_view_indicator * @see ui_view_get_indicator() @@ -184,10 +184,10 @@ EAPI ui_view_indicator ui_view_get_indicator(ui_view *view); * @param[in] count The number of arrays of rotations * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER If @a view is invalid or @a count is less than 1 or @a rotations is invalid pointer. - * @retval #TIZEN_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #TIZEN_ERROR_NOT_PERMITTED Current view manager system is not set up. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER If @a view is invalid or @a count is less than 1 or @a rotations is invalid pointer. + * @retval #UI_VIEWMGR_ERROR_OUT_OF_MEMORY Out of Memory + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Current view manager system is not set up. * * @see ui_view_get_available_rotations() */ @@ -218,8 +218,8 @@ EAPI const int *ui_view_get_available_rotations(ui_view *view, unsigned int *cou * @warning You should not remove a view content manually on unload status if removable content is set * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER If @a view is invalid or @a count is less than 1 or @a rotations is invalid pointer. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER If @a view is invalid or @a count is less than 1 or @a rotations is invalid pointer. * * @see ui_view_get_removable_content() */ @@ -271,8 +271,8 @@ EAPI ui_view_orientation_mode ui_view_get_orientation_mode(ui_view *view); * @param[in] style a transition style name * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is invalid or @a style is not supported. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is invalid or @a style is not supported. * * @see ui_view_get_transition_style() */ @@ -329,8 +329,8 @@ EAPI ui_view_state ui_view_get_state(ui_view *view); * @param[in] view An ui_view instance * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is invalid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is invalid. * * @see ui_view_create() * @see ui_standard_view_create() diff --git a/src/include/efl/mobile/c/ui_viewmgr.h b/src/include/efl/mobile/c/ui_viewmgr.h index d30dbd6..2d216f6 100644 --- a/src/include/efl/mobile/c/ui_viewmgr.h +++ b/src/include/efl/mobile/c/ui_viewmgr.h @@ -23,8 +23,8 @@ extern "C" { * @param[in] view An ui_view to insert in the ui_viewmgr view list * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. * * @see ui_viewmgr_activate() * @see ui_viewmgr_insert_view_before() @@ -41,9 +41,9 @@ EAPI int ui_viewmgr_push_view(ui_view *view); * @param[in] before An ui_view that will be just inserted after @a view. If you pass @c NULL, @a view will be inserted at the front of the view list * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. * * @see ui_viewmgr_insert_view_after() */ @@ -57,9 +57,9 @@ EAPI int ui_viewmgr_insert_view_before(ui_view *view, ui_view *before); * @param[in] after An ui_view that will be just inserted before the @a view. If you pass @c NULL, @a view will be inserted at the end of the view list * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. * * @see ui_viewmgr_insert_view_before() */ @@ -74,9 +74,9 @@ EAPI int ui_viewmgr_insert_view_after(ui_view *view, ui_view *after); * the application will be terminated. It's up to system configuration. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED No more views to pop. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS On a certain profile, it may not allow to pop multiple views at the same time. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED No more views to pop. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS On a certain profile, it may not allow to pop multiple views at the same time. * * @see ui_viewmgr_deactivate() * @see ui_viewmgr_push_view() @@ -90,9 +90,9 @@ EAPI int ui_viewmgr_pop_view(void); * Usually this should be called after applications set their all views on initialization time. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS Already activated - * @retval #TIZEN_ERROR_NOT_PERMITTED Can't be activated. (ie, view manager has zero views.) + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS Already activated + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Can't be activated. (ie, view manager has zero views.) * * @see ui_viewmgr_deactivate() */ @@ -106,8 +106,8 @@ EAPI int ui_viewmgr_activate(void); * current window in order that application go background. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS Already deactivated + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS Already deactivated * * @see ui_viewmgr_activate() */ diff --git a/src/include/interface/UiIfaceApp.h b/src/include/interface/UiIfaceApp.h index 1b8aa5c..dbe09d0 100644 --- a/src/include/interface/UiIfaceApp.h +++ b/src/include/interface/UiIfaceApp.h @@ -74,10 +74,10 @@ public: * @param[in] argv process argument list * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #TIZEN_ERROR_APPLICATION The application is illegally launched, not launched by the launch system. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS The main loop already starts. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #UI_VIEWMGR_ERROR_APPLICATION The application is illegally launched, not launched by the launch system. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS The main loop already starts. */ virtual int run(int argc, char **argv); diff --git a/src/include/interface/UiIfaceOverlay.h b/src/include/interface/UiIfaceOverlay.h index 1563682..04e1d4c 100644 --- a/src/include/interface/UiIfaceOverlay.h +++ b/src/include/interface/UiIfaceOverlay.h @@ -44,7 +44,7 @@ public: * @param[in] content a new content. It allows @c nullptr for canceling the previous content. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NONE Successful */ virtual int setContent(T content); diff --git a/src/include/interface/UiIfaceTypes.h b/src/include/interface/UiIfaceTypes.h index 6b0f6c4..1be7654 100644 --- a/src/include/interface/UiIfaceTypes.h +++ b/src/include/interface/UiIfaceTypes.h @@ -22,6 +22,21 @@ * @{ */ +/** + * @brief Enumerations of error code for UI VIEWMGR + */ +typedef enum +{ + UI_VIEWMGR_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ + UI_VIEWMGR_ERROR_NOT_PERMITTED = TIZEN_ERROR_NOT_PERMITTED, /**< Operation not permitted */ + UI_VIEWMGR_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ + UI_VIEWMGR_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */ + UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE = TIZEN_ERROR_RESULT_OUT_OF_RANGE, /**< Result not representable */ + UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS = TIZEN_ERROR_ALREADY_IN_PROGRESS, /**< Operation already in progress */ + UI_VIEWMGR_ERROR_UNKNOWN = TIZEN_ERROR_UNKNOWN /** Framework internal operation failed */ +} ui_viewmgr_error_e; + + /** * @brief Possible values for indicator state. * @since_tizen 3.0 diff --git a/src/include/interface/UiIfaceView.h b/src/include/interface/UiIfaceView.h index ef48929..5092b84 100644 --- a/src/include/interface/UiIfaceView.h +++ b/src/include/interface/UiIfaceView.h @@ -62,8 +62,8 @@ public: * @param[in] style a transition style name. A default value is "default" * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a style is not supported. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a style is not supported. * * @warning When you override this member function, you should implement the logic to check the given style name is available or not. * If your framework doesn't support any styles then just allow a @c nullptr argument and return true. Otherwise return false. @@ -85,8 +85,8 @@ public: * @param[in] indicator The mode to set, one of #UiViewIndicator. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a indicator is not valid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a indicator is not valid. * * @warning @a indicator is not allowed to #UI_VIEW_INDICATOR_UNKNOWN. */ @@ -102,9 +102,9 @@ public: * @param[in] count The number of arrays of rotations. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_INVALID_PARAMETER If @a count is less than 1 or @a rotations is invalid pointer. - * @retval #TIZEN_ERROR_OUT_OF_MEMORY Out of Memory + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER If @a count is less than 1 or @a rotations is invalid pointer. + * @retval #UI_VIEWMGR_ERROR_OUT_OF_MEMORY Out of Memory * * @see getAvailableRotations() */ @@ -153,7 +153,7 @@ public: * @param[in] content a new content. It allows @c nullptr for canceling the previous content. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NONE Successful */ virtual int setContent(T content); @@ -203,7 +203,7 @@ protected: * @param[in] block @c true, when blocking is enabled, otherwise @c false. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NONE Successful * @retval #TIZEN_ERROR_NOT_SUPPORTED The system doesn't support event blocking feature. * * @see getEventBlock() diff --git a/src/include/interface/UiIfaceViewmgr.h b/src/include/interface/UiIfaceViewmgr.h index bd41065..6773a1e 100644 --- a/src/include/interface/UiIfaceViewmgr.h +++ b/src/include/interface/UiIfaceViewmgr.h @@ -42,9 +42,9 @@ public: * on initialization time. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS Already activated - * @retval #TIZEN_ERROR_NOT_PERMITTED Can't be activated. (ie, view manager has zero views.) + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS Already activated + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED Can't be activated. (ie, view manager has zero views.) * * @see deactivate() */ @@ -57,8 +57,8 @@ public: * current window in order that application go background. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS Already deactivated + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS Already deactivated * * @see activate() */ @@ -145,8 +145,8 @@ protected: * @param[in] view A view to insert at the end of viewmgr view list. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. * * @see activated() * @see insertViewBefore() @@ -165,9 +165,9 @@ protected: * the application will be terminated. It's up to system configuration. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED No more views to pop. - * @retval #TIZEN_ERROR_ALREADY_IN_PROGRESS On a certain profile, it may not allow to pop multiple views at the same time. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED No more views to pop. + * @retval #UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS On a certain profile, it may not allow to pop multiple views at the same time. * * @see deactivate() * @see pushView() @@ -181,9 +181,9 @@ protected: * @param[in] before A view that will be just inserted after @a view. If you pass @c nullptr, @a view will be inserted at the front of the view list. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. */ int insertViewBefore(UiIfaceView *view, UiIfaceView *before); @@ -194,9 +194,9 @@ protected: * @param[in] after A view that will be just inserted before the @a view. If you pass @c nullptr, @a view will be inserted at the end of the view list. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted. - * @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid. + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view was already inserted. + * @retval #UI_VIEWMGR_ERROR_INVALID_PARAMETER @a view is not valid. */ int insertViewAfter(UiIfaceView *view, UiIfaceView *after); @@ -206,8 +206,8 @@ protected: * @param[in] view A view to remove from the viewmgr view list. * * @return @c 0 on success, otherwise a negative error value. - * @retval #TIZEN_ERROR_NONE Successful - * @retval #TIZEN_ERROR_NOT_PERMITTED @a view may not belongs to the view manager. (already removed.) + * @retval #UI_VIEWMGR_ERROR_NONE Successful + * @retval #UI_VIEWMGR_ERROR_NOT_PERMITTED @a view may not belongs to the view manager. (already removed.) * * @see insertViewBefore() * @see insertViewAfter() diff --git a/src/lib/efl/UiBaseKeyListener.cpp b/src/lib/efl/UiBaseKeyListener.cpp index a4e46b1..7cd00b9 100644 --- a/src/lib/efl/UiBaseKeyListener.cpp +++ b/src/lib/efl/UiBaseKeyListener.cpp @@ -72,26 +72,26 @@ int UiBaseKeyListenerImpl::term() { evas_object_del(this->keyGrabber); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiBaseKeyListenerImpl::init() { if (!this->viewmgr) { LOGE("No view manager??"); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } Evas *e = evas_object_evas_get(this->viewmgr->getWindow()); if (!e) { LOGE("Failed to get Evas from window"); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } Eo *keyGrabRect = evas_object_rectangle_add(e); if (!keyGrabRect) { LOGE("Failed to create a key grabber rectangle"); - return TIZEN_ERROR_UNKNOWN; + return UI_VIEWMGR_ERROR_UNKNOWN; } evas_object_event_callback_add(keyGrabRect, EVAS_CALLBACK_KEY_UP, [](void *data, Evas *e, Eo *obj, void *event_info) @@ -104,18 +104,18 @@ int UiBaseKeyListenerImpl::init() if (!evas_object_key_grab(keyGrabRect, KEY_BACK, 0, 0, EINA_FALSE)) { LOGE("Failed to grab BACK KEY(%s)\n", KEY_BACK); evas_object_del(keyGrabRect); - return TIZEN_ERROR_UNKNOWN; + return UI_VIEWMGR_ERROR_UNKNOWN; } if (!evas_object_key_grab(keyGrabRect, KEY_BACK2, 0, 0, EINA_FALSE)) { LOGE("Failed to grab BACK KEY(%s)\n", KEY_BACK2); evas_object_del(keyGrabRect); - return TIZEN_ERROR_UNKNOWN; + return UI_VIEWMGR_ERROR_UNKNOWN; } this->keyGrabber = keyGrabRect; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } diff --git a/src/lib/efl/UiBaseView.cpp b/src/lib/efl/UiBaseView.cpp index 4b09387..2bdbcab 100644 --- a/src/lib/efl/UiBaseView.cpp +++ b/src/lib/efl/UiBaseView.cpp @@ -59,7 +59,7 @@ int UiBaseView::setContent(Eo *content) return UiIfaceView::setContent(content); } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } Eo *UiBaseView::unsetContent() @@ -99,31 +99,31 @@ Eo *UiBaseView ::getParent() int UiBaseView::setIndicator(UiViewIndicator indicator) { - if (this->getIndicator() == indicator) return TIZEN_ERROR_NONE; + if (this->getIndicator() == indicator) return UI_VIEWMGR_ERROR_NONE; int ret = UiIfaceView::setIndicator(indicator); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; auto viewmgr = UI_BASE_VIEWMGR; if (!viewmgr) { LOGE("Failed to get a viewmgr"); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } - if (!viewmgr->isActivated()) return TIZEN_ERROR_NONE; + if (!viewmgr->isActivated()) return UI_VIEWMGR_ERROR_NONE; - if (viewmgr->getLastView() != this) return TIZEN_ERROR_NONE; + if (viewmgr->getLastView() != this) return UI_VIEWMGR_ERROR_NONE; viewmgr->setIndicator(indicator); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiBaseView::setAvailableRotations(const int *rotations, unsigned int count) { int ret = UiIfaceView::setAvailableRotations(rotations, count); - if (ret != TIZEN_ERROR_NONE) { + if (ret != UI_VIEWMGR_ERROR_NONE) { return ret; } @@ -131,13 +131,13 @@ int UiBaseView::setAvailableRotations(const int *rotations, unsigned int count) if (!viewmgr) { LOGE("Failed to get a viewmgr"); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } if (this == viewmgr->getLastView()) elm_win_wm_rotation_available_rotations_set(viewmgr->getWindow(), rotations, count); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } void UiBaseView::onRotate(int degree) @@ -155,11 +155,11 @@ void UiBaseView::onLandscape() int UiBaseView::setEventBlock(bool block) { int ret = UiIfaceView::setEventBlock(block); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; evas_object_freeze_events_set(this->getContent(), block); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiBaseView::getDegree() diff --git a/src/lib/efl/UiBaseViewmgr.cpp b/src/lib/efl/UiBaseViewmgr.cpp index d634c46..813d0c0 100644 --- a/src/lib/efl/UiBaseViewmgr.cpp +++ b/src/lib/efl/UiBaseViewmgr.cpp @@ -458,46 +458,46 @@ UiBaseViewmgr::~UiBaseViewmgr() int UiBaseViewmgr::activate() { int ret = UiIfaceViewmgr::activate(); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; this->_impl->activate(); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiBaseViewmgr::deactivate() { int ret = UiIfaceViewmgr::deactivate(); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; this->_impl->deactivate(); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiBaseViewmgr::popView() { if (this->getViewCount() == 1) { this->deactivate(); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int ret = UiIfaceViewmgr::popView(); - if(ret != TIZEN_ERROR_NONE) { + if(ret != UI_VIEWMGR_ERROR_NONE) { return ret; } this->_impl->popView(); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiBaseViewmgr::pushView(UiBaseView *view) { int ret = UiIfaceViewmgr::pushView(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; this->_impl->pushView(view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiBaseViewmgr::insertViewBefore(UiBaseView *view, UiBaseView *before) diff --git a/src/lib/efl/mobile/UiKeyListener.cpp b/src/lib/efl/mobile/UiKeyListener.cpp index 8bddfb0..a8e75c8 100644 --- a/src/lib/efl/mobile/UiKeyListener.cpp +++ b/src/lib/efl/mobile/UiKeyListener.cpp @@ -41,19 +41,19 @@ void UiKeyListener::extendEventProc(UiBaseView *view, Evas_Event_Key_Down *ev) int UiKeyListener::init() { int ret = UiBaseKeyListener::init(); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; if (!evas_object_key_grab(this->getKeygrabObj(), KEY_MENU, 0, 0, EINA_FALSE)) { LOGE("Failed to grab MENU KEY(%s)\n", KEY_MENU); - return TIZEN_ERROR_UNKNOWN; + return UI_VIEWMGR_ERROR_UNKNOWN; } if (!evas_object_key_grab(this->getKeygrabObj(), KEY_MENU2, 0, 0, EINA_FALSE)) { LOGE("Failed to grab MENU KEY(%s)\n", KEY_MENU2); - return TIZEN_ERROR_UNKNOWN; + return UI_VIEWMGR_ERROR_UNKNOWN; } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } diff --git a/src/lib/efl/mobile/UiMenu.cpp b/src/lib/efl/mobile/UiMenu.cpp index b8f7492..09a02c2 100644 --- a/src/lib/efl/mobile/UiMenu.cpp +++ b/src/lib/efl/mobile/UiMenu.cpp @@ -33,10 +33,10 @@ static void _ctxpopupDelCb(void *data, Evas *e, Eo *obj, void *event_info) static bool _updateMenu(UiMenu *menu) { Elm_Win *win = menu->getBase(); - if (!win) return TIZEN_ERROR_NOT_PERMITTED; + if (!win) return UI_VIEWMGR_ERROR_NOT_PERMITTED; Elm_Ctxpopup *ctxpopup = menu->getContent(); - if (!ctxpopup) return TIZEN_ERROR_NOT_PERMITTED; + if (!ctxpopup) return UI_VIEWMGR_ERROR_NOT_PERMITTED; /* We convince the top widget is a window */ Evas_Coord w, h; @@ -56,7 +56,7 @@ static bool _updateMenu(UiMenu *menu) evas_object_show(ctxpopup); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } static void _winResizeCb(void *data, Evas *e, Eo *obj, void *event_info) @@ -100,19 +100,19 @@ int UiMenu::deactivate() if (!ctxpopup) { LOGE("Content is not set! = UiMenu(%p)", this); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } elm_ctxpopup_dismiss(ctxpopup); dynamic_cast(this->getView())->onResume(); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiMenu::activate() { bool ret = _updateMenu(this); - if (ret != TIZEN_ERROR_NONE) dynamic_cast(this->getView())->onPause(); + if (ret != UI_VIEWMGR_ERROR_NONE) dynamic_cast(this->getView())->onPause(); return ret; } @@ -122,11 +122,11 @@ int UiMenu::setContent(Elm_Ctxpopup *ctxpopup) Elm_Ctxpopup *prev = this->unsetContent(); evas_object_del(prev); - if (!ctxpopup) return TIZEN_ERROR_NONE; + if (!ctxpopup) return UI_VIEWMGR_ERROR_NONE; if (strcmp(evas_object_type_get(ctxpopup), "elm_ctxpopup")) { LOGE("Menu widget is not a ctxpopup!"); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } elm_object_style_set(ctxpopup, "more/default"); diff --git a/src/lib/efl/mobile/UiPopup.cpp b/src/lib/efl/mobile/UiPopup.cpp index 5960e40..6e4a781 100644 --- a/src/lib/efl/mobile/UiPopup.cpp +++ b/src/lib/efl/mobile/UiPopup.cpp @@ -22,17 +22,17 @@ using namespace efl_viewmanager; static int _updatePopup(UiPopup *popup) { if (popup->getView()->getState() != UI_VIEW_STATE_ACTIVATE) - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; Elm_Win *win = popup->getBase(); - if (!win) return TIZEN_ERROR_NOT_PERMITTED; + if (!win) return UI_VIEWMGR_ERROR_NOT_PERMITTED; Elm_Popup *_popup = popup->getContent(); - if (!_popup) return TIZEN_ERROR_NOT_PERMITTED; + if (!_popup) return UI_VIEWMGR_ERROR_NOT_PERMITTED; evas_object_show(_popup); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } static void _popupDismissedCb(void *data, Eo *obj, void *event_info) @@ -73,24 +73,24 @@ Elm_Win *UiPopup::getWindow() int UiPopup::deactivate() { if (this->isActivated() == false) - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; Elm_Popup *popup = this->getContent(); if (!popup) { LOGE("Content is not set! = UiPopup(%p)", this); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } elm_popup_dismiss(popup); dynamic_cast(this->getView())->onResume(); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiPopup::activate() { int ret = _updatePopup(this); - if (ret != TIZEN_ERROR_NONE) dynamic_cast(this->getView())->onPause(); + if (ret != UI_VIEWMGR_ERROR_NONE) dynamic_cast(this->getView())->onPause(); return ret; } @@ -99,11 +99,11 @@ int UiPopup::setContent(Elm_Popup *popup) Elm_Popup *prev = this->unsetContent(); evas_object_del(prev); - if (!popup) return TIZEN_ERROR_NONE; + if (!popup) return UI_VIEWMGR_ERROR_NONE; if (strcmp(evas_object_type_get(popup), "elm_popup")) { LOGE("Menu widget is not a popup!"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); diff --git a/src/lib/efl/mobile/UiStandardView.cpp b/src/lib/efl/mobile/UiStandardView.cpp index 0db2bc2..a540c0a 100644 --- a/src/lib/efl/mobile/UiStandardView.cpp +++ b/src/lib/efl/mobile/UiStandardView.cpp @@ -78,7 +78,7 @@ public: #define LAYOUT_VALIDATE() if (!layout) { \ LOGE("Layout is invalid! UiStandardView(%p)", this); \ - return TIZEN_ERROR_RESULT_OUT_OF_RANGE; \ + return UI_VIEWMGR_ERROR_RESULT_OUT_OF_RANGE; \ } static void _titleLeftBtnDelCb(void *data, Evas *e, Eo *obj, void *event_info) @@ -184,7 +184,7 @@ int UiStandardViewImpl::setContent(Eo *content) elm_object_signal_emit(layout, "elm.state,elm.swallow.content,hide", "viewmgr"); } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiStandardViewImpl::setSubtitle(const char *text) @@ -197,7 +197,7 @@ int UiStandardViewImpl::setSubtitle(const char *text) if (text) elm_object_signal_emit(layout, "elm,state,subtitle,show", "viewmgr"); else elm_object_signal_emit(layout, "elm,state,subtitle,hide", "viewmgr"); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiStandardViewImpl::setTitleLeftBtn(Elm_Button *titleLeftBtn) @@ -206,7 +206,7 @@ int UiStandardViewImpl::setTitleLeftBtn(Elm_Button *titleLeftBtn) LAYOUT_VALIDATE(); if (this->getTitleLeftBtn() == titleLeftBtn) - return TIZEN_ERROR_ALREADY_IN_PROGRESS; + return UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS; Elm_Button *pbtn; @@ -214,7 +214,7 @@ int UiStandardViewImpl::setTitleLeftBtn(Elm_Button *titleLeftBtn) { pbtn = this->unsetTitleLeftBtn(); evas_object_del(pbtn); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } pbtn = this->getTitleLeftBtn(); @@ -227,7 +227,7 @@ int UiStandardViewImpl::setTitleLeftBtn(Elm_Button *titleLeftBtn) elm_object_signal_emit(layout, "elm,state,title_left_btn,show", "viewmgr"); evas_object_event_callback_add(titleLeftBtn, EVAS_CALLBACK_DEL, _titleLeftBtnDelCb, this->_view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiStandardViewImpl::setTitleRightBtn(Elm_Button *titleRightBtn) @@ -236,13 +236,13 @@ int UiStandardViewImpl::setTitleRightBtn(Elm_Button *titleRightBtn) Elm_Button *pbtn; if (this->getTitleRightBtn() == titleRightBtn) - return TIZEN_ERROR_ALREADY_IN_PROGRESS; + return UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS; if (!titleRightBtn) { pbtn = this->unsetTitleRightBtn(); evas_object_del(pbtn); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } pbtn = this->getTitleRightBtn(); @@ -255,7 +255,7 @@ int UiStandardViewImpl::setTitleRightBtn(Elm_Button *titleRightBtn) elm_object_signal_emit(layout, "elm,state,title_right_btn,show", "viewmgr"); evas_object_event_callback_add(titleRightBtn, EVAS_CALLBACK_DEL, _titleRightBtnDelCb, this->_view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiStandardViewImpl::setTitleBadge(const char *text) @@ -268,7 +268,7 @@ int UiStandardViewImpl::setTitleBadge(const char *text) if (text) elm_object_signal_emit(layout, "elm,state,title_badge,show", "viewmgr"); else elm_object_signal_emit(layout, "elm,state,title_badge,hide", "viewmgr"); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiStandardViewImpl::setTitle(const char *text) @@ -281,7 +281,7 @@ int UiStandardViewImpl::setTitle(const char *text) if (text && this->_titleVisible) elm_object_signal_emit(layout, "elm,state,title,show", "viewmgr"); else elm_object_signal_emit(layout, "elm,state,title,hide", "viewmgr"); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiStandardViewImpl::setToolbar(Elm_Toolbar *toolbar) @@ -290,7 +290,7 @@ int UiStandardViewImpl::setToolbar(Elm_Toolbar *toolbar) LAYOUT_VALIDATE(); if (toolbar == this->getToolbar()) - return TIZEN_ERROR_ALREADY_IN_PROGRESS; + return UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS; //FIXME: inside of the unset_toolbar, it will send a toolbar,hide signal. //But right after it needs to send a show signal again if new toolbar is valid. @@ -299,7 +299,7 @@ int UiStandardViewImpl::setToolbar(Elm_Toolbar *toolbar) evas_object_del(ptoolbar); this->_toolbar = toolbar; - if (!toolbar) return TIZEN_ERROR_NONE; + if (!toolbar) return UI_VIEWMGR_ERROR_NONE; //FIXME: eeeek. check style?? :( if (!strcmp(elm_object_style_get(toolbar), "navigationbar")) { @@ -318,7 +318,7 @@ int UiStandardViewImpl::setToolbar(Elm_Toolbar *toolbar) elm_object_signal_emit(layout, "elm,state,toolbar,show", "viewmgr"); evas_object_event_callback_add(toolbar, EVAS_CALLBACK_DEL, _toolbarDelCb, this->_view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiStandardViewImpl::unsetContent() @@ -329,7 +329,7 @@ int UiStandardViewImpl::unsetContent() elm_object_part_content_unset(layout, "elm.swallow.content"); elm_object_signal_emit(layout, "elm.state,elm.swallow.content,hide", "viewmgr"); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } Elm_Button *UiStandardViewImpl::unsetTitleLeftBtn() @@ -416,7 +416,7 @@ int UiStandardViewImpl::setTitleVisible(bool visible, bool anim) else elm_object_signal_emit(layout, "elm,state,title,hide", "viewmgr"); } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } /***********************************************************************************************/ @@ -453,7 +453,7 @@ void UiStandardView::onUnload() int UiStandardView::setContent(Eo *content) { int ret = UiView::setContent(content); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return this->_impl->setContent(content); } @@ -491,11 +491,11 @@ int UiStandardView::setToolbar(Elm_Toolbar *toolbar) int UiStandardView::setEventBlock(bool block) { int ret = UiView::setEventBlock(block); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; evas_object_freeze_events_set(this->getBase(), block); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } Eo *UiStandardView::unsetContent() diff --git a/src/lib/efl/mobile/c/ui_application.cpp b/src/lib/efl/mobile/c/ui_application.cpp index f7a0315..a0ecfb1 100644 --- a/src/lib/efl/mobile/c/ui_application.cpp +++ b/src/lib/efl/mobile/c/ui_application.cpp @@ -114,18 +114,18 @@ static ui_app_capi *g_app = nullptr; EAPI int ui_application_init(const char *pkg, const char *locale_dir) { ui_app_capi *app = g_app; - if (app) return TIZEN_ERROR_ALREADY_IN_PROGRESS; + if (app) return UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS; app = new ui_app_capi(pkg, locale_dir); if (!app) { LOGE("Failed to create new ui_app_capi()!"); - return TIZEN_ERROR_OUT_OF_MEMORY; + return UI_VIEWMGR_ERROR_OUT_OF_MEMORY; } g_app = app; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI int ui_application_run(int argc, char **argv, ui_application_event_s *events, int count, void *user_data) @@ -134,7 +134,7 @@ EAPI int ui_application_run(int argc, char **argv, ui_application_event_s *event if (!app) { LOGE("ui_application is not initialized yet."); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } if (count <= 0) @@ -142,15 +142,14 @@ EAPI int ui_application_run(int argc, char **argv, ui_application_event_s *event LOGE("Event Count is %d, Application have to implement app event at least 1(app_create).", count); return TIZEN_ERROR_INVALID_PARAMETER; } - - int ret = TIZEN_ERROR_NONE; + int ret = UI_VIEWMGR_ERROR_NONE; for (int i = 0; i < count; i++) { if (events[i].event_type < UI_APPLICATION_EVENT_CREATE) { LOGE("events[%d] is invalid(%d)", i, events[i].event_type); - ret = TIZEN_ERROR_INVALID_PARAMETER; + ret = UI_VIEWMGR_ERROR_INVALID_PARAMETER; } else { @@ -158,7 +157,7 @@ EAPI int ui_application_run(int argc, char **argv, ui_application_event_s *event } } - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return app->run(argc, argv); } @@ -169,5 +168,5 @@ EAPI int ui_application_term(void) if (app) delete (app); g_app = nullptr; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp index c06bd2e..4eaf005 100644 --- a/src/lib/efl/mobile/c/ui_menu.cpp +++ b/src/lib/efl/mobile/c/ui_menu.cpp @@ -11,29 +11,29 @@ static int validate_menu(ui_menu *menu) if (!menu) { LOGE("Invalid ui_menu = nullptr"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI int ui_menu_set_content(ui_menu *menu, Elm_Ctxpopup *ctxpopup) { int ret = validate_menu(menu); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return menu->setContent(ctxpopup); } EAPI Elm_Ctxpopup *ui_menu_get_content(ui_menu *menu) { - if (TIZEN_ERROR_NONE != validate_menu(menu)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; return menu->getContent(); } EAPI Elm_Ctxpopup *ui_menu_unset_content(ui_menu *menu) { - if (TIZEN_ERROR_NONE != validate_menu(menu)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; return menu->unsetContent(); } @@ -41,7 +41,7 @@ EAPI Elm_Ctxpopup *ui_menu_unset_content(ui_menu *menu) EAPI int ui_menu_activate(ui_menu *menu) { int ret = validate_menu(menu); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return menu->activate(); } @@ -49,35 +49,35 @@ EAPI int ui_menu_activate(ui_menu *menu) EAPI int ui_menu_deactivate(ui_menu *menu) { int ret = validate_menu(menu); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return menu->deactivate(); } EAPI bool ui_menu_get_activated(ui_menu *menu) { - if (TIZEN_ERROR_NONE != validate_menu(menu)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; return menu->isActivated(); } EAPI Eo *ui_menu_get_base(ui_menu *menu) { - if (TIZEN_ERROR_NONE != validate_menu(menu)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; return menu->getBase(); } EAPI int ui_menu_get_degree(ui_menu *menu) { - if (TIZEN_ERROR_NONE != validate_menu(menu)) return -1; + if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return -1; return menu->getDegree(); } EAPI ui_view *ui_menu_get_view(ui_menu *menu) { - if (TIZEN_ERROR_NONE != validate_menu(menu)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; return dynamic_cast(menu->getView()); } diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp index 2d9db98..2719704 100644 --- a/src/lib/efl/mobile/c/ui_popup.cpp +++ b/src/lib/efl/mobile/c/ui_popup.cpp @@ -11,9 +11,9 @@ static int validate_popup(ui_popup *popup) if (!popup) { LOGE("Invalid ui_popup = nullptr"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI ui_popup *ui_popup_create(ui_view *view) @@ -30,37 +30,37 @@ EAPI ui_popup *ui_popup_create(ui_view *view) EAPI int ui_popup_destroy(ui_popup *popup) { int ret = validate_popup(popup); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; delete(popup); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI int ui_popup_set_content(ui_popup *popup, Elm_Popup *content) { int ret = validate_popup(popup); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return popup->setContent(content); } EAPI Elm_Popup *ui_popup_get_content(ui_popup *popup) { - if (TIZEN_ERROR_NONE != validate_popup(popup)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return nullptr; return popup->getContent(); } EAPI Elm_Popup *ui_popup_unset_content(ui_popup *popup) { - if (TIZEN_ERROR_NONE != validate_popup(popup)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return nullptr; return popup->unsetContent(); } EAPI int ui_popup_activate(ui_popup *popup) { int ret = validate_popup(popup); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return popup->activate(); } @@ -68,31 +68,31 @@ EAPI int ui_popup_activate(ui_popup *popup) EAPI int ui_popup_deactivate(ui_popup *popup) { int ret = validate_popup(popup); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return popup->deactivate(); } EAPI bool ui_popup_get_activated(ui_popup *popup) { - if (TIZEN_ERROR_NONE != validate_popup(popup)) return false; + if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return false; return popup->isActivated(); } EAPI Eo *ui_popup_get_base(ui_popup *popup) { - if (TIZEN_ERROR_NONE != validate_popup(popup)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return nullptr; return popup->getBase(); } EAPI int ui_popup_get_degree(ui_popup *popup) { - if (TIZEN_ERROR_NONE != validate_popup(popup)) return -1; + if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return -1; return popup->getDegree(); } EAPI ui_view *ui_popup_get_view(ui_popup *popup) { - if (TIZEN_ERROR_NONE != validate_popup(popup)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return nullptr; return dynamic_cast(popup->getView()); } diff --git a/src/lib/efl/mobile/c/ui_standard_view.cpp b/src/lib/efl/mobile/c/ui_standard_view.cpp index 4c0dff3..f3a1e4b 100644 --- a/src/lib/efl/mobile/c/ui_standard_view.cpp +++ b/src/lib/efl/mobile/c/ui_standard_view.cpp @@ -229,7 +229,7 @@ EAPI ui_standard_view* ui_standard_view_create(const char *name) EAPI int ui_standard_view_set_title(ui_standard_view *view, const char *text) { ui_standard_view_capi *capi_view = validate_view(view); - if (!capi_view) return TIZEN_ERROR_INVALID_PARAMETER; + if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitle(text); } @@ -237,7 +237,7 @@ EAPI int ui_standard_view_set_title(ui_standard_view *view, const char *text) EAPI int ui_standard_view_set_sub_title(ui_standard_view *view, const char *text) { ui_standard_view_capi *capi_view = validate_view(view); - if (!capi_view) return TIZEN_ERROR_INVALID_PARAMETER; + if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setSubtitle(text); } @@ -245,7 +245,7 @@ EAPI int ui_standard_view_set_sub_title(ui_standard_view *view, const char *text EAPI int ui_standard_view_set_title_badge(ui_standard_view *view, const char *badge_text) { ui_standard_view_capi *capi_view = validate_view(view); - if (!capi_view) return TIZEN_ERROR_INVALID_PARAMETER; + if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleBadge(badge_text); } @@ -253,7 +253,7 @@ EAPI int ui_standard_view_set_title_badge(ui_standard_view *view, const char *ba EAPI int ui_standard_view_set_title_right_btn(ui_standard_view *view, Eo *title_right_btn) { ui_standard_view_capi *capi_view = validate_view(view); - if (!capi_view) return TIZEN_ERROR_INVALID_PARAMETER; + if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleRightBtn(title_right_btn); } @@ -277,7 +277,7 @@ EAPI Elm_Button *ui_standard_view_unset_title_right_btn(ui_standard_view *view) EAPI int ui_standard_view_set_title_left_btn(ui_standard_view *view, Eo *title_left_btn) { ui_standard_view_capi *capi_view = validate_view(view); - if (!capi_view) return TIZEN_ERROR_INVALID_PARAMETER; + if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleLeftBtn(title_left_btn); } @@ -301,7 +301,7 @@ EAPI Elm_Button *ui_standard_view_unset_title_left_btn(ui_standard_view *view) EAPI int ui_standard_view_set_toolbar(ui_standard_view *view, Elm_Toolbar *toolbar) { ui_standard_view_capi *capi_view = validate_view(view); - if (!capi_view) return TIZEN_ERROR_INVALID_PARAMETER; + if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setToolbar(toolbar); } @@ -323,7 +323,7 @@ EAPI Elm_Toolbar *ui_standard_view_unset_toolbar(ui_standard_view *view) EAPI int ui_standard_view_set_title_visible(ui_standard_view *view, bool visible, bool anim) { ui_standard_view_capi *capi_view = validate_view(view); - if (!capi_view) return TIZEN_ERROR_INVALID_PARAMETER; + if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleVisible(visible, anim); } diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp index b165ab7..fd8a726 100644 --- a/src/lib/efl/mobile/c/ui_view.cpp +++ b/src/lib/efl/mobile/c/ui_view.cpp @@ -207,9 +207,9 @@ static int validate_view(ui_view *view) if (!view) { LOGE("Invalid ui_view = nullptr"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI ui_view* ui_view_create(const char *name) @@ -220,152 +220,152 @@ EAPI ui_view* ui_view_create(const char *name) EAPI int ui_view_set_event_cb(ui_view *view, ui_view_event_type_e event_type, ui_view_event_cb event_cb, void *user_data) { int ret = validate_view(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; if (event_type < UI_VIEW_EVENT_LOAD || event_type >= _NUM_OF_UI_VIEW_EVENT_TYPE) { LOGE("This view(%p) event_type is invalid(%d)", view, event_type); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } auto event_attr = dynamic_cast(view); if (!event_attr) { LOGE("This view(%p) doesn't allow event callback?!"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } event_attr->event_cb[event_type] = event_cb; event_attr->event_data[event_type] = user_data; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI Eo* ui_view_get_base(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; return view->getBase(); } EAPI Eo *ui_view_unset_content(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; return view->unsetContent(); } EAPI int ui_view_set_indicator(ui_view *view, ui_view_indicator indicator) { int ret = validate_view(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return view->setIndicator(indicator); } EAPI ui_view_indicator ui_view_get_indicator(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return UI_VIEW_INDICATOR_UNKNOWN; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return UI_VIEW_INDICATOR_UNKNOWN; return view->getIndicator(); } EAPI int ui_view_set_removable_content(ui_view *view, bool remove) { int ret = validate_view(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; view->setRemovableContent(remove); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI bool ui_view_get_removable_content(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return false; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return false; return view->getRemovableContent(); } EAPI int ui_view_get_degree(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return -1; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return -1; return view->getDegree(); } EAPI ui_view_orientation_mode ui_view_get_orientation_mode(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return UI_VIEW_ORIENTATION_MODE_UNKNOWN; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return UI_VIEW_ORIENTATION_MODE_UNKNOWN; return view->getOrientationMode(); } EAPI int ui_view_set_available_rotations(ui_view *view, const int *rotations, unsigned int count) { int ret = validate_view(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return view->setAvailableRotations(rotations, count); } EAPI const int *ui_view_get_available_rotations(ui_view *view, unsigned int *count) { - if (TIZEN_ERROR_NONE != validate_view(view)) return false; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return false; return view->getAvailableRotations(count); } EAPI int ui_view_set_transition_style(ui_view *view, const char *style) { int ret = validate_view(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return view->setTransitionStyle(style); } EAPI const char *ui_view_get_transition_style(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; return view->getTransitionStyle(); } EAPI ui_menu *ui_view_get_menu(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; return const_cast(view->getMenu()); } EAPI const char *ui_view_get_name(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; return view->getName(); } EAPI ui_view_state ui_view_get_state(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return UI_VIEW_STATE_UNKNOWN; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return UI_VIEW_STATE_UNKNOWN; return view->getState(); } EAPI Eo *ui_view_get_content(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; return view->getContent(); } EAPI int ui_view_destroy(ui_view *view) { int ret = validate_view(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; delete (view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } EAPI int ui_view_set_content(ui_view *view, Eo *content) { int ret = validate_view(view); - if (ret != TIZEN_ERROR_NONE) return ret; + if (ret != UI_VIEWMGR_ERROR_NONE) return ret; return view->setContent(content); } EAPI const char *ui_view_get_type(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return false; + if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return false; return dynamic_cast(view)->type; } diff --git a/src/lib/efl/mobile/c/ui_viewmgr.cpp b/src/lib/efl/mobile/c/ui_viewmgr.cpp index a720596..79d74ad 100644 --- a/src/lib/efl/mobile/c/ui_viewmgr.cpp +++ b/src/lib/efl/mobile/c/ui_viewmgr.cpp @@ -6,7 +6,7 @@ EAPI int ui_viewmgr_push_view(ui_view *view) if (!view) { LOGE("Invalid Parameter view = %p", view); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } return UI_VIEWMGR->pushView(view); @@ -17,7 +17,7 @@ EAPI int ui_viewmgr_insert_view_before(ui_view *view, ui_view *before) if (!view) { LOGE("Invalid Parameter view = %p", view); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } return UI_VIEWMGR->insertViewBefore(view, before); @@ -28,7 +28,7 @@ EAPI int ui_viewmgr_insert_view_after(ui_view *view, ui_view *after) if (!view) { LOGE("Invalid Parameter view = %p", view); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } return UI_VIEWMGR->insertViewAfter(view, after); diff --git a/src/lib/interface/UiIfaceOverlay.cpp b/src/lib/interface/UiIfaceOverlay.cpp index 78a1c89..b6b88dd 100644 --- a/src/lib/interface/UiIfaceOverlay.cpp +++ b/src/lib/interface/UiIfaceOverlay.cpp @@ -58,7 +58,7 @@ UiIfaceOverlayImpl::~UiIfaceOverlayImpl() int UiIfaceOverlayImpl::setContent(T content) { this->_content = content; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } T UiIfaceOverlayImpl::unsetContent() diff --git a/src/lib/interface/UiIfaceView.cpp b/src/lib/interface/UiIfaceView.cpp index 5035fae..2ea5ab0 100644 --- a/src/lib/interface/UiIfaceView.cpp +++ b/src/lib/interface/UiIfaceView.cpp @@ -91,7 +91,7 @@ int UiIfaceViewImpl::setEventBlock(bool block) { this->_eventBlock = block; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } void UiIfaceViewImpl::onLoad() @@ -163,7 +163,7 @@ UiIfaceViewImpl::~UiIfaceViewImpl() int UiIfaceViewImpl::setContent(T content) { this->_content = content; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } T UiIfaceViewImpl::unsetContent() @@ -178,7 +178,7 @@ int UiIfaceViewImpl::setTransitionStyle(const char *style) //FIXME: Check style is valid or not? this->_transitionStyle.assign(style); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } void UiIfaceViewImpl::setRemovableContent(bool removable) @@ -191,11 +191,11 @@ void UiIfaceViewImpl::setRemovableContent(bool removable) int UiIfaceViewImpl::setIndicator(UiViewIndicator indicator) { if (indicator <= UI_VIEW_INDICATOR_UNKNOWN || indicator >= _NUM_OF_UI_VIEW_INDICATOR) - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; this->_indicator = indicator; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiIfaceViewImpl::setAvailableRotations(const int *rotations, unsigned int count) @@ -203,18 +203,18 @@ int UiIfaceViewImpl::setAvailableRotations(const int *rotations, unsigned int co if (!rotations) { LOGE("rotations is invalid (NULL)"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } if (count <= 0) { LOGE("Invalid count value %d count must bigger than 0", count); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } this->_rotations = new int[count]; if (!this->_rotations) { LOGE("Memory Allocation failed"); - return TIZEN_ERROR_OUT_OF_MEMORY; + return UI_VIEWMGR_ERROR_OUT_OF_MEMORY; } for (unsigned int i = 0; i < count; i++) { @@ -223,7 +223,7 @@ int UiIfaceViewImpl::setAvailableRotations(const int *rotations, unsigned int co this->_rotationCount = count; - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } const int *UiIfaceViewImpl::getAvailableRotations(unsigned int *count) diff --git a/src/lib/interface/UiIfaceViewmgr.cpp b/src/lib/interface/UiIfaceViewmgr.cpp index 595724a..d68771a 100644 --- a/src/lib/interface/UiIfaceViewmgr.cpp +++ b/src/lib/interface/UiIfaceViewmgr.cpp @@ -82,18 +82,18 @@ int UiIfaceViewmgrImpl::insertViewAfter(UiIfaceView *view, UiIfaceView *after) { if (!view) { LOGE("invalid view argument. view(nullptr)"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } if (view == after) { LOGE("invalid view argument. view == after?"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } int ret = this->connectView(view); - if (ret != TIZEN_ERROR_NONE) { + if (ret != UI_VIEWMGR_ERROR_NONE) { LOGE("connect view failed"); return ret; } @@ -108,7 +108,7 @@ int UiIfaceViewmgrImpl::insertViewAfter(UiIfaceView *view, UiIfaceView *after) else this->_viewList.insert(++it, view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } } } @@ -136,20 +136,20 @@ int UiIfaceViewmgrImpl::connectView(UiIfaceView *view) //Got you! if ((viewNameLen == nameLen) && !strcmp(name, viewName)) { LOGE("the same name of UiIfaceView(%p) is already in this UiIfaceViewmgr(%p)", v, this); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } } view->_setViewmgr(this->getInstance()); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiIfaceViewmgrImpl::disconnectView(UiIfaceView *view) { - if (!view->_getViewmgr()) return TIZEN_ERROR_NOT_PERMITTED; + if (!view->_getViewmgr()) return UI_VIEWMGR_ERROR_NOT_PERMITTED; view->_setViewmgr(nullptr); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } void UiIfaceViewmgrImpl::setEventBlock(UiIfaceView *view, bool block) @@ -224,12 +224,12 @@ int UiIfaceViewmgrImpl::pushView(UiIfaceView *view) { if (!view) { LOGE("invalid view argument. view(nullptr)"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } int ret = this->connectView(view); - if (ret != TIZEN_ERROR_NONE) { + if (ret != UI_VIEWMGR_ERROR_NONE) { LOGE("connect view failed"); return ret; } @@ -246,7 +246,7 @@ int UiIfaceViewmgrImpl::pushView(UiIfaceView *view) this->_viewList.push_back(view); //If view manager is not activated yet, don't load view. - if (!this->isActivated()) return TIZEN_ERROR_NONE; + if (!this->isActivated()) return UI_VIEWMGR_ERROR_NONE; view->onLoad(); view->onDeactivate(); @@ -255,7 +255,7 @@ int UiIfaceViewmgrImpl::pushView(UiIfaceView *view) this->setEventBlock(view, true); } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiIfaceViewmgrImpl::popView() @@ -264,12 +264,12 @@ int UiIfaceViewmgrImpl::popView() auto view = this->_viewList.back(); if (view->getEventBlock()) { - return TIZEN_ERROR_ALREADY_IN_PROGRESS; + return UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS; } if (this->getViewCount() == 0) { LOGE("No Views. Can't pop anymore!"); - return TIZEN_ERROR_NOT_PERMITTED; + return UI_VIEWMGR_ERROR_NOT_PERMITTED; } //This is the last page. @@ -281,7 +281,7 @@ int UiIfaceViewmgrImpl::popView() view->onDestroy(); delete(view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } view->setPopping(true); @@ -298,26 +298,26 @@ int UiIfaceViewmgrImpl::popView() pview->onDeactivate(); this->setEventBlock(pview, true); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiIfaceViewmgrImpl::insertViewBefore(UiIfaceView *view, UiIfaceView *before) { if (!view) { LOGE("invalid view argument. view(nullptr)"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } if (view == before) { LOGE("invalid view argument. view == before?"); - return TIZEN_ERROR_INVALID_PARAMETER; + return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } int ret = this->connectView(view); - if (ret != TIZEN_ERROR_NONE) { + if (ret != UI_VIEWMGR_ERROR_NONE) { LOGE("connect view failed"); return ret; } @@ -326,7 +326,7 @@ int UiIfaceViewmgrImpl::insertViewBefore(UiIfaceView *view, UiIfaceView *before) for (auto it = this->_viewList.begin(); it != this->_viewList.end(); it++) { if (before == *it) { this->_viewList.insert(it, view); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } } } @@ -336,7 +336,7 @@ int UiIfaceViewmgrImpl::insertViewBefore(UiIfaceView *view, UiIfaceView *before) int UiIfaceViewmgrImpl::removeView(UiIfaceView *view) { - if (this->_destroying) return TIZEN_ERROR_NONE; + if (this->_destroying) return UI_VIEWMGR_ERROR_NONE; this->_viewList.remove(view); @@ -378,8 +378,8 @@ UiIfaceView *UiIfaceViewmgrImpl::getLastView() int UiIfaceViewmgrImpl::activate() { - if (this->_activated) return TIZEN_ERROR_ALREADY_IN_PROGRESS; - if (this->getViewCount() == 0) return TIZEN_ERROR_NOT_PERMITTED; + if (this->_activated) return UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS; + if (this->getViewCount() == 0) return UI_VIEWMGR_ERROR_NOT_PERMITTED; this->_activated = true; auto view = this->getLastView(); @@ -388,12 +388,12 @@ int UiIfaceViewmgrImpl::activate() view->onDeactivate(); view->onActivate(); - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } int UiIfaceViewmgrImpl::deactivate() { - if (!this->_activated)return TIZEN_ERROR_ALREADY_IN_PROGRESS; + if (!this->_activated)return UI_VIEWMGR_ERROR_ALREADY_IN_PROGRESS; this->_activated = false; auto view = this->getLastView(); @@ -406,7 +406,7 @@ int UiIfaceViewmgrImpl::deactivate() view->onUnload(); } - return TIZEN_ERROR_NONE; + return UI_VIEWMGR_ERROR_NONE; } UiIfaceView *UiIfaceViewmgrImpl::getView(const char *name) -- 2.34.1