Remove not used methods

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

diff --git a/watch-holder-base/src/watch_base.cc b/watch-holder-base/src/watch_base.cc
index d263f7485133bba2bb065d0f53467b67616799a2..4eae633d42a8308828635cc2dafda2154fc6f817 100644 (file)
--- a/watch-holder-base/src/watch_base.cc
+++ b/watch-holder-base/src/watch_base.cc
@@ -75,7 +75,6 @@ WatchBase::Impl::Impl(WatchBase* parent, std::string appid,
 
 WatchBase::Impl::~Impl() = default;
 
-
 void WatchBase::Resume() {
   RemoteSurface::SendVisibility(true);
 }

diff --git a/watch-holder-base/src/watch_base.hh b/watch-holder-base/src/watch_base.hh
index d6709f28256c269d77353470e0e7bab2e80ffe43..2b85c398ba082de5c41d5e74b513217296817069 100644 (file)
--- a/watch-holder-base/src/watch_base.hh
+++ b/watch-holder-base/src/watch_base.hh
@@ -72,22 +72,22 @@ class EXPORT_API WatchBase : public screen_connector::RemoteSurface,
   bool IsFaulted() const override;
   void BlockUpdate(bool enable) override;
   IEvent* GetListener();
+
+ protected:
+  friend class WatchHolderBase;
   virtual void OnAdded(const std::string& appId, const std::string& instId,
       int pid, std::shared_ptr<screen_connector::WlBuffer> tbm);
   virtual void OnRemoved(const std::string& appId, const std::string& instId,
       int pid, std::shared_ptr<screen_connector::WlBuffer> tbm);
   virtual void OnChanged(const std::string& appId, const std::string& instId,
       int pid, std::shared_ptr<screen_connector::WlBuffer> tbm);
-
- protected:
-  friend class WatchHolderBase;
   void OnBufferAdded(const std::string& appId,
-      const std::string& instId, int pid) override;
+      const std::string& instId, int pid) final;
   void OnBufferRemoved(const std::string& appId,
-      const std::string& instId, int pid) override;
+      const std::string& instId, int pid) final;
   void OnBufferChanged(int type,
       std::shared_ptr<screen_connector::WlBuffer> tbm,
-      int fd, uint32_t size, uint32_t time) override;
+      int fd, uint32_t size, uint32_t time) final;
   void SetFaulted(bool is_faulted);
 
  private:

diff --git a/watch-holder-base/src/watch_holder_base.cc b/watch-holder-base/src/watch_holder_base.cc
index 8af9243495c0b13d0cd73b4d7e76387a5261cba2..b854ae825a31b87710b35465e48cb3250e9344d1 100644 (file)
--- a/watch-holder-base/src/watch_holder_base.cc
+++ b/watch-holder-base/src/watch_holder_base.cc
@@ -44,8 +44,8 @@ namespace watch_holder {
 WatchHolderBase::~WatchHolderBase() {
   if (impl_->launch_signal_conn_)
     aul_app_com_leave(impl_->launch_signal_conn_);
-  if (impl_->launch_signal_conn_)
-    aul_app_com_leave(impl_->launch_signal_conn_);
+  if (impl_->dead_signal_conn_)
+    aul_app_com_leave(impl_->dead_signal_conn_);
 }
 
 WatchHolderBase::WatchHolderBase(int w, int h)
@@ -56,7 +56,7 @@ WatchHolderBase::WatchHolderBase(int w, int h)
   }
 
   if (aul_app_com_create("watch.launch", nullptr, impl_->OnLaunchSignal,
-      this, &impl_->launch_signal_conn_) != AUL_R_OK) {
+      this, &impl_->dead_signal_conn_) != AUL_R_OK) {
     LOGE("Failed to listen watch.launch signal");
   }
 

diff --git a/watch-holder-base/src/watch_holder_base.hh b/watch-holder-base/src/watch_holder_base.hh
index fb699430e211b562071ed9bddc1871e836b8bb1f..01779c3ed0dae69da0b9c0da35cd94ea3ab885bd 100644 (file)
--- a/watch-holder-base/src/watch_holder_base.hh
+++ b/watch-holder-base/src/watch_holder_base.hh
@@ -41,7 +41,6 @@ class EXPORT_API WatchHolderBase
   int Launch(std::string appid, bool background, bundle* extra);
   const std::list<std::shared_ptr<WatchBase>>& GetStack() const;
   std::shared_ptr<WatchBase> GetCurrent() const;
-  void AddWatch(std::shared_ptr<WatchBase> watch);
   virtual void OnLaunched(const WatchBase& watch) = 0;
   virtual void OnDead(const WatchBase& watch) = 0;
   void OnAmbientChanged(bool enter,

diff --git a/watch-holder-base/src/watch_holder_base_implementation.hh b/watch-holder-base/src/watch_holder_base_implementation.hh
index a4b18367a4b5c423d858391aee6155369addcfb9..cb9191042c8033535c220d0d103316a7eef53170 100644 (file)
--- a/watch-holder-base/src/watch_holder_base_implementation.hh
+++ b/watch-holder-base/src/watch_holder_base_implementation.hh
@@ -49,7 +49,6 @@ class WatchHolderBase::Impl {
   std::list<std::shared_ptr<WatchBase>> stack_;
   aul_app_com_connection_h launch_signal_conn_ = nullptr;
   aul_app_com_connection_h dead_signal_conn_ = nullptr;
-  aul_app_com_connection_h ambient_changed_signal_conn_ = nullptr;
   int w_;
   int h_;
 };

diff --git a/watch-holder-base/src/watch_mirror_base.cc b/watch-holder-base/src/watch_mirror_base.cc
index e9b704969dbac735a5384682e8ec5acc0351b81a..439da3ba52de8511f220ada88f2c97354f174c44 100644 (file)
--- a/watch-holder-base/src/watch_mirror_base.cc
+++ b/watch-holder-base/src/watch_mirror_base.cc
@@ -96,10 +96,6 @@ std::shared_ptr<ISharableWatchBase> WatchMirrorBase::GetCurrent() const {
   return impl_->stack_.back();
 }
 
-void WatchMirrorBase::AddWatch(shared_ptr<WatchBase> watch) {
-  impl_->stack_.push_back(watch);
-}
-
 void WatchMirrorBase::OnAmbientChanged(bool enter, const Bundle& extra) {
 }
 

diff --git a/watch-holder-base/src/watch_mirror_base.hh b/watch-holder-base/src/watch_mirror_base.hh
index 1fbfc60a16737de595556b731368adacb5bf38b5..70d93b7a0a379b3cf75e0da7a829b9802a6eabb6 100644 (file)
--- a/watch-holder-base/src/watch_mirror_base.hh
+++ b/watch-holder-base/src/watch_mirror_base.hh
@@ -47,7 +47,6 @@ class EXPORT_API WatchMirrorBase : public WatchBase::IEvent, public AmbientListe
       const tizen_base::Bundle& extra) override;
   void OnAmbientEvent(EventType ev, std::string sender,
       tizen_base::Bundle extra) override;
-  void AddWatch(std::shared_ptr<WatchBase> watch);
 
  protected:
   virtual std::shared_ptr<WatchBase> CreateWatch(int rid, std::string id,

diff --git a/watch-holder/src/watch_mirror.cc b/watch-holder/src/watch_mirror.cc
index 20c5e8a9101033a8c436932227ded7029e054642..d721cc124e7a366b469f9a9c447bbdfc7f75694b 100644 (file)
--- a/watch-holder/src/watch_mirror.cc
+++ b/watch-holder/src/watch_mirror.cc
@@ -47,8 +47,6 @@ void WatchMirror::OnChanged(const ISharableWatchBase& watch) {
 }
 
 void WatchMirror::OnChanged(int rid, std::string inst_id, std::string appid) {
-  WatchMirrorBase::AddWatch(make_shared<Watch>(
-          rid, inst_id, appid, impl_->viewer_win_, nullptr, this));
   shared_ptr<ISharableWatchBase> cur = WatchMirrorBase::GetCurrent();
   OnChanged(*cur.get());
 }