Modify api signature

Change-Id: I06142c47f439df27456cca59deefd02d0a9cd45a
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/unittest/src/test_complication.cc b/unittest/src/test_complication.cc
index cf50f0d..6b7c28c 100644 (file)
--- a/unittest/src/test_complication.cc
+++ b/unittest/src/test_complication.cc
@@ -163,7 +163,7 @@ TEST_F(WFC, GetData)
 {
   watchface_complication_type_e cur_type;
 
-  EXPECT_EQ(watchface_complication_get_cur_type(WFC::complication, &cur_type), 0);
+  EXPECT_EQ(watchface_complication_get_current_type(WFC::complication, &cur_type), 0);
   EXPECT_EQ(cur_type, WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT);
 }
 

diff --git a/unittest/src/test_editables_container.cc b/unittest/src/test_editables_container.cc
index 672439c..907716f 100644 (file)
--- a/unittest/src/test_editables_container.cc
+++ b/unittest/src/test_editables_container.cc
@@ -152,10 +152,10 @@ TEST_F(EC, GetData)
   watchface_editable_geo_h geo;
   char* get_editable_name = NULL;
 
-  EXPECT_EQ(watchface_editable_get_cur_data_idx(EC::received, &idx_check), 0);
+  EXPECT_EQ(watchface_editable_get_current_data_idx(EC::received, &idx_check), 0);
   EXPECT_EQ(idx, idx_check);
 
-  EXPECT_EQ(watchface_editable_get_cur_data(EC::received, &data), WATCHFACE_COMPLICATION_ERROR_NONE);
+  EXPECT_EQ(watchface_editable_get_current_data(EC::received, &data), WATCHFACE_COMPLICATION_ERROR_NONE);
   EXPECT_EQ(watchface_editable_get_nth_data(EC::received, 1, &nthdata), WATCHFACE_COMPLICATION_ERROR_NONE);
   EXPECT_EQ(watchface_editable_get_editable_id(EC::received, &id), WATCHFACE_COMPLICATION_ERROR_NONE);
   EXPECT_EQ(id, 0);

diff --git a/watchface-complication/include/watchface-complication.h b/watchface-complication/include/watchface-complication.h
index b496a05..1c345d8 100644 (file)
--- a/watchface-complication/include/watchface-complication.h
+++ b/watchface-complication/include/watchface-complication.h
@@ -97,13 +97,13 @@ typedef void (*watchface_complication_updated_cb)(
        if (ret != WATCHFACE_COMPLICATION_ERROR_NONE || complication == NULL)
                return ret;
 
-       ret = watchface_complication_get_cur_provider_id(complication, &cur_provider_id);
+       ret = watchface_complication_get_current_provider_id(complication, &cur_provider_id);
        if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
                return ret;
 }
  * @endcode
  */
-int watchface_complication_get_cur_provider_id(complication_h handle,
+int watchface_complication_get_current_provider_id(complication_h handle,
                        char **cur_provider);
 
 /**
@@ -131,13 +131,13 @@ int watchface_complication_get_cur_provider_id(complication_h handle,
        if (ret != WATCHFACE_COMPLICATION_ERROR_NONE || complication == NULL)
                return ret;
 
-       ret = watchface_complication_get_cur_type(complication, &cur_type);
+       ret = watchface_complication_get_current_type(complication, &cur_type);
        if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
                return ret;
 }
  * @endcode
  */
-int watchface_complication_get_cur_type(complication_h handle,
+int watchface_complication_get_current_type(complication_h handle,
                        watchface_complication_type_e *cur_type);
 
 /**
@@ -686,7 +686,7 @@ typedef struct complication_allowed_list_ *complication_allowed_list_h;
  * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported
  * @see watchface_complication_allowed_list_destroy()
  * @see watchface_complication_allowed_list_add()
- * @see watchface_complication_allowed_list_del()
+ * @see watchface_complication_allowed_list_delete()
  * @see watchface_complication_allowed_list_get_nth()
  * @see watchface_complication_allowed_list_apply()
  * @see watchface_complication_allowed_list_clear()
@@ -714,7 +714,7 @@ int watchface_complication_allowed_list_create(
  * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported
  * @see watchface_complication_allowed_list_create()
  * @see watchface_complication_allowed_list_add()
- * @see watchface_complication_allowed_list_del()
+ * @see watchface_complication_allowed_list_delete()
  * @see watchface_complication_allowed_list_get_nth()
  * @see watchface_complication_allowed_list_apply()
  * @see watchface_complication_allowed_list_clear()
@@ -749,7 +749,7 @@ int watchface_complication_allowed_list_destroy(
  * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported
  * @see watchface_complication_allowed_list_create()
  * @see watchface_complication_allowed_list_destroy()
- * @see watchface_complication_allowed_list_del()
+ * @see watchface_complication_allowed_list_delete()
  * @see watchface_complication_allowed_list_get_nth()
  * @see watchface_complication_allowed_list_apply()
  * @see watchface_complication_allowed_list_clear()
@@ -794,14 +794,14 @@ int watchface_complication_allowed_list_add(complication_allowed_list_h handle,
   if (ret == WATCHFACE_COMPLICATION_ERROR_NONE) {
       ret = watchface_complication_allowed_list_add(handle, provider_id, types);
       if (ret == WATCHFACE_COMPLICATION_ERROR_EXIST_ID) {
-        watchface_complication_allowed_list_del(handle, provider_id);
+        watchface_complication_allowed_list_delete(handle, provider_id);
         watchface_complication_allowed_list_add(handle, provider_id, types);
       }
   }
 }
  * @endcode
  */
-int watchface_complication_allowed_list_del(complication_allowed_list_h handle,
+int watchface_complication_allowed_list_delete(complication_allowed_list_h handle,
                const char *provider_id);
 
 /**
@@ -822,7 +822,7 @@ int watchface_complication_allowed_list_del(complication_allowed_list_h handle,
  * @see watchface_complication_allowed_list_create()
  * @see watchface_complication_allowed_list_destroy()
  * @see watchface_complication_allowed_list_add()
- * @see watchface_complication_allowed_list_del()
+ * @see watchface_complication_allowed_list_delete()
  * @see watchface_complication_allowed_list_apply()
  * @see watchface_complication_allowed_list_clear()
  * @par Sample code:
@@ -835,7 +835,7 @@ int watchface_complication_allowed_list_del(complication_allowed_list_h handle,
   if (ret == WATCHFACE_COMPLICATION_ERROR_NONE) {
       ret = watchface_complication_allowed_list_add(handle, provider_id, types);
       if (ret == WATCHFACE_COMPLICATION_ERROR_EXIST_ID) {
-        watchface_complication_allowed_list_del(handle, provider_id);
+        watchface_complication_allowed_list_delete(handle, provider_id);
         watchface_complication_allowed_list_add(handle, provider_id, types);
       }
       watchface_complication_allowed_list_get_nth(handle, 0, &n_provider_id, &n_types);
@@ -863,7 +863,7 @@ int watchface_complication_allowed_list_get_nth(
  * @see watchface_complication_allowed_list_create()
  * @see watchface_complication_allowed_list_destroy()
  * @see watchface_complication_allowed_list_add()
- * @see watchface_complication_allowed_list_del()
+ * @see watchface_complication_allowed_list_delete()
  * @see watchface_complication_allowed_list_get_nth()
  * @see watchface_complication_allowed_list_clear()
  * @par Sample code:
@@ -880,7 +880,7 @@ int watchface_complication_allowed_list_get_nth(
   if (ret == WATCHFACE_COMPLICATION_ERROR_NONE) {
       ret = watchface_complication_allowed_list_add(allowed_list, provider_id, types);
       if (ret == WATCHFACE_COMPLICATION_ERROR_EXIST_ID) {
-        watchface_complication_allowed_list_del(allowed_list, provider_id);
+        watchface_complication_allowed_list_delete(allowed_list, provider_id);
         watchface_complication_allowed_list_add(allowed_list, provider_id, types);
       }
       watchface_complication_allowed_list_get_nth(allowed_list, 0, &n_provider_id, &n_types);
@@ -904,7 +904,7 @@ int watchface_complication_allowed_list_apply(complication_h handle,
  * @see watchface_complication_allowed_list_create()
  * @see watchface_complication_allowed_list_destroy()
  * @see watchface_complication_allowed_list_add()
- * @see watchface_complication_allowed_list_del()
+ * @see watchface_complication_allowed_list_delete()
  * @see watchface_complication_allowed_list_get_nth()
  * @see watchface_complication_allowed_list_apply()
  * @par Sample code:
@@ -921,7 +921,7 @@ int watchface_complication_allowed_list_apply(complication_h handle,
   if (ret == WATCHFACE_COMPLICATION_ERROR_NONE) {
       ret = watchface_complication_allowed_list_add(allowed_list, provider_id, types);
       if (ret == WATCHFACE_COMPLICATION_ERROR_EXIST_ID) {
-        watchface_complication_allowed_list_del(allowed_list, provider_id);
+        watchface_complication_allowed_list_delete(allowed_list, provider_id);
         watchface_complication_allowed_list_add(allowed_list, provider_id, types);
       }
       watchface_complication_allowed_list_get_nth(allowed_list, 0, &n_provider_id, &n_types);

diff --git a/watchface-complication/include/watchface-editable.h b/watchface-complication/include/watchface-editable.h
index 72e1106..66b0982 100755 (executable)
--- a/watchface-complication/include/watchface-editable.h
+++ b/watchface-complication/include/watchface-editable.h
@@ -552,7 +552,7 @@ _watchface_editable_update_requested_cb(const watchface_editable_h handle,
        int ret;
        bundle *data;
 
-       ret = watchface_editable_get_cur_data(handle, &data);
+       ret = watchface_editable_get_current_data(handle, &data);
        if (ret != WATCHFACE_COMPLICATION_ERROR_NONE || data == NULL);
                return;
 
@@ -560,7 +560,7 @@ _watchface_editable_update_requested_cb(const watchface_editable_h handle,
 }
  * @endcode
  */
-int watchface_editable_get_cur_data(const watchface_editable_h handle,
+int watchface_editable_get_current_data(const watchface_editable_h handle,
                        bundle **cur_data);
 
 /**
@@ -582,13 +582,13 @@ _watchface_editable_update_requested_cb(const watchface_editable_h handle,
        int ret;
        int cur_idx = 0;
 
-       ret = watchface_editable_get_cur_data_idx(handle, &cur_idx);
+       ret = watchface_editable_get_current_data_idx(handle, &cur_idx);
        if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
                return;
 }
  * @endcode
  */
-int watchface_editable_get_cur_data_idx(const watchface_editable_h handle, int *idx);
+int watchface_editable_get_current_data_idx(const watchface_editable_h handle, int *idx);
 
 /**
  * @brief Gets the id of editable.

diff --git a/watchface-complication/watchface-complication.cc b/watchface-complication/watchface-complication.cc
index 9e85ed0..3877eef 100755 (executable)
--- a/watchface-complication/watchface-complication.cc
+++ b/watchface-complication/watchface-complication.cc
@@ -186,7 +186,7 @@ extern "C" EXPORT_API int watchface_complication_destroy(complication_h handle)
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-extern "C" EXPORT_API int watchface_complication_get_cur_provider_id(
+extern "C" EXPORT_API int watchface_complication_get_current_provider_id(
     complication_h handle, char** cur_provider_id) {
   if (handle == NULL || cur_provider_id == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
@@ -202,7 +202,7 @@ extern "C" EXPORT_API int watchface_complication_get_cur_provider_id(
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-extern "C" EXPORT_API int watchface_complication_get_cur_type(
+extern "C" EXPORT_API int watchface_complication_get_current_type(
     complication_h handle, watchface_complication_type_e* cur_type) {
   if (handle == NULL || cur_type == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
@@ -544,7 +544,7 @@ extern "C" EXPORT_API int watchface_complication_allowed_list_add(
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-extern "C" EXPORT_API int watchface_complication_allowed_list_del(
+extern "C" EXPORT_API int watchface_complication_allowed_list_delete(
     complication_allowed_list_h handle, const char *provider_id) {
 
   if (handle == NULL || provider_id == NULL || handle->allowed_list == NULL) {

diff --git a/watchface-complication/watchface-editable.cc b/watchface-complication/watchface-editable.cc
index 040780b..f3f7a55 100755 (executable)
--- a/watchface-complication/watchface-editable.cc
+++ b/watchface-complication/watchface-editable.cc
@@ -255,7 +255,7 @@ extern "C" EXPORT_API int watchface_editable_remove_edit_ready_cb(
   return __container->RemoveReadyCallbackInfo(cb);
 }
 
-extern "C" EXPORT_API int watchface_editable_get_cur_data_idx(
+extern "C" EXPORT_API int watchface_editable_get_current_data_idx(
     const watchface_editable_h handle, int *idx) {
   if (handle == NULL || idx == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
@@ -265,7 +265,7 @@ extern "C" EXPORT_API int watchface_editable_get_cur_data_idx(
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-extern "C" EXPORT_API int watchface_editable_get_cur_data(
+extern "C" EXPORT_API int watchface_editable_get_current_data(
     const watchface_editable_h handle, bundle **cur_data) {
   if (handle == NULL || cur_data == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;