X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-effect.h;h=72758a374374996f0c85914dc717cc36d22c1b14;hp=40ca06eb71085592f23e86ec9e4fcb469f199752;hb=2eb0f016cf4d8a8282681283ae0e842c0c67bded;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2 diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h index 40ca06e..72758a3 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SCROLL_VIEW_EFFECT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -19,7 +19,6 @@ */ // EXTERNAL INCLUDES -#include #include namespace Dali @@ -38,14 +37,14 @@ namespace Internal DALI_INTERNAL class ScrollViewEffect; class ScrollViewWobbleEffect; } +/** + * @addtogroup dali_toolkit_controls_scroll_view + * @{ + */ class ScrollView; class ScrollViewEffect; -typedef std::vector ScrollViewEffectContainer; ///< Container of Dali::Toolkit::ScrollViewEffect%s -typedef ScrollViewEffectContainer::iterator ScrollViewEffectIter; ///< Iterator for Dali::Toolkit::ScrollViewEffectContainer -typedef ScrollViewEffectContainer::const_iterator ScrollViewEffectConstIter; ///< Const Iterator for Dali::Toolkit::ScrollViewEffectContainer - /** * @brief ScrollView Effect base class, used to apply custom effects to a * ScrollView instance. @@ -54,6 +53,7 @@ typedef ScrollViewEffectContainer::const_iterator ScrollViewEffectConstIter; /// * properties that can be used with visual effects. Such as creating * constraints that are applied to ShaderEffects or Actors using these * properties as inputs. + * @SINCE_1_0.0 */ class DALI_IMPORT_API ScrollViewEffect : public Dali::BaseHandle { @@ -64,6 +64,7 @@ public: * @brief Create an uninitialized ScrollViewEffect; this can only be initialized with derived classes. * * Calling member functions with an uninitialized Toolkit::BaseObject is not allowed. + * @SINCE_1_0.0 */ ScrollViewEffect(); @@ -72,12 +73,16 @@ public: // Not intended for application developers /** * @brief This constructor is used by Dali New() methods. * + * @SINCE_1_0.0 * @param [in] impl A pointer to a newly allocated Dali resource */ explicit DALI_INTERNAL ScrollViewEffect(Internal::ScrollViewEffect *impl); }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali