From b6210cbd25a2defef608591a3c808af3fc9fafa1 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 28 Jul 2017 16:21:02 +0900 Subject: [PATCH] Move the EXAPI macro from header to source file Change-Id: Icc4541474d43c02935ccb66dbfaae75138ae5e10 Signed-off-by: Jihoon Kim --- ism/src/isf_control.h | 48 ++++++++++++++++++++++---------------------- ism/src/isf_remote_control.h | 34 +++++++++++++++---------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ism/src/isf_control.h b/ism/src/isf_control.h index b2873d1..00824f5 100644 --- a/ism/src/isf_control.h +++ b/ism/src/isf_control.h @@ -67,7 +67,7 @@ typedef struct { * * @return 0 if successfully, otherwise return -1; */ -EXAPI int isf_control_set_active_ise_by_uuid (const char *uuid); +int isf_control_set_active_ise_by_uuid (const char *uuid); /** * @deprecated Deprecated since tizen 2.4. [Use isf_control_get_active_ime() instead] @@ -79,7 +79,7 @@ EXAPI int isf_control_set_active_ise_by_uuid (const char *uuid); * * @return the length of UUID if successfully, otherwise return -1 */ -EXAPI int isf_control_get_active_ise (char **uuid); +int isf_control_get_active_ise (char **uuid); /** * @brief Get the list of all ISEs' UUID. @@ -89,7 +89,7 @@ EXAPI int isf_control_get_active_ise (char **uuid); * * @return the count of UUID list if successfully, otherwise return -1; */ -EXAPI int isf_control_get_ise_list (char ***uuid_list); +int isf_control_get_ise_list (char ***uuid_list); /** * @brief Get ISE's information according to ISE's UUID. @@ -102,7 +102,7 @@ EXAPI int isf_control_get_ise_list (char ***uuid_list); * * @return 0 if successfully, otherwise return -1 */ -EXAPI int isf_control_get_ise_info (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option); +int isf_control_get_ise_info (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option); /** * @brief Get ISE's information according to ISE's UUID. @@ -116,21 +116,21 @@ EXAPI int isf_control_get_ise_info (const char *uuid, char **name, char **langua * * @return 0 if successfully, otherwise return -1 */ -EXAPI int isf_control_get_ise_info_and_module_name (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option, char **module_name); +int isf_control_get_ise_info_and_module_name (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option, char **module_name); /** * @brief Set active ISE to default ISE. * * @return 0 if successfully, otherwise return -1 */ -EXAPI int isf_control_set_active_ise_to_default (void); +int isf_control_set_active_ise_to_default (void); /** * @brief Reset all ISEs' options. * * @return 0 if successfully, otherwise return -1; */ -EXAPI int isf_control_reset_ise_option (void); +int isf_control_reset_ise_option (void); /** * @brief Set initial ISE by UUID. @@ -139,7 +139,7 @@ EXAPI int isf_control_reset_ise_option (void); * * @return 0 if successfully, otherwise return -1 */ -EXAPI int isf_control_set_initial_ise_by_uuid (const char *uuid); +int isf_control_set_initial_ise_by_uuid (const char *uuid); /** * @brief Get initial ISE UUID. @@ -149,7 +149,7 @@ EXAPI int isf_control_set_initial_ise_by_uuid (const char *uuid); * * @return the length of UUID if successfully, otherwise return -1; */ -EXAPI int isf_control_get_initial_ise (char **uuid); +int isf_control_get_initial_ise (char **uuid); /** * @deprecated Deprecated since tizen 2.4. [Use isf_control_show_ime_selector() instead] @@ -158,7 +158,7 @@ EXAPI int isf_control_get_initial_ise (char **uuid); * * @return 0 if successfully, otherwise return -1; */ -EXAPI int isf_control_show_ise_selector (void); +int isf_control_show_ise_selector (void); /** * @brief Get the number of S/W or H/W keyboard ISEs @@ -167,7 +167,7 @@ EXAPI int isf_control_show_ise_selector (void); * * @return the count of ISEs if successfully, otherwise return -1; */ -EXAPI int isf_control_get_ise_count (ISE_TYPE_T type); +int isf_control_get_ise_count (ISE_TYPE_T type); /** * @deprecated Deprecated since tizen 2.4. [Use isf_control_open_ime_option_window() instead] @@ -176,7 +176,7 @@ EXAPI int isf_control_get_ise_count (ISE_TYPE_T type); * * @return 0 if successfully, otherwise return -1 */ -EXAPI int isf_control_show_ise_option_window (void); +int isf_control_show_ise_option_window (void); /** * @brief Gets the information of all IME (on-screen keyboard). @@ -202,7 +202,7 @@ EXAPI int isf_control_show_ise_option_window (void); } * @endcode */ -EXAPI int isf_control_get_all_ime_info (ime_info_s **info); +int isf_control_get_all_ime_info (ime_info_s **info); /** * @brief Requests to open the current IME's option window. @@ -215,7 +215,7 @@ EXAPI int isf_control_get_all_ime_info (ime_info_s **info); * * @pre The availibility of IME option can be found using isf_control_get_all_ime_info() and isf_control_get_active_ime() functions. */ -EXAPI int isf_control_open_ime_option_window (void); +int isf_control_open_ime_option_window (void); /** * @brief Requests to resume the current IME's option window. @@ -228,7 +228,7 @@ EXAPI int isf_control_open_ime_option_window (void); * * @pre The availibility of IME option can be found using isf_control_get_all_ime_info() and isf_control_get_active_ime() functions. */ -EXAPI int isf_control_resume_ime_option_window (void); +int isf_control_resume_ime_option_window (void); /** * @brief Gets active IME's Application ID. @@ -239,7 +239,7 @@ EXAPI int isf_control_resume_ime_option_window (void); * * @return The length of @a appid on success, otherwise -1 */ -EXAPI int isf_control_get_active_ime (char **appid); +int isf_control_get_active_ime (char **appid); /** * @brief Sets active IME by Application ID. @@ -250,7 +250,7 @@ EXAPI int isf_control_get_active_ime (char **appid); * * @return 0 on success, otherwise return -1 */ -EXAPI int isf_control_set_active_ime (const char *appid); +int isf_control_set_active_ime (const char *appid); /** * @brief Sets On/Off of installed IME by Application ID. @@ -262,7 +262,7 @@ EXAPI int isf_control_set_active_ime (const char *appid); * * @return 0 on success, otherwise return -1 */ -EXAPI int isf_control_set_enable_ime (const char *appid, bool is_enabled); +int isf_control_set_enable_ime (const char *appid, bool is_enabled); /** * @brief Requests to open the installed IME list application. @@ -273,7 +273,7 @@ EXAPI int isf_control_set_enable_ime (const char *appid, bool is_enabled); * * @return 0 on success, otherwise return -1 */ -EXAPI int isf_control_show_ime_list (void); +int isf_control_show_ime_list (void); /** * @brief Requests to open the IME selector application. @@ -284,7 +284,7 @@ EXAPI int isf_control_show_ime_list (void); * * @return 0 on success, otherwise return -1 */ -EXAPI int isf_control_show_ime_selector (void); +int isf_control_show_ime_selector (void); /** * @brief Checks if the specific IME is enabled or disabled in the system keyboard setting. @@ -296,7 +296,7 @@ EXAPI int isf_control_show_ime_selector (void); * * @return 0 on success, otherwise return -1 */ -EXAPI int isf_control_is_ime_enabled (const char *appid, bool *enabled); +int isf_control_is_ime_enabled (const char *appid, bool *enabled); /** * @brief Get the recent geometry of S/W keyboard @@ -313,7 +313,7 @@ EXAPI int isf_control_is_ime_enabled (const char *appid, bool *enabled); * * @return 0 if successfully, otherwise return -1; */ -EXAPI int isf_control_get_recent_ime_geometry (int *x, int *y, int *w, int *h); +int isf_control_get_recent_ime_geometry (int *x, int *y, int *w, int *h); /** * @brief Get the recent geometry of S/W keyboard with the rotation mode @@ -329,7 +329,7 @@ EXAPI int isf_control_get_recent_ime_geometry (int *x, int *y, int *w, int *h); * * @return 0 if successfully, otherwise return -1; */ -EXAPI int isf_control_get_recent_ime_geometry_with_rotation_angle (int angle, int *x, int *y, int *w, int *h); +int isf_control_get_recent_ime_geometry_with_rotation_angle (int angle, int *x, int *y, int *w, int *h); /** * @brief Requests to hide the input panel. @@ -338,7 +338,7 @@ EXAPI int isf_control_get_recent_ime_geometry_with_rotation_angle (int angle, in * * @return 0 on success, otherwise return -1 */ -EXAPI int isf_control_hide_ime (void); +int isf_control_hide_ime (void); #ifdef __cplusplus } diff --git a/ism/src/isf_remote_control.h b/ism/src/isf_remote_control.h index 5be4e10..748235f 100644 --- a/ism/src/isf_remote_control.h +++ b/ism/src/isf_remote_control.h @@ -100,7 +100,7 @@ typedef struct _remote_control_client remote_control_client; * * @see remote_control_disconnect() */ -EXAPI remote_control_client * remote_control_connect(void); +remote_control_client * remote_control_connect(void); /** * @brief Destroys a remote control client. @@ -122,7 +122,7 @@ EXAPI remote_control_client * remote_control_connect(void); * * @see remote_control_connect() */ -EXAPI int remote_control_disconnect(remote_control_client *client); +int remote_control_disconnect(remote_control_client *client); /** * @brief Called when an associated text field has focus. @@ -165,7 +165,7 @@ typedef void (*remote_control_focus_in_cb)(void *user_data); * @see remote_control_focus_in_cb() * @see remote_control_focus_in_callback_unset() */ -EXAPI int remote_control_focus_in_callback_set(remote_control_client *client, remote_control_focus_in_cb func, void *user_data); +int remote_control_focus_in_callback_set(remote_control_client *client, remote_control_focus_in_cb func, void *user_data); /** * @brief Remove a remote_control_focus_in_cb() callback function. @@ -188,7 +188,7 @@ EXAPI int remote_control_focus_in_callback_set(remote_control_client *client, re * @see remote_control_focus_in_cb() * @see remote_control_focus_in_callback_set() */ -EXAPI int remote_control_focus_in_callback_unset(remote_control_client *client); +int remote_control_focus_in_callback_unset(remote_control_client *client); /** * @brief Called when an associated text field loses focus. @@ -231,7 +231,7 @@ typedef void (*remote_control_focus_out_cb)(void *user_data); * @see remote_control_focus_out_cb() * @see remote_control_focus_out_callback_unset() */ -EXAPI int remote_control_focus_out_callback_set(remote_control_client *client, remote_control_focus_out_cb func , void *user_data); +int remote_control_focus_out_callback_set(remote_control_client *client, remote_control_focus_out_cb func , void *user_data); /** * @brief Remove a remote_control_focus_out_cb() callback function. @@ -254,7 +254,7 @@ EXAPI int remote_control_focus_out_callback_set(remote_control_client *client, r * @see remote_control_focus_out_cb() * @see remote_control_focus_out_callback_set() */ -EXAPI int remote_control_focus_out_callback_unset(remote_control_client *client); +int remote_control_focus_out_callback_unset(remote_control_client *client); /** * @brief Called when an associated text field requests the input panel to set its attributes. @@ -300,7 +300,7 @@ typedef void (*remote_control_entry_metadata_cb)(void *user_data, remote_control * @see remote_control_entry_metadata_cb() * @see remote_control_entry_metadata_callback_unset() */ -EXAPI int remote_control_entry_metadata_callback_set(remote_control_client *client, remote_control_entry_metadata_cb func, void *user_data); +int remote_control_entry_metadata_callback_set(remote_control_client *client, remote_control_entry_metadata_cb func, void *user_data); /** * @brief Remove a remote_control_entry_metadata_cb() callback function. @@ -323,7 +323,7 @@ EXAPI int remote_control_entry_metadata_callback_set(remote_control_client *clie * @see remote_control_entry_metadata_cb() * @see remote_control_entry_metadata_callback_set() */ -EXAPI int remote_control_entry_metadata_callback_unset(remote_control_client *client); +int remote_control_entry_metadata_callback_unset(remote_control_client *client); /** * @brief Called when an associated text field responds to a request with the surrounding text. @@ -370,7 +370,7 @@ typedef void (*remote_control_text_updated_cb)(void *user_data, const char *surr * @see remote_control_text_updated_cb() * @see remote_control_text_updated_callback_unset() */ -EXAPI int remote_control_text_updated_callback_set(remote_control_client *client, remote_control_text_updated_cb func, void *user_data); +int remote_control_text_updated_callback_set(remote_control_client *client, remote_control_text_updated_cb func, void *user_data); /** * @brief Remove a remote_control_text_updated_cb() callback function. @@ -393,7 +393,7 @@ EXAPI int remote_control_text_updated_callback_set(remote_control_client *client * @see remote_control_text_updated_cb() * @see remote_control_text_updated_callback_set() */ -EXAPI int remote_control_text_updated_callback_unset(remote_control_client *client); +int remote_control_text_updated_callback_unset(remote_control_client *client); /** * @brief Called when the input resource is changed. @@ -437,7 +437,7 @@ typedef void (*remote_control_input_resource_changed_cb)(void *user_data, remote * @see remote_control_input_resource_changed_cb() * @see remote_control_input_resource_changed_callback_unset() */ -EXAPI int remote_control_input_resource_changed_callback_set(remote_control_client *client, remote_control_input_resource_changed_cb func , void *user_data); +int remote_control_input_resource_changed_callback_set(remote_control_client *client, remote_control_input_resource_changed_cb func , void *user_data); /** * @brief Remove a remote_control_input_resource_changed_cb() callback function. @@ -460,7 +460,7 @@ EXAPI int remote_control_input_resource_changed_callback_set(remote_control_clie * @see remote_control_input_resource_changed_cb() * @see remote_control_input_resource_changed_callback_set() */ -EXAPI int remote_control_input_resource_changed_callback_unset(remote_control_client *client); +int remote_control_input_resource_changed_callback_unset(remote_control_client *client); /** * @brief Sends the key event to the associated text field. @@ -484,7 +484,7 @@ EXAPI int remote_control_input_resource_changed_callback_unset(remote_control_cl * * @see remote_control_key_type_e */ -EXAPI int remote_control_send_key_event(remote_control_client *client, remote_control_key_type_e key); +int remote_control_send_key_event(remote_control_client *client, remote_control_key_type_e key); /** * @brief Sends the text to the associated text field. @@ -508,7 +508,7 @@ EXAPI int remote_control_send_key_event(remote_control_client *client, remote_co * * @see remote_control_update_preedit_string() */ -EXAPI int remote_control_send_commit_string(remote_control_client *client, const char *text); +int remote_control_send_commit_string(remote_control_client *client, const char *text); /** * @brief Updates a new preedit string to the associated text field. @@ -534,7 +534,7 @@ EXAPI int remote_control_send_commit_string(remote_control_client *client, const * * @see remote_control_send_commit_string() */ -EXAPI int remote_control_update_preedit_string(remote_control_client *client, const char *text, Eina_List *attrs, int cursor_pos); +int remote_control_update_preedit_string(remote_control_client *client, const char *text, Eina_List *attrs, int cursor_pos); /** * @brief Requests to delete surrounding text. @@ -557,10 +557,10 @@ EXAPI int remote_control_update_preedit_string(remote_control_client *client, co * @retval #REMOTE_CONTROL_REPLY_TIMEOUT Reply timeout * @retval #REMOTE_CONTROL_CONNECTION_LOST Connection to server lost */ -EXAPI int remote_control_delete_surrounding_text(remote_control_client *client, int offset, int len); +int remote_control_delete_surrounding_text(remote_control_client *client, int offset, int len); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif \ No newline at end of file +#endif -- 2.7.4