From 9d922d60d09000ee1787d7e8272cecdebe6f6260 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 30 Nov 2016 19:54:38 +0900 Subject: [PATCH] Renamed internal class names. Using two types of class convention makes us confuse... Change-Id: Ifa46d829b38755b9dd35265a76f6a090a030dfd7 --- .../efl/mobile/c/_ui_common_view_capi.h | 6 +- src/lib/efl/mobile/c/ui_standard_view.cpp | 68 +++++++++--------- src/lib/efl/mobile/c/ui_tab_view.cpp | 70 +++++++++---------- src/lib/efl/mobile/c/ui_view.cpp | 40 +++++------ 4 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/include/efl/mobile/c/_ui_common_view_capi.h b/src/include/efl/mobile/c/_ui_common_view_capi.h index 7a6a97a..8ff70ac 100644 --- a/src/include/efl/mobile/c/_ui_common_view_capi.h +++ b/src/include/efl/mobile/c/_ui_common_view_capi.h @@ -22,7 +22,7 @@ namespace efl_viewmanager { -class ui_common_view_capi +class UiCommonViewCapi { public: //TODO: Optimize memory? We don't need all slots. @@ -31,11 +31,11 @@ public: const char *type = nullptr; - ui_common_view_capi(const char *type) : type(type) + UiCommonViewCapi(const char *type) : type(type) { } - ~ui_common_view_capi() + ~UiCommonViewCapi() { } }; diff --git a/src/lib/efl/mobile/c/ui_standard_view.cpp b/src/lib/efl/mobile/c/ui_standard_view.cpp index 205a666..bdf0a0d 100644 --- a/src/lib/efl/mobile/c/ui_standard_view.cpp +++ b/src/lib/efl/mobile/c/ui_standard_view.cpp @@ -5,7 +5,7 @@ static const char *_this_type = "ui_standard_view"; -class ui_standard_view_capi: public ui_standard_view, public ui_common_view_capi +class UiStandardViewCapi: public UiStandardView, public UiCommonViewCapi { public: void onLoad() override @@ -15,7 +15,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_LOAD](this, this->event_data[UI_VIEW_EVENT_LOAD])) return; } - ui_standard_view::onLoad(); + UiStandardView::onLoad(); if (this->event_cb[UI_VIEW_EVENT_LOAD_POST]) { @@ -30,7 +30,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_UNLOAD](this, this->event_data[UI_VIEW_EVENT_UNLOAD])) return; } - ui_standard_view::onUnload(); + UiStandardView::onUnload(); if (this->event_cb[UI_VIEW_EVENT_UNLOAD_POST]) { @@ -45,7 +45,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_PAUSE](this, this->event_data[UI_VIEW_EVENT_PAUSE])) return; } - ui_standard_view::onPause(); + UiStandardView::onPause(); if (this->event_cb[UI_VIEW_EVENT_PAUSE_POST]) { @@ -60,7 +60,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_RESUME](this, this->event_data[UI_VIEW_EVENT_RESUME])) return; } - ui_standard_view::onResume(); + UiStandardView::onResume(); if (this->event_cb[UI_VIEW_EVENT_RESUME_POST]) { @@ -75,7 +75,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_ACTIVATE](this, this->event_data[UI_VIEW_EVENT_ACTIVATE])) return; } - ui_standard_view::onActivate(); + UiStandardView::onActivate(); if (this->event_cb[UI_VIEW_EVENT_ACTIVATE_POST]) { @@ -90,7 +90,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_DEACTIVATE](this, this->event_data[UI_VIEW_EVENT_DEACTIVATE])) return; } - ui_standard_view::onDeactivate(); + UiStandardView::onDeactivate(); if (this->event_cb[UI_VIEW_EVENT_DEACTIVATE_POST]) { @@ -105,7 +105,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_DESTROY](this, this->event_data[UI_VIEW_EVENT_DESTROY])) return; } - ui_standard_view::onDestroy(); + UiStandardView::onDestroy(); if (this->event_cb[UI_VIEW_EVENT_DESTROY_POST]) { @@ -120,7 +120,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_PORTRAIT])(this, this->event_data[UI_VIEW_EVENT_PORTRAIT])) return; } - ui_standard_view::onPortrait(); + UiStandardView::onPortrait(); if (this->event_cb[UI_VIEW_EVENT_PORTRAIT_POST]) { @@ -135,7 +135,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_LANDSCAPE])(this, this->event_data[UI_VIEW_EVENT_LANDSCAPE])) return; } - ui_standard_view::onLandscape(); + UiStandardView::onLandscape(); if (this->event_cb[UI_VIEW_EVENT_LANDSCAPE_POST]) { @@ -150,7 +150,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_ROTATE])(this, this->event_data[UI_VIEW_EVENT_ROTATE])) return; } - ui_standard_view::onRotate(degree); + UiStandardView::onRotate(degree); if (this->event_cb[UI_VIEW_EVENT_ROTATE_POST]) { @@ -165,7 +165,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_BACK])(this, this->event_data[UI_VIEW_EVENT_BACK])) return; } - ui_standard_view::onBack(); + UiStandardView::onBack(); if (this->event_cb[UI_VIEW_EVENT_BACK_POST]) { @@ -180,7 +180,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_MENU])(this, this->event_data[UI_VIEW_EVENT_MENU])) return; } - ui_standard_view::onMenu(menu); + UiStandardView::onMenu(menu); if (this->event_cb[UI_VIEW_EVENT_MENU_POST]) { @@ -188,22 +188,22 @@ public: } } - ui_standard_view_capi(const char *name) - : ui_standard_view(name), ui_common_view_capi(_this_type) + UiStandardViewCapi(const char *name) + : UiStandardView(name), UiCommonViewCapi(_this_type) { } - ~ui_standard_view_capi() + ~UiStandardViewCapi() { } }; struct ui_standard_view_s { - ui_standard_view_capi *p; + UiStandardViewCapi *p; }; -static ui_standard_view_capi *validate_view(const ui_standard_view *view) +static UiStandardViewCapi *validate_view(const ui_standard_view *view) { if (!view) { @@ -212,7 +212,7 @@ static ui_standard_view_capi *validate_view(const ui_standard_view *view) return nullptr; } - auto capi_view = dynamic_cast(const_cast(view)); + auto capi_view = dynamic_cast(const_cast(view)); if (!capi_view) { LOGE("Invalid ui_standard_view = %p. Probably, you passed other type of view, not ui_tab_view.", view); @@ -224,7 +224,7 @@ static ui_standard_view_capi *validate_view(const ui_standard_view *view) EAPI ui_standard_view* ui_standard_view_create(const char *name) { - ui_standard_view *view = new ui_standard_view_capi(name); + ui_standard_view *view = new UiStandardViewCapi(name); if (!view) { @@ -234,12 +234,12 @@ EAPI ui_standard_view* ui_standard_view_create(const char *name) } set_last_result(UI_VIEWMGR_ERROR_NONE); - return new ui_standard_view_capi(name); + return new UiStandardViewCapi(name); } EAPI int ui_standard_view_set_title(ui_standard_view *view, const char *text) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitle(text); @@ -247,7 +247,7 @@ EAPI int ui_standard_view_set_title(ui_standard_view *view, const char *text) EAPI int ui_standard_view_set_sub_title(ui_standard_view *view, const char *text) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setSubtitle(text); @@ -255,7 +255,7 @@ EAPI int ui_standard_view_set_sub_title(ui_standard_view *view, const char *text EAPI int ui_standard_view_set_title_badge(ui_standard_view *view, const char *badge_text) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleBadge(badge_text); @@ -263,7 +263,7 @@ EAPI int ui_standard_view_set_title_badge(ui_standard_view *view, const char *ba EAPI int ui_standard_view_set_title_right_btn(ui_standard_view *view, Eo *title_right_btn) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleRightBtn(title_right_btn); @@ -271,7 +271,7 @@ EAPI int ui_standard_view_set_title_right_btn(ui_standard_view *view, Eo *title_ EAPI Elm_Button *ui_standard_view_get_title_right_btn(const ui_standard_view *view) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) { set_last_result(UI_VIEWMGR_ERROR_INVALID_PARAMETER); @@ -284,7 +284,7 @@ EAPI Elm_Button *ui_standard_view_get_title_right_btn(const ui_standard_view *vi EAPI Elm_Button *ui_standard_view_unset_title_right_btn(ui_standard_view *view) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return nullptr; return capi_view->unsetTitleRightBtn(); @@ -292,7 +292,7 @@ EAPI Elm_Button *ui_standard_view_unset_title_right_btn(ui_standard_view *view) EAPI int ui_standard_view_set_title_left_btn(ui_standard_view *view, Eo *title_left_btn) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleLeftBtn(title_left_btn); @@ -300,7 +300,7 @@ EAPI int ui_standard_view_set_title_left_btn(ui_standard_view *view, Eo *title_l EAPI Elm_Button *ui_standard_view_get_title_left_btn(const ui_standard_view *view) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return nullptr; set_last_result(UI_VIEWMGR_ERROR_NONE); @@ -309,7 +309,7 @@ EAPI Elm_Button *ui_standard_view_get_title_left_btn(const ui_standard_view *vie EAPI Elm_Button *ui_standard_view_unset_title_left_btn(ui_standard_view *view) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return nullptr; return capi_view->unsetTitleLeftBtn(); @@ -317,7 +317,7 @@ EAPI Elm_Button *ui_standard_view_unset_title_left_btn(ui_standard_view *view) EAPI int ui_standard_view_set_toolbar(ui_standard_view *view, Elm_Toolbar *toolbar) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setToolbar(toolbar); @@ -325,7 +325,7 @@ EAPI int ui_standard_view_set_toolbar(ui_standard_view *view, Elm_Toolbar *toolb EAPI Elm_Toolbar *ui_standard_view_get_toolbar(const ui_standard_view *view) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return nullptr; set_last_result(UI_VIEWMGR_ERROR_NONE); @@ -334,7 +334,7 @@ EAPI Elm_Toolbar *ui_standard_view_get_toolbar(const ui_standard_view *view) EAPI Elm_Toolbar *ui_standard_view_unset_toolbar(ui_standard_view *view) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return nullptr; return capi_view->unsetToolbar(); @@ -342,7 +342,7 @@ EAPI Elm_Toolbar *ui_standard_view_unset_toolbar(ui_standard_view *view) EAPI int ui_standard_view_set_title_visible(ui_standard_view *view, bool visible, bool anim) { - ui_standard_view_capi *capi_view = validate_view(view); + UiStandardViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTitleVisible(visible, anim); diff --git a/src/lib/efl/mobile/c/ui_tab_view.cpp b/src/lib/efl/mobile/c/ui_tab_view.cpp index 5016227..f8f7138 100644 --- a/src/lib/efl/mobile/c/ui_tab_view.cpp +++ b/src/lib/efl/mobile/c/ui_tab_view.cpp @@ -5,7 +5,7 @@ static const char *_this_type = "ui_tab_view"; -class ui_tab_view_capi: public ui_tab_view, public ui_common_view_capi +class UiTabViewCapi: public UiTabView, public UiCommonViewCapi { public: ui_tab_view_event_cb tab_event_cb[_NUM_OF_UI_TAB_VIEW_EVENT_TYPE] = {nullptr, }; @@ -18,7 +18,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_LOAD](this, this->event_data[UI_VIEW_EVENT_LOAD])) return; } - ui_tab_view::onLoad(); + UiTabView::onLoad(); if (this->event_cb[UI_VIEW_EVENT_LOAD_POST]) { @@ -33,7 +33,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_UNLOAD](this, this->event_data[UI_VIEW_EVENT_UNLOAD])) return; } - ui_tab_view::onUnload(); + UiTabView::onUnload(); if (this->event_cb[UI_VIEW_EVENT_UNLOAD_POST]) { @@ -48,7 +48,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_PAUSE](this, this->event_data[UI_VIEW_EVENT_PAUSE])) return; } - ui_tab_view::onPause(); + UiTabView::onPause(); if (this->event_cb[UI_VIEW_EVENT_PAUSE_POST]) { @@ -63,7 +63,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_RESUME](this, this->event_data[UI_VIEW_EVENT_RESUME])) return; } - ui_tab_view::onResume(); + UiTabView::onResume(); if (this->event_cb[UI_VIEW_EVENT_RESUME_POST]) { @@ -78,7 +78,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_ACTIVATE](this, this->event_data[UI_VIEW_EVENT_ACTIVATE])) return; } - ui_tab_view::onActivate(); + UiTabView::onActivate(); if (this->event_cb[UI_VIEW_EVENT_ACTIVATE_POST]) { @@ -93,7 +93,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_DEACTIVATE](this, this->event_data[UI_VIEW_EVENT_DEACTIVATE])) return; } - ui_tab_view::onDeactivate(); + UiTabView::onDeactivate(); if (this->event_cb[UI_VIEW_EVENT_DEACTIVATE_POST]) { @@ -108,7 +108,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_DESTROY](this, this->event_data[UI_VIEW_EVENT_DESTROY])) return; } - ui_tab_view::onDestroy(); + UiTabView::onDestroy(); if (this->event_cb[UI_VIEW_EVENT_DESTROY_POST]) { @@ -123,7 +123,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_PORTRAIT])(this, this->event_data[UI_VIEW_EVENT_PORTRAIT])) return; } - ui_tab_view::onPortrait(); + UiTabView::onPortrait(); if (this->event_cb[UI_VIEW_EVENT_PORTRAIT_POST]) { @@ -138,7 +138,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_LANDSCAPE])(this, this->event_data[UI_VIEW_EVENT_LANDSCAPE])) return; } - ui_tab_view::onLandscape(); + UiTabView::onLandscape(); if (this->event_cb[UI_VIEW_EVENT_LANDSCAPE_POST]) { @@ -153,7 +153,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_ROTATE])(this, this->event_data[UI_VIEW_EVENT_ROTATE])) return; } - ui_tab_view::onRotate(degree); + UiTabView::onRotate(degree); if (this->event_cb[UI_VIEW_EVENT_ROTATE_POST]) { @@ -168,7 +168,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_BACK])(this, this->event_data[UI_VIEW_EVENT_BACK])) return; } - ui_tab_view::onBack(); + UiTabView::onBack(); if (this->event_cb[UI_VIEW_EVENT_BACK_POST]) { @@ -183,7 +183,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_MENU])(this, this->event_data[UI_VIEW_EVENT_MENU])) return; } - ui_tab_view::onMenu(menu); + UiTabView::onMenu(menu); if (this->event_cb[UI_VIEW_EVENT_MENU_POST]) { @@ -191,12 +191,12 @@ public: } } - ui_tab_view_capi(const char *name) - : ui_tab_view(name), ui_common_view_capi(_this_type) + UiTabViewCapi(const char *name) + : UiTabView(name), UiCommonViewCapi(_this_type) { } - ~ui_tab_view_capi() + ~UiTabViewCapi() { } @@ -221,10 +221,10 @@ protected: struct ui_tab_view_s { - ui_tab_view_capi *p; + UiTabViewCapi *p; }; -static ui_tab_view_capi *validate_view(const ui_tab_view *view) +static UiTabViewCapi *validate_view(const ui_tab_view *view) { if (!view) { @@ -233,7 +233,7 @@ static ui_tab_view_capi *validate_view(const ui_tab_view *view) return nullptr; } - auto capi_view = dynamic_cast(const_cast(view)); + auto capi_view = dynamic_cast(const_cast(view)); if (!capi_view) { LOGE("Invalid ui_tab_view = %p. Probably, you passed other type of view, not ui_tab_view.", view); @@ -245,7 +245,7 @@ static ui_tab_view_capi *validate_view(const ui_tab_view *view) EAPI int ui_tab_view_set_event_cb(ui_tab_view *view, ui_tab_view_event_type_e event_type, ui_tab_view_event_cb event_cb, void *user_data) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; if (event_type < UI_TAB_ACTIVATED || event_type >= _NUM_OF_UI_TAB_VIEW_EVENT_TYPE) @@ -263,7 +263,7 @@ EAPI int ui_tab_view_set_event_cb(ui_tab_view *view, ui_tab_view_event_type_e ev EAPI ui_tab_view *ui_tab_view_create(const char *name) { - ui_tab_view *view = new ui_tab_view_capi(name); + ui_tab_view *view = new UiTabViewCapi(name); if (!view) { @@ -273,12 +273,12 @@ EAPI ui_tab_view *ui_tab_view_create(const char *name) } set_last_result(UI_VIEWMGR_ERROR_NONE); - return new ui_tab_view_capi(name); + return new UiTabViewCapi(name); } EAPI int ui_tab_view_add_tab(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->addTab(id); @@ -286,7 +286,7 @@ EAPI int ui_tab_view_add_tab(ui_tab_view *view, int id) EAPI int ui_tab_view_set_tab_icon(ui_tab_view *view, int id, const char *icon) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTabIcon(id, icon); @@ -294,7 +294,7 @@ EAPI int ui_tab_view_set_tab_icon(ui_tab_view *view, int id, const char *icon) EAPI int ui_tab_view_set_tab_label(ui_tab_view *view, int id, const char *label) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTabLabel(id, label); @@ -302,7 +302,7 @@ EAPI int ui_tab_view_set_tab_label(ui_tab_view *view, int id, const char *label) EAPI int ui_tab_view_set_tab_content(ui_tab_view *view, int id, Eo *content) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->setTabContent(id, content); @@ -310,7 +310,7 @@ EAPI int ui_tab_view_set_tab_content(ui_tab_view *view, int id, Eo *content) EAPI const char *ui_tab_view_get_tab_icon(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return NULL; return capi_view->getTabIcon(id); @@ -318,7 +318,7 @@ EAPI const char *ui_tab_view_get_tab_icon(ui_tab_view *view, int id) EAPI const char *ui_tab_view_get_tab_label(ui_tab_view *view,int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return NULL; return capi_view->getTabLabel(id); @@ -326,7 +326,7 @@ EAPI const char *ui_tab_view_get_tab_label(ui_tab_view *view,int id) EAPI Eo *ui_tab_view_get_tab_content(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return NULL; return capi_view->getTabContent(id); @@ -334,7 +334,7 @@ EAPI Eo *ui_tab_view_get_tab_content(ui_tab_view *view, int id) EAPI const char *ui_tab_view_unset_tab_icon(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return NULL; return capi_view->unsetTabIcon(id); @@ -342,7 +342,7 @@ EAPI const char *ui_tab_view_unset_tab_icon(ui_tab_view *view, int id) EAPI const char *ui_tab_view_unset_tab_label(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return NULL; return capi_view->unsetTabLabel(id); @@ -350,7 +350,7 @@ EAPI const char *ui_tab_view_unset_tab_label(ui_tab_view *view, int id) EAPI Eo *ui_tab_view_unset_tab_content(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return NULL; return capi_view->unsetTabContent(id); @@ -359,7 +359,7 @@ EAPI Eo *ui_tab_view_unset_tab_content(ui_tab_view *view, int id) EAPI int ui_tab_view_select_tab(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->selectTab(id); @@ -367,7 +367,7 @@ EAPI int ui_tab_view_select_tab(ui_tab_view *view, int id) EAPI int ui_tab_view_get_selected_tab(ui_tab_view *view) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->getSelectedTab(); @@ -375,7 +375,7 @@ EAPI int ui_tab_view_get_selected_tab(ui_tab_view *view) EAPI int ui_tab_view_remove_tab(ui_tab_view *view, int id) { - ui_tab_view_capi *capi_view = validate_view(view); + UiTabViewCapi *capi_view = validate_view(view); if (!capi_view) return UI_VIEWMGR_ERROR_INVALID_PARAMETER; return capi_view->removeTab(id); diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp index 2f3730b..b9e925d 100644 --- a/src/lib/efl/mobile/c/ui_view.cpp +++ b/src/lib/efl/mobile/c/ui_view.cpp @@ -4,7 +4,7 @@ static const char *_this_type = "ui_view"; -class ui_view_capi: public ui_view, public ui_common_view_capi +class UiViewCapi: public UiView, public UiCommonViewCapi { public: void onLoad() override @@ -14,7 +14,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_LOAD](this, this->event_data[UI_VIEW_EVENT_LOAD])) return; } - ui_view::onLoad(); + UiView::onLoad(); if (this->event_cb[UI_VIEW_EVENT_LOAD_POST]) { @@ -29,7 +29,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_UNLOAD](this, this->event_data[UI_VIEW_EVENT_UNLOAD])) return; } - ui_view::onUnload(); + UiView::onUnload(); if (this->event_cb[UI_VIEW_EVENT_UNLOAD_POST]) { @@ -44,7 +44,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_PAUSE](this, this->event_data[UI_VIEW_EVENT_PAUSE])) return; } - ui_view::onPause(); + UiView::onPause(); if (this->event_cb[UI_VIEW_EVENT_PAUSE_POST]) { @@ -59,7 +59,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_RESUME](this, this->event_data[UI_VIEW_EVENT_RESUME])) return; } - ui_view::onResume(); + UiView::onResume(); if (this->event_cb[UI_VIEW_EVENT_RESUME_POST]) { @@ -74,7 +74,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_ACTIVATE](this, this->event_data[UI_VIEW_EVENT_ACTIVATE])) return; } - ui_view::onActivate(); + UiView::onActivate(); if (this->event_cb[UI_VIEW_EVENT_ACTIVATE_POST]) { @@ -89,7 +89,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_DEACTIVATE](this, this->event_data[UI_VIEW_EVENT_DEACTIVATE])) return; } - ui_view::onDeactivate(); + UiView::onDeactivate(); if (this->event_cb[UI_VIEW_EVENT_DEACTIVATE_POST]) { @@ -104,7 +104,7 @@ public: if (!this->event_cb[UI_VIEW_EVENT_DESTROY](this, this->event_data[UI_VIEW_EVENT_DESTROY])) return; } - ui_view::onDestroy(); + UiView::onDestroy(); if (this->event_cb[UI_VIEW_EVENT_DESTROY_POST]) { @@ -119,7 +119,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_PORTRAIT])(this, this->event_data[UI_VIEW_EVENT_PORTRAIT])) return; } - ui_view::onPortrait(); + UiView::onPortrait(); if (this->event_cb[UI_VIEW_EVENT_PORTRAIT_POST]) { @@ -134,7 +134,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_LANDSCAPE])(this, this->event_data[UI_VIEW_EVENT_LANDSCAPE])) return; } - ui_view::onLandscape(); + UiView::onLandscape(); if (this->event_cb[UI_VIEW_EVENT_LANDSCAPE_POST]) { @@ -149,7 +149,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_ROTATE])(this, this->event_data[UI_VIEW_EVENT_ROTATE])) return; } - ui_view::onRotate(degree); + UiView::onRotate(degree); if (this->event_cb[UI_VIEW_EVENT_ROTATE_POST]) { @@ -164,7 +164,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_BACK])(this, this->event_data[UI_VIEW_EVENT_BACK])) return; } - ui_view::onBack(); + UiView::onBack(); if (this->event_cb[UI_VIEW_EVENT_BACK_POST]) { @@ -179,7 +179,7 @@ public: if (!(*this->event_cb[UI_VIEW_EVENT_MENU])(this, this->event_data[UI_VIEW_EVENT_MENU])) return; } - ui_view::onMenu(menu); + UiView::onMenu(menu); if (this->event_cb[UI_VIEW_EVENT_MENU_POST]) { @@ -187,19 +187,19 @@ public: } } - ui_view_capi(const char *name) - : ui_view(name), ui_common_view_capi(_this_type) + UiViewCapi(const char *name) + : UiView(name), UiCommonViewCapi(_this_type) { } - ~ui_view_capi() + ~UiViewCapi() { } }; struct ui_view_s { - ui_view_capi *p; + UiViewCapi *p; }; static int validate_view(const ui_view *view) @@ -215,7 +215,7 @@ static int validate_view(const ui_view *view) EAPI ui_view* ui_view_create(const char *name) { - ui_view *view = new ui_view_capi(name); + ui_view *view = new UiViewCapi(name); if (!view) { @@ -239,7 +239,7 @@ EAPI int ui_view_set_event_cb(ui_view *view, ui_view_event_type_e event_type, ui return UI_VIEWMGR_ERROR_INVALID_PARAMETER; } - auto event_attr = dynamic_cast(view); + auto event_attr = dynamic_cast(view); if (!event_attr) { LOGE("This view(%p) doesn't allow event callback?!"); @@ -403,5 +403,5 @@ EAPI const char *ui_view_get_type(ui_view *view) if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return false; set_last_result(UI_VIEWMGR_ERROR_NONE); - return dynamic_cast(view)->type; + return dynamic_cast(view)->type; } -- 2.34.1