X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-portrait-view-impl.h;h=358ad76fcf86904eb98a22b9fc5fc6f308a46226;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hp=5e950f86908c004458f4cf3118aebd4e32bd3410;hpb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h index 5e950f8..358ad76 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h @@ -41,7 +41,7 @@ public: /** * @copydoc Toolkit::PageTurnPortraitView::New( PageFactory&, const Vector2& ) */ - static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& pageSize ); + static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& viewPageSize ); protected: @@ -49,9 +49,9 @@ protected: * Constructor. * It initializes the PageTurnPortraitView members * @param[in] pageFactory The factory which provides image to PageTurnView as the page content. - * @param[in] pageSize The size of the page + * @param[in] viewPageSize The size of the page */ - PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize ); + PageTurnPortraitView( PageFactory& pageFactory, const Vector2& viewPageSize ); /** * A reference counted object may only be deleted by calling Unreference() @@ -63,27 +63,27 @@ protected: // From PageTurnView /** * @copydoc PageTurnView::OnPageTurnViewInitialize */ - virtual void OnPageTurnViewInitialize(); + void OnPageTurnViewInitialize() override; /** * @copydoc PageTurnView::SetPanPosition */ - virtual Vector2 SetPanPosition( const Vector2& gesturePosition ); + Vector2 SetPanPosition( const Vector2& gesturePosition ) override; /** * @copydoc PageTurnView::SetPanActor */ - virtual void SetPanActor( const Vector2& panPosition ); + void SetPanActor( const Vector2& panPosition ) override; /** * @copydoc PageTurnView::OnPossibleOutwardsFlick */ - virtual void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed ); + void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed ) override; /** * @copydoc PageTurnView::OnTurnedOver */ - virtual void OnTurnedOver( Actor actor, bool isLeftSide ); + void OnTurnedOver( Actor actor, bool isLeftSide ) override; private: