Merge from 2.2

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

diff --git a/inc/FTelTypes.h b/inc/FTelTypes.h
old mode 100644 (file)
new mode 100755 (executable)
index 077f78f..98071e1
--- a/inc/FTelTypes.h
+++ b/inc/FTelTypes.h
@@ -16,9 +16,9 @@
 //
 /**
  * @file    FTelTypes.h
- * @brief   This is the header file for the enumerations of the Tizen::Telephony namespace.
+ * @brief   This is the header file for the enumerations of the %Telephony namespace.
  *
- * This header file contains the definitions of the enumerations of the Tizen::Telephony namespace.
+ * This header file contains the declarations of the enumerations of the Telephony namespace.
  */
 #ifndef _FTEL_ENUM_H_
 #define _FTEL_ENUM_H_
@@ -28,7 +28,7 @@ namespace Tizen { namespace Telephony
 /**
  * @enum    CallType
  *
- * Defines the type of the current call.
+ * Defines the current call type.
  *
  * @since   2.0
  */
@@ -42,7 +42,7 @@ enum CallType
 /**
  * @enum    CallStatus
  *
- * Defines the current status of calls.
+ * Defines the current call status.
  *
  * @since   2.0
  */
@@ -50,17 +50,17 @@ enum CallStatus
 {
        CALL_STATUS_UNDEFINED = -1, /**< No defined type */
        CALL_STATUS_IDLE = 0,       /**< No call is in progress */
-       CALL_STATUS_ACTIVE,         /**< @if OSPDEPREC @deprecated This enum value is deprecated because an active status is divided into three, that is, communicating, ringing, dialing, and holding @endif */
-       CALL_STATUS_COMMUNICATING,  /**< Voice or video calls are in progress */
+       CALL_STATUS_ACTIVE,         /**< @if OSPDEPREC @deprecated This enum value is deprecated because an active status is divided into four types, that is, communicating, ringing, dialing, and holding @endif */
+       CALL_STATUS_COMMUNICATING,  /**< A voice or video call is in progress */
        CALL_STATUS_RINGING,        /**< An incoming voice or video call */
        CALL_STATUS_DIALING,        /**< An outgoing voice or video call */
-       CALL_STATUS_HOLDING         /**< A call on holding status */
+       CALL_STATUS_HOLDING         /**< A call in the holding status */
 };
 
 /**
  * @enum       SimType
  *
- * Defines the type of the SIM card.
+ * Defines the SIM card type.
  *
  * @since      2.1
  */
@@ -76,7 +76,7 @@ enum SimType
 /**
  * @enum       SimState
  *
- * Defines the current state of SIM card.
+ * Defines the current SIM card state.
  *
  * @since      2.1
  */
@@ -84,12 +84,12 @@ enum SimState
 {
        SIM_STATE_UNKNOWN,                      /**< Unknown state */
        SIM_STATE_ABSENT,                       /**< SIM is not present */
-       SIM_STATE_INITIALIZING,         /**< SIM is on initializing */
-       SIM_STATE_READY,                        /**< SIM is ready*/
-       SIM_STATE_PIN_REQUIRED,         /**< PIN required */
-       SIM_STATE_PUK_REQUIRED,         /**< PUK required */
-       SIM_STATE_NETWORK_LOCKED,       /**< Network locked */
-       SIM_STATE_SIM_LOCKED            /**< PH-SIM (phone-SIM) locked */
+       SIM_STATE_INITIALIZING,         /**< SIM is in the initializing state */
+       SIM_STATE_READY,                        /**< SIM is in the ready state */
+       SIM_STATE_PIN_REQUIRED,         /**< PIN is required */
+       SIM_STATE_PUK_REQUIRED,         /**< PUK is required */
+       SIM_STATE_NETWORK_LOCKED,       /**< Network locked state */
+       SIM_STATE_SIM_LOCKED            /**< PH-SIM (phone-SIM) locked state */
 };
 
 }} // Tizen::Telephony