Change callback function names

- watchface_complication_updated_cb()
  watchface_complication_provider_update_requested_cb()
  watchface_editable_update_requested_cb()

Change-Id: If97563b34e1388d69458d1a3857dba512381fdc1
Signed-off-by: mk5004.lee <mk5004.lee@samsung.com>

diff --git a/unittest/src/test_complication.cc b/unittest/src/test_complication.cc
index 77527ac..5b9a5f9 100644 (file)
--- a/unittest/src/test_complication.cc
+++ b/unittest/src/test_complication.cc
@@ -154,9 +154,9 @@ TEST_F(WFC, Create)
 
 TEST_F(WFC, Callback)
 {
-  EXPECT_EQ(watchface_complication_add_complication_update_cb(WFC::complication, _on_complication_update_cb, NULL), 0);
+  EXPECT_EQ(watchface_complication_add_complication_updated_cb(WFC::complication, _on_complication_update_cb, NULL), 0);
   EXPECT_EQ(watchface_complication_send_update_request(WFC::complication), WATCHFACE_COMPLICATION_ERROR_IO_ERROR);
-  EXPECT_EQ(watchface_complication_remove_complication_update_cb(WFC::complication, _on_complication_update_cb), 0);
+  EXPECT_EQ(watchface_complication_remove_complication_updated_cb(WFC::complication, _on_complication_update_cb), 0);
 }
 
 TEST_F(WFC, GetData)

diff --git a/unittest/src/test_complication_provider.cc b/unittest/src/test_complication_provider.cc
index 3a945ef..f763e9d 100644 (file)
--- a/unittest/src/test_complication_provider.cc
+++ b/unittest/src/test_complication_provider.cc
@@ -59,8 +59,8 @@ TEST_F(WCP, GetProviderId)
 
 TEST_F(WCP, UpdateRequestCb)
 {
-  EXPECT_EQ(watchface_complication_provider_add_update_request_cb(providerId.c_str(), _on_update_request_cb, NULL), 0);
-  EXPECT_EQ(watchface_complication_provider_remove_update_request_cb(providerId.c_str(), _on_update_request_cb, NULL), 0);
+  EXPECT_EQ(watchface_complication_provider_add_update_requested_cb(providerId.c_str(), _on_update_request_cb, NULL), 0);
+  EXPECT_EQ(watchface_complication_provider_remove_update_requested_cb(providerId.c_str(), _on_update_request_cb, NULL), 0);
 }
 
 TEST_F(WCP, NotifyUpdate)

diff --git a/watchface-complication-provider/include/watchface-complication-provider.h b/watchface-complication-provider/include/watchface-complication-provider.h
index 3f0cd21..d783d9e 100644 (file)
--- a/watchface-complication-provider/include/watchface-complication-provider.h
+++ b/watchface-complication-provider/include/watchface-complication-provider.h
@@ -36,18 +36,18 @@ extern "C" {
  */
 
 
-typedef void (*watchface_complication_provider_update_request_cb)(
+typedef void (*watchface_complication_provider_update_requested_cb)(
                        const char *provider_id, const char *req_appid,
                        watchface_complication_type_e type, const bundle *context,
                        bundle *share_data, void *user_data);
 
-int watchface_complication_provider_add_update_request_cb(
+int watchface_complication_provider_add_update_requested_cb(
                        const char *provider_id,
-                       watchface_complication_provider_update_request_cb callback,
+                       watchface_complication_provider_update_requested_cb callback,
                        void *user_data);
-int watchface_complication_provider_remove_update_request_cb(
+int watchface_complication_provider_remove_update_requested_cb(
                        const char *provider_id,
-                       watchface_complication_provider_update_request_cb callback,
+                       watchface_complication_provider_update_requested_cb callback,
                        void *user_data);
 int watchface_complication_provider_notify_update(
                        const char *updated_provider_id);

diff --git a/watchface-complication-provider/watchface-complication-provider.cc b/watchface-complication-provider/watchface-complication-provider.cc
index c70ac58..be43cde 100644 (file)
--- a/watchface-complication-provider/watchface-complication-provider.cc
+++ b/watchface-complication-provider/watchface-complication-provider.cc
@@ -43,7 +43,7 @@
 using namespace watchface_complication;
 class CallbackInfo {
  public:
-  CallbackInfo(watchface_complication_provider_update_request_cb cb, void* user_data)
+  CallbackInfo(watchface_complication_provider_update_requested_cb cb, void* user_data)
     : cb_(cb), user_data_(user_data) {
   }
 
@@ -56,12 +56,12 @@ class CallbackInfo {
         shared_data->GetRaw(), user_data_);
   }
 
-  watchface_complication_provider_update_request_cb GetCallback() {
+  watchface_complication_provider_update_requested_cb GetCallback() {
     return cb_;
   }
 
  private:
-  watchface_complication_provider_update_request_cb cb_;
+  watchface_complication_provider_update_requested_cb cb_;
   void* user_data_;
 };
 
@@ -92,7 +92,7 @@ class WatchComplicationProviderStub : public ComplicationProvider {
     return WATCHFACE_COMPLICATION_ERROR_NONE;
   }
 
-  int RemoveCallbackInfo(watchface_complication_provider_update_request_cb ci) {
+  int RemoveCallbackInfo(watchface_complication_provider_update_requested_cb ci) {
     for (auto& i : cb_list_) {
       if (i.get()->GetCallback() == ci) {
         cb_list_.remove(i);
@@ -108,9 +108,9 @@ class WatchComplicationProviderStub : public ComplicationProvider {
 
 static std::map<std::string, WatchComplicationProviderStub*> __providers;
 
-extern "C" EXPORT_API int watchface_complication_provider_add_update_request_cb(
+extern "C" EXPORT_API int watchface_complication_provider_add_update_requested_cb(
     const char *provider_id,
-    watchface_complication_provider_update_request_cb cb,
+    watchface_complication_provider_update_requested_cb cb,
     void *user_data) {
   if (provider_id == NULL || cb == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
@@ -139,9 +139,9 @@ extern "C" EXPORT_API int watchface_complication_provider_add_update_request_cb(
   return ret;
 }
 
-extern "C" EXPORT_API int watchface_complication_provider_remove_update_request_cb(
+extern "C" EXPORT_API int watchface_complication_provider_remove_update_requested_cb(
     const char *provider_id,
-    watchface_complication_provider_update_request_cb cb,
+    watchface_complication_provider_update_requested_cb cb,
     void *user_data) {
   if (provider_id == NULL || cb == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;

diff --git a/watchface-complication/include/watchface-complication.h b/watchface-complication/include/watchface-complication.h
index 172f7b5..bc5e227 100644 (file)
--- a/watchface-complication/include/watchface-complication.h
+++ b/watchface-complication/include/watchface-complication.h
@@ -51,7 +51,7 @@ typedef enum _complication_shape_type {
  * @since_tizen 5.0
  */
 typedef void *complication_h;
-typedef void (*watchface_complication_complication_update_cb)(
+typedef void (*watchface_complication_updated_cb)(
                        int complication_id,
                        const char *provider_id,
                        watchface_complication_type_e type,
@@ -64,11 +64,11 @@ int watchface_complication_get_cur_type(complication_h handle,
                        watchface_complication_type_e *cur_type);
 int watchface_complication_get_support_types(complication_h handle, int *support_types);
 
-int watchface_complication_add_complication_update_cb(complication_h handle,
-                       watchface_complication_complication_update_cb cb,
+int watchface_complication_add_complication_updated_cb(complication_h handle,
+                       watchface_complication_updated_cb cb,
                        void *user_data);
-int watchface_complication_remove_complication_update_cb(complication_h handle,
-                       watchface_complication_complication_update_cb cb);
+int watchface_complication_remove_complication_updated_cb(complication_h handle,
+                       watchface_complication_updated_cb cb);
 int watchface_complication_send_update_request(complication_h handle);
 int watchface_complication_create(int complication_id,
                        const char *default_provider_id,
@@ -81,7 +81,7 @@ int watchface_complication_destroy(complication_h handle);
 /**
  * @brief Gets data type of complication data.
  * @details Developer can get different set of data from data depends on data type.
- *          Data will be passed through #watchface_complication_complication_update_cb callback and sent by complication provider app.
+ *          Data will be passed through #watchface_complication_updated_cb callback and sent by complication provider app.
  * @since_tizen 5.0
  * @param[in] data The data received from complication provider app
  * @param[out] type The data type
@@ -92,7 +92,7 @@ int watchface_complication_destroy(complication_h handle);
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -122,7 +122,7 @@ int watchface_complication_data_get_type(const bundle *data,
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -156,7 +156,7 @@ int watchface_complication_data_get_short_text(const bundle *data,
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -190,7 +190,7 @@ int watchface_complication_data_get_long_text(const bundle *data,
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -222,7 +222,7 @@ int watchface_complication_data_get_title(const bundle *data, char **title);
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -256,7 +256,7 @@ int watchface_complication_data_get_timestamp(const bundle *data,
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -291,7 +291,7 @@ int watchface_complication_data_get_image_path(const bundle *data,
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -325,7 +325,7 @@ int watchface_complication_data_get_ranged_value(const bundle *data,
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>
@@ -359,7 +359,7 @@ int watchface_complication_data_get_icon_path(const bundle *data,
  * @retval #WATCHFACE_COMPLICATION_ERROR_NO_DATA No data
  * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR IO Error
  * @see watchface_complication_type_e
- * @see watchface_complication_complication_update_cb()
+ * @see watchface_complication_updated_cb()
  * @par Sample code:
  * @code
 #include <watchface-complication.h>

diff --git a/watchface-complication/include/watchface-editable.h b/watchface-complication/include/watchface-editable.h
index a4fe216..b252130 100644 (file)
--- a/watchface-complication/include/watchface-editable.h
+++ b/watchface-complication/include/watchface-editable.h
@@ -70,7 +70,7 @@ typedef enum _editable_edit_state {
   WATCHFACE_EDITABLE_EDIT_STATE_CANCEL /**< Cancel */
 } watchface_editable_edit_state_e;
 
-typedef void (*watchface_editable_editable_update_cb)(
+typedef void (*watchface_editable_update_requested_cb)(
                        const watchface_editable_h handle, int selected_idx,
                        const watchface_editable_edit_state_e state, void *user_data);
 typedef void (*watchface_editable_edit_ready_cb)(watchface_editable_container_h handle,
@@ -265,7 +265,7 @@ int watchface_editable_add_complication(watchface_editable_container_h handle,
 
 int watchface_editable_request_edit(watchface_editable_container_h handle,
                        const char *editor_appid,
-                       watchface_editable_editable_update_cb cb,
+                       watchface_editable_update_requested_cb cb,
                        void *user_data);
 int watchface_editable_add_edit_ready_cb(watchface_editable_edit_ready_cb cb,
                        void *user_data);

diff --git a/watchface-complication/watchface-complication.cc b/watchface-complication/watchface-complication.cc
index 7984731..fb1d864 100644 (file)
--- a/watchface-complication/watchface-complication.cc
+++ b/watchface-complication/watchface-complication.cc
@@ -42,7 +42,7 @@ struct complication_allowed_list_ {
 using namespace watchface_complication;
 class CallbackInfo {
  public:
-  CallbackInfo(watchface_complication_complication_update_cb cb, void* user_data)
+  CallbackInfo(watchface_complication_updated_cb cb, void* user_data)
     : cb_(cb), user_data_(user_data) {
   }
 
@@ -55,7 +55,7 @@ class CallbackInfo {
   }
 
  private:
-  watchface_complication_complication_update_cb cb_;
+  watchface_complication_updated_cb cb_;
   void* user_data_;
 };
 
@@ -95,8 +95,8 @@ class WatchComplicationStub : public Complication {
   std::list<std::unique_ptr<CallbackInfo>> cb_list_;
 };
 
-extern "C" EXPORT_API int watchface_complication_add_complication_update_cb(
-    complication_h handle, watchface_complication_complication_update_cb cb,
+extern "C" EXPORT_API int watchface_complication_add_complication_updated_cb(
+    complication_h handle, watchface_complication_updated_cb cb,
     void *user_data) {
   if (handle == NULL || cb == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
@@ -108,8 +108,8 @@ extern "C" EXPORT_API int watchface_complication_add_complication_update_cb(
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-extern "C" EXPORT_API int watchface_complication_remove_complication_update_cb(
-    complication_h handle, watchface_complication_complication_update_cb cb) {
+extern "C" EXPORT_API int watchface_complication_remove_complication_updated_cb(
+    complication_h handle, watchface_complication_updated_cb cb) {
   if (handle == NULL || cb == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
 

diff --git a/watchface-complication/watchface-editable.cc b/watchface-complication/watchface-editable.cc
index 92c2e5f..de395d6 100644 (file)
--- a/watchface-complication/watchface-editable.cc
+++ b/watchface-complication/watchface-editable.cc
@@ -60,7 +60,7 @@ class ReadyCallbackInfo {
 
 class UpdateCallbackInfo {
  public:
-  UpdateCallbackInfo(watchface_editable_editable_update_cb cb, void* user_data)
+  UpdateCallbackInfo(watchface_editable_update_requested_cb cb, void* user_data)
     : cb_(cb), user_data_(user_data) {
   }
 
@@ -71,7 +71,7 @@ class UpdateCallbackInfo {
   }
 
  private:
-  watchface_editable_editable_update_cb cb_;
+  watchface_editable_update_requested_cb cb_;
   void* user_data_;
 };
 
@@ -193,7 +193,7 @@ extern "C" EXPORT_API int watchface_editable_add_complication(
 
 extern "C" EXPORT_API int watchface_editable_request_edit(
     watchface_editable_container_h handle, const char *editor_appid,
-    watchface_editable_editable_update_cb cb, void *user_data) {
+    watchface_editable_update_requested_cb cb, void *user_data) {
   if (handle == NULL || editor_appid == NULL || cb == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;