[dali_2.3.21] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / page-turn-view / page-turn-effect.h

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h
index 35895d4..2f0a47e 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PAGE_TURN_EFFECT_H_
-#define __DALI_PAGE_TURN_EFFECT_H_
+#ifndef DALI_PAGE_TURN_EFFECT_H
+#define DALI_PAGE_TURN_EFFECT_H

 
 /*
 
 /*

- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.


@@ -22,14 +22,10 @@
 
 namespace Dali
 {
 
 namespace Dali
 {

-

 namespace Toolkit
 {
 namespace Toolkit
 {

-

 namespace Internal
 {
 namespace Internal
 {

-
-

 /**
  * @brief Re-applies PageTurnEffect internal constraints
  * The internal constraint uses the OriginalCenter property and the CURRENT_CENTER Property
 /**
  * @brief Re-applies PageTurnEffect internal constraints
  * The internal constraint uses the OriginalCenter property and the CURRENT_CENTER Property


@@ -41,7 +37,7 @@ namespace Internal
  * @param[in] actor The page turn actor to which internal constraints should be re-applied
  * @param[in] pageHeight The page height.
  */
  * @param[in] actor The page turn actor to which internal constraints should be re-applied
  * @param[in] pageHeight The page height.
  */

-void PageTurnApplyInternalConstraint( Actor& actor, float pageHeight );
+void PageTurnApplyInternalConstraint(Actor& actor, float pageHeight);

 
 /**
  * @brief Create a new PageTurnEffect
 
 /**
  * @brief Create a new PageTurnEffect


@@ -84,4 +80,4 @@ Property::Map CreatePageTurnEffect();
 
 } // namespace Dali
 
 
 } // namespace Dali
 

-#endif /* __DALI_TOOLKIT_SC_CURVE_EFFECT_H_ */
+#endif // DALI_PAGE_TURN_EFFECT_H