Add remote input error enums for consistency

Change-Id: Ide06927fcd40be62c3814c094bd826e687c12fd3
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/remote_input/include/remote_input.h b/remote_input/include/remote_input.h
index 177bfd1..2360529 100644 (file)
--- a/remote_input/include/remote_input.h
+++ b/remote_input/include/remote_input.h
@@ -47,6 +47,10 @@ typedef enum {
     REMOTE_INPUT_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */
     REMOTE_INPUT_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY,         /**< Out of Memory */
     REMOTE_INPUT_OPERATION_FAILED,                                  /**< Operation failed */
+    REMOTE_INPUT_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
+    REMOTE_INPUT_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */
+    REMOTE_INPUT_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY,         /**< Out of Memory */
+    REMOTE_INPUT_ERROR_OPERATION_FAILED = REMOTE_INPUT_OPERATION_FAILED,  /**< Operation failed */
 } remote_input_error_e;
 
 /**
@@ -168,10 +172,10 @@ typedef void (*remote_input_resource_changed_cb)(remote_input_resource_e resourc
  * @param[out] remote_handle The remote input handle
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
- * @retval #REMOTE_INPUT_PERMISSION_DENIED Permission denied
- * @retval #REMOTE_INPUT_OUT_OF_MEMORY Out of memory
- * @retval #REMOTE_INPUT_OPERATION_FAILED Operation failure
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_PERMISSION_DENIED Permission denied
+ * @retval #REMOTE_INPUT_ERROR_OUT_OF_MEMORY Out of memory
+ * @retval #REMOTE_INPUT_ERROR_OPERATION_FAILED Operation failure
  * @see remote_input_destroy()
  */
 int remote_input_create(remote_input_h *remote_handle);
@@ -183,8 +187,8 @@ int remote_input_create(remote_input_h *remote_handle);
  * @param[in] remote_handle The remote input handle
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
- * @retval #REMOTE_INPUT_OPERATION_FAILED Operation failed
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_OPERATION_FAILED Operation failed
  * @see remote_input_create()
  */
 int remote_input_destroy(remote_input_h remote_handle);
@@ -198,7 +202,7 @@ int remote_input_destroy(remote_input_h remote_handle);
  * @param[in] user_data User data to be passed to the callback function
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_focus_in_callback_unset()
  */
 int remote_input_focus_in_callback_set(remote_input_h remote_handle, remote_input_focus_in_cb callback, void *user_data);
@@ -210,7 +214,7 @@ int remote_input_focus_in_callback_set(remote_input_h remote_handle, remote_inpu
  * @param[in] remote_handle The remote input handle
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_focus_in_callback_set()
  */
 int remote_input_focus_in_callback_unset(remote_input_h remote_handle);
@@ -224,7 +228,7 @@ int remote_input_focus_in_callback_unset(remote_input_h remote_handle);
  * @param[in] user_data User data to be passed to the callback function
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_focus_out_callback_unset()
  */
 int remote_input_focus_out_callback_set(remote_input_h remote_handle, remote_input_focus_out_cb callback, void *user_data);
@@ -236,7 +240,7 @@ int remote_input_focus_out_callback_set(remote_input_h remote_handle, remote_inp
  * @param[in] remote_handle The remote input handle
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_focus_out_callback_set()
  */
 int remote_input_focus_out_callback_unset(remote_input_h remote_handle);
@@ -250,7 +254,7 @@ int remote_input_focus_out_callback_unset(remote_input_h remote_handle);
  * @param[in] user_data User data to be passed to the callback function
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_metadata_updated_callback_unset()
  */
 int remote_input_metadata_updated_callback_set(remote_input_h remote_handle, remote_input_metadata_updated_cb callback, void *user_data);
@@ -262,7 +266,7 @@ int remote_input_metadata_updated_callback_set(remote_input_h remote_handle, rem
  * @param[in] remote_handle The remote input handle
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_metadata_updated_callback_set()
  */
 int remote_input_metadata_updated_callback_unset(remote_input_h remote_handle);
@@ -276,7 +280,7 @@ int remote_input_metadata_updated_callback_unset(remote_input_h remote_handle);
  * @param[in] user_data User data to be passed to the callback function
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_text_updated_callback_unset()
  */
 int remote_input_text_updated_callback_set(remote_input_h remote_handle, remote_input_text_updated_cb callback, void *user_data);
@@ -288,7 +292,7 @@ int remote_input_text_updated_callback_set(remote_input_h remote_handle, remote_
  * @param[in] remote_handle The remote input handle
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_text_updated_callback_set()
  */
 int remote_input_text_updated_callback_unset(remote_input_h remote_handle);
@@ -302,7 +306,7 @@ int remote_input_text_updated_callback_unset(remote_input_h remote_handle);
  * @param[in] user_data User data to be passed to the callback function
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_resource_changed_callback_unset()
  */
 int remote_input_resource_changed_callback_set(remote_input_h remote_handle, remote_input_resource_changed_cb callback, void *user_data);
@@ -314,7 +318,7 @@ int remote_input_resource_changed_callback_set(remote_input_h remote_handle, rem
  * @param[in] remote_handle The remote input handle
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @see remote_input_resource_changed_callback_set()
  */
 int remote_input_resource_changed_callback_unset(remote_input_h remote_handle);
@@ -331,7 +335,7 @@ int remote_input_resource_changed_callback_unset(remote_input_h remote_handle);
  * @param[out] input_hint Input hint information
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @post Remote input panel UI should be drawn or operated by this information accordingly.
  * @see remote_input_metadata_updated_cb()
  */
@@ -347,7 +351,7 @@ int remote_input_get_input_hint(remote_input_h remote_handle, Ecore_IMF_Input_Hi
  * @param[out] layout Layout information
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @post Remote input panel UI should be drawn or operated by this information accordingly.
  * @see remote_input_metadata_updated_cb()
  */
@@ -363,7 +367,7 @@ int remote_input_get_layout(remote_input_h remote_handle, Ecore_IMF_Input_Panel_
  * @param[out] variation The layout variation
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @post Remote input panel UI should be drawn or operated by this information accordingly.
  * @see remote_input_metadata_updated_cb()
  */
@@ -379,7 +383,7 @@ int remote_input_get_layout_variation(remote_input_h remote_handle, int *variati
  * @param[out] autocapital_type autocapital_type Autocapital type information
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @post Remote input panel UI should be drawn or operated by this information accordingly.
  * @see remote_input_metadata_updated_cb()
  */
@@ -395,7 +399,7 @@ int remote_input_get_autocapital_type(remote_input_h remote_handle, Ecore_IMF_Au
  * @param[out] return_key_state The return key state information \n @c true to enable return key button, @c false to disable return key button
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @post Remote input panel UI should be drawn or operated by this information accordingly.
  * @see remote_input_metadata_updated_cb()
  */
@@ -411,7 +415,7 @@ int remote_input_get_return_key_state(remote_input_h remote_handle, bool *return
  * @param[out] return_key_type The return key label type information
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
  * @post Remote input panel UI should be drawn or operated by this information accordingly.
  * @see remote_input_metadata_updated_cb()
  */
@@ -422,13 +426,13 @@ int remote_input_get_return_key_type(remote_input_h remote_handle, Ecore_IMF_Inp
  * @brief Sends a key event to the associated text field.
  * @since_tizen 5.5
  * @remarks This function must be used if an associated text field has focus.
- *          Otherwise, #REMOTE_INPUT_OPERATION_FAILED will be returned.
+ *          Otherwise, #REMOTE_INPUT_ERROR_OPERATION_FAILED will be returned.
  * @param[in] remote_handle The remote input handle
  * @param[in] key The key type
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
- * @retval #REMOTE_INPUT_OPERATION_FAILED Operation failure
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_OPERATION_FAILED Operation failure
  */
 int remote_input_send_key_event(remote_input_h remote_handle, remote_input_key_type_e key);
 
@@ -437,13 +441,13 @@ int remote_input_send_key_event(remote_input_h remote_handle, remote_input_key_t
  * @brief Sends a commit string to the associated text field.
  * @since_tizen 5.5
  * @remarks This function must be used if an associated text field has focus.
- *          Otherwise, #REMOTE_INPUT_OPERATION_FAILED will be returned.
+ *          Otherwise, #REMOTE_INPUT_ERROR_OPERATION_FAILED will be returned.
  * @param[in] remote_handle The remote input handle
  * @param[in] text The UTF-8 string to be committed
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
- * @retval #REMOTE_INPUT_OPERATION_FAILED Operation failure
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_OPERATION_FAILED Operation failure
  */
 int remote_input_send_commit_string(remote_input_h remote_handle, const char *text);
 
@@ -452,14 +456,14 @@ int remote_input_send_commit_string(remote_input_h remote_handle, const char *te
  * @brief Updates a preedit string to the associated text field.
  * @since_tizen 5.5
  * @remarks This function must be used if an associated text field has focus.
- *          Otherwise, #REMOTE_INPUT_OPERATION_FAILED will be returned.
+ *          Otherwise, #REMOTE_INPUT_ERROR_OPERATION_FAILED will be returned.
  * @param[in] remote_handle The remote input handle
  * @param[in] text The UTF-8 string to be committed
  * @param[in] cursor_pos The cursor position; -1 means at the end of line
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
- * @retval #REMOTE_INPUT_OPERATION_FAILED Operation failure
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_OPERATION_FAILED Operation failure
  */
 int remote_input_update_preedit_string(remote_input_h remote_handle, const char *text, int cursor_pos);
 
@@ -468,14 +472,14 @@ int remote_input_update_preedit_string(remote_input_h remote_handle, const char
  * @brief Requests to delete surrounding text.
  * @since_tizen 5.5
  * @remarks This function must be used if an associated text field has focus.
- *          Otherwise, #REMOTE_INPUT_OPERATION_FAILED will be returned.
+ *          Otherwise, #REMOTE_INPUT_ERROR_OPERATION_FAILED will be returned.
  * @param[in] remote_handle The remote input handle
  * @param[in] offset The offset value from the cursor position
  * @param[in] len The length of the text to delete
  * @return 0 on success, otherwise a negative error value
  * @retval #REMOTE_INPUT_ERROR_NONE Successful
- * @retval #REMOTE_INPUT_INVALID_PARAMETER Invalid parameter
- * @retval #REMOTE_INPUT_OPERATION_FAILED Operation failure
+ * @retval #REMOTE_INPUT_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #REMOTE_INPUT_ERROR_OPERATION_FAILED Operation failure
  */
 int remote_input_delete_surrounding_text(remote_input_h remote_handle, int offset, int len);
 

diff --git a/remote_input/src/remote_input.cpp b/remote_input/src/remote_input.cpp
index 2a89720..22d224e 100644 (file)
--- a/remote_input/src/remote_input.cpp
+++ b/remote_input/src/remote_input.cpp
@@ -35,13 +35,13 @@ static remote_input_error_e _remote_check_privilege() {
 
     if (inputmethod_cynara_initialize() == false) {
         LOGE("cynara_initialize () == false");
-        return REMOTE_INPUT_PERMISSION_DENIED;
+        return REMOTE_INPUT_ERROR_PERMISSION_DENIED;
     }
 
     snprintf(uid, 16, "%d", getuid());
     if (check_privilege(uid, REMOTE_PRIVILEGE) == false) {
         LOGE("check_privilege(uid, REMOTE_PRIVILEGE) == false. uid : %s", uid);
-        ret = REMOTE_INPUT_PERMISSION_DENIED;
+        ret = REMOTE_INPUT_ERROR_PERMISSION_DENIED;
     }
 
     inputmethod_cynara_finish();
@@ -104,28 +104,28 @@ EXPORT_API int remote_input_create(remote_input_h *remote_handle)
     remote_input_error_e ret = REMOTE_INPUT_ERROR_NONE;
 
     if (!remote_handle) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     ret = _remote_check_privilege();
     if (ret != REMOTE_INPUT_ERROR_NONE) {
-        LOGE("REMOTE_INPUT_PERMISSION_DENIED");
+        LOGE("REMOTE_INPUT_ERROR_PERMISSION_DENIED");
         return ret;
     }
 
     struct remote_input_s *remote_input = (remote_input_h)calloc(1, sizeof(struct remote_input_s));
     if (!remote_input) {
-        LOGE("REMOTE_INPUT_OUT_OF_MEMORY");
-        return REMOTE_INPUT_OUT_OF_MEMORY;
+        LOGE("REMOTE_INPUT_ERROR_OUT_OF_MEMORY");
+        return REMOTE_INPUT_ERROR_OUT_OF_MEMORY;
     }
 
     remote_input->remote_client = remote_control_connect();
     if (!remote_input->remote_client) {
-        LOGE("REMOTE_INPUT_OPERATION_FAILED");
+        LOGE("REMOTE_INPUT_ERROR_OPERATION_FAILED");
         free(remote_input);
         remote_input = NULL;
-        return REMOTE_INPUT_OPERATION_FAILED;
+        return REMOTE_INPUT_ERROR_OPERATION_FAILED;
     }
 
     *remote_handle = (remote_input_h)remote_input;
@@ -136,13 +136,13 @@ EXPORT_API int remote_input_create(remote_input_h *remote_handle)
 EXPORT_API int remote_input_destroy(remote_input_h remote_handle)
 {
     if (!remote_handle || !remote_handle->remote_client) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     if (remote_control_disconnect(remote_handle->remote_client) != REMOTE_CONTROL_ERROR_NONE) {
-        LOGE("REMOTE_INPUT_OPERATION_FAILED");
-        return REMOTE_INPUT_OPERATION_FAILED;
+        LOGE("REMOTE_INPUT_ERROR_OPERATION_FAILED");
+        return REMOTE_INPUT_ERROR_OPERATION_FAILED;
     } else {
         remote_handle->remote_client = NULL;
     }
@@ -156,8 +156,8 @@ EXPORT_API int remote_input_destroy(remote_input_h remote_handle)
 EXPORT_API int remote_input_focus_in_callback_set(remote_input_h remote_handle, remote_input_focus_in_cb callback, void *user_data)
 {
     if (!remote_handle || !remote_handle->remote_client || !callback) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_focus_in_callback_set(remote_handle->remote_client, callback, user_data);
@@ -168,8 +168,8 @@ EXPORT_API int remote_input_focus_in_callback_set(remote_input_h remote_handle,
 EXPORT_API int remote_input_focus_in_callback_unset(remote_input_h remote_handle)
 {
     if (!remote_handle || !remote_handle->remote_client) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_focus_in_callback_unset(remote_handle->remote_client);
@@ -180,8 +180,8 @@ EXPORT_API int remote_input_focus_in_callback_unset(remote_input_h remote_handle
 EXPORT_API int remote_input_focus_out_callback_set(remote_input_h remote_handle, remote_input_focus_out_cb callback, void *user_data)
 {
     if (!remote_handle || !remote_handle->remote_client || !callback) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_focus_out_callback_set(remote_handle->remote_client, callback, user_data);
@@ -192,8 +192,8 @@ EXPORT_API int remote_input_focus_out_callback_set(remote_input_h remote_handle,
 EXPORT_API int remote_input_focus_out_callback_unset(remote_input_h remote_handle)
 {
     if (!remote_handle || !remote_handle->remote_client) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_focus_out_callback_unset(remote_handle->remote_client);
@@ -204,8 +204,8 @@ EXPORT_API int remote_input_focus_out_callback_unset(remote_input_h remote_handl
 EXPORT_API int remote_input_metadata_updated_callback_set(remote_input_h remote_handle, remote_input_metadata_updated_cb callback, void *user_data)
 {
     if (!remote_handle || !remote_handle->remote_client || !callback) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_entry_metadata_callback_set(remote_handle->remote_client, _metadata_updated_cb, (void *)remote_handle);
@@ -218,8 +218,8 @@ EXPORT_API int remote_input_metadata_updated_callback_set(remote_input_h remote_
 EXPORT_API int remote_input_metadata_updated_callback_unset(remote_input_h remote_handle)
 {
     if (!remote_handle || !remote_handle->remote_client) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_entry_metadata_callback_unset(remote_handle->remote_client);
@@ -232,8 +232,8 @@ EXPORT_API int remote_input_metadata_updated_callback_unset(remote_input_h remot
 EXPORT_API int remote_input_text_updated_callback_set(remote_input_h remote_handle, remote_input_text_updated_cb callback, void *user_data)
 {
     if (!remote_handle || !remote_handle->remote_client || !callback) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_text_updated_callback_set(remote_handle->remote_client, _text_updated_cb, (void *)remote_handle);
@@ -246,8 +246,8 @@ EXPORT_API int remote_input_text_updated_callback_set(remote_input_h remote_hand
 EXPORT_API int remote_input_text_updated_callback_unset(remote_input_h remote_handle)
 {
     if (!remote_handle || !remote_handle->remote_client) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_text_updated_callback_unset(remote_handle->remote_client);
@@ -260,8 +260,8 @@ EXPORT_API int remote_input_text_updated_callback_unset(remote_input_h remote_ha
 EXPORT_API int remote_input_resource_changed_callback_set(remote_input_h remote_handle, remote_input_resource_changed_cb callback, void *user_data)
 {
     if (!remote_handle || !remote_handle->remote_client || !callback) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_input_resource_changed_callback_set(remote_handle->remote_client, _resource_updated_cb, (void *)remote_handle);
@@ -274,8 +274,8 @@ EXPORT_API int remote_input_resource_changed_callback_set(remote_input_h remote_
 EXPORT_API int remote_input_resource_changed_callback_unset(remote_input_h remote_handle)
 {
     if (!remote_handle || !remote_handle->remote_client) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     remote_control_input_resource_changed_callback_unset(remote_handle->remote_client);
@@ -288,8 +288,8 @@ EXPORT_API int remote_input_resource_changed_callback_unset(remote_input_h remot
 EXPORT_API int remote_input_get_input_hint(remote_input_h remote_handle, Ecore_IMF_Input_Hints *input_hint)
 {
     if (!remote_handle || !input_hint) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     *input_hint = remote_handle->hint;
@@ -300,8 +300,8 @@ EXPORT_API int remote_input_get_input_hint(remote_input_h remote_handle, Ecore_I
 EXPORT_API int remote_input_get_layout(remote_input_h remote_handle, Ecore_IMF_Input_Panel_Layout *layout)
 {
     if (!remote_handle || !layout) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     *layout = remote_handle->layout;
@@ -312,8 +312,8 @@ EXPORT_API int remote_input_get_layout(remote_input_h remote_handle, Ecore_IMF_I
 EXPORT_API int remote_input_get_layout_variation(remote_input_h remote_handle, int *variation)
 {
     if (!remote_handle || !variation) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     *variation = remote_handle->variation;
@@ -324,8 +324,8 @@ EXPORT_API int remote_input_get_layout_variation(remote_input_h remote_handle, i
 EXPORT_API int remote_input_get_autocapital_type(remote_input_h remote_handle, Ecore_IMF_Autocapital_Type *autocapital_type)
 {
     if (!remote_handle || !autocapital_type) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     *autocapital_type = remote_handle->autocapital_type;
@@ -336,8 +336,8 @@ EXPORT_API int remote_input_get_autocapital_type(remote_input_h remote_handle, E
 EXPORT_API int remote_input_get_return_key_state(remote_input_h remote_handle, bool *return_key_state)
 {
     if (!remote_handle || !return_key_state) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     *return_key_state = remote_handle->return_key_disabled;
@@ -348,8 +348,8 @@ EXPORT_API int remote_input_get_return_key_state(remote_input_h remote_handle, b
 EXPORT_API int remote_input_get_return_key_type(remote_input_h remote_handle, Ecore_IMF_Input_Panel_Return_Key_Type *return_key_type)
 {
     if (!remote_handle || !return_key_type) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     *return_key_type = remote_handle->return_key_type;
@@ -360,13 +360,13 @@ EXPORT_API int remote_input_get_return_key_type(remote_input_h remote_handle, Ec
 EXPORT_API int remote_input_send_key_event(remote_input_h remote_handle, remote_input_key_type_e key)
 {
     if (!remote_handle || key > REMOTE_INPUT_KEY_CANCEL) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     if (remote_control_send_key_event(remote_handle->remote_client, (remote_control_key_type_e)key) != REMOTE_CONTROL_ERROR_NONE) {
-        LOGE("REMOTE_INPUT_OPERATION_FAILED");
-        return REMOTE_INPUT_OPERATION_FAILED;
+        LOGE("REMOTE_INPUT_ERROR_OPERATION_FAILED");
+        return REMOTE_INPUT_ERROR_OPERATION_FAILED;
     }
 
     return REMOTE_INPUT_ERROR_NONE;
@@ -375,13 +375,13 @@ EXPORT_API int remote_input_send_key_event(remote_input_h remote_handle, remote_
 EXPORT_API int remote_input_send_commit_string(remote_input_h remote_handle, const char *text)
 {
     if (!remote_handle || !text) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     if (remote_control_send_commit_string(remote_handle->remote_client, text) != REMOTE_CONTROL_ERROR_NONE) {
-        LOGE("REMOTE_INPUT_OPERATION_FAILED");
-        return REMOTE_INPUT_OPERATION_FAILED;
+        LOGE("REMOTE_INPUT_ERROR_OPERATION_FAILED");
+        return REMOTE_INPUT_ERROR_OPERATION_FAILED;
     }
 
     return REMOTE_INPUT_ERROR_NONE;
@@ -390,13 +390,13 @@ EXPORT_API int remote_input_send_commit_string(remote_input_h remote_handle, con
 EXPORT_API int remote_input_update_preedit_string(remote_input_h remote_handle, const char *text, int cursor_pos)
 {
     if (!remote_handle || !text || cursor_pos < -1) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     if (remote_control_update_preedit_string(remote_handle->remote_client, text, NULL, cursor_pos) != REMOTE_CONTROL_ERROR_NONE) {
-        LOGE("REMOTE_INPUT_OPERATION_FAILED");
-        return REMOTE_INPUT_OPERATION_FAILED;
+        LOGE("REMOTE_INPUT_ERROR_OPERATION_FAILED");
+        return REMOTE_INPUT_ERROR_OPERATION_FAILED;
     }
 
     return REMOTE_INPUT_ERROR_NONE;
@@ -405,13 +405,13 @@ EXPORT_API int remote_input_update_preedit_string(remote_input_h remote_handle,
 EXPORT_API int remote_input_delete_surrounding_text(remote_input_h remote_handle, int offset, int len)
 {
     if (!remote_handle || len <= 0) {
-        LOGE("REMOTE_INPUT_INVALID_PARAMETER");
-        return REMOTE_INPUT_INVALID_PARAMETER;
+        LOGE("REMOTE_INPUT_ERROR_INVALID_PARAMETER");
+        return REMOTE_INPUT_ERROR_INVALID_PARAMETER;
     }
 
     if (remote_control_delete_surrounding_text(remote_handle->remote_client, offset, len) != REMOTE_CONTROL_ERROR_NONE) {
-        LOGE("REMOTE_INPUT_OPERATION_FAILED");
-        return REMOTE_INPUT_OPERATION_FAILED;
+        LOGE("REMOTE_INPUT_ERROR_OPERATION_FAILED");
+        return REMOTE_INPUT_ERROR_OPERATION_FAILED;
     }
 
     return REMOTE_INPUT_ERROR_NONE;