Change interfaces

Change-Id: If763dca7ef6438cb4c85137e5e3bd87f36a8a047
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>

diff --git a/watch-holder/api/watch_holder.cc b/watch-holder/api/watch_holder.cc
index 37b1fb6..6a9ff35 100644 (file)
--- a/watch-holder/api/watch_holder.cc
+++ b/watch-holder/api/watch_holder.cc
@@ -127,7 +127,7 @@ C_EXPORT int watch_holder_get_current(watch_holder_h handle, watch_h *watch) {
   if (handle == nullptr)
     return WATCH_HOLDER_ERROR_INVALID_PARAMETER;
 
-  *watch = reinterpret_cast<watch_h>(&(handle->GetCurrent()));
+  *watch = reinterpret_cast<watch_h>(handle->GetCurrent().get());
 
   return WATCH_HOLDER_ERROR_NONE;
 }

diff --git a/watch-holder/src/watch_holder.cc b/watch-holder/src/watch_holder.cc
index e2dfc77..7f0c7eb 100644 (file)
--- a/watch-holder/src/watch_holder.cc
+++ b/watch-holder/src/watch_holder.cc
@@ -76,12 +76,12 @@ void WatchHolder::DisableRendering(int timeout) {
 
 }
 
-const std::list<std::shared_ptr<Watch>>& WatchHolder::GetStack() {
+const std::list<std::shared_ptr<Watch>>& WatchHolder::GetStack() const {
   return stack_;
 }
 
-Watch& WatchHolder::GetCurrent() {
-  return *stack_.back();
+std::shared_ptr<Watch> WatchHolder::GetCurrent() const {
+  return stack_.back();
 }
 
 int WatchHolder::OnDeadSignal(const char *endpoint, aul_app_com_result_e e,

diff --git a/watch-holder/src/watch_holder.hh b/watch-holder/src/watch_holder.hh
index 244f9ce..7fd65c3 100644 (file)
--- a/watch-holder/src/watch_holder.hh
+++ b/watch-holder/src/watch_holder.hh
@@ -38,14 +38,10 @@ class EXPORT_API WatchHolder : public Watch::IEvent {
   int Launch(app_control_h control, bool background, bundle* extra);
   void EnableRendering();
   void DisableRendering(int timeout);
-  const std::list<std::shared_ptr<Watch>>& GetStack();
-  Watch& GetCurrent();
+  const std::list<std::shared_ptr<Watch>>& GetStack() const;
+  std::shared_ptr<Watch> GetCurrent() const;
   virtual void OnLaunched(const Watch& watch) = 0;
   virtual void OnDead(const Watch& watch) = 0;
-  virtual void OnBound(const Watch& watch) = 0;
-  virtual void OnAdded(const Watch& watch) = 0;
-  virtual void OnUpdated(const Watch& watch) = 0;
-  virtual void OnRemoved(const Watch& watch) = 0;
 
  private:
   static int OnDeadSignal(const char *endpoint, aul_app_com_result_e e,

diff --git a/watch-holder/src/watch_mirror.cc b/watch-holder/src/watch_mirror.cc
index 416a92a..0631a0a 100644 (file)
--- a/watch-holder/src/watch_mirror.cc
+++ b/watch-holder/src/watch_mirror.cc
@@ -35,7 +35,7 @@ namespace watch_holder {
 WatchMirror::WatchMirror(Evas_Object* win) : win_(win) {
 }
 
-string WatchMirror::GetUUID(string rid) {
+string WatchMirror::GetUUID(string rid) const {
   char uuid[37];
   uuid_t u;
 
@@ -72,8 +72,8 @@ int WatchMirror::Listen() {
   return 0;
 }
 
-ISharableWatch& WatchMirror::GetCurrent() {
-  return *stack_.back();
+std::shared_ptr<ISharableWatch> WatchMirror::GetCurrent() const {
+  return stack_.back();
 }
 
 void WatchMirror::OnChanged(const ISharableWatch& watch) {

diff --git a/watch-holder/src/watch_mirror.hh b/watch-holder/src/watch_mirror.hh
index 4e6c31a..4b74a04 100644 (file)
--- a/watch-holder/src/watch_mirror.hh
+++ b/watch-holder/src/watch_mirror.hh
@@ -36,14 +36,14 @@ class EXPORT_API WatchMirror : public Watch::IEvent {
  public:
   WatchMirror(Evas_Object* win);
   int Listen();
-  ISharableWatch& GetCurrent();
+  std::shared_ptr<ISharableWatch> GetCurrent() const;
   virtual void OnChanged(const ISharableWatch& watch);
   virtual void OnAdded(const ISharableWatch& watch);
   virtual void OnUpdated(const ISharableWatch& watch);
   virtual void OnRemoved(const ISharableWatch& watch);
 
  private:
-  std::string GetUUID(std::string rid);
+  std::string GetUUID(std::string rid) const;
   void OnAdded(const Watch& watch) override final;
   void OnUpdated(const Watch& watch) override final;
   void OnRemoved(const Watch& watch) override final;