Implements WatchBase

[platform/core/appfw/widget-viewer.git] / watch-holder / api / watch.cc

diff --git a/watch-holder/api/watch.cc b/watch-holder/api/watch.cc
index 1883c28..961eeb2 100644 (file)
--- a/watch-holder/api/watch.cc
+++ b/watch-holder/api/watch.cc
@@ -23,10 +23,10 @@
 
 using namespace watch_holder;
 
-struct watch_s : public Watch {};
+struct watch_s : public WatchBase {};
 
 C_EXPORT int watch_resume(watch_h watch) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -35,7 +35,7 @@ C_EXPORT int watch_resume(watch_h watch) {
 }
 
 C_EXPORT int watch_pause(watch_h watch) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -44,7 +44,7 @@ C_EXPORT int watch_pause(watch_h watch) {
 }
 
 C_EXPORT int watch_terminate(watch_h watch) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -53,16 +53,16 @@ C_EXPORT int watch_terminate(watch_h watch) {
 }
 
 C_EXPORT int watch_bind(watch_h watch, Evas_Object *win) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
-  w->Bind(win);
+  ((Watch*)w)->Bind(win);
   return WATCH_HOLDER_ERROR_NONE;
 }
 
 C_EXPORT int watch_unbind(watch_h watch) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -71,7 +71,7 @@ C_EXPORT int watch_unbind(watch_h watch) {
 }
 
 C_EXPORT int watch_get_appid(watch_h watch, char **appid) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -84,7 +84,7 @@ C_EXPORT int watch_get_appid(watch_h watch, char **appid) {
 }
 
 C_EXPORT int watch_get_pid(watch_h watch, int *pid) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -100,12 +100,12 @@ C_EXPORT int watch_get_opr(watch_h watch, float *opr) {
 }
 
 C_EXPORT int watch_get_current_image(watch_h watch, Evas_Object **image) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
 
   if (w == nullptr || image == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
-  *image = w->GetCurrentImage();
+  *image = ((Watch*)w)->GetCurrentImageEvas();
 
   if (*image == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_OPERATION;
@@ -114,7 +114,7 @@ C_EXPORT int watch_get_current_image(watch_h watch, Evas_Object **image) {
 }
 
 C_EXPORT int watch_notify_changed_event(watch_h watch) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -126,7 +126,7 @@ C_EXPORT int watch_notify_changed_event(watch_h watch) {
 }
 
 C_EXPORT int watch_get_rid(watch_h watch, int *rid) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr || rid == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -136,7 +136,7 @@ C_EXPORT int watch_get_rid(watch_h watch, int *rid) {
 }
 
 C_EXPORT int watch_is_faulted(watch_h watch, bool *faulted) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr || faulted == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -146,7 +146,7 @@ C_EXPORT int watch_is_faulted(watch_h watch, bool *faulted) {
 }
 
 C_EXPORT int watch_is_bound(watch_h watch, bool *bound) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr || bound == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -156,7 +156,7 @@ C_EXPORT int watch_is_bound(watch_h watch, bool *bound) {
 }
 
 C_EXPORT int watch_cancel_touch(watch_h watch) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -166,7 +166,7 @@ C_EXPORT int watch_cancel_touch(watch_h watch) {
 }
 
 C_EXPORT int watch_get_extra(watch_h watch, bundle **extra) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr || extra == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
@@ -176,7 +176,7 @@ C_EXPORT int watch_get_extra(watch_h watch, bundle **extra) {
 }
 
 C_EXPORT int watch_block_update(watch_h watch, bool enable) {
-  Watch* w = reinterpret_cast<Watch*>(watch);
+  WatchBase* w = reinterpret_cast<WatchBase*>(watch);
   if (w == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;