From: Hermet Park Date: Tue, 5 Jul 2016 12:03:04 +0000 (+0900) Subject: c++: ++secure code. X-Git-Tag: submit/tizen/20160707.233627~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=001b3897a2df54a783b0c7f546d12d5f9875f38b;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git c++: ++secure code. use override specifier for secure code. This override may occur build break when parents base function won't be exist in virtual. Change-Id: I1737742520586457ad6f6062c59abc7f5fbd3a5b --- diff --git a/src/include/efl/UiBaseView.h b/src/include/efl/UiBaseView.h index a268766..e12444a 100644 --- a/src/include/efl/UiBaseView.h +++ b/src/include/efl/UiBaseView.h @@ -48,14 +48,14 @@ public: * * @return A previous content. If it wasn't, return @c NULL. */ - virtual bool setContent(Evas_Object *content); + virtual bool setContent(Evas_Object *content) override; /** * @brief This is for unsetting a content of the view. * * @return A previous content. If it wasn't, return @c NULL. */ - virtual Evas_Object *unsetContent(); + virtual Evas_Object *unsetContent() override; /** * @brief Get a base object of ui_view. @@ -71,14 +71,14 @@ public: * * @param indicator The mode to set, one of #UiViewIndicator. */ - virtual void setIndicator(UiViewIndicator indicator); + virtual void setIndicator(UiViewIndicator indicator) override; /** * @brief Get current view's degree. * * @return Current rotation degree, -1 if it fails to get degree information. */ - virtual int getDegree(); + virtual int getDegree() override; protected: /** @@ -97,7 +97,7 @@ protected: * * @param block @c true, when blocking is enabled, otherwise @c false. */ - virtual void setEventBlock(bool block); + virtual void setEventBlock(bool block) override; /** * @brief View rotate changed. @@ -109,7 +109,7 @@ protected: * @see onPortrait() * @see onLandscpae() */ - virtual void onRotate(int degree); + virtual void onRotate(int degree) override; /** * @brief View portrait state. @@ -119,7 +119,7 @@ protected: * @see onLandscpae() * @see onRotate() */ - virtual void onPortrait(); + virtual void onPortrait() override; /** * @brief View landscape state. @@ -129,7 +129,7 @@ protected: * @see onPortrait() * @see onRotate() */ - virtual void onLandscape(); + virtual void onLandscape() override; private: _UI_DECLARE_PRIVATE_IMPL(UiBaseView); diff --git a/src/include/efl/UiBaseViewmgr.h b/src/include/efl/UiBaseViewmgr.h index 688bf8f..f919943 100644 --- a/src/include/efl/UiBaseViewmgr.h +++ b/src/include/efl/UiBaseViewmgr.h @@ -48,7 +48,7 @@ public: * * @see deactivate() */ - virtual bool activate(); + virtual bool activate() override; /** * @brief Deactivate this view manager. @@ -60,7 +60,7 @@ public: * * @see activate() */ - virtual bool deactivate(); + virtual bool deactivate() override; /** * @brief Push a new view into this viewmgr. This function is used for when application switches a current view to a new one. @@ -94,7 +94,7 @@ public: * @see deactivate() * @see pushView() */ - virtual bool popView(); + virtual bool popView() override; /** * @brief Insert a view in this viewmgr view list. Specifically, insert a given @p view right before of the given view, @before. diff --git a/src/include/efl/mobile/UiKeyListener.h b/src/include/efl/mobile/UiKeyListener.h index bff6289..10264c8 100644 --- a/src/include/efl/mobile/UiKeyListener.h +++ b/src/include/efl/mobile/UiKeyListener.h @@ -44,14 +44,14 @@ public: * * @note Add menu key to target of key grabber. */ - virtual bool init(); + virtual bool init() override; /** * @brief Check the menu key event occurs or not. * * @note This is checking H/W key is menu or not. */ - virtual void extendEventProc(UiBaseView *view, Evas_Event_Key_Down *ev); + virtual void extendEventProc(UiBaseView *view, Evas_Event_Key_Down *ev) override; //Don't generate by compiler. UiKeyListener() = delete; diff --git a/src/include/efl/mobile/UiMenu.h b/src/include/efl/mobile/UiMenu.h index 0fd484a..2dc5a9d 100644 --- a/src/include/efl/mobile/UiMenu.h +++ b/src/include/efl/mobile/UiMenu.h @@ -45,7 +45,7 @@ public: * * @see deactivate() */ - virtual bool activate(); + virtual bool activate() override; /** * @brief menu deactivate. @@ -56,7 +56,7 @@ public: * * @see activate() */ - virtual bool deactivate(); + virtual bool deactivate() override; /** * @brief This is for replacing or setting a content of the menu. @@ -65,14 +65,14 @@ public: * * @return @c true if it succeeds, @c false otherwise. */ - virtual bool setContent(Elm_Ctxpopup* ctxpopup); + virtual bool setContent(Elm_Ctxpopup* ctxpopup) override; /** * @brief This is for unsetting a content of the menu. * * @return A previous content. If it wasn't, return value will be @c NULL. */ - virtual Elm_Ctxpopup *unsetContent(); + virtual Elm_Ctxpopup *unsetContent() override; /** * @brief Return the active status of menu. @@ -82,7 +82,7 @@ public: * @see activate() * @see deactivate() */ - virtual bool isActivated(); + virtual bool isActivated() override; /** * @brief Get a base object of a UiMenu. @@ -97,7 +97,7 @@ public: * * @return Current rotation degree, -1 if it fails to get degree information. */ - virtual int getDegree(); + virtual int getDegree() override; protected: /** diff --git a/src/include/efl/mobile/UiPopup.h b/src/include/efl/mobile/UiPopup.h index dd83573..b3e2801 100644 --- a/src/include/efl/mobile/UiPopup.h +++ b/src/include/efl/mobile/UiPopup.h @@ -57,7 +57,7 @@ public: * * @see deactivate() */ - virtual bool activate(); + virtual bool activate() override; /** * @brief popup deactivate. @@ -68,7 +68,7 @@ public: * * @see activate() */ - virtual bool deactivate(); + virtual bool deactivate() override; /** * @brief This is for replacing or setting a content of the popup. @@ -77,14 +77,14 @@ public: * * @return @c true if it succeeds, @c false otherwise. */ - virtual bool setContent(Elm_Popup* popup); + virtual bool setContent(Elm_Popup* popup) override; /** * @brief This is for unsetting a content of the popup. * * @return A previous content. If it wasn't, return value will be @c NULL. */ - virtual Elm_Popup *unsetContent(); + virtual Elm_Popup *unsetContent() override; /** * @brief Return the active status of popup. @@ -94,7 +94,7 @@ public: * @see activate() * @see deactivate() */ - virtual bool isActivated(); + virtual bool isActivated() override; /** * @brief Get a base object of an UiPopup. @@ -110,7 +110,7 @@ public: * * @return Current rotation degree, -1 if it fails to get degree information. */ - virtual int getDegree(); + virtual int getDegree() override; protected: /** diff --git a/src/include/efl/mobile/UiStandardView.h b/src/include/efl/mobile/UiStandardView.h index 96381bf..59d3e19 100644 --- a/src/include/efl/mobile/UiStandardView.h +++ b/src/include/efl/mobile/UiStandardView.h @@ -138,7 +138,7 @@ public: * * @return A previous content. If it wasn't, return @c NULL. */ - Evas_Object *unsetContent(); + Evas_Object *unsetContent() override; /** * @brief Unset a title left button of title area. @@ -187,7 +187,7 @@ public: * * @return viewmgr's base layout object. */ - virtual Evas_Object *getBase(); + virtual Evas_Object *getBase() override; protected: /** @@ -196,14 +196,14 @@ protected: * @note this state will be triggered by UiIfaceViewmgr. * */ - virtual void onLoad(); + virtual void onLoad() override; /** @brief view unload state. * * @note this state will be triggered by UiIfaceViewmgr. * */ - virtual void onUnload(); + virtual void onUnload() override; /** @brief toggle event block. * @@ -212,7 +212,7 @@ protected: * * @param block @c true, blocking enable, otherwise @c false. */ - virtual void setEventBlock(bool block); + virtual void setEventBlock(bool block) override; private: _UI_DECLARE_PRIVATE_IMPL(UiStandardView); diff --git a/src/include/efl/mobile/UiView.h b/src/include/efl/mobile/UiView.h index ff82bc4..3f14e08 100644 --- a/src/include/efl/mobile/UiView.h +++ b/src/include/efl/mobile/UiView.h @@ -98,7 +98,7 @@ protected: * @see onPortrait() * @see onLandscpae() */ - virtual void onRotate(int degree); + virtual void onRotate(int degree) override; /** * @brief View portrait state. @@ -108,7 +108,7 @@ protected: * @see onLandscpae() * @see onRotate() */ - virtual void onPortrait(); + virtual void onPortrait() override; /** * @brief View landscape state. @@ -118,14 +118,14 @@ protected: * @see onPortrait() * @see onRotate() */ - virtual void onLandscape(); + virtual void onLandscape() override; /** @brief View deactivate state. * * @note this state will be triggered by UiIfaceViewmgr. * */ - virtual void onDeactivate(); + virtual void onDeactivate() override; private: /** diff --git a/src/include/interface/UiIfaceView.h b/src/include/interface/UiIfaceView.h index f1c642e..5e21699 100644 --- a/src/include/interface/UiIfaceView.h +++ b/src/include/interface/UiIfaceView.h @@ -82,7 +82,7 @@ public: * * @param indicator The mode to set, one of #UiViewIndicator. */ - void setIndicator(UiViewIndicator indicator); + virtual void setIndicator(UiViewIndicator indicator); /** * @brief Return a style name of this view.