projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Fix role setting
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-view-impl.h
diff --git
a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index
73aff02
..
7023daf
100644
(file)
--- a/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@
-123,7
+123,7
@@
protected:
* Constructor.
* It initializes the PageTurnView members
*/
* Constructor.
* It initializes the PageTurnView members
*/
- PageTurnView( PageFactory& pageFactory, const Vector2&
p
ageSize );
+ PageTurnView( PageFactory& pageFactory, const Vector2&
viewP
ageSize );
/**
* A reference counted object may only be deleted by calling Unreference()
/**
* A reference counted object may only be deleted by calling Unreference()
@@
-134,9
+134,9
@@
public:
/**
* Set the page size
/**
* Set the page size
- * @param[in]
p
ageSize The size of pages
+ * @param[in]
viewP
ageSize The size of pages
*/
*/
- void SetPageSize( const Vector2&
p
ageSize );
+ void SetPageSize( const Vector2&
viewP
ageSize );
/**
* Retrieve the page size.
/**
* Retrieve the page size.
@@
-250,22
+250,22
@@
private: // from Control
/**
* @copydoc Toolkit::Control::OnPan
*/
/**
* @copydoc Toolkit::Control::OnPan
*/
- v
irtual void OnPan( const PanGesture& gesture )
;
+ v
oid OnPan( const PanGesture& gesture ) override
;
/**
* @copydoc Toolkit::Control::OnInitialize
*/
/**
* @copydoc Toolkit::Control::OnInitialize
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
/**
- * @copydoc CustomActorImpl::OnS
tag
eConnection()
+ * @copydoc CustomActorImpl::OnS
cen
eConnection()
*/
*/
- v
irtual void OnStageConnection( int depth )
;
+ v
oid OnSceneConnection( int depth ) override
;
/**
/**
- * @copydoc CustomActorImpl::OnS
tag
eDisconnection()
+ * @copydoc CustomActorImpl::OnS
cen
eDisconnection()
*/
*/
- v
irtual void OnStageDisconnection()
;
+ v
oid OnSceneDisconnection() override
;
private: // implemented differently by PageTurnLandscapeView and PageTurnPortraitView
private: // implemented differently by PageTurnLandscapeView and PageTurnPortraitView