Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / capi / dali_toolkit_doc.h

diff --git a/capi/dali_toolkit_doc.h b/capi/dali_toolkit_doc.h
index a53b6d6..8a67233 100644 (file)
--- a/capi/dali_toolkit_doc.h
+++ b/capi/dali_toolkit_doc.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_DOC_H__
 #define __DALI_TOOLKIT_DOC_H__
 
 #ifndef __DALI_TOOLKIT_DOC_H__
 #define __DALI_TOOLKIT_DOC_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.
+ *
+ */

 
 /**
  * @ingroup CAPI_DALI_FRAMEWORK
 
 /**
  * @ingroup CAPI_DALI_FRAMEWORK


@@ -154,6 +155,7 @@
  * (via touch) or automatically. </td></tr>
  * <tr><td>@ref CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE</td><td> Item view </td></tr>
  * <tr><td>@ref CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE</td><td> Scroll view </td></tr>
  * (via touch) or automatically. </td></tr>
  * <tr><td>@ref CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE</td><td> Item view </td></tr>
  * <tr><td>@ref CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE</td><td> Scroll view </td></tr>

+ * <tr><td>@ref CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE</td><td> Scroll Connector </td></tr>

  * <tr><td>@ref Dali::Toolkit::Scrollable </td><td>Base class for derived Scrollables that contains actors that can be scrolled manually
  * </table>
  */
  * <tr><td>@ref Dali::Toolkit::Scrollable </td><td>Base class for derived Scrollables that contains actors that can be scrolled manually
  * </table>
  */


@@ -176,6 +178,18 @@
 
 /**
  * @ingroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE
 
 /**
  * @ingroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE

+ * @defgroup CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE   Scroll Connector
+ * @brief
+ * @section  CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE_HEADER Required Header
+ *  \#include <dali-toolkit/dali-toolkit.h>
+ * @section CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE_OVERVIEW Overview
+ * <table> <tr><th>API</th><th>Description</th></tr>
+ * <tr><td>@ref Dali::Toolkit::ScrollConnector </td><td>ScrollConnector is used to connect scrollable containers with components such as scroll bars, indicators etc.</td></tr>
+ * </table>
+ */
+
+/**
+ * @ingroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE

  * @defgroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE Scroll view
  * @brief
  * @section  CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE_HEADER Required Header
  * @defgroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE Scroll view
  * @brief
  * @section  CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE_HEADER Required Header