merge with master

[platform/framework/native/telephony.git] / inc / FTelCallManager.h

diff --git a/inc/FTelCallManager.h b/inc/FTelCallManager.h
index aa7b61d..58d00cd 100755 (executable)
--- a/inc/FTelCallManager.h
+++ b/inc/FTelCallManager.h
@@ -136,13 +136,12 @@ public:
        result Construct(ITelephonyCallEventListener& listener);
 
        /**
-     * @if VISPARTNER-OPERATOR
      * Sets the listener that listens to the call forwarding request.
      *
      * @since   2.0
         *
-     * @visibility  partner-operator
-     * @privilege   %http://tizen.org/privilege/callforward
+     * @privlevel      platform
+     * @privilege   http://tizen.org/privilege/callforward
      *
      * @return  An error code
      * @param[in]   pListener           An ITelephonyCallForwardListener instance @n
@@ -150,20 +149,17 @@ public:
      * @exception   E_SUCCESS           The method is successful.
      * @exception   E_PRIVILEGE_DENIED  The application does not have the privilege to call this method.
      * @exception   E_SYSTEM            A system error has occurred.
-     *
-     * @endif
      */
        result SetCallForwardListener(ITelephonyCallForwardListener* pListener);
 
        /**
-     * @if VISPARTNER-OPERATOR
      * Requests call forwarding with the specified number. @n
      * This method sends the request to the network, and receives the response asynchronously.
      *
      * @since   2.0
         *
-     * @visibility  partner-operator
-     * @privilege   %http://tizen.org/privilege/callforward
+     * @privlevel      platform
+     * @privilege   http://tizen.org/privilege/callforward
      *
      * @return  An error code
      * @param[in]   phoneNumber The phone number for call forwarding
@@ -178,42 +174,36 @@ public:
      * @remarks The call will be forwarded unconditionally. Voice call only. @n
      *          The phone number can start with plus(+) and the remaining part must be number.
      * @see ITelephonyCallForwardListener::OnTelephonyCallForwardResponseReceived()
-     *
-     * @endif
      */
        result RequestCallForward(const Tizen::Base::String& phoneNumber);
 
     /**
-     * @if VISPARTNER-OPERATOR
      * Stops call forwarding.
      *
      * @since   2.0
         *
-     * @visibility  partner-operator
-     * @privilege   %http://tizen.org/privilege/callforward
+     * @privlevel      platform
+     * @privilege   http://tizen.org/privilege/callforward
      *
      * @return  An error code
-     * @exception   E_SUCCESS               The method is successful.
-      @exception    E_INVALID_STATE         This instance is in an invalid state.
-     * @exception   E_IN_PROGRESS           The previous request is in progress.
-     * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
-     * @exception   E_NETWORK_UNAVAILABLE   The operation has failed because the device is in the offline mode.
-     * @exception   E_SERVICE_UNAVAILABLE   The operation has failed because the device is out of the coverage area or in the emergency mode.
-     * @exception   E_SYSTEM                A system error has occurred.
+     * @exception      E_SUCCESS               The method is successful.
+     * @exception      E_INVALID_STATE         This instance is in an invalid state.
+     * @exception      E_IN_PROGRESS           The previous request is in progress.
+     * @exception      E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
+     * @exception      E_NETWORK_UNAVAILABLE   The operation has failed because the device is in the offline mode.
+     * @exception      E_SERVICE_UNAVAILABLE   The operation has failed because the device is out of the coverage area or in the emergency mode.
+     * @exception      E_SYSTEM                A system error has occurred.
      * @see ITelephonyCallForwardListener::OnTelephonyCallForwardStopped()
-     *
-     * @endif
      */
        result StopCallForward(void);
 
        /**
-     * @if VISPARTNER-OPERATOR
      * Gets the phone number to which the call must be forwarded.
      *
      * @since   2.0
         *
-     * @visibility  partner-operator
-     * @privilege   %http://tizen.org/privilege/callforward
+     * @privlevel      platform
+     * @privilege   http://tizen.org/privilege/callforward
      *
      * @return  An error code
      * @exception   E_SUCCESS               The method is successful.
@@ -223,8 +213,6 @@ public:
      * @exception   E_SERVICE_UNAVAILABLE   The operation has failed because the device is out of the coverage area or in the emergency mode.
      * @exception   E_SYSTEM                A system error has occurred.
      * @see ITelephonyCallForwardListener::OnTelephonyCallForwardNumberReceived
-     *
-     * @endif
      */
        result GetCallForwardNumber(void) const;
 
@@ -234,7 +222,7 @@ public:
      * @since                  2.0
         *
      * @return      The current call type, @n
-     *              else Telephony::TYPE_UNDEFINED_CALL if the method fails
+     *              else TYPE_UNDEFINED_CALL if the method fails
      */
        CallType GetCurrentCallType(void) const;
 
@@ -244,7 +232,7 @@ public:
      * @since                  2.0
         *
      * @return      The current call status, @n
-     *              else Telephony::CALL_STATUS_UNDEFINED if the method fails
+     *              else CALL_STATUS_UNDEFINED if the method fails
      */
        CallStatus GetCurrentCallStatus(void) const;