Merge branch 'devel/master' into tizen

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

diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
index 3a67428..a4705e4 100644 (file)
--- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_PAGE_TURN_VIEW_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -63,7 +63,7 @@ class PageTurnView;
  *
  * @SINCE_1_1.4
  */
-class DALI_IMPORT_API PageTurnView : public Control
+class DALI_TOOLKIT_API PageTurnView : public Control
 {
 public:
 
@@ -182,8 +182,8 @@ public: //Signal
 
 public: // Not intended for application developers
 
+  /// @cond internal
   /**
-   * @internal
    * @brief Creates a handle using the Toolkit::Internal implementation.
    * @SINCE_1_1.4
    * @param[in]  implementation  The Control implementation.
@@ -191,12 +191,12 @@ public: // Not intended for application developers
   DALI_INTERNAL PageTurnView(Internal::PageTurnView& implementation);
 
   /**
-   * @internal
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    * @SINCE_1_1.4
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
   explicit DALI_INTERNAL PageTurnView(Dali::Internal::CustomActor* internal);
+  /// @endcond
 };
 
 } // namespace Toolkit