From: Woochan Lee Date: Tue, 3 Jan 2017 01:38:36 +0000 (+0900) Subject: Revert "correct return value to match its type" X-Git-Tag: submit/tizen/20170103.014635~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08ae8a1c91aeeabfc847cbdc7454bf9ffbd8ba27;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git Revert "correct return value to match its type" This reverts commit f15cb4278e335de0e97c57a4a40a0691ac2af745. Change-Id: If43016a23c9f249864c535887d2f73ae2c43a2c5 --- diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp index 7a139a8..c06bd2e 100644 --- a/src/lib/efl/mobile/c/ui_menu.cpp +++ b/src/lib/efl/mobile/c/ui_menu.cpp @@ -56,7 +56,7 @@ EAPI int ui_menu_deactivate(ui_menu *menu) EAPI bool ui_menu_get_activated(ui_menu *menu) { - if (TIZEN_ERROR_NONE != validate_menu(menu)) return false; + if (TIZEN_ERROR_NONE != validate_menu(menu)) return nullptr; return menu->isActivated(); } diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp index 72ccd40..16786c9 100644 --- a/src/lib/efl/mobile/c/ui_view.cpp +++ b/src/lib/efl/mobile/c/ui_view.cpp @@ -305,7 +305,7 @@ EAPI int ui_view_set_available_rotations(ui_view *view, const int *rotations, un EAPI const int *ui_view_get_available_rotations(ui_view *view, unsigned int *count) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (TIZEN_ERROR_NONE != validate_view(view)) return false; return view->getAvailableRotations(count); } @@ -366,6 +366,6 @@ EAPI int ui_view_set_content(ui_view *view, Eo *content) EAPI const char *ui_view_get_type(ui_view *view) { - if (TIZEN_ERROR_NONE != validate_view(view)) return nullptr; + if (TIZEN_ERROR_NONE != validate_view(view)) return false; return dynamic_cast(view)->type; }