Merge "Scrollable public API clean-up phase 1" into tizen

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

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-component.h b/dali-toolkit/public-api/controls/scrollable/scroll-component.h
index ab7d195..cbfdf5b 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-component.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-component.h
@@ -1,27 +1,27 @@
 #ifndef __DALI_TOOLKIT_SCROLL_COMPONENT_H__
 #define __DALI_TOOLKIT_SCROLL_COMPONENT_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/dali.h>
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -34,7 +34,7 @@ class ScrollConnector;
  * Base class for scroll component handles.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */
-class ScrollComponent : public Control
+class DALI_IMPORT_API ScrollComponent : public Control
 {
 
 public:
@@ -55,10 +55,11 @@ public:
   ScrollComponent& operator=( const ScrollComponent& scrollComponent );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ScrollComponent();
+  ~ScrollComponent();
 
   /**
    * Downcast an Object handle to ScrollComponent. If handle points to a ScrollComponent the
@@ -88,13 +89,13 @@ public: // Not intended for application developers
    * Creates a handle using the implementation.
    * @param[in]  implementation The Control implementation.
    */
-  ScrollComponent( ScrollComponentImpl& implementation );
+  DALI_INTERNAL ScrollComponent( ScrollComponentImpl& implementation );
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  ScrollComponent( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ScrollComponent( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit