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
Fix compile error. Non initialized variable.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-landscape-view-impl.h
diff --git
a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
index
2033649
..
aee1d5e
100644
(file)
--- a/
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
+++ b/
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__
-#define
__DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H
+#define
DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,7
+19,7
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/
public
-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/
devel
-api/controls/page-turn-view/page-turn-landscape-view.h>
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
namespace Dali
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
namespace Dali
@@
-36,17
+36,18
@@
class PageTurnLandscapeView : public PageTurnView
public:
/**
public:
/**
- * Create a new PageTurnLandscapeView
- * @return A handle to the newly allocated PageTurnLandscapeView
+ * @copydoc Toolkit::PageTurnLandscapeView::New( PageFactory&, const Vector2& )
*/
*/
- static Toolkit::PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2&
p
ageSize );
+ static Toolkit::PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2&
viewP
ageSize );
protected:
/**
* Constructor.
protected:
/**
* Constructor.
- * It initializes the PageTurnLandscapeView members
+ * It initializes the PageTurnPortraitView members
+ * @param[in] pageFactory The factory which provides image to PageTurnView as the page content.
+ * @param[in] viewPageSize The size of the page
*/
*/
- PageTurnLandscapeView( PageFactory& pageFactory, const Vector2&
p
ageSize );
+ PageTurnLandscapeView( 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()
@@
-63,7
+64,7
@@
protected: // From PageTurnView
/**
* @copydoc PageTurnView::OnAddPage
*/
/**
* @copydoc PageTurnView::OnAddPage
*/
- virtual void OnAddPage(
Image
Actor newPage, bool isLeftSide );
+ virtual void OnAddPage( Actor newPage, bool isLeftSide );
/**
* @copydoc PageTurnView::SetPanPosition
/**
* @copydoc PageTurnView::SetPanPosition
@@
-75,11
+76,6
@@
protected: // From PageTurnView
*/
virtual void SetPanActor( const Vector2& panPosition );
*/
virtual void SetPanActor( const Vector2& panPosition );
- /**
- * @copydoc PageTurnView::SetSpineEffect
- */
- virtual void SetSpineEffect(ImageActor actor, bool isLeftSide);
-
private:
//Undefined
private:
//Undefined
@@
-95,4
+91,5
@@
private:
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali
-#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__ */
+
+#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H