From 3491d0101ae031524f01871708d07e42ccba5db2 Mon Sep 17 00:00:00 2001 From: hyunho Date: Wed, 17 Jun 2020 16:00:37 +0900 Subject: [PATCH] Remove not used methods Change-Id: Iade0fad33f116ceb4e5cc727929eb4d2f4c11dd2 Signed-off-by: hyunho --- watch-holder-base/src/watch_base.cc | 1 - watch-holder-base/src/watch_base.hh | 12 ++++++------ watch-holder-base/src/watch_holder_base.cc | 6 +++--- watch-holder-base/src/watch_holder_base.hh | 1 - .../src/watch_holder_base_implementation.hh | 1 - watch-holder-base/src/watch_mirror_base.cc | 4 ---- watch-holder-base/src/watch_mirror_base.hh | 1 - watch-holder/src/watch_mirror.cc | 2 -- 8 files changed, 9 insertions(+), 19 deletions(-) diff --git a/watch-holder-base/src/watch_base.cc b/watch-holder-base/src/watch_base.cc index d263f748..4eae633d 100644 --- 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 d6709f28..2b85c398 100644 --- 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 tbm); virtual void OnRemoved(const std::string& appId, const std::string& instId, int pid, std::shared_ptr tbm); virtual void OnChanged(const std::string& appId, const std::string& instId, int pid, std::shared_ptr 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 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 8af92434..b854ae82 100644 --- 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 fb699430..01779c3e 100644 --- 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>& GetStack() const; std::shared_ptr GetCurrent() const; - void AddWatch(std::shared_ptr 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 a4b18367..cb919104 100644 --- 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> 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 e9b70496..439da3ba 100644 --- 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 WatchMirrorBase::GetCurrent() const { return impl_->stack_.back(); } -void WatchMirrorBase::AddWatch(shared_ptr 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 1fbfc60a..70d93b7a 100644 --- 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 watch); protected: virtual std::shared_ptr CreateWatch(int rid, std::string id, diff --git a/watch-holder/src/watch_mirror.cc b/watch-holder/src/watch_mirror.cc index 20c5e8a9..d721cc12 100644 --- 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( - rid, inst_id, appid, impl_->viewer_win_, nullptr, this)); shared_ptr cur = WatchMirrorBase::GetCurrent(); OnChanged(*cur.get()); } -- 2.34.1