merge the changed things from tizen_2.1

Change-Id: Iec66e730ef359f6a30a4eaf59d01c778edbd558f

diff --git a/inc/FUiAnimFrameAnimator.h b/inc/FUiAnimFrameAnimator.h
index e7dff7b..870196b 100644 (file)
--- a/inc/FUiAnimFrameAnimator.h
+++ b/inc/FUiAnimFrameAnimator.h
@@ -110,7 +110,7 @@ public:
         * Sets the specified form as the current form of the frame with an animation.
         *
         * @brief       <i> [Deprecated] </i>
-        * @deprecated  This API is deprecated.
+        * @deprecated  This method is deprecated.
         * @since       2.0
         *
         * @return              An error code

diff --git a/inc/FUiAnimVisualElement.h b/inc/FUiAnimVisualElement.h
index c2edef3..e226078 100644 (file)
--- a/inc/FUiAnimVisualElement.h
+++ b/inc/FUiAnimVisualElement.h
@@ -384,7 +384,7 @@ public:
         * Checks whether this instance is a child or descendant of the specified one.
         *
         * @brief       <i> [Deprecated] </i>
-        * @deprecated  This API is deprecated.
+        * @deprecated  This method is deprecated.
         * @since               2.0
         *
         * @return              @c true if this instance is a child or descendant of the specified one, @n
@@ -413,7 +413,7 @@ public:
         * If you need to change Z-Order group, you can change it using the SetZOrderGroup() method.
         *
         * @brief       <i> [Deprecated] </i>
-        * @deprecated  This API is deprecated.
+        * @deprecated  This method is deprecated.
         * @since               2.0
         *
         * @return              An error code
@@ -458,7 +458,7 @@ public:
         * placed right above or below the @c pReference instance according to the @c above parameter.
         *
         * @brief       <i> [Deprecated] </i>
-        * @deprecated  This API is deprecated.
+        * @deprecated  This method is deprecated.
         * @since               2.0
         *
         * @return              An error code
@@ -517,7 +517,7 @@ public:
         * Detaches a child from this instance.
         *
         * @brief       <i> [Deprecated] </i>
-        * @deprecated  This API is deprecated.
+        * @deprecated  This method is deprecated.
         * @since               2.0
         *
         * @return              An error code

diff --git a/inc/FUiCtrlCustomList.h b/inc/FUiCtrlCustomList.h
index ab9ca49..e917217 100644 (file)
--- a/inc/FUiCtrlCustomList.h
+++ b/inc/FUiCtrlCustomList.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlCustomList.h
  * @brief      This is the header file for the %CustomList class.
  *
  * This header file contains the declarations of the %CustomList class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_CUSTOM_LIST_H_

diff --git a/inc/FUiCtrlCustomListItem.h b/inc/FUiCtrlCustomListItem.h
index 4d635e0..789aaba 100644 (file)
--- a/inc/FUiCtrlCustomListItem.h
+++ b/inc/FUiCtrlCustomListItem.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlCustomListItem.h
  * @brief      This is the header file for the %CustomListItem class.
  *
  * This header file contains the declarations of the %CustomListItem class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_CUSTOM_LIST_ITEM_H_

diff --git a/inc/FUiCtrlCustomListItemFormat.h b/inc/FUiCtrlCustomListItemFormat.h
index 35fc5e5..e4fd5a0 100644 (file)
--- a/inc/FUiCtrlCustomListItemFormat.h
+++ b/inc/FUiCtrlCustomListItemFormat.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlCustomListItemFormat.h
  * @brief      This is the header file for the %CustomListItemFormat class.
  *
  * This header file contains the declarations of the %CustomListItemFormat class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_CUSTOM_LIST_ITEM_FORMAT_H_

diff --git a/inc/FUiCtrlExpandableList.h b/inc/FUiCtrlExpandableList.h
index 3f28c2b..6c7e8a2 100644 (file)
--- a/inc/FUiCtrlExpandableList.h
+++ b/inc/FUiCtrlExpandableList.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlExpandableList.h
  * @brief      This is the header file for the %ExpandableList class.
  *
  * This header file contains the declarations of the %ExpandableList class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_EXPANDABLE_LIST_H_

diff --git a/inc/FUiCtrlGroupedList.h b/inc/FUiCtrlGroupedList.h
index 1b7b546..e75a552 100644 (file)
--- a/inc/FUiCtrlGroupedList.h
+++ b/inc/FUiCtrlGroupedList.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlGroupedList.h
  * @brief      This is the header file for the %GroupedList class.
  *
  * This header file contains the declarations of the %GroupedList class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_GROUPED_LIST_H_

diff --git a/inc/FUiCtrlICustomListElement.h b/inc/FUiCtrlICustomListElement.h
index a7e80f4..c8a2da2 100644 (file)
--- a/inc/FUiCtrlICustomListElement.h
+++ b/inc/FUiCtrlICustomListElement.h
@@ -15,11 +15,12 @@
 // limitations under the License.
 //
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlICustomListElement.h
  * @brief      This is the header file for the %ICustomListElement interface.
  *
  * This header files contains the declarations of %ICustomListElement interface.
- *
+ * @endif
  */
 
 #ifndef _FUI_CTRL_ICUSTOM_LIST_ELEMENT_H_

diff --git a/inc/FUiCtrlIconList.h b/inc/FUiCtrlIconList.h
index cc4ee9a..b9569a5 100644 (file)
--- a/inc/FUiCtrlIconList.h
+++ b/inc/FUiCtrlIconList.h
@@ -15,10 +15,12 @@
 // limitations under the License.
 //
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlIconList.h
  * @brief      This is the header file for the %IconList class.
  *
  * This header file contains the declarations of the %IconList class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_ICON_LIST_H_

diff --git a/inc/FUiCtrlList.h b/inc/FUiCtrlList.h
index 787cb6b..77e78fc 100644 (file)
--- a/inc/FUiCtrlList.h
+++ b/inc/FUiCtrlList.h
@@ -15,10 +15,12 @@
 // limitations under the License.
 //
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlList.h
  * @brief      This is the header file for the %List class.
  *
  * This header file contains the declarations of the %List class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_LIST_H_

diff --git a/inc/FUiCtrlSlidableGroupedList.h b/inc/FUiCtrlSlidableGroupedList.h
index 678cf2b..3a6d7d6 100644 (file)
--- a/inc/FUiCtrlSlidableGroupedList.h
+++ b/inc/FUiCtrlSlidableGroupedList.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlSlidableGroupedList.h
  * @brief      This is the header file for the %SlidableGroupedList class.
  *
  * This header file contains the declarations of the %SlidableGroupedList class and its helper classes.
+ * @endif
  */
 #ifndef _FUI_CTRL_SLIDABLE_GROUPED_LIST_H_
 #define _FUI_CTRL_SLIDABLE_GROUPED_LIST_H_

diff --git a/inc/FUiCtrlSlidableList.h b/inc/FUiCtrlSlidableList.h
index bd362c0..e5a28d9 100644 (file)
--- a/inc/FUiCtrlSlidableList.h
+++ b/inc/FUiCtrlSlidableList.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlSlidableList.h
  * @brief      This is the header file for the %SlidableList class.
  *
  * This header file contains the declarations of the %SlidableList class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_SLIDABLE_LIST_H_

diff --git a/inc/FUiCtrlTab.h b/inc/FUiCtrlTab.h
index fd8e66c..8136dc6 100644 (file)
--- a/inc/FUiCtrlTab.h
+++ b/inc/FUiCtrlTab.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCtrlTab.h
  * @brief      This is the header file for the %Tab class.
  *
  * This header file contains the declarations of the %Tab class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CTRL_TAB_H_

diff --git a/inc/FUiCustomControlBase.h b/inc/FUiCustomControlBase.h
index 9034cbe..1bcadf0 100644 (file)
--- a/inc/FUiCustomControlBase.h
+++ b/inc/FUiCustomControlBase.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiCustomControlBase.h
  * @brief      This is the header file for the %CustomControlBase class.
  *
  * This header file contains the declarations of the %CustomControlBase class and its helper classes.
+ * @endif
  */
 
 #ifndef _FUI_CUSTOM_CONTROL_BASE_H_

diff --git a/inc/FUiKeyboardMap.h b/inc/FUiKeyboardMap.h
index af22e53..219781e 100644 (file)
--- a/inc/FUiKeyboardMap.h
+++ b/inc/FUiKeyboardMap.h
@@ -16,10 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file               FUiKeyboardMap.h
  * @brief              This is the header file for the %KeyboardMap class.
  *
  * This header file contains the declarations of the %KeyboardMap class.
+ * @endif
  */
 
 #ifndef _FUI_KEYBOARD_MAP_H_

diff --git a/inc/FUiTouch.h b/inc/FUiTouch.h
index 0e9b09c..3aaf986 100644 (file)
--- a/inc/FUiTouch.h
+++ b/inc/FUiTouch.h
@@ -16,11 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiTouch.h
  * @brief      This is the header file for the %Touch class.
  *
  * This header file contains the declarations of the %Touch class.get
- *
+ * @endif
  */
 
 #ifndef _FUI_TOUCH_H_

diff --git a/inc/FUiTouchInfo.h b/inc/FUiTouchInfo.h
index 360bd6c..03c275b 100644 (file)
--- a/inc/FUiTouchInfo.h
+++ b/inc/FUiTouchInfo.h
@@ -16,11 +16,12 @@
 //
 
 /**
+ * @if OSPDEPREC
  * @file       FUiTouchInfo.h
  * @brief      This is the header file for the %TouchInfo class.
  *
  * This header file contains the declarations of the %TouchInfo class.
- *
+ * @endif
  */
 
 #ifndef _FUI_TOUCH_INFO_H_