X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-carousel-effect.h;h=868ebcad28a4c8389c7f09fe587e20442cc8331d;hp=f8070a67db1d958af8a8788dfec0fdc22fc312db;hb=42eeffaa69044c2236996eb543416486ae92335c;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
index f8070a6..868ebca 100644
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
@@ -1,26 +1,27 @@
 #ifndef __DALI_TOOLKIT_SCROLL_VIEW_CAROUSEL_EFFECT_H__
 #define __DALI_TOOLKIT_SCROLL_VIEW_CAROUSEL_EFFECT_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Actor;
@@ -60,7 +61,7 @@ class ScrollViewCarouselEffect;
  * Notes:
  * * Assumes Actor's AnchorPoint = AnchorPoint::CENTER
  */
-class ScrollViewCarouselEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewCarouselEffect : public ScrollViewEffect
 {
 
 public:
@@ -103,7 +104,7 @@ protected:
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
-  ScrollViewCarouselEffect(Internal::ScrollViewCarouselEffect *impl);
+  explicit DALI_INTERNAL ScrollViewCarouselEffect(Internal::ScrollViewCarouselEffect *impl);
 
 };