replace Evas_Object to Eo 98/89398/2
authorHermet Park <hermet@hermet.pe.kr>
Fri, 23 Sep 2016 09:35:23 +0000 (18:35 +0900)
committerHermet Park <hermet@hermet.pe.kr>
Fri, 23 Sep 2016 09:36:28 +0000 (18:36 +0900)
Change-Id: I7683f42eb206f632dfb7309f0b7b8b03cd1bd63a

52 files changed:
src/examples/efl/c/contents.cpp
src/examples/efl/c/main.h
src/examples/efl/c/page1.cpp
src/examples/efl/c/page10.cpp
src/examples/efl/c/page11.cpp
src/examples/efl/c/page12.cpp
src/examples/efl/c/page13.cpp
src/examples/efl/c/page14.cpp
src/examples/efl/c/page15.cpp
src/examples/efl/c/page16.cpp
src/examples/efl/c/page2.cpp
src/examples/efl/c/page3.cpp
src/examples/efl/c/page4.cpp
src/examples/efl/c/page5.cpp
src/examples/efl/c/page6.cpp
src/examples/efl/c/page7.cpp
src/examples/efl/c/page8.cpp
src/examples/efl/c/page9.cpp
src/examples/efl/cpp/contents.cpp
src/examples/efl/cpp/main.h
src/examples/efl/cpp/page1.h
src/examples/efl/cpp/page10.h
src/examples/efl/cpp/page11.h
src/examples/efl/cpp/page12.h
src/examples/efl/cpp/page13.h
src/examples/efl/cpp/page14.h
src/examples/efl/cpp/page15.h
src/examples/efl/cpp/page16.h
src/examples/efl/cpp/page2.h
src/examples/efl/cpp/page3.h
src/examples/efl/cpp/page4.h
src/examples/efl/cpp/page5.h
src/examples/efl/cpp/page6.h
src/examples/efl/cpp/page7.h
src/examples/efl/cpp/page8.h
src/examples/efl/cpp/page9.h
src/include/efl/UiBaseKeyListener.h
src/include/efl/UiBaseView.h
src/include/efl/UiBaseViewManager.h
src/include/efl/UiBaseViewmgr.h
src/include/efl/mobile/UiMenu.h
src/include/efl/mobile/UiPopup.h
src/include/efl/mobile/UiStandardView.h
src/include/efl/mobile/c/ui_menu.h
src/include/efl/mobile/c/ui_mobile_viewmanager.h
src/include/efl/mobile/c/ui_popup.h
src/include/efl/mobile/c/ui_standard_view.h
src/include/efl/mobile/c/ui_view.h
src/include/efl/mobile/c/ui_viewmgr.h
src/include/interface/UiIfaceOverlay.h
src/include/interface/UiIfaceView.h
src/include/interface/UiIfaceViewManager.h

index f4e4de6de9540c5c0108784870b9b141159f5d85..24cf6840590f3bc999e5d0469e27d277c56b5e53 100644 (file)
@@ -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;
 
index b86546008ac3174a8f41507364572a62d23cc2fd..9f41b12b7f92984eede08b4b232a32ae10dbcfaf 100644 (file)
 #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();
index f61b9fcb02c224ffc6871c1c9d0101fb54864063..2d85436a49928020ffb7bd5a7f7316c6a694365e 100644 (file)
 #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);
index 683c45f7bc47c59139f353aa5ef264fea52b04c9..e3962ce31f2b82f0ca7cfe1d8f4e87af7da8c88d 100644 (file)
 #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);
index eae474ab8af9f99a284c15f446cdb29e1961c3f9..54aaea079d9d2bbeac950d0835250cc078ad09c0 100644 (file)
 #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.
index fb1503c462bc7273c518e1ac94625a9966d51ec5..48d623bfa9dca73901731eaa7be952526b4fdb47 100644 (file)
 #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.
index 0ee5dbbb7994924afce573ba68c2b4bb9d307933..7ca08182ad2ffc95592d7c10367ee3cddf4e085b 100644 (file)
 #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);
index 957595b277c704b25db6b6d26b7b66d3bf64529d..748fdc338c75e965ed1b2c75195ef65654d177ee 100644 (file)
 #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);
index c67266827641e0fa882bffef11bc2e48557dd092..3803d7a21422e6b32d713af125b293cfdece3794 100644 (file)
@@ -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);
index 0f3e466f69c99e6b76966052b8dbfd2a04f754b6..3ef82c6de9e0dd7b9cb1470bc8877c3bdd4a1181 100644 (file)
 #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);
index 8d4cfc15de862ed952098c324e8e73a6114fe379..27bcdc1a9fabc468823a5760eed959b28149e307 100644 (file)
 #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);
index 26c6a2ee48bbe9ac21d8d277f5c314aaca2ceffb..6df9de7c18fcaa1d76b296c664dd9c45e876de7a 100644 (file)
 #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);
index 257df8f06f75d2bca4d02e2f83385fee30255d67..9cd4815be775d7762270b7e70802fbc881c6e526 100644 (file)
 #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);
index f8d3101d2e5edfb480ca48df2a02972c06feba2b..6842f674f551c61ff8951722cab187d41fd44dc8 100644 (file)
 #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);
index 7ce473e55bbc05af74c061fe22dbaff03a672b5b..98510afdbc5d454c9412cb3f1f3a4ac57c403043 100644 (file)
 #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);
index 30195c11870bcbcb75d13ac1b27be64e3c32d84b..aec4525e9d58fd4d81f4609bda6f3d70b78d5dbc 100644 (file)
 #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);
index 6089ed47121857165b505cb98022238c9fdfa6f0..b093024723ac629fd3c4cd68861d8065e594f8dd 100644 (file)
 #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");
index 44ee94022d6c6af91fdc66320240dd1f583fe24d..51e57381184914d85f415ef839a228e48c282ed0 100644 (file)
 #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)
index bc4018f862d6cfa50b601615c3503fd0659ed813..c25fe55b88b83939b31735ffb0995fc7a96834cb 100644 (file)
@@ -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;
index fd553b16633927d9dac145f7e2be310707e87cdb..1c7e4f5c790b158cfd2d1754264e8b5579f57bb7 100644 (file)
 
 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);
index e24e77590fd3fcd3c270574d12171ffa6670844c..7166016ba4c614ddb48dcce05079ce607cdfd703 100644 (file)
@@ -27,17 +27,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
index 08bd8350dcd8e60a54499668300158ffae9d2625..616a8810098250c16368462abc5150f722b7024e 100644 (file)
@@ -34,17 +34,17 @@ protected:
                if (this->getOrientationMode() == UI_VIEW_ORIENTATION_MODE_PORTRAIT)
                {
                        //Portrait
-                       Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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<br>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<br>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");
index 8227c3bc65b75915a41e51e79f6120c2c9e71018..75514364cba7a2f9737d21f140feffc7da3d71ec 100644 (file)
@@ -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<Elm_Object_Item *>(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<br>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<br>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");
index 9de4d0f6cf7425c0f4d5daf2c37f42c074edbd6a..e63484ffbdeb3cd7f1ff50ec59dee3c39255ac92 100644 (file)
@@ -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<UiPopup *>(data);
@@ -35,28 +35,28 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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<page12 *>(data);
-                                       view->createPopup();
-                               },
-                               this);
+                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                               {
+                                                                                       auto view = static_cast<page12 *>(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();
index 58cc934d83c5b924c3126adab9275995806bef47..0fb20fe8cd4394ac6e73c1744d5d4644c5d415b5 100644 (file)
@@ -28,17 +28,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
index 5f73807a70a183b00480ae3077c5682dbca3d25f..f13f7c06d7a71a3786d3cee7718c778f697a5b8a 100644 (file)
@@ -28,17 +28,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
index 35d081d3988b834694218090f7bc29e64650c19b..d8c0414a7b51baef40d64150107b9daf09206a30 100644 (file)
@@ -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");
index 0f311a00f4b758f23bd30350e6a33f6c962f054c..d965df7da3aa6c9872836b0ac0a6ff800f5152d4 100644 (file)
@@ -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<UiStandardView *>(data);
-                                       view->setTitleVisible(true, false);
-                               },
-                               //Title Hide Button Callback
-                               [](void *data, Evas_Object *obj, void *event_info) -> void
-                               {
-                                       auto view = static_cast<UiStandardView *>(data);
-                                       view->setTitleVisible(false, false);
-                               },
-                               //Title Show Anim Button Callback
-                               [](void *data, Evas_Object *obj, void *event_info) -> void
-                               {
-                                       auto view = static_cast<UiStandardView *>(data);
-                                       view->setTitleVisible(true, true);
-                               },
-                               //Title Hide Anim Button Callback
-                               [](void *data, Evas_Object *obj, void *event_info) -> void
-                               {
-                                       auto view = static_cast<UiStandardView *>(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<UiStandardView *>(data);
+                                                                                               view->setTitleVisible(true, false);
+                                                                                       },
+                                                                                       //Title Hide Button Callback
+                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       {
+                                                                                               auto view = static_cast<UiStandardView *>(data);
+                                                                                               view->setTitleVisible(false, false);
+                                                                                       },
+                                                                                       //Title Show Anim Button Callback
+                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       {
+                                                                                               auto view = static_cast<UiStandardView *>(data);
+                                                                                               view->setTitleVisible(true, true);
+                                                                                       },
+                                                                                       //Title Hide Anim Button Callback
+                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       {
+                                                                                               auto view = static_cast<UiStandardView *>(data);
+                                                                                               view->setTitleVisible(false, true);
+                                                                                       }, this);
 
                //Set title text, content
                this->setTitle("Page16");
index bb9695cbc03875e5a656b4a826561d87cb1104c1..77fd5cf563ccf0e7cd05bbbdfd66e591bee5db41 100644 (file)
@@ -26,17 +26,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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());
index 05c0345448e47196133e2e68ee28cf6567edc75b..fc74c0a1b878e4598161e5124cdbb6fc0b8df4ab 100644 (file)
@@ -26,17 +26,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
index bd5e894a2bd5e2fc325c630b22807b87529ca749..38f5210b9393d178ac8e235cb3913808f721501f 100644 (file)
@@ -27,17 +27,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
index 4cc5a55e3de168d6a1608bb6f98542402ccbd698..57e087ef8a42b019e412fc4124a337ae4e7fa9e1 100644 (file)
@@ -26,17 +26,17 @@ protected:
                UiView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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);
index befcdecf0bbc212f12bceea61313b54694bbd057..97b874eabdc29d0c5c46495b17902e0a47090fe1 100644 (file)
@@ -25,17 +25,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
 
index 8a87f3f4ddf7a32a942718b7420b95e281e6a39e..f774fe41321b613bf040e0f4a7b9750fa1682abd 100644 (file)
@@ -25,17 +25,17 @@ protected:
                UiStandardView::onLoad();
 
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
 
index 3677cae3360b0b53f7c8e3efe96cfbfc78dd8e61..3f62b5257f586b5701c38fd942c89ce3cb45359d 100644 (file)
@@ -23,17 +23,17 @@ public:
        page8() : UiStandardView("page8")
        {
                //Create a main content.
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr++ Demo<br>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<br>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");
index 14a4396652278a559c8ea7fb94c7987577cd3b02..2ad3a5c12decf01308efe69f2bcf04cf291bc8b4 100644 (file)
@@ -36,17 +36,17 @@ protected:
        {
                UiStandardView::onPortrait();
 
-               Evas_Object *content = createContent(this->getBase(), "ViewMgr Demo<br>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<br>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<br>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<br>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");
index 6be6255a353fee902a58be5b4611d87c49d212f8..a5599589b975710249dd46f2e9e6df298efde154 100644 (file)
@@ -82,7 +82,7 @@ protected:
         *
         *  @return key grabber object.
         */
-       Evas_Object *getKeygrabObj();
+       Eo *getKeygrabObj();
 
 public:
        _UI_DISABLE_COPY_AND_ASSIGN(UiBaseKeyListener);
index b95a5fec5dc97b41f14c94e4c453c0230a376fa4..fa6f1b999707b3b53771e1b220d83bd24e656ffb 100644 (file)
@@ -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.
index b3cfc445a18f4151304fa36c2fc6ed0a6a20a608..e190d190fc3be604ed369ad78ea555b31d7762a0 100644 (file)
 #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"
index 4d2d998e7d4d41ebf667849e4c24a2bb92257414..c81369500c690961d486127159adca0eb3f721d5 100644 (file)
@@ -174,7 +174,7 @@ public:
         *
         *  @return The base object of this viewmgr.
         */
-       Evas_Object *getBase();
+       Eo *getBase();
 
 protected:
        /**
index e989f4b5d4d1d747fbb8cd40575eb349ce5a2e72..5c10e93e94426e5420fc5a73996646c732b2ebb0 100644 (file)
@@ -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.
index dc6d4f59a64d121d354facc3c456ebb71a6528bf..cb8de5b1975631d98d2a88b788e93f890d2ec7ea 100644 (file)
@@ -103,7 +103,7 @@ public:
         *
         *  @return base object of UiPopup.
         */
-       virtual Evas_Object *getBase();
+       virtual Eo *getBase();
 
        /**
         *  @brief Get current popup's degree.
index e3db2976641cf9470a07b574053ca2735a6c62aa..3618158f81b4e8a1d184af1c477cdd95219e35dd 100644 (file)
@@ -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:
        /**
index fc71615f98f4763f563c99b9e41095243ac1d6af..aed38a852fa8956090f5c752641e83e06323339d 100644 (file)
@@ -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.
index ec23f7e38b67cde5306d1d319cf903517deced34..54a5d2f0f5bb3b7a1ca53f34a41d5c402b18fb76 100644 (file)
 #include <app.h>
 #include <dlog.h>
 
-//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;
index 91b495659c5d4d1016927ac59a6324a553206c24..0c98a58e324d4513ce7010df65cc3637b082f253 100644 (file)
@@ -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.
index 895d8b9b496094fc55e374ae002cd95c5bb183f9..827870802f8e0871d9d5978cab21736e395a69b0 100644 (file)
@@ -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.
index 9fe7e0ba6b80ed5b6e8a0934dc563eef21f56b54..947ba5eb19c234de1e7c76ac65bb803aa8c107a7 100644 (file)
@@ -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.
index cc94d322007e0722a386938f8ea74d7aae32284e..7854b6b8bdf833bce103a477b55abded944d6f58 100644 (file)
@@ -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.
index e60f9849b3082327e6c0150abf86c833d4f0daa3..6307a0175f2f14b162b33aef1f04c21dbce2c811 100644 (file)
@@ -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.
         *
index bddc3ae152cb37f4269bd537dd2ae6175434fa5e..4ea53430721207230fbe4ec23133f1fe9dde902a 100644 (file)
@@ -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.
         *
index 3a9e3f779508c799b83e9c9a9760ed6f9dcd67b0..de0a360113fe7cbea0f2286e9dfdbcbcc4723023 100644 (file)
@@ -24,7 +24,7 @@
 
 #if UI_EFL
        #include <Elementary.h>
-       using T = Evas_Object*;
+       using T = Eo*;
 #elif UI_DALI
 #endif