merge changed things from tizen_2.1

Change-Id: I0bc4b348eb11defea52269c899ee2c65a9112bed

diff --git a/inc/FCntContentTransfer.h b/inc/FCntContentTransfer.h
index 8918b50..2684c3c 100644 (file)
--- a/inc/FCntContentTransfer.h
+++ b/inc/FCntContentTransfer.h
@@ -14,10 +14,12 @@
 // limitations under the License.
 //
 /**
+ * @if OSPDEPREC
  * @file               FCntContentTransfer.h
  * @brief              This is the header file for the %ContentTransfer class.
  *
  * This header file contains the declarations of the %ContentTransfer class.
+ * @endif
  */
 
 #ifndef _FCNT_CONTENT_TRANSFER_H_

diff --git a/inc/FCntContentTransferInfo.h b/inc/FCntContentTransferInfo.h
index 9038b19..38705fa 100644 (file)
--- a/inc/FCntContentTransferInfo.h
+++ b/inc/FCntContentTransferInfo.h
@@ -14,10 +14,12 @@
 // limitations under the License.
 //
 /**
+ * @if OSPDEPREC
  * @file               FCntContentTransferInfo.h
  * @brief              This is the header file for the %ContentTransferInfo class.
  *
  * This header file contains the declarations of the %ContentTransferInfo class.
+ * @endif
  */
 
 #ifndef _FCNT_CONTENT_TRANSFER_INFO_H_

diff --git a/inc/FCntDownloadRequest.h b/inc/FCntDownloadRequest.h
index 86ce229..a31c3b4 100644 (file)
--- a/inc/FCntDownloadRequest.h
+++ b/inc/FCntDownloadRequest.h
@@ -165,7 +165,6 @@ public:
        *
        * @param[in] enable Set to @c true if the system shows a notification for this download request, @n
        *                                       else @c false
-       * @see Tizen::Shell::NotificationManager
        */
        void SetNotification(bool enable);
 
@@ -183,12 +182,11 @@ public:
        * - The argument is @c null.
        * - The argument is not a map of the Tizen::Base::String key and the Tizen::Base::String value pair.
        * @see Tizen::Shell::NotificationManager
-       * @see Tizen::App::IAppControlProviderEventListener::OnAppControlRequestReceived()
        */
        result SetNotificationExtraData(const Tizen::Base::Collection::IMap *pExtraData);
 
        /**
-       * Sets to an allowed network type. @n
+       * Sets an allowed network type. @n
        * By default, all network types are allowed.
        *
        * @since 2.1

diff --git a/inc/FCntIContentTransferListener.h b/inc/FCntIContentTransferListener.h
index 05844ae..5e54c4d 100644 (file)
--- a/inc/FCntIContentTransferListener.h
+++ b/inc/FCntIContentTransferListener.h
@@ -14,10 +14,12 @@
 // limitations under the License.
 //
 /**
+ * @if OSPDEPREC
  * @file                       FCntIContentTransferListener.h
  * @brief              This is the header file for the %IContentTransferListener interface.
  *
  * This header file contains the declarations of the %IContentTransferListener interface.
+ * @endif
  */
 
 #ifndef _FCNT_ICONTENT_TRANSFER_LISTENER_H_