From: Hermet Park Date: Wed, 2 Nov 2016 06:37:12 +0000 (+0900) Subject: apply const specifiers. X-Git-Tag: submit/tizen_3.0/20161104.045713^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2ecd70a22327313ffb2c11f1350d2be4002ed49;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git apply const specifiers. Change-Id: Ifd6b7969c699ebdad05dde3f7b630222593ecfc2 --- diff --git a/src/include/efl/UiBaseView.h b/src/include/efl/UiBaseView.h index a0c188c..0393f67 100644 --- a/src/include/efl/UiBaseView.h +++ b/src/include/efl/UiBaseView.h @@ -69,7 +69,7 @@ public: * * @return The base object of view */ - virtual Eo *getBase(); + virtual Eo *getBase() const; /** * @brief Set the indicator mode. @@ -106,7 +106,7 @@ public: * * @return Current rotation degree, -1 if it fails to get degree information */ - virtual int getDegree() override; + virtual int getDegree() const override; protected: /** @@ -116,7 +116,7 @@ protected: * * @return The base layout object of viewmgr. */ - Eo *getParent(); + Eo *getParent() const; /** * @brief Toggle event block. diff --git a/src/include/efl/UiBaseViewmgr.h b/src/include/efl/UiBaseViewmgr.h index ebe4bed..6c22684 100644 --- a/src/include/efl/UiBaseViewmgr.h +++ b/src/include/efl/UiBaseViewmgr.h @@ -204,7 +204,7 @@ public: * * @return The base object of this viewmgr. */ - Eo *getBase(); + Eo *getBase() const; protected: /** diff --git a/src/include/efl/mobile/UiMenu.h b/src/include/efl/mobile/UiMenu.h index 692ad39..b77fc39 100644 --- a/src/include/efl/mobile/UiMenu.h +++ b/src/include/efl/mobile/UiMenu.h @@ -91,7 +91,7 @@ public: * @see activate() * @see deactivate() */ - virtual bool isActivated() override; + virtual bool isActivated() const override; /** * @brief Gets a base object of menu. @@ -99,14 +99,14 @@ public: * * @return base object of menu */ - virtual Eo *getBase(); + virtual Eo *getBase() const; /** * @brief Get a current menu's degree. * * @return Current rotation degree, -1 if it fails to get degree information. */ - virtual int getDegree() override; + virtual int getDegree() const override; protected: /** @@ -124,7 +124,7 @@ protected: * * @return viewmgr's window object. */ - Elm_Win *getWindow(); + Elm_Win *getWindow() const; public: _UI_DISABLE_DEFAULT_CTOR(UiMenu); diff --git a/src/include/efl/mobile/UiPopup.h b/src/include/efl/mobile/UiPopup.h index 3334325..28b0449 100644 --- a/src/include/efl/mobile/UiPopup.h +++ b/src/include/efl/mobile/UiPopup.h @@ -105,7 +105,7 @@ public: * @see activate() * @see deactivate() */ - virtual bool isActivated() override; + virtual bool isActivated() const override; /** * @brief Gets a base object of popup. @@ -113,14 +113,14 @@ public: * * @return base object of popup */ - virtual Eo *getBase(); + virtual Eo *getBase() const; /** * @brief Get current popup's degree. * * @return Current rotation degree, -1 if it fails to get degree information. */ - virtual int getDegree() override; + virtual int getDegree() const override; protected: /** @@ -128,7 +128,7 @@ protected: * * @return viewmgr's window object. */ - virtual Elm_Win *getWindow(); + virtual Elm_Win *getWindow() const; public: _UI_DISABLE_DEFAULT_CTOR(UiPopup); diff --git a/src/include/efl/mobile/UiStandardView.h b/src/include/efl/mobile/UiStandardView.h index c2e3bb0..0c918a9 100644 --- a/src/include/efl/mobile/UiStandardView.h +++ b/src/include/efl/mobile/UiStandardView.h @@ -205,7 +205,7 @@ public: * @see setTitleLeftBtn() * @see unsetTitleLeftBtn() */ - Elm_Button *getTitleLeftBtn(); + Elm_Button *getTitleLeftBtn() const; /** * @brief Returns a title right button of the view. @@ -215,7 +215,7 @@ public: * @see setTitleRightBtn() * @see unsetTitleRightBtn() */ - Elm_Button *getTitleRightBtn(); + Elm_Button *getTitleRightBtn() const; /** * @brief Returns a toolbar of the view. @@ -225,14 +225,14 @@ public: * @see setToolbar() * @see unsetToolbar() */ - Elm_Toolbar *getToolbar(); + Elm_Toolbar *getToolbar() const; /** * @brief Get a base layout of viewmgr. * * @return viewmgr's base layout object. */ - virtual Eo *getBase() override; + virtual Eo *getBase() const override; protected: /** diff --git a/src/include/efl/mobile/UiView.h b/src/include/efl/mobile/UiView.h index 5abc1fd..72c7172 100644 --- a/src/include/efl/mobile/UiView.h +++ b/src/include/efl/mobile/UiView.h @@ -59,7 +59,7 @@ public: * * @return The menu object that connected with this view. If it doesn't, @c nullptr will be returned. */ - const UiMenu *getMenu(); + const UiMenu *getMenu() const; /** * @brief Gets current view's orientation mode. @@ -68,7 +68,7 @@ public: * * @see UiViewOrientationMode */ - virtual UiViewOrientationMode getOrientationMode() override; + virtual UiViewOrientationMode getOrientationMode() const override; protected: /** diff --git a/src/include/efl/mobile/c/ui_menu.h b/src/include/efl/mobile/c/ui_menu.h index 14808ae..21234ed 100644 --- a/src/include/efl/mobile/c/ui_menu.h +++ b/src/include/efl/mobile/c/ui_menu.h @@ -44,7 +44,7 @@ EAPI int ui_menu_set_content(ui_menu *menu, Elm_Ctxpopup *content); * @see ui_menu_unset_content() * @see get_last_result() */ -EAPI Elm_Ctxpopup *ui_menu_get_content(ui_menu *menu); +EAPI Elm_Ctxpopup *ui_menu_get_content(const ui_menu *menu); /** * @brief Unsets an ui_menu content. @@ -112,7 +112,7 @@ EAPI int ui_menu_deactivate(ui_menu *menu); * @see ui_menu_deactivate() * @see get_last_result() */ -EAPI bool ui_menu_get_activated(ui_menu *menu); +EAPI bool ui_menu_get_activated(const ui_menu *menu); /** * @brief Gets a base object of an ui_menu. @@ -129,7 +129,7 @@ EAPI bool ui_menu_get_activated(ui_menu *menu); * * @see get_last_result() */ -EAPI Eo *ui_menu_get_base(ui_menu *menu); +EAPI Eo *ui_menu_get_base(const ui_menu *menu); /** * @brief Gets a current ui_menu's degree. @@ -145,7 +145,7 @@ EAPI Eo *ui_menu_get_base(ui_menu *menu); * * @see get_last_result() */ -EAPI int ui_menu_get_degree(ui_menu *menu); +EAPI int ui_menu_get_degree(const ui_menu *menu); /** * @brief Returns a view which is matched with this ui_menu. @@ -161,7 +161,7 @@ EAPI int ui_menu_get_degree(ui_menu *menu); * * @see get_last_result() */ -EAPI ui_view *ui_menu_get_view(ui_menu *menu); +EAPI ui_view *ui_menu_get_view(const ui_menu *menu); /** * @} diff --git a/src/include/efl/mobile/c/ui_popup.h b/src/include/efl/mobile/c/ui_popup.h index 8239f79..5e76ef9 100644 --- a/src/include/efl/mobile/c/ui_popup.h +++ b/src/include/efl/mobile/c/ui_popup.h @@ -78,7 +78,7 @@ EAPI int ui_popup_set_content(ui_popup *popup, Elm_Popup *content); * @see ui_popup_unset_content() * @see get_last_result() */ -EAPI Elm_Popup *ui_popup_get_content(ui_popup *popup); +EAPI Elm_Popup *ui_popup_get_content(const ui_popup *popup); /** * @brief Unsets an ui_popup content. @@ -148,7 +148,7 @@ EAPI int ui_popup_deactivate(ui_popup *popup); * @see ui_popup_deactivate() * @see get_last_result() */ -EAPI bool ui_popup_get_activated(ui_popup *popup); +EAPI bool ui_popup_get_activated(const ui_popup *popup); /** * @brief Gets a base object of an ui_popup. @@ -165,7 +165,7 @@ EAPI bool ui_popup_get_activated(ui_popup *popup); * * @see get_last_result() */ -EAPI Eo *ui_popup_get_base(ui_popup *popup); +EAPI Eo *ui_popup_get_base(const ui_popup *popup); /** * @brief Gets current ui_popup's degree. @@ -181,7 +181,7 @@ EAPI Eo *ui_popup_get_base(ui_popup *popup); * * @see get_last_result() */ -EAPI int ui_popup_get_degree(ui_popup *popup); +EAPI int ui_popup_get_degree(const ui_popup *popup); /** * @brief Returns a view which is matched with the ui_popup. @@ -197,7 +197,7 @@ EAPI int ui_popup_get_degree(ui_popup *popup); * * @see get_last_result() */ -EAPI ui_view *ui_popup_get_view(ui_popup *popup); +EAPI ui_view *ui_popup_get_view(const ui_popup *popup); /** * @} diff --git a/src/include/efl/mobile/c/ui_standard_view.h b/src/include/efl/mobile/c/ui_standard_view.h index e97377a..bd645f8 100644 --- a/src/include/efl/mobile/c/ui_standard_view.h +++ b/src/include/efl/mobile/c/ui_standard_view.h @@ -112,7 +112,7 @@ EAPI int ui_standard_view_set_title_right_btn(ui_standard_view *view, Elm_Button * @see ui_standard_view_unset_title_right_btn() * @see get_last_result() */ -EAPI Elm_Button *ui_standard_view_get_title_right_btn(ui_standard_view *view); +EAPI Elm_Button *ui_standard_view_get_title_right_btn(const ui_standard_view *view); /** * @brief Unsets a title right button of title area. @@ -167,7 +167,7 @@ EAPI int ui_standard_view_set_title_left_btn(ui_standard_view *view, Elm_Button * @see ui_standard_view_unset_title_left_btn() * @see get_last_result() */ -EAPI Elm_Button *ui_standard_view_get_title_left_btn(ui_standard_view *view); +EAPI Elm_Button *ui_standard_view_get_title_left_btn(const ui_standard_view *view); /** * @brief Unsets a title left button of title area. @@ -223,7 +223,7 @@ EAPI int ui_standard_view_set_toolbar(ui_standard_view *view, Elm_Toolbar *toolb * @see ui_standard_view_unset_toolbar() * @see get_last_result() */ -EAPI Elm_Toolbar *ui_standard_view_get_toolbar(ui_standard_view *view); +EAPI Elm_Toolbar *ui_standard_view_get_toolbar(const ui_standard_view *view); /** * @brief Unsets a toolbar. diff --git a/src/include/efl/mobile/c/ui_view.h b/src/include/efl/mobile/c/ui_view.h index 56bff07..d2c323e 100644 --- a/src/include/efl/mobile/c/ui_view.h +++ b/src/include/efl/mobile/c/ui_view.h @@ -112,7 +112,7 @@ EAPI int ui_view_set_content(ui_view *view, Eo *content); * @see ui_view_unset_content() * @see get_last_result() */ -EAPI Eo *ui_view_get_content(ui_view *view); +EAPI Eo *ui_view_get_content(const ui_view *view); /** * @brief Unsets a ui_view content. @@ -164,7 +164,7 @@ EAPI int ui_view_set_event_cb(ui_view *view, ui_view_event_type_e event_type, ui * * @see get_last_result() */ -EAPI Eo* ui_view_get_base(ui_view *view); +EAPI Eo* ui_view_get_base(const ui_view *view); /** * @brief Sets the indicator mode of a ui_view. @@ -198,7 +198,7 @@ EAPI int ui_view_set_indicator(ui_view *view, ui_view_indicator indicator); * @see ui_view_get_indicator() * @see get_last_result() */ -EAPI ui_view_indicator ui_view_get_indicator(ui_view *view); +EAPI ui_view_indicator ui_view_get_indicator(const ui_view *view); /** * @brief Sets the array of view's available rotations. @@ -236,7 +236,7 @@ EAPI int ui_view_set_available_rotations(ui_view *view, const int *rotations, un * @see ui_view_set_available_rotations() * @see get_last_result() */ -EAPI const int *ui_view_get_available_rotations(ui_view *view, unsigned int *count); +EAPI const int *ui_view_get_available_rotations(const ui_view *view, unsigned int *count); /** * @brief Sets content removable. @@ -270,7 +270,7 @@ EAPI int ui_view_set_removable_content(ui_view *view, bool remove); * @see ui_view_get_removable_content() * @see get_last_result() */ -EAPI bool ui_view_get_removable_content(ui_view *view); +EAPI bool ui_view_get_removable_content(const ui_view *view); /** * @brief Gets the current view's degree. @@ -286,7 +286,7 @@ EAPI bool ui_view_get_removable_content(ui_view *view); * * @see get_last_result() */ -EAPI int ui_view_get_degree(ui_view *view); +EAPI int ui_view_get_degree(const ui_view *view); /** * @brief Gets current view's orientation mode. @@ -303,7 +303,7 @@ EAPI int ui_view_get_degree(ui_view *view); * @see ui_view_orientation_mode * @see get_last_result() */ -EAPI ui_view_orientation_mode ui_view_get_orientation_mode(ui_view *view); +EAPI ui_view_orientation_mode ui_view_get_orientation_mode(const ui_view *view); /** * @brief Sets transition style of a view. @@ -339,7 +339,7 @@ EAPI int ui_view_set_transition_style(ui_view *view, const char *style); * @see ui_view_set_transition_style() * @see get_last_result() */ -EAPI const char *ui_view_get_transition_style(ui_view *view); +EAPI const char *ui_view_get_transition_style(const ui_view *view); /** * @brief Gets a ui_menu instance. @@ -355,7 +355,7 @@ EAPI const char *ui_view_get_transition_style(ui_view *view); * * @get_last_result() */ -EAPI ui_menu *ui_view_get_menu(ui_view *view); +EAPI ui_menu *ui_view_get_menu(const ui_view *view); /** * @brief Returns a name of this view. @@ -371,7 +371,7 @@ EAPI ui_menu *ui_view_get_menu(ui_view *view); * * @get_last_result() */ -EAPI const char *ui_view_get_name(ui_view *view); +EAPI const char *ui_view_get_name(const ui_view *view); /** * @brief Returns a state of this view. @@ -388,7 +388,7 @@ EAPI const char *ui_view_get_name(ui_view *view); * @see ui_view_state * @see get_last_result() */ -EAPI ui_view_state ui_view_get_state(ui_view *view); +EAPI ui_view_state ui_view_get_state(const ui_view *view); /** * @brief Destroys an ui_view. diff --git a/src/include/interface/UiIfaceOverlay.h b/src/include/interface/UiIfaceOverlay.h index f8448f6..44b8311 100644 --- a/src/include/interface/UiIfaceOverlay.h +++ b/src/include/interface/UiIfaceOverlay.h @@ -96,14 +96,14 @@ public: * @see activate() * @see deactivate() */ - virtual bool isActivated() = 0; + virtual bool isActivated() const = 0; /** * @brief Return a view which is matched with the overlay. * * @return The view which is matched with overlay. */ - UiIfaceView *getView(); + UiIfaceView *getView() const; /** * @brief Returns a content of overlay. @@ -113,7 +113,7 @@ public: * @see setContent() * @see unsetContent() */ - virtual T getContent(); + virtual T getContent() const; protected: /** diff --git a/src/include/interface/UiIfaceRotatable.h b/src/include/interface/UiIfaceRotatable.h index cf18a2b..f9fd2db 100644 --- a/src/include/interface/UiIfaceRotatable.h +++ b/src/include/interface/UiIfaceRotatable.h @@ -37,14 +37,14 @@ public: * * @return Current rotation degree, -1 if it fails to get degree information. */ - virtual int getDegree() { return 0; } + virtual int getDegree() const { return 0; } /** * @brief Get current view's orientation mode. * * @return Current orientation mode, one of #UiViewOrientationMode. */ - virtual UiViewOrientationMode getOrientationMode() { return UI_VIEW_ORIENTATION_MODE_UNKNOWN; } + virtual UiViewOrientationMode getOrientationMode() const { return UI_VIEW_ORIENTATION_MODE_UNKNOWN; } protected: /** diff --git a/src/include/interface/UiIfaceView.h b/src/include/interface/UiIfaceView.h index 9915df8..204863c 100644 --- a/src/include/interface/UiIfaceView.h +++ b/src/include/interface/UiIfaceView.h @@ -124,7 +124,7 @@ public: * @see setAvailableRotations * @see get_last_result() */ - const int *getAvailableRotations(unsigned int *count); + const int *getAvailableRotations(unsigned int *count) const; /** * @brief Returns a style name of this view. @@ -133,14 +133,14 @@ public: * * @see setTransitionStyle() */ - const char *getTransitionStyle(); + const char *getTransitionStyle() const; /** * @brief Returns a name of this view. * * @return name of view */ - const char *getName(); + const char *getName() const; /** * @brief Returns a content of this view. @@ -150,7 +150,7 @@ public: * @see setContent() * @see unsetContent() */ - T getContent(); + T getContent() const; /** * @brief Replace or set a content of the view. @@ -181,21 +181,21 @@ public: * * @see UiViewState */ - UiViewState getState(); + UiViewState getState() const; /** * @brief Returns a state of removable content. * * @return @c true if the view's content is removable, otherwise @c false */ - bool getRemovableContent(); + bool getRemovableContent() const; /** * @brief Returns the indicator mode of this view. * * @return indicator state of this view */ - UiViewIndicator getIndicator(); + UiViewIndicator getIndicator() const; /** * @brief The H/W back key event occurs on view. @@ -229,7 +229,7 @@ protected: * * @see setEventBlock() */ - bool getEventBlock(); + bool getEventBlock() const; /** * @brief View load state. @@ -346,7 +346,7 @@ private: * * @see _setViewmgr() */ - UiIfaceViewmgr *_getViewmgr(); + UiIfaceViewmgr *_getViewmgr() const; public: _UI_DISABLE_COPY_AND_ASSIGN(UiIfaceView); diff --git a/src/lib/efl/UiBaseView.cpp b/src/lib/efl/UiBaseView.cpp index 2bdbcab..2145f81 100644 --- a/src/lib/efl/UiBaseView.cpp +++ b/src/lib/efl/UiBaseView.cpp @@ -74,7 +74,7 @@ Eo *UiBaseView::unsetContent() return obj; } -Eo *UiBaseView::getBase() +Eo *UiBaseView::getBase() const { auto viewmgr = UI_BASE_VIEWMGR; @@ -85,7 +85,7 @@ Eo *UiBaseView::getBase() return viewmgr->getBase(); } -Eo *UiBaseView ::getParent() +Eo *UiBaseView ::getParent() const { auto viewmgr = UI_BASE_VIEWMGR; @@ -162,7 +162,7 @@ int UiBaseView::setEventBlock(bool block) return UI_VIEWMGR_ERROR_NONE; } -int UiBaseView::getDegree() +int UiBaseView::getDegree() const { auto viewmgr = UI_BASE_VIEWMGR; diff --git a/src/lib/efl/UiBaseViewmgr.cpp b/src/lib/efl/UiBaseViewmgr.cpp index 813d0c0..b4d76f0 100644 --- a/src/lib/efl/UiBaseViewmgr.cpp +++ b/src/lib/efl/UiBaseViewmgr.cpp @@ -63,7 +63,7 @@ public: void pushView(UiBaseView *view); void popView(); - Eo *getBase() { + Eo *getBase() const { return this->_layout; } @@ -525,7 +525,7 @@ UiBaseView *UiBaseViewmgr::getLastView() return dynamic_cast(UiIfaceViewmgr::getLastView()); } -Eo *UiBaseViewmgr::getBase() +Eo *UiBaseViewmgr::getBase() const { return this->_impl->getBase(); } diff --git a/src/lib/efl/mobile/UiMenu.cpp b/src/lib/efl/mobile/UiMenu.cpp index 09a02c2..c3f5595 100644 --- a/src/lib/efl/mobile/UiMenu.cpp +++ b/src/lib/efl/mobile/UiMenu.cpp @@ -83,7 +83,7 @@ UiMenu::~UiMenu() evas_object_del(ctxpopup); } -Elm_Win *UiMenu::getWindow() +Elm_Win *UiMenu::getWindow() const { UiViewmgr *viewmgr = UI_VIEWMGR; if (!viewmgr) { @@ -137,7 +137,7 @@ int UiMenu::setContent(Elm_Ctxpopup *ctxpopup) return UiBaseOverlay::setContent(ctxpopup); } -bool UiMenu::isActivated() +bool UiMenu::isActivated() const { Elm_Ctxpopup *ctxpopup = this->getContent(); if (!ctxpopup) return false; @@ -156,12 +156,12 @@ Elm_Ctxpopup *UiMenu::unsetContent() return ctxpopup; } -Eo *UiMenu::getBase() +Eo *UiMenu::getBase() const { return this->getWindow(); } -int UiMenu::getDegree() +int UiMenu::getDegree() const { return this->getView()->getDegree(); } diff --git a/src/lib/efl/mobile/UiPopup.cpp b/src/lib/efl/mobile/UiPopup.cpp index 6e4a781..aa00d4e 100644 --- a/src/lib/efl/mobile/UiPopup.cpp +++ b/src/lib/efl/mobile/UiPopup.cpp @@ -59,7 +59,7 @@ UiPopup::~UiPopup() evas_object_del(popup); } -Elm_Win *UiPopup::getWindow() +Elm_Win *UiPopup::getWindow() const { UiViewmgr *viewmgr = UI_VIEWMGR; if (!viewmgr) { @@ -113,7 +113,7 @@ int UiPopup::setContent(Elm_Popup *popup) return UiBaseOverlay::setContent(popup); } -bool UiPopup::isActivated() +bool UiPopup::isActivated() const { Elm_Popup *popup = this->getContent(); if (!popup) return false; @@ -131,12 +131,12 @@ Elm_Popup *UiPopup::unsetContent() return popup; } -Eo *UiPopup::getBase() +Eo *UiPopup::getBase() const { return this->getWindow(); } -int UiPopup::getDegree() +int UiPopup::getDegree() const { return this->getView()->getDegree(); } diff --git a/src/lib/efl/mobile/UiStandardView.cpp b/src/lib/efl/mobile/UiStandardView.cpp index fe0b1ae..59a9d63 100644 --- a/src/lib/efl/mobile/UiStandardView.cpp +++ b/src/lib/efl/mobile/UiStandardView.cpp @@ -57,17 +57,17 @@ public: Elm_Button *unsetTitleLeftBtn(); Elm_Button *unsetTitleRightBtn(); Elm_Toolbar *unsetToolbar(); - Eo *getBase(); + Eo *getBase() const; - Elm_Button *getTitleLeftBtn() { + Elm_Button *getTitleLeftBtn() const { return this->_titleLeftBtn; } - Elm_Button *getTitleRightBtn() { + Elm_Button *getTitleRightBtn()const { return this->_titleRightBtn; } - Elm_Toolbar *getToolbar() { + Elm_Toolbar *getToolbar() const { return this->_toolbar; } }; @@ -407,10 +407,10 @@ Elm_Toolbar *UiStandardViewImpl::unsetToolbar() return toolbar; } -Eo *UiStandardViewImpl::getBase() +Eo *UiStandardViewImpl::getBase() const { if (!this->_layout) { - this->_createLayout(); + const_cast(this)->_createLayout(); } return this->_layout; @@ -538,7 +538,7 @@ Elm_Toolbar *UiStandardView::unsetToolbar() return this->_impl->unsetToolbar(); } -Eo *UiStandardView::getBase() +Eo *UiStandardView::getBase() const { return this->_impl->getBase(); } @@ -548,17 +548,17 @@ int UiStandardView::setTitleVisible(bool visible, bool anim) return this->_impl->setTitleVisible(visible, anim); } -Elm_Button *UiStandardView::getTitleLeftBtn() +Elm_Button *UiStandardView::getTitleLeftBtn() const { return this->_impl->getTitleLeftBtn(); } -Elm_Button *UiStandardView::getTitleRightBtn() +Elm_Button *UiStandardView::getTitleRightBtn() const { return this->_impl->getTitleRightBtn(); } -Elm_Toolbar *UiStandardView::getToolbar() +Elm_Toolbar *UiStandardView::getToolbar() const { return this->_impl->getToolbar(); } diff --git a/src/lib/efl/mobile/UiView.cpp b/src/lib/efl/mobile/UiView.cpp index fd3cd39..54486ac 100644 --- a/src/lib/efl/mobile/UiView.cpp +++ b/src/lib/efl/mobile/UiView.cpp @@ -54,12 +54,12 @@ public: explicit UiViewImpl(UiView *view); ~UiViewImpl(); - const UiMenu *getMenu() + const UiMenu *getMenu() const { return this->_menu; } - UiViewOrientationMode getOrientationMode(); + UiViewOrientationMode getOrientationMode() const; }; } @@ -160,7 +160,7 @@ void UiViewImpl::onLandscape() this->_menu->onLandscape(); } -UiViewOrientationMode UiViewImpl::getOrientationMode() +UiViewOrientationMode UiViewImpl::getOrientationMode() const { switch (this->_view->getDegree()) { case 0: @@ -254,12 +254,12 @@ void UiView::onLandscape() this->_impl->onLandscape(); } -UiViewOrientationMode UiView::getOrientationMode() +UiViewOrientationMode UiView::getOrientationMode() const { return this->_impl->getOrientationMode(); } -const UiMenu *UiView::getMenu() +const UiMenu *UiView::getMenu() const { return this->_impl->getMenu(); } diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp index c8646c4..df5281f 100644 --- a/src/lib/efl/mobile/c/ui_menu.cpp +++ b/src/lib/efl/mobile/c/ui_menu.cpp @@ -6,7 +6,7 @@ struct ui_menu_s ui_menu *p; }; -static int validate_menu(ui_menu *menu) +static int validate_menu(const ui_menu *menu) { if (!menu) { @@ -25,7 +25,7 @@ EAPI int ui_menu_set_content(ui_menu *menu, Elm_Ctxpopup *ctxpopup) return menu->setContent(ctxpopup); } -EAPI Elm_Ctxpopup *ui_menu_get_content(ui_menu *menu) +EAPI Elm_Ctxpopup *ui_menu_get_content(const ui_menu *menu) { if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; @@ -57,7 +57,7 @@ EAPI int ui_menu_deactivate(ui_menu *menu) return menu->deactivate(); } -EAPI bool ui_menu_get_activated(ui_menu *menu) +EAPI bool ui_menu_get_activated(const ui_menu *menu) { if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; @@ -65,7 +65,7 @@ EAPI bool ui_menu_get_activated(ui_menu *menu) return menu->isActivated(); } -EAPI Eo *ui_menu_get_base(ui_menu *menu) +EAPI Eo *ui_menu_get_base(const ui_menu *menu) { if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; @@ -73,7 +73,7 @@ EAPI Eo *ui_menu_get_base(ui_menu *menu) return menu->getBase(); } -EAPI int ui_menu_get_degree(ui_menu *menu) +EAPI int ui_menu_get_degree(const ui_menu *menu) { if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return -1; @@ -81,7 +81,7 @@ EAPI int ui_menu_get_degree(ui_menu *menu) return menu->getDegree(); } -EAPI ui_view *ui_menu_get_view(ui_menu *menu) +EAPI ui_view *ui_menu_get_view(const ui_menu *menu) { if (UI_VIEWMGR_ERROR_NONE != validate_menu(menu)) return nullptr; diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp index 60e562c..9995296 100644 --- a/src/lib/efl/mobile/c/ui_popup.cpp +++ b/src/lib/efl/mobile/c/ui_popup.cpp @@ -6,7 +6,7 @@ struct ui_popup_s ui_popup *p; }; -static int validate_popup(ui_popup *popup) +static int validate_popup(const ui_popup *popup) { if (!popup) { @@ -55,7 +55,7 @@ EAPI int ui_popup_set_content(ui_popup *popup, Elm_Popup *content) return popup->setContent(content); } -EAPI Elm_Popup *ui_popup_get_content(ui_popup *popup) +EAPI Elm_Popup *ui_popup_get_content(const ui_popup *popup) { if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return nullptr; @@ -87,7 +87,7 @@ EAPI int ui_popup_deactivate(ui_popup *popup) return popup->deactivate(); } -EAPI bool ui_popup_get_activated(ui_popup *popup) +EAPI bool ui_popup_get_activated(const ui_popup *popup) { if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return false; @@ -95,7 +95,7 @@ EAPI bool ui_popup_get_activated(ui_popup *popup) return popup->isActivated(); } -EAPI Eo *ui_popup_get_base(ui_popup *popup) +EAPI Eo *ui_popup_get_base(const ui_popup *popup) { if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return nullptr; @@ -103,7 +103,7 @@ EAPI Eo *ui_popup_get_base(ui_popup *popup) return popup->getBase(); } -EAPI int ui_popup_get_degree(ui_popup *popup) +EAPI int ui_popup_get_degree(const ui_popup *popup) { if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return -1; @@ -111,7 +111,7 @@ EAPI int ui_popup_get_degree(ui_popup *popup) return popup->getDegree(); } -EAPI ui_view *ui_popup_get_view(ui_popup *popup) +EAPI ui_view *ui_popup_get_view(const ui_popup *popup) { if (UI_VIEWMGR_ERROR_NONE != validate_popup(popup)) return nullptr; diff --git a/src/lib/efl/mobile/c/ui_standard_view.cpp b/src/lib/efl/mobile/c/ui_standard_view.cpp index 1fb815f..cd171af 100644 --- a/src/lib/efl/mobile/c/ui_standard_view.cpp +++ b/src/lib/efl/mobile/c/ui_standard_view.cpp @@ -203,7 +203,7 @@ struct ui_standard_view_s ui_standard_view_capi *p; }; -static ui_standard_view_capi *validate_view(ui_standard_view *view) +static ui_standard_view_capi *validate_view(const ui_standard_view *view) { if (!view) { @@ -212,7 +212,7 @@ static ui_standard_view_capi *validate_view(ui_standard_view *view) return nullptr; } - auto capi_view = dynamic_cast(view); + auto capi_view = dynamic_cast(const_cast(view)); if (!capi_view) { LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view); @@ -269,7 +269,7 @@ EAPI int ui_standard_view_set_title_right_btn(ui_standard_view *view, Eo *title_ return capi_view->setTitleRightBtn(title_right_btn); } -EAPI Elm_Button *ui_standard_view_get_title_right_btn(ui_standard_view *view) +EAPI Elm_Button *ui_standard_view_get_title_right_btn(const ui_standard_view *view) { ui_standard_view_capi *capi_view = validate_view(view); if (!capi_view) @@ -298,7 +298,7 @@ EAPI int ui_standard_view_set_title_left_btn(ui_standard_view *view, Eo *title_l return capi_view->setTitleLeftBtn(title_left_btn); } -EAPI Elm_Button *ui_standard_view_get_title_left_btn(ui_standard_view *view) +EAPI Elm_Button *ui_standard_view_get_title_left_btn(const ui_standard_view *view) { ui_standard_view_capi *capi_view = validate_view(view); if (!capi_view) return nullptr; @@ -323,7 +323,7 @@ EAPI int ui_standard_view_set_toolbar(ui_standard_view *view, Elm_Toolbar *toolb return capi_view->setToolbar(toolbar); } -EAPI Elm_Toolbar *ui_standard_view_get_toolbar(ui_standard_view *view) +EAPI Elm_Toolbar *ui_standard_view_get_toolbar(const ui_standard_view *view) { ui_standard_view_capi *capi_view = validate_view(view); if (!capi_view) return nullptr; diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp index 81097f0..b9c4209 100644 --- a/src/lib/efl/mobile/c/ui_view.cpp +++ b/src/lib/efl/mobile/c/ui_view.cpp @@ -202,7 +202,7 @@ struct ui_view_s ui_view_capi *p; }; -static int validate_view(ui_view *view) +static int validate_view(const ui_view *view) { if (!view) { @@ -252,7 +252,7 @@ EAPI int ui_view_set_event_cb(ui_view *view, ui_view_event_type_e event_type, ui return UI_VIEWMGR_ERROR_NONE; } -EAPI Eo* ui_view_get_base(ui_view *view) +EAPI Eo* ui_view_get_base(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; return view->getBase(); @@ -274,7 +274,7 @@ EAPI int ui_view_set_indicator(ui_view *view, ui_view_indicator indicator) return view->setIndicator(indicator); } -EAPI ui_view_indicator ui_view_get_indicator(ui_view *view) +EAPI ui_view_indicator ui_view_get_indicator(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return UI_VIEW_INDICATOR_UNKNOWN; @@ -292,7 +292,7 @@ EAPI int ui_view_set_removable_content(ui_view *view, bool remove) return UI_VIEWMGR_ERROR_NONE; } -EAPI bool ui_view_get_removable_content(ui_view *view) +EAPI bool ui_view_get_removable_content(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return false; @@ -300,7 +300,7 @@ EAPI bool ui_view_get_removable_content(ui_view *view) return view->getRemovableContent(); } -EAPI int ui_view_get_degree(ui_view *view) +EAPI int ui_view_get_degree(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return -1; @@ -308,7 +308,7 @@ EAPI int ui_view_get_degree(ui_view *view) return view->getDegree(); } -EAPI ui_view_orientation_mode ui_view_get_orientation_mode(ui_view *view) +EAPI ui_view_orientation_mode ui_view_get_orientation_mode(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return UI_VIEW_ORIENTATION_MODE_UNKNOWN; @@ -325,7 +325,7 @@ EAPI int ui_view_set_available_rotations(ui_view *view, const int *rotations, un return view->setAvailableRotations(rotations, count); } -EAPI const int *ui_view_get_available_rotations(ui_view *view, unsigned int *count) +EAPI const int *ui_view_get_available_rotations(const ui_view *view, unsigned int *count) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return false; @@ -341,7 +341,7 @@ EAPI int ui_view_set_transition_style(ui_view *view, const char *style) return view->setTransitionStyle(style); } -EAPI const char *ui_view_get_transition_style(ui_view *view) +EAPI const char *ui_view_get_transition_style(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; @@ -349,7 +349,7 @@ EAPI const char *ui_view_get_transition_style(ui_view *view) return view->getTransitionStyle(); } -EAPI ui_menu *ui_view_get_menu(ui_view *view) +EAPI ui_menu *ui_view_get_menu(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; @@ -357,7 +357,7 @@ EAPI ui_menu *ui_view_get_menu(ui_view *view) return const_cast(view->getMenu()); } -EAPI const char *ui_view_get_name(ui_view *view) +EAPI const char *ui_view_get_name(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; @@ -365,7 +365,7 @@ EAPI const char *ui_view_get_name(ui_view *view) return view->getName(); } -EAPI ui_view_state ui_view_get_state(ui_view *view) +EAPI ui_view_state ui_view_get_state(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return UI_VIEW_STATE_UNKNOWN; @@ -373,7 +373,7 @@ EAPI ui_view_state ui_view_get_state(ui_view *view) return view->getState(); } -EAPI Eo *ui_view_get_content(ui_view *view) +EAPI Eo *ui_view_get_content(const ui_view *view) { if (UI_VIEWMGR_ERROR_NONE != validate_view(view)) return nullptr; diff --git a/src/lib/interface/UiIfaceOverlay.cpp b/src/lib/interface/UiIfaceOverlay.cpp index b6b88dd..20289da 100644 --- a/src/lib/interface/UiIfaceOverlay.cpp +++ b/src/lib/interface/UiIfaceOverlay.cpp @@ -37,8 +37,8 @@ private: public: int setContent(T content); T unsetContent(); - UiIfaceView *getView(); - T getContent(); + UiIfaceView *getView() const; + T getContent() const; UiIfaceOverlayImpl(UiIfaceOverlay *overlay, UiIfaceView *view); ~UiIfaceOverlayImpl(); @@ -68,12 +68,12 @@ T UiIfaceOverlayImpl::unsetContent() return prev; } -T UiIfaceOverlayImpl::getContent() +T UiIfaceOverlayImpl::getContent() const { return this->_content; } -UiIfaceView *UiIfaceOverlayImpl::getView() +UiIfaceView *UiIfaceOverlayImpl::getView() const { return this->_view; } @@ -102,12 +102,12 @@ T UiIfaceOverlay::unsetContent() return this->_impl->unsetContent(); } -T UiIfaceOverlay::getContent() +T UiIfaceOverlay::getContent() const { return this->_impl->getContent(); } -UiIfaceView *UiIfaceOverlay::getView() +UiIfaceView *UiIfaceOverlay::getView() const { return this->_impl->getView(); } diff --git a/src/lib/interface/UiIfaceView.cpp b/src/lib/interface/UiIfaceView.cpp index e11b89e..8817dcf 100644 --- a/src/lib/interface/UiIfaceView.cpp +++ b/src/lib/interface/UiIfaceView.cpp @@ -57,7 +57,7 @@ public: void onPause(); void onResume(); void onDestroy(); - bool getEventBlock(); + bool getEventBlock() const; int setContent(T content); T unsetContent(); @@ -68,13 +68,13 @@ public: void setRemovableContent(bool removable); int setIndicator(UiViewIndicator indicator); int setAvailableRotations(const int *rotations, unsigned int count); - const int *getAvailableRotations(unsigned int *count); - const char *getTransitionStyle(); - const char *getName(); - T getContent(); - UiViewState getState(); - bool getRemovableContent(); - UiViewIndicator getIndicator(); + const int *getAvailableRotations(unsigned int *count) const; + const char *getTransitionStyle() const; + const char *getName() const; + T getContent() const; + UiViewState getState() const; + bool getRemovableContent() const; + UiViewIndicator getIndicator() const; void onBack(); }; @@ -82,7 +82,7 @@ public: #define MAX_NUM_OF_AVAILABLE_ROTATIONS 4 -bool UiIfaceViewImpl::getEventBlock() +bool UiIfaceViewImpl::getEventBlock() const { return this->_eventBlock; } @@ -226,7 +226,7 @@ int UiIfaceViewImpl::setAvailableRotations(const int *rotations, unsigned int co return UI_VIEWMGR_ERROR_NONE; } -const int *UiIfaceViewImpl::getAvailableRotations(unsigned int *count) +const int *UiIfaceViewImpl::getAvailableRotations(unsigned int *count) const { if (!count) { set_last_result(UI_VIEWMGR_ERROR_INVALID_PARAMETER); @@ -246,32 +246,32 @@ const int *UiIfaceViewImpl::getAvailableRotations(unsigned int *count) } } -const char *UiIfaceViewImpl::getTransitionStyle() +const char *UiIfaceViewImpl::getTransitionStyle() const { return this->_transitionStyle.c_str(); } -const char *UiIfaceViewImpl::getName() +const char *UiIfaceViewImpl::getName() const { return this->_name.c_str(); } -T UiIfaceViewImpl::getContent() +T UiIfaceViewImpl::getContent() const { return this->_content; } -UiViewState UiIfaceViewImpl::getState() +UiViewState UiIfaceViewImpl::getState() const { return this->_state; } -bool UiIfaceViewImpl::getRemovableContent() +bool UiIfaceViewImpl::getRemovableContent() const { return this->_removableContent; } -UiViewIndicator UiIfaceViewImpl::getIndicator() +UiViewIndicator UiIfaceViewImpl::getIndicator() const { return this->_indicator; } @@ -290,7 +290,7 @@ void UiIfaceViewImpl::onBack() /* External class Implementation */ /***********************************************************************************************/ -bool UiIfaceView::getEventBlock() +bool UiIfaceView::getEventBlock() const { return this->_impl->getEventBlock(); } @@ -375,37 +375,37 @@ int UiIfaceView::setAvailableRotations(const int *rotations, unsigned int count) return this->_impl->setAvailableRotations(rotations, count); } -const int *UiIfaceView::getAvailableRotations(unsigned int *count) +const int *UiIfaceView::getAvailableRotations(unsigned int *count) const { return this->_impl->getAvailableRotations(count); } -const char *UiIfaceView::getTransitionStyle() +const char *UiIfaceView::getTransitionStyle() const { return this->_impl->getTransitionStyle(); } -const char *UiIfaceView::getName() +const char *UiIfaceView::getName() const { return this->_impl->getName(); } -T UiIfaceView::getContent() +T UiIfaceView::getContent() const { return this->_impl->getContent(); } -UiViewState UiIfaceView::getState() +UiViewState UiIfaceView::getState() const { return this->_impl->getState(); } -bool UiIfaceView::getRemovableContent() +bool UiIfaceView::getRemovableContent() const { return this->_impl->getRemovableContent(); } -UiViewIndicator UiIfaceView::getIndicator() +UiViewIndicator UiIfaceView::getIndicator() const { return this->_impl->getIndicator(); } @@ -420,7 +420,7 @@ void UiIfaceView::_setViewmgr(UiIfaceViewmgr *viewmgr) this->_impl->_viewmgr = viewmgr; } -UiIfaceViewmgr *UiIfaceView::_getViewmgr() +UiIfaceViewmgr *UiIfaceView::_getViewmgr() const { return this->_impl->_viewmgr; }