Update copyright year to 2015 for public api: toolkit

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / scrollable / scroll-view / scroll-view-wobble-effect.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
index 83b3153..93a9b20 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
@@ -1,26 +1,27 @@
 #ifndef __DALI_TOOLKIT_SCROLL_VIEW_WOBBLE_EFFECT_H__
 #define __DALI_TOOLKIT_SCROLL_VIEW_WOBBLE_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) 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.
+ * 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
 {
 
 namespace Toolkit
@@ -39,7 +40,7 @@ class ScrollViewWobbleEffect;
  * Using this effect, a %wobble% property is produced which swings
  * towards the origin in accordance to how the user pans the ScrollView.
  */
-class ScrollViewWobbleEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewWobbleEffect : public ScrollViewEffect
 {
 public:
 
@@ -66,7 +67,7 @@ protected:
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
-  ScrollViewWobbleEffect(Internal::ScrollViewWobbleEffect *impl);
+  explicit DALI_INTERNAL ScrollViewWobbleEffect(Internal::ScrollViewWobbleEffect *impl);
 
 };