From ad7ee1cd6bab9b6c90f90cfd8b38a3b06c53f4b1 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 23 Sep 2016 18:35:23 +0900 Subject: [PATCH] replace Evas_Object to Eo Change-Id: I7683f42eb206f632dfb7309f0b7b8b03cd1bd63a --- src/examples/efl/c/contents.cpp | 22 +++--- src/examples/efl/c/main.h | 14 ++-- src/examples/efl/c/page1.cpp | 8 +-- src/examples/efl/c/page10.cpp | 8 +-- src/examples/efl/c/page11.cpp | 12 ++-- src/examples/efl/c/page12.cpp | 18 ++--- src/examples/efl/c/page13.cpp | 8 +-- src/examples/efl/c/page14.cpp | 8 +-- src/examples/efl/c/page15.cpp | 6 +- src/examples/efl/c/page16.cpp | 16 ++--- src/examples/efl/c/page2.cpp | 8 +-- src/examples/efl/c/page3.cpp | 8 +-- src/examples/efl/c/page4.cpp | 8 +-- src/examples/efl/c/page5.cpp | 8 +-- 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 | 12 ++-- src/examples/efl/cpp/contents.cpp | 18 ++--- src/examples/efl/cpp/main.h | 14 ++-- src/examples/efl/cpp/page1.h | 22 +++--- src/examples/efl/cpp/page10.h | 44 ++++++------ src/examples/efl/cpp/page11.h | 24 +++---- src/examples/efl/cpp/page12.h | 56 +++++++-------- src/examples/efl/cpp/page13.h | 22 +++--- src/examples/efl/cpp/page14.h | 22 +++--- src/examples/efl/cpp/page15.h | 12 ++-- src/examples/efl/cpp/page16.h | 70 +++++++++---------- src/examples/efl/cpp/page2.h | 22 +++--- src/examples/efl/cpp/page3.h | 22 +++--- src/examples/efl/cpp/page4.h | 22 +++--- src/examples/efl/cpp/page5.h | 22 +++--- src/examples/efl/cpp/page6.h | 22 +++--- src/examples/efl/cpp/page7.h | 22 +++--- src/examples/efl/cpp/page8.h | 22 +++--- src/examples/efl/cpp/page9.h | 44 ++++++------ src/include/efl/UiBaseKeyListener.h | 2 +- src/include/efl/UiBaseView.h | 10 +-- src/include/efl/UiBaseViewManager.h | 8 +-- src/include/efl/UiBaseViewmgr.h | 2 +- src/include/efl/mobile/UiMenu.h | 2 +- src/include/efl/mobile/UiPopup.h | 2 +- src/include/efl/mobile/UiStandardView.h | 6 +- src/include/efl/mobile/c/ui_menu.h | 2 +- .../efl/mobile/c/ui_mobile_viewmanager.h | 9 --- src/include/efl/mobile/c/ui_popup.h | 2 +- src/include/efl/mobile/c/ui_standard_view.h | 4 +- src/include/efl/mobile/c/ui_view.h | 8 +-- src/include/efl/mobile/c/ui_viewmgr.h | 2 +- src/include/interface/UiIfaceOverlay.h | 2 +- src/include/interface/UiIfaceView.h | 2 +- src/include/interface/UiIfaceViewManager.h | 2 +- 52 files changed, 372 insertions(+), 383 deletions(-) diff --git a/src/examples/efl/c/contents.cpp b/src/examples/efl/c/contents.cpp index f4e4de6..24cf684 100644 --- a/src/examples/efl/c/contents.cpp +++ b/src/examples/efl/c/contents.cpp @@ -1,7 +1,7 @@ #include "main.h" -Evas_Object* -create_landscape_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb) +Eo* +create_landscape_content(Eo *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb) { char buf[PATH_MAX]; Elm_Grid *grid; @@ -69,10 +69,10 @@ create_landscape_content(Evas_Object *parent, const char *text, Evas_Smart_Cb pr } -Evas_Object* -create_title_handle_content(Evas_Object *parent, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb, - Evas_Smart_Cb title_show_btn_clicked_cb, Evas_Smart_Cb title_hide_btn_clicked_cb, - Evas_Smart_Cb title_show_anim_btn_clicked_cb, Evas_Smart_Cb title_hide_anim_btn_clicked_cb, ui_view *view) +Eo* +create_title_handle_content(Eo *parent, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb, + Evas_Smart_Cb title_show_btn_clicked_cb, Evas_Smart_Cb title_hide_btn_clicked_cb, + Evas_Smart_Cb title_show_anim_btn_clicked_cb, Evas_Smart_Cb title_hide_anim_btn_clicked_cb, ui_view *view) { Elm_Grid *grid; Elm_Box *box; @@ -167,8 +167,8 @@ create_title_handle_content(Evas_Object *parent, Evas_Smart_Cb prev_btn_clicked_ return grid; } -Evas_Object* -create_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb) +Eo* +create_content(Eo *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb) { Elm_Grid *grid; Elm_Box *box; @@ -226,8 +226,8 @@ create_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_cli return scroller; } -Evas_Object* -create_scrolling_content(Evas_Object *parent) +Eo* +create_scrolling_content(Eo *parent) { char buf[PATH_MAX]; Elm_Image *image; @@ -243,7 +243,7 @@ create_scrolling_content(Evas_Object *parent) } Elm_Toolbar* -create_toolbar(Evas_Object *parent, const char *style) +create_toolbar(Eo *parent, const char *style) { Elm_Toolbar *toolbar; diff --git a/src/examples/efl/c/main.h b/src/examples/efl/c/main.h index b865460..9f41b12 100644 --- a/src/examples/efl/c/main.h +++ b/src/examples/efl/c/main.h @@ -31,13 +31,13 @@ #define PACKAGE "ui-viewmgr" #endif -Evas_Object* create_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb); -Evas_Object* create_landscape_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb); -Evas_Object* create_title_handle_content(Evas_Object *parent, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb, - Evas_Smart_Cb title_show_btn_clicked_cb, Evas_Smart_Cb title_hide_btn_clicked_cb, - Evas_Smart_Cb title_show_anim_btn_clicked_cb, Evas_Smart_Cb title_hide_anim_btn_clicked_cb, ui_view *view); -Evas_Object* create_scrolling_content(Evas_Object *parent); -Elm_Toolbar* create_toolbar(Evas_Object *parent, const char *style); +Eo* create_content(Eo *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb); +Eo* create_landscape_content(Eo *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb); +Eo* create_title_handle_content(Eo *parent, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb, + Evas_Smart_Cb title_show_btn_clicked_cb, Evas_Smart_Cb title_hide_btn_clicked_cb, + Evas_Smart_Cb title_show_anim_btn_clicked_cb, Evas_Smart_Cb title_hide_anim_btn_clicked_cb, ui_view *view); +Eo* create_scrolling_content(Eo *parent); +Elm_Toolbar* create_toolbar(Eo *parent, const char *style); void create_page1(); void create_page2(); diff --git a/src/examples/efl/c/page1.cpp b/src/examples/efl/c/page1.cpp index f61b9fc..2d85436 100644 --- a/src/examples/efl/c/page1.cpp +++ b/src/examples/efl/c/page1.cpp @@ -18,14 +18,14 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { //FIXME: deactivate??? or ui_app deactivate??? or ui_viewmgr pop??? UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page2(); } @@ -33,8 +33,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view1_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page10.cpp b/src/examples/efl/c/page10.cpp index 683c45f..e3962ce 100644 --- a/src/examples/efl/c/page10.cpp +++ b/src/examples/efl/c/page10.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page11(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view10_rotate_cb(ui_standard_view *view, int degree, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page11.cpp b/src/examples/efl/c/page11.cpp index eae474a..54aaea0 100644 --- a/src/examples/efl/c/page11.cpp +++ b/src/examples/efl/c/page11.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page12(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view11_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); @@ -58,7 +58,7 @@ view11_load_cb(ui_standard_view *view, void *data) } static void -ctxpopup_item_select_cb(void *data, Evas_Object *obj, void *event_info) +ctxpopup_item_select_cb(void *data, Eo *obj, void *event_info) { Elm_Object_Item *it = (Elm_Object_Item *) event_info; LOGE("Item (%s) is selected", elm_object_item_text_get(it)); @@ -68,7 +68,7 @@ ctxpopup_item_select_cb(void *data, Evas_Object *obj, void *event_info) static bool view11_menu_cb(ui_menu *menu, void *data) { - Evas_Object *base = NULL; + Eo *base = NULL; Elm_Ctxpopup *ctxpopup = NULL; //Get a base object from menu. diff --git a/src/examples/efl/c/page12.cpp b/src/examples/efl/c/page12.cpp index fb1503c..48d623b 100644 --- a/src/examples/efl/c/page12.cpp +++ b/src/examples/efl/c/page12.cpp @@ -18,31 +18,31 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page13(); } static void -popup_block_clicked_cb(void *data, Evas_Object *obj, void *event_info) +popup_block_clicked_cb(void *data, Eo *obj, void *event_info) { elm_popup_dismiss(obj); } static void -popup_timeout_cb(void *data, Evas_Object *obj, void *event_info) +popup_timeout_cb(void *data, Eo *obj, void *event_info) { elm_popup_dismiss(obj); } static void -popup_dismissed_cb(void *data, Evas_Object *obj, void *event_info) +popup_dismissed_cb(void *data, Eo *obj, void *event_info) { evas_object_smart_callback_del(obj, "dismissed", popup_dismissed_cb); @@ -52,11 +52,11 @@ popup_dismissed_cb(void *data, Evas_Object *obj, void *event_info) } static void -view12_btn_clicked(void *data, Evas_Object *obj, void *event_info) +view12_btn_clicked(void *data, Eo *obj, void *event_info) { ui_standard_view *view = NULL; ui_popup *popup = NULL; - Evas_Object *base = NULL; + Eo *base = NULL; Elm_Popup *content = NULL; view = (ui_standard_view *) data; @@ -96,8 +96,8 @@ view12_btn_clicked(void *data, Evas_Object *obj, void *event_info) static bool view12_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; Elm_Button *right_btn = NULL; //Get a base object from view. diff --git a/src/examples/efl/c/page13.cpp b/src/examples/efl/c/page13.cpp index 0ee5dbb..7ca0818 100644 --- a/src/examples/efl/c/page13.cpp +++ b/src/examples/efl/c/page13.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page14(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view13_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page14.cpp b/src/examples/efl/c/page14.cpp index 957595b..748fdc3 100644 --- a/src/examples/efl/c/page14.cpp +++ b/src/examples/efl/c/page14.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page15(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view14_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page15.cpp b/src/examples/efl/c/page15.cpp index c672668..3803d7a 100644 --- a/src/examples/efl/c/page15.cpp +++ b/src/examples/efl/c/page15.cpp @@ -18,7 +18,7 @@ #include "main.h" static void -view15_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +view15_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page16(); } @@ -26,8 +26,8 @@ view15_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view15_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page16.cpp b/src/examples/efl/c/page16.cpp index 0f3e466..3ef82c6 100644 --- a/src/examples/efl/c/page16.cpp +++ b/src/examples/efl/c/page16.cpp @@ -18,40 +18,40 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_DEACTIVATE(); } static void -title_show_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +title_show_btn_clicked_cb(void *data, Eo *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; ui_standard_view_set_title_visible(view, true, false); } static void -title_hide_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +title_hide_btn_clicked_cb(void *data, Eo *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; ui_standard_view_set_title_visible(view, false, false); } static void -title_show_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +title_show_anim_btn_clicked_cb(void *data, Eo *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; ui_standard_view_set_title_visible(view, true, true); } static void -title_hide_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +title_hide_anim_btn_clicked_cb(void *data, Eo *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; ui_standard_view_set_title_visible(view, false, true); @@ -60,8 +60,8 @@ title_hide_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view16_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page2.cpp b/src/examples/efl/c/page2.cpp index 8d4cfc1..27bcdc1 100644 --- a/src/examples/efl/c/page2.cpp +++ b/src/examples/efl/c/page2.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page3(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view2_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page3.cpp b/src/examples/efl/c/page3.cpp index 26c6a2e..6df9de7 100644 --- a/src/examples/efl/c/page3.cpp +++ b/src/examples/efl/c/page3.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page4(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view3_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page4.cpp b/src/examples/efl/c/page4.cpp index 257df8f..9cd4815 100644 --- a/src/examples/efl/c/page4.cpp +++ b/src/examples/efl/c/page4.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page5(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view4_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page5.cpp b/src/examples/efl/c/page5.cpp index f8d3101..6842f67 100644 --- a/src/examples/efl/c/page5.cpp +++ b/src/examples/efl/c/page5.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page6(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view5_load_cb(ui_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page6.cpp b/src/examples/efl/c/page6.cpp index 7ce473e..98510af 100644 --- a/src/examples/efl/c/page6.cpp +++ b/src/examples/efl/c/page6.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page7(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view6_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page7.cpp b/src/examples/efl/c/page7.cpp index 30195c1..aec4525 100644 --- a/src/examples/efl/c/page7.cpp +++ b/src/examples/efl/c/page7.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page8(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view7_load_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); diff --git a/src/examples/efl/c/page8.cpp b/src/examples/efl/c/page8.cpp index 6089ed4..b093024 100644 --- a/src/examples/efl/c/page8.cpp +++ b/src/examples/efl/c/page8.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page9(); } @@ -33,8 +33,8 @@ void create_page8() { ui_standard_view *view = NULL; - Evas_Object *base = NULL; - Evas_Object *content = NULL; + Eo *base = NULL; + Eo *content = NULL; //Create a view. view = ui_standard_view_create("page8"); diff --git a/src/examples/efl/c/page9.cpp b/src/examples/efl/c/page9.cpp index 44ee940..51e5738 100644 --- a/src/examples/efl/c/page9.cpp +++ b/src/examples/efl/c/page9.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { UI_VIEWMGR_POP_VIEW(); } static void -next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { create_page10(); } @@ -32,8 +32,8 @@ next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view9_portrait_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; //Get a base object from view. base = ui_view_get_base(view); @@ -62,8 +62,8 @@ view9_portrait_cb(ui_standard_view *view, void *data) static bool view9_landscape_cb(ui_standard_view *view, void *data) { - Evas_Object *content = NULL; - Evas_Object *base = NULL; + Eo *content = NULL; + Eo *base = NULL; base = ui_view_get_base(view); if (!base) diff --git a/src/examples/efl/cpp/contents.cpp b/src/examples/efl/cpp/contents.cpp index bc4018f..c25fe55 100644 --- a/src/examples/efl/cpp/contents.cpp +++ b/src/examples/efl/cpp/contents.cpp @@ -17,7 +17,7 @@ #include "main.h" Elm_Toolbar* -createToolbar(Evas_Object *parent, const char *style) +createToolbar(Eo *parent, const char *style) { Elm_Toolbar *toolbar; @@ -38,8 +38,8 @@ createToolbar(Evas_Object *parent, const char *style) return toolbar; } -Evas_Object* -createScrollingContent(Evas_Object *parent) +Eo* +createScrollingContent(Eo *parent) { char buf[PATH_MAX]; Elm_Image *image; @@ -54,8 +54,8 @@ createScrollingContent(Evas_Object *parent) return image; } -Evas_Object* -createLandscapeContent(Evas_Object *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb) +Eo* +createLandscapeContent(Eo *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb) { char buf[PATH_MAX]; Elm_Grid *grid; @@ -122,8 +122,8 @@ createLandscapeContent(Evas_Object *parent, const char *text, Evas_Smart_Cb _pre return scroller; } -Evas_Object* -createTitleHandleContent(Evas_Object *parent, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb, +Eo* +createTitleHandleContent(Eo *parent, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb, Evas_Smart_Cb _titleShowBtnClickedCb, Evas_Smart_Cb _titleHideBtnClickedCb, Evas_Smart_Cb _titleShowAnimBtnClickedCb, Evas_Smart_Cb _titleHideAnimBtnClickedCb, UiView *view) { @@ -220,8 +220,8 @@ createTitleHandleContent(Evas_Object *parent, Evas_Smart_Cb _prevBtnClickedCb, E return grid; } -Evas_Object* -createContent(Evas_Object *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb) +Eo* +createContent(Eo *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb) { Elm_Grid *grid; Elm_Box *box; diff --git a/src/examples/efl/cpp/main.h b/src/examples/efl/cpp/main.h index fd553b1..1c7e4f5 100644 --- a/src/examples/efl/cpp/main.h +++ b/src/examples/efl/cpp/main.h @@ -33,10 +33,10 @@ using namespace efl_viewmanager; -Evas_Object *createLandscapeContent(Evas_Object *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb); -Evas_Object *createContent(Evas_Object *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nexBtnClickedCb); -Evas_Object *createScrollingContent(Evas_Object *parent); -Evas_Object* createTitleHandleContent(Evas_Object *parent, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb, - Evas_Smart_Cb _titleShowBtnClickedCb, Evas_Smart_Cb _titleHideBtnClickedCb, - Evas_Smart_Cb _titleShowAnimBtnClickedCb, Evas_Smart_Cb _titleHideAnimBtnClickedCb, UiView *view); -Elm_Toolbar *createToolbar(Evas_Object *parent, const char *style); +Eo *createLandscapeContent(Eo *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb); +Eo *createContent(Eo *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nexBtnClickedCb); +Eo *createScrollingContent(Eo *parent); +Eo* createTitleHandleContent(Eo *parent, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb, Evas_Smart_Cb _titleShowBtnClickedCb, + Evas_Smart_Cb _titleHideBtnClickedCb, Evas_Smart_Cb _titleShowAnimBtnClickedCb, Evas_Smart_Cb _titleHideAnimBtnClickedCb, + UiView *view); +Elm_Toolbar *createToolbar(Eo *parent, const char *style); diff --git a/src/examples/efl/cpp/page1.h b/src/examples/efl/cpp/page1.h index e24e775..7166016 100644 --- a/src/examples/efl/cpp/page1.h +++ b/src/examples/efl/cpp/page1.h @@ -27,17 +27,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Basic View", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page2()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Basic View", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page2()); + }); //Set title text, content this->setTitle("Page1"); diff --git a/src/examples/efl/cpp/page10.h b/src/examples/efl/cpp/page10.h index 08bd835..616a881 100644 --- a/src/examples/efl/cpp/page10.h +++ b/src/examples/efl/cpp/page10.h @@ -34,17 +34,17 @@ protected: if (this->getOrientationMode() == UI_VIEW_ORIENTATION_MODE_PORTRAIT) { //Portrait - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Rotation", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page11()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Rotation", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page11()); + }); //Set title text, content, indicator property this->setTitle("Page10"); @@ -52,17 +52,17 @@ protected: this->setIndicator(UI_VIEW_INDICATOR_DEFAULT); } else { //Landscape - Evas_Object *content = createLandscapeContent(this->getBase(), "ViewMgr++ Demo
Rotation", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page11()); - }); + Eo *content = createLandscapeContent(this->getBase(), "ViewMgr++ Demo
Rotation", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page11()); + }); //Set title text, content, indicator property this->setTitle("Page10"); diff --git a/src/examples/efl/cpp/page11.h b/src/examples/efl/cpp/page11.h index 8227c3b..7551436 100644 --- a/src/examples/efl/cpp/page11.h +++ b/src/examples/efl/cpp/page11.h @@ -19,7 +19,7 @@ /** This page implement on_menu() method to create ctxpopup when menu HW key clicked. * This page will be created menu(ctxpopup)items in on_menu() method. */ -static void _ctxpopupItemSelectCb(void *data, Evas_Object *obj, void *event_info) +static void _ctxpopupItemSelectCb(void *data, Eo *obj, void *event_info) { auto it = static_cast(event_info); LOGE("Item (%s) is selected", elm_object_item_text_get(it)); @@ -34,17 +34,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Menu Popup", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page12()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Menu Popup", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page12()); + }); //Set title text, content this->setTitle("Page11"); diff --git a/src/examples/efl/cpp/page12.h b/src/examples/efl/cpp/page12.h index 9de4d0f..e63484f 100644 --- a/src/examples/efl/cpp/page12.h +++ b/src/examples/efl/cpp/page12.h @@ -20,7 +20,7 @@ * The created popup has view and it will be managed by viewmgr. */ -static void _popupDismissedCb(void *data, Evas_Object *obj, void *event_info) +static void _popupDismissedCb(void *data, Eo *obj, void *event_info) { evas_object_smart_callback_del(obj, "dismissed", _popupDismissedCb); auto popup = static_cast(data); @@ -35,28 +35,28 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Popup", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page13()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Popup", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page13()); + }); //Title Right button Elm_Button *rightBtn = elm_button_add(this->getBase()); elm_object_text_set(rightBtn, "popup"); evas_object_smart_callback_add(rightBtn, "clicked", - [](void *data, Evas_Object *obj, void *event_info) -> void - { - auto view = static_cast(data); - view->createPopup(); - }, - this); + [](void *data, Eo *obj, void *event_info) -> void + { + auto view = static_cast(data); + view->createPopup(); + }, + this); //Set title text, right button, content this->setTitle("Page12"); @@ -79,17 +79,17 @@ public: elm_popup_timeout_set(obj, 3.0); evas_object_smart_callback_add(obj, "dismissed", _popupDismissedCb, popup); evas_object_smart_callback_add(obj, "block,clicked", - [](void *data, Evas_Object *obj, void *event_info) -> void - { - elm_popup_dismiss(obj); - }, - nullptr); + [](void *data, Eo *obj, void *event_info) -> void + { + elm_popup_dismiss(obj); + }, + nullptr); evas_object_smart_callback_add(obj, "timeout", - [](void *data, Evas_Object *obj, void *event_info) -> void - { - elm_popup_dismiss(obj); - }, - nullptr); + [](void *data, Eo *obj, void *event_info) -> void + { + elm_popup_dismiss(obj); + }, + nullptr); popup->setContent(obj); popup->activate(); diff --git a/src/examples/efl/cpp/page13.h b/src/examples/efl/cpp/page13.h index 58cc934..0fb20fe 100644 --- a/src/examples/efl/cpp/page13.h +++ b/src/examples/efl/cpp/page13.h @@ -28,17 +28,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Fade Transition", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page14()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Fade Transition", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page14()); + }); //Set title text, content this->setTitle("Page13"); diff --git a/src/examples/efl/cpp/page14.h b/src/examples/efl/cpp/page14.h index 5f73807..f13f7c0 100644 --- a/src/examples/efl/cpp/page14.h +++ b/src/examples/efl/cpp/page14.h @@ -28,17 +28,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
None Transition", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page15()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
None Transition", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page15()); + }); //Set title text, right button, content this->setTitle("Page14"); diff --git a/src/examples/efl/cpp/page15.h b/src/examples/efl/cpp/page15.h index 35d081d..d8c0414 100644 --- a/src/examples/efl/cpp/page15.h +++ b/src/examples/efl/cpp/page15.h @@ -27,17 +27,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createScrollingContent(this->getBase()); + Eo *content = createScrollingContent(this->getBase()); //Title Right button Elm_Button *rightBtn = elm_button_add(this->getBase()); elm_object_text_set(rightBtn, "Next"); evas_object_smart_callback_add(rightBtn, "clicked", - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page16()); - }, - this); + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page16()); + }, + this); //Set title text, right button, content this->setTitle("Page15 Scroller In Viewmgr"); diff --git a/src/examples/efl/cpp/page16.h b/src/examples/efl/cpp/page16.h index 0f311a0..d965df7 100644 --- a/src/examples/efl/cpp/page16.h +++ b/src/examples/efl/cpp/page16.h @@ -26,41 +26,41 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createTitleHandleContent(this->getBase(), - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->deactivate(); - }, - //Title Show Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - auto view = static_cast(data); - view->setTitleVisible(true, false); - }, - //Title Hide Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - auto view = static_cast(data); - view->setTitleVisible(false, false); - }, - //Title Show Anim Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - auto view = static_cast(data); - view->setTitleVisible(true, true); - }, - //Title Hide Anim Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - auto view = static_cast(data); - view->setTitleVisible(false, true); - }, this); + Eo *content = createTitleHandleContent(this->getBase(), + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->deactivate(); + }, + //Title Show Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + auto view = static_cast(data); + view->setTitleVisible(true, false); + }, + //Title Hide Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + auto view = static_cast(data); + view->setTitleVisible(false, false); + }, + //Title Show Anim Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + auto view = static_cast(data); + view->setTitleVisible(true, true); + }, + //Title Hide Anim Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + auto view = static_cast(data); + view->setTitleVisible(false, true); + }, this); //Set title text, content this->setTitle("Page16"); diff --git a/src/examples/efl/cpp/page2.h b/src/examples/efl/cpp/page2.h index bb9695c..77fd5cf 100644 --- a/src/examples/efl/cpp/page2.h +++ b/src/examples/efl/cpp/page2.h @@ -26,17 +26,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Title Buttons", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page3()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Title Buttons", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page3()); + }); //Title left button Elm_Button *leftTitleBtn = elm_button_add(this->getBase()); diff --git a/src/examples/efl/cpp/page3.h b/src/examples/efl/cpp/page3.h index 05c0345..fc74c0a 100644 --- a/src/examples/efl/cpp/page3.h +++ b/src/examples/efl/cpp/page3.h @@ -26,17 +26,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Subtitle", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page4()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Subtitle", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page4()); + }); //Set title text, subtitle text, content this->setTitle("Page3"); diff --git a/src/examples/efl/cpp/page4.h b/src/examples/efl/cpp/page4.h index bd5e894..38f5210 100644 --- a/src/examples/efl/cpp/page4.h +++ b/src/examples/efl/cpp/page4.h @@ -27,17 +27,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Title Badge", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page5()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Title Badge", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page5()); + }); //Set title text, badge text, content this->setTitle("Page4. We put a long title here intentionally"); diff --git a/src/examples/efl/cpp/page5.h b/src/examples/efl/cpp/page5.h index 4cc5a55..57e087e 100644 --- a/src/examples/efl/cpp/page5.h +++ b/src/examples/efl/cpp/page5.h @@ -26,17 +26,17 @@ protected: UiView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Full View", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page6()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Full View", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page6()); + }); //Set content, indicator property this->setContent(content); diff --git a/src/examples/efl/cpp/page6.h b/src/examples/efl/cpp/page6.h index befcdec..97b874e 100644 --- a/src/examples/efl/cpp/page6.h +++ b/src/examples/efl/cpp/page6.h @@ -25,17 +25,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Toolbar", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page7()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Toolbar", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page7()); + }); Elm_Toolbar *toolbar = createToolbar(this->getBase(), "toolbar_with_title"); diff --git a/src/examples/efl/cpp/page7.h b/src/examples/efl/cpp/page7.h index 8a87f3f..f774fe4 100644 --- a/src/examples/efl/cpp/page7.h +++ b/src/examples/efl/cpp/page7.h @@ -25,17 +25,17 @@ protected: UiStandardView::onLoad(); //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Navigationbar", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page8()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Navigationbar", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page8()); + }); Elm_Toolbar *toolbar = createToolbar(this->getBase(), "navigationbar"); diff --git a/src/examples/efl/cpp/page8.h b/src/examples/efl/cpp/page8.h index 3677cae..3f62b52 100644 --- a/src/examples/efl/cpp/page8.h +++ b/src/examples/efl/cpp/page8.h @@ -23,17 +23,17 @@ public: page8() : UiStandardView("page8") { //Create a main content. - Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo
Content Preloading", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page9()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr++ Demo
Content Preloading", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page9()); + }); //Set title text, content this->setTitle("Page8"); diff --git a/src/examples/efl/cpp/page9.h b/src/examples/efl/cpp/page9.h index 14a4396..2ad3a5c 100644 --- a/src/examples/efl/cpp/page9.h +++ b/src/examples/efl/cpp/page9.h @@ -36,17 +36,17 @@ protected: { UiStandardView::onPortrait(); - Evas_Object *content = createContent(this->getBase(), "ViewMgr Demo
Portrait/Landscape", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page10()); - }); + Eo *content = createContent(this->getBase(), "ViewMgr Demo
Portrait/Landscape", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page10()); + }); //Set title text, content, indicator property this->setTitle("Page9"); @@ -58,17 +58,17 @@ protected: { UiStandardView::onLandscape(); - Evas_Object *content = createLandscapeContent(this->getBase(), "ViewMgr Demo
Portrait/Landscape", - //Prev Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->popView(); - }, - //Next Button Callback - [](void *data, Evas_Object *obj, void *event_info) -> void - { - UI_VIEWMGR->pushView(new page10()); - }); + Eo *content = createLandscapeContent(this->getBase(), "ViewMgr Demo
Portrait/Landscape", + //Prev Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->popView(); + }, + //Next Button Callback + [](void *data, Eo *obj, void *event_info) -> void + { + UI_VIEWMGR->pushView(new page10()); + }); //Set title text, content, indicator property this->setTitle("Page9"); diff --git a/src/include/efl/UiBaseKeyListener.h b/src/include/efl/UiBaseKeyListener.h index 6be6255..a559958 100644 --- a/src/include/efl/UiBaseKeyListener.h +++ b/src/include/efl/UiBaseKeyListener.h @@ -82,7 +82,7 @@ protected: * * @return key grabber object. */ - Evas_Object *getKeygrabObj(); + Eo *getKeygrabObj(); public: _UI_DISABLE_COPY_AND_ASSIGN(UiBaseKeyListener); diff --git a/src/include/efl/UiBaseView.h b/src/include/efl/UiBaseView.h index b95a5fe..fa6f1b9 100644 --- a/src/include/efl/UiBaseView.h +++ b/src/include/efl/UiBaseView.h @@ -26,7 +26,7 @@ namespace efl_viewmanager * @ingroup efl_viewmanager * * @brief This is a base class of EFL view. Typically, this view extends UiIfaceView and implements basic behaviors for EFL view in all profiles. - * A view must have one Evas_Object content instance which represents a view for a current screen. + * A view must have one Eo content instance which represents a view for a current screen. */ class UiBaseView: public ui_viewmanager::UiIfaceView { @@ -48,14 +48,14 @@ public: * * @return A previous content. If it wasn't, return @c nullptr. */ - virtual bool setContent(Evas_Object *content) override; + virtual bool setContent(Eo *content) override; /** * @brief This is for unsetting a content of the view. * * @return A previous content. If it wasn't, return @c nullptr. */ - virtual Evas_Object *unsetContent() override; + virtual Eo *unsetContent() override; /** * @brief Get a base object of ui_view. @@ -64,7 +64,7 @@ public: * * @return The base object of ui_view. */ - virtual Evas_Object *getBase(); + virtual Eo *getBase(); /** * @brief Set the indicator mode. @@ -99,7 +99,7 @@ protected: * * @return The base layout object of viewmgr. */ - Evas_Object *getParent(); + Eo *getParent(); /** * @brief Toggle event block. diff --git a/src/include/efl/UiBaseViewManager.h b/src/include/efl/UiBaseViewManager.h index b3cfc44..e190d19 100644 --- a/src/include/efl/UiBaseViewManager.h +++ b/src/include/efl/UiBaseViewManager.h @@ -17,12 +17,10 @@ #ifndef _UI_BASE_VIEWMANAGER_H_ #define _UI_BASE_VIEWMANAGER_H_ -//FIXME: ?? -#ifndef Elm_Conformant -#define Elm_Conformant Evas_Object -#endif - #include "../interface/UiIfaceViewManager.h" + +using Elm_Conformant = Eo; + #include "UiBaseOverlay.h" #include "UiBaseKeyListener.h" #include "UiBaseViewmgr.h" diff --git a/src/include/efl/UiBaseViewmgr.h b/src/include/efl/UiBaseViewmgr.h index 4d2d998..c813695 100644 --- a/src/include/efl/UiBaseViewmgr.h +++ b/src/include/efl/UiBaseViewmgr.h @@ -174,7 +174,7 @@ public: * * @return The base object of this viewmgr. */ - Evas_Object *getBase(); + Eo *getBase(); protected: /** diff --git a/src/include/efl/mobile/UiMenu.h b/src/include/efl/mobile/UiMenu.h index e989f4b..5c10e93 100644 --- a/src/include/efl/mobile/UiMenu.h +++ b/src/include/efl/mobile/UiMenu.h @@ -90,7 +90,7 @@ public: * @note Normally, A base object can be used for a parent of UiMenu content. * @return base object of UiMenu. */ - virtual Evas_Object *getBase(); + virtual Eo *getBase(); /** * @brief Get a current menu's degree. diff --git a/src/include/efl/mobile/UiPopup.h b/src/include/efl/mobile/UiPopup.h index dc6d4f5..cb8de5b 100644 --- a/src/include/efl/mobile/UiPopup.h +++ b/src/include/efl/mobile/UiPopup.h @@ -103,7 +103,7 @@ public: * * @return base object of UiPopup. */ - virtual Evas_Object *getBase(); + virtual Eo *getBase(); /** * @brief Get current popup's degree. diff --git a/src/include/efl/mobile/UiStandardView.h b/src/include/efl/mobile/UiStandardView.h index e3db297..3618158 100644 --- a/src/include/efl/mobile/UiStandardView.h +++ b/src/include/efl/mobile/UiStandardView.h @@ -54,7 +54,7 @@ public: * * @return @c true if it succeeds, @c false otherwise. */ - bool setContent(Evas_Object *content); + bool setContent(Eo *content); /** * @brief Set a title badge text. @@ -125,7 +125,7 @@ public: * * @return A previous content. If it wasn't, return @c nullptr. */ - Evas_Object *unsetContent() override; + Eo *unsetContent() override; /** * @brief Unset a title left button of title area. @@ -174,7 +174,7 @@ public: * * @return viewmgr's base layout object. */ - virtual Evas_Object *getBase() override; + virtual Eo *getBase() override; protected: /** diff --git a/src/include/efl/mobile/c/ui_menu.h b/src/include/efl/mobile/c/ui_menu.h index fc71615..aed38a8 100644 --- a/src/include/efl/mobile/c/ui_menu.h +++ b/src/include/efl/mobile/c/ui_menu.h @@ -107,7 +107,7 @@ EAPI bool ui_menu_get_activated(ui_menu *menu); * * @since_tizen 3.0 */ -EAPI Evas_Object *ui_menu_get_base(ui_menu *menu); +EAPI Eo *ui_menu_get_base(ui_menu *menu); /** * @brief Get a current ui_menu's degree. diff --git a/src/include/efl/mobile/c/ui_mobile_viewmanager.h b/src/include/efl/mobile/c/ui_mobile_viewmanager.h index ec23f7e..54a5d2f 100644 --- a/src/include/efl/mobile/c/ui_mobile_viewmanager.h +++ b/src/include/efl/mobile/c/ui_mobile_viewmanager.h @@ -38,15 +38,6 @@ #include #include -//FIXME? -#ifndef Elm_Conformant -#define Elm_Conformant Evas_Object -#endif - -#ifndef Elm_Ctxpopup -#define Elm_Ctxpopup Evas_Object -#endif - typedef struct ui_viewmgr_s ui_viewmgr; typedef struct ui_view_s ui_view; typedef ui_view ui_standard_view; diff --git a/src/include/efl/mobile/c/ui_popup.h b/src/include/efl/mobile/c/ui_popup.h index 91b4956..0c98a58 100644 --- a/src/include/efl/mobile/c/ui_popup.h +++ b/src/include/efl/mobile/c/ui_popup.h @@ -138,7 +138,7 @@ EAPI bool ui_popup_get_activated(ui_popup *popup); * * @since_tizen 3.0 */ -EAPI Evas_Object *ui_popup_get_base(ui_popup *popup); +EAPI Eo *ui_popup_get_base(ui_popup *popup); /** * @brief Get current ui_popup's degree. diff --git a/src/include/efl/mobile/c/ui_standard_view.h b/src/include/efl/mobile/c/ui_standard_view.h index 895d8b9..8278708 100644 --- a/src/include/efl/mobile/c/ui_standard_view.h +++ b/src/include/efl/mobile/c/ui_standard_view.h @@ -80,7 +80,7 @@ EAPI bool ui_standard_view_set_title_badge(ui_standard_view *view, const char *b * * @since_tizen 3.0 */ -EAPI bool ui_standard_view_set_title_right_btn(ui_standard_view *view, Evas_Object *title_right_btn); +EAPI bool ui_standard_view_set_title_right_btn(ui_standard_view *view, Elm_Button *title_right_btn); /** * @brief Return a title right button of the view. @@ -117,7 +117,7 @@ EAPI Elm_Button *ui_standard_view_unset_title_right_btn(ui_standard_view *view); * * @since_tizen 3.0 */ -EAPI bool ui_standard_view_set_title_left_btn(ui_standard_view *view, Evas_Object *title_left_btn); +EAPI bool ui_standard_view_set_title_left_btn(ui_standard_view *view, Elm_Button *title_left_btn); /** * @brief Return a title left button of the view. diff --git a/src/include/efl/mobile/c/ui_view.h b/src/include/efl/mobile/c/ui_view.h index 9fe7e0b..947ba5e 100644 --- a/src/include/efl/mobile/c/ui_view.h +++ b/src/include/efl/mobile/c/ui_view.h @@ -112,7 +112,7 @@ EAPI ui_view *ui_view_create(const char *name); * * @since_tizen 3.0 */ -EAPI bool ui_view_set_content(ui_view *view, Evas_Object *content); +EAPI bool ui_view_set_content(ui_view *view, Eo *content); /** * @brief Set callback functions for handling view's lifecycle events. @@ -151,7 +151,7 @@ EAPI bool ui_view_set_event_callbacks(ui_view *view, ui_view_event_callback_s *e * * @since_tizen 3.0 */ -EAPI Evas_Object* ui_view_get_base(ui_view *view); +EAPI Eo* ui_view_get_base(ui_view *view); /** * @brief Unset a ui_view content. @@ -164,7 +164,7 @@ EAPI Evas_Object* ui_view_get_base(ui_view *view); * * @since_tizen 3.0 */ -EAPI Evas_Object *ui_view_unset_content(ui_view *view); +EAPI Eo *ui_view_unset_content(ui_view *view); /** * @brief Set the indicator mode of a ui_view. @@ -345,7 +345,7 @@ EAPI ui_view_state ui_view_get_state(ui_view *view); * * @since_tizen 3.0 */ -EAPI Evas_Object *ui_view_get_content(ui_view *view); +EAPI Eo *ui_view_get_content(ui_view *view); /** * @brief A destructor for an ui_view. diff --git a/src/include/efl/mobile/c/ui_viewmgr.h b/src/include/efl/mobile/c/ui_viewmgr.h index cc94d32..7854b6b 100644 --- a/src/include/efl/mobile/c/ui_viewmgr.h +++ b/src/include/efl/mobile/c/ui_viewmgr.h @@ -183,7 +183,7 @@ EAPI ui_view *ui_viewmgr_get_view_by_name(ui_viewmgr *viewmgr, const char *name) * * @since_tizen 3.0 */ -EAPI Evas_Object *ui_viewmgr_get_base(ui_viewmgr *viewmgr); +EAPI Eo *ui_viewmgr_get_base(ui_viewmgr *viewmgr); /** * @brief Return a view index(page) number of the given view. diff --git a/src/include/interface/UiIfaceOverlay.h b/src/include/interface/UiIfaceOverlay.h index e60f984..6307a01 100644 --- a/src/include/interface/UiIfaceOverlay.h +++ b/src/include/interface/UiIfaceOverlay.h @@ -39,7 +39,7 @@ public: * @brief This is for replacing or setting a content of the view. * * @note @p content is a logical object that represents a view in your framework. The actual type of the content could be translated to any certain types. - * For instance, the type could be Evas_Object * in EFL and Layer * in Dali. + * For instance, the type could be Eo * in EFL and Layer * in Dali. * * @param content a new content. It allows @c nullptr for canceling the previous content. * diff --git a/src/include/interface/UiIfaceView.h b/src/include/interface/UiIfaceView.h index bddc3ae..4ea5343 100644 --- a/src/include/interface/UiIfaceView.h +++ b/src/include/interface/UiIfaceView.h @@ -133,7 +133,7 @@ public: * @brief Replace or set a content of the view. * * @note @p content is a logical object that represents a view in your framework. The actual type of the content could be translated to any certain types. - * For instance, the type could be Evas_Object * in EFL and Layer * in Dali. + * For instance, the type could be Eo * in EFL and Layer * in Dali. * * @param content a new content. It allows @c nullptr for canceling the previous content. * diff --git a/src/include/interface/UiIfaceViewManager.h b/src/include/interface/UiIfaceViewManager.h index 3a9e3f7..de0a360 100644 --- a/src/include/interface/UiIfaceViewManager.h +++ b/src/include/interface/UiIfaceViewManager.h @@ -24,7 +24,7 @@ #if UI_EFL #include - using T = Evas_Object*; + using T = Eo*; #elif UI_DALI #endif -- 2.34.1