Change some func name and param name

- editor_editable_list_get_size
  editor_editable_list_get_nth
  editor_editable_candidate_list_get_size
  editor_editable_candidate_list_get_nth
  from ed_h to handle

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

diff --git a/unittest/src/test_editor.cc b/unittest/src/test_editor.cc
index 22ae284..ebde610 100755 (executable)
--- a/unittest/src/test_editor.cc
+++ b/unittest/src/test_editor.cc
@@ -148,12 +148,12 @@ TEST_F(WEL, EditableList)
   EXPECT_EQ(editor_foreach_editable_list(WEL::editables, _editable_list_foreach_cb, NULL), 0);
 
   EXPECT_NE(duplist = editor_editable_list_dup(WEL::editables), nullptr);
-  EXPECT_GT(editor_editable_list_size(WEL::editables), 0);
+  EXPECT_GT(editor_editable_list_get_size(WEL::editables), 0);
 
-  EXPECT_NE(nthEditor = editor_editable_list_nth(WEL::editables, 0), nullptr);
-  EXPECT_GT(editor_editable_candidate_list_size(nthEditor), 0);
+  EXPECT_NE(nthEditor = editor_editable_list_get_nth(WEL::editables, 0), nullptr);
+  EXPECT_GT(editor_editable_candidate_list_get_size(nthEditor), 0);
 
-  EXPECT_NE(data = editor_editable_candidate_list_nth(nthEditor, 0), nullptr);
+  EXPECT_NE(data = editor_editable_candidate_list_get_nth(nthEditor, 0), nullptr);
 
   EXPECT_EQ(editor_editable_list_destroy(duplist), 0);
 }

diff --git a/watchface-editor/include/watchface-editor.h b/watchface-editor/include/watchface-editor.h
index 9fcaa0a..4c7eb1a 100755 (executable)
--- a/watchface-editor/include/watchface-editor.h
+++ b/watchface-editor/include/watchface-editor.h
@@ -35,10 +35,10 @@ typedef int (*editable_list_foreach_cb)(const editable_h handle,
                                         void *user_data);
 int editor_on_request_edit_cb_add(on_request_edit cb, void *user_data);
 int editor_on_request_edit_cb_del(on_request_edit cb);
-int editor_update_cur_data(const editable_h ed_h, int cur_data_idx,
+int editor_update_cur_data(const editable_h handle, int cur_data_idx,
                            editable_edit_state state);
 int editor_edit_complete();
-int editor_edit_preview(const editable_h ed_h, int cur_data_idx);
+int editor_edit_preview(const editable_h handle, int cur_data_idx);
 int editor_edit_cancel();
 int editor_notify_edit_ready(const char *appid);
 int editor_foreach_editable_list(editable_list_h list_h,
@@ -46,10 +46,11 @@ int editor_foreach_editable_list(editable_list_h list_h,
                                  void *user_data);
 editable_list_h editor_editable_list_dup(editable_list_h source);
 int editor_editable_list_destroy(editable_list_h list);
-int editor_editable_list_size(editable_list_h list);
-const editable_h editor_editable_list_nth(editable_list_h list, int nth);
-int editor_editable_candidate_list_size(const editable_h ed);
-const bundle* editor_editable_candidate_list_nth(const editable_h ed, int nth);
+int editor_editable_list_get_size(editable_list_h list);
+const editable_h editor_editable_list_get_nth(editable_list_h list, int nth);
+int editor_editable_candidate_list_get_size(const editable_h handle);
+const bundle* editor_editable_candidate_list_get_nth(const editable_h handle,
+                                                     int nth);
 
 #ifdef __cplusplus
 }

diff --git a/watchface-editor/watchface-editor.cc b/watchface-editor/watchface-editor.cc
index 4ae429d..1d81c42 100644 (file)
--- a/watchface-editor/watchface-editor.cc
+++ b/watchface-editor/watchface-editor.cc
@@ -118,12 +118,12 @@ extern "C" EXPORT_API int editor_on_request_edit_cb_del(on_request_edit cb) {
   return 0;
 }
 
-extern "C" EXPORT_API int editor_edit_preview(const editable_h ed_h,
+extern "C" EXPORT_API int editor_edit_preview(const editable_h handle,
     int cur_data_idx) {
- if (ed_h == NULL)
+ if (handle == NULL)
     return COMPLICATION_ERROR_INVALID_PARAMETER;
 
-  IEditable* ed = static_cast<IEditable*>(ed_h);
+  IEditable* ed = static_cast<IEditable*>(handle);
   ed->SetCurDataIdx(cur_data_idx);
   return __stub->EditPreview(*ed, cur_data_idx);
 }
@@ -186,11 +186,11 @@ extern "C" EXPORT_API int editor_editable_list_destroy(editable_list_h list) {
   return 0;
 }
 
-extern "C" EXPORT_API int editor_editable_list_size(editable_list_h list) {
+extern "C" EXPORT_API int editor_editable_list_get_size(editable_list_h list) {
   return g_list_length(list);
 }
 
-extern "C" EXPORT_API const editable_h editor_editable_list_nth(
+extern "C" EXPORT_API const editable_h editor_editable_list_get_nth(
   editable_list_h list, int nth) {
   if (list == NULL) {
     LOGE("Invalid parameter");
@@ -208,26 +208,26 @@ extern "C" EXPORT_API const editable_h editor_editable_list_nth(
   return iter->data;
 }
 
-
-extern "C" EXPORT_API int editor_editable_candidate_list_size(const editable_h ed_h) {
-  if (ed_h == NULL) {
+extern "C" EXPORT_API int editor_editable_candidate_list_get_size(
+  const editable_h handle) {
+  if (handle == NULL) {
     LOGE("Invalid parameter");
     return -1;
   }
 
-  IEditable* ed = static_cast<IEditable*>(ed_h);
+  IEditable* ed = static_cast<IEditable*>(handle);
   std::list<std::unique_ptr<Bundle>> const& list = ed->GetCandidates();
   return list.size();
 }
 
-extern "C" EXPORT_API const bundle* editor_editable_candidate_list_nth(
-  const editable_h ed_h, int nth) {
-  if (ed_h == NULL) {
+extern "C" EXPORT_API const bundle* editor_editable_candidate_list_get_nth(
+  const editable_h handle, int nth) {
+  if (handle == NULL) {
     LOGE("Invalid parameter");
     return NULL;
   }
 
-  IEditable* ed = static_cast<IEditable*>(ed_h);
+  IEditable* ed = static_cast<IEditable*>(handle);
   const std::list<std::unique_ptr<Bundle>>& list = ed->GetCandidates();
   const std::list<std::unique_ptr<Bundle>>::const_iterator it
                                   = list.begin();