Add virtual destructors

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

diff --git a/watch-holder/src/ambient_listener.cc b/watch-holder/src/ambient_listener.cc
index 094cd84..120d530 100644 (file)
--- a/watch-holder/src/ambient_listener.cc
+++ b/watch-holder/src/ambient_listener.cc
@@ -32,71 +32,74 @@
 
 using namespace tizen_base;
 using namespace std;
+
 namespace watch_holder {
-  AmbientListener::AmbientListener() {
-    if (aul_app_com_create("watch.ambientchange", nullptr, OnAmbientChangedSignal,
-        this, &ambient_changed_signal_conn_) != AUL_R_OK) {
-      LOGE("Failed to listen watch.ambientchange signal");
-    }
-
-    if (aul_app_com_create("aod.ambientevent", nullptr, OnReceiveSignal,
-        this, &ambient_event_signal_conn_) != AUL_R_OK) {
-      LOGE("Failed to listen aod.ambientevent signal");
-    }
+
+AmbientListener::AmbientListener() {
+  if (aul_app_com_create("watch.ambientchange", nullptr, OnAmbientChangedSignal,
+      this, &ambient_changed_signal_conn_) != AUL_R_OK) {
+    LOGE("Failed to listen watch.ambientchange signal");
   }
 
-  int AmbientListener::OnReceiveSignal(const char* endpoint, aul_app_com_result_e e,
-      bundle* envelope, void* user_data) {
-    LOGI("Receive aod ambient event");
-    AmbientListener* listener = (AmbientListener*)user_data;
-
-    if (!envelope) {
-      LOGE("Bad bundle data from application");
-      return -1;
-    }
-
-    tizen_base::Bundle b = tizen_base::Bundle(envelope, true, true);
-    std::string event_type = b.GetString("__APP_AMBIENT_EVENT__");
-    LOGI("event type (%s)", event_type.c_str());
-    int type = stoi(event_type);
-    std::string sender = b.GetString("__APP_AMBIENT_SENDER__");
-    b.Delete("__APP_AMBIENT_EVENT__");
-    b.Delete("__APP_AMBIENT_SENDER__");
-    listener->OnAmbientEvent((EventType)type, sender, b);
-    LOGI("Handling AOD ambient event(%d) from (%s) done",
-        type, sender.c_str());
-    return 0;
+  if (aul_app_com_create("aod.ambientevent", nullptr, OnReceiveSignal,
+      this, &ambient_event_signal_conn_) != AUL_R_OK) {
+    LOGE("Failed to listen aod.ambientevent signal");
   }
+}
 
-  int AmbientListener::OnAmbientChangedSignal(const char *endpoint,
-      aul_app_com_result_e e, bundle *envelope, void *user_data) {
-    LOGI("Receive ambient change event");
-    tizen_base::Bundle data(envelope, false, false);
-    AmbientListener* listener = (AmbientListener*)user_data;
-    std::string mode = data.GetString("__AMBIENT_MODE__");
-    std::string extra = data.GetString("__AMBIENT_EXTRA__");
-    if (mode.empty())
-      return 0;
-
-    tizen_base::Bundle extra_data;
-    bool enter;
-    try {
-      extra_data = tizen_base::Bundle(extra);
-      enter = (bool)stoi(mode);
-    } catch (const std::exception& e) {
-      LOGE("Exception (%s)", e.what());
-      return 0;
-    }
-    listener->OnAmbientChanged(enter, extra_data);
-    LOGI("Handling AOD ambient changed(%d) done", (int)enter);
-    return 0;
+int AmbientListener::OnReceiveSignal(const char* endpoint, aul_app_com_result_e e,
+    bundle* envelope, void* user_data) {
+  LOGI("Receive aod ambient event");
+  AmbientListener* listener = (AmbientListener*)user_data;
+
+  if (!envelope) {
+    LOGE("Bad bundle data from application");
+    return -1;
   }
 
-  AmbientListener::~AmbientListener() {
-    if (ambient_changed_signal_conn_)
-      aul_app_com_leave(ambient_changed_signal_conn_);
+  tizen_base::Bundle b = tizen_base::Bundle(envelope, true, true);
+  std::string event_type = b.GetString("__APP_AMBIENT_EVENT__");
+  LOGI("event type (%s)", event_type.c_str());
+  int type = stoi(event_type);
+  std::string sender = b.GetString("__APP_AMBIENT_SENDER__");
+  b.Delete("__APP_AMBIENT_EVENT__");
+  b.Delete("__APP_AMBIENT_SENDER__");
+  listener->OnAmbientEvent((EventType)type, sender, b);
+  LOGI("Handling AOD ambient event(%d) from (%s) done",
+      type, sender.c_str());
+  return 0;
+}
 
-    if (ambient_event_signal_conn_)
-      aul_app_com_leave(ambient_event_signal_conn_);
+int AmbientListener::OnAmbientChangedSignal(const char *endpoint,
+    aul_app_com_result_e e, bundle *envelope, void *user_data) {
+  LOGI("Receive ambient change event");
+  tizen_base::Bundle data(envelope, false, false);
+  AmbientListener* listener = (AmbientListener*)user_data;
+  std::string mode = data.GetString("__AMBIENT_MODE__");
+  std::string extra = data.GetString("__AMBIENT_EXTRA__");
+  if (mode.empty())
+    return 0;
+
+  tizen_base::Bundle extra_data;
+  bool enter;
+  try {
+    extra_data = tizen_base::Bundle(extra);
+    enter = (bool)stoi(mode);
+  } catch (const std::exception& e) {
+    LOGE("Exception (%s)", e.what());
+    return 0;
   }
+  listener->OnAmbientChanged(enter, extra_data);
+  LOGI("Handling AOD ambient changed(%d) done", (int)enter);
+  return 0;
+}
+
+AmbientListener::~AmbientListener() {
+  if (ambient_changed_signal_conn_)
+    aul_app_com_leave(ambient_changed_signal_conn_);
+
+  if (ambient_event_signal_conn_)
+    aul_app_com_leave(ambient_event_signal_conn_);
+}
+
 }  // namespace watch_holder

diff --git a/watch-holder/src/ambient_listener.hh b/watch-holder/src/ambient_listener.hh
index 6646c55..75128d0 100644 (file)
--- a/watch-holder/src/ambient_listener.hh
+++ b/watch-holder/src/ambient_listener.hh
@@ -32,7 +32,7 @@ class AmbientListener {
     EVENT_AOD_NOTIFIED
   };
   AmbientListener();
-  ~AmbientListener();
+  virtual ~AmbientListener();
   static int OnAmbientChangedSignal(const char *endpoint,
       aul_app_com_result_e e, bundle *envelope, void *user_data);
   static int OnReceiveSignal(const char* endpoint, aul_app_com_result_e e,

diff --git a/watch-holder/src/sharable_watch_interface.hh b/watch-holder/src/sharable_watch_interface.hh
index 1315a7b..8440fe8 100644 (file)
--- a/watch-holder/src/sharable_watch_interface.hh
+++ b/watch-holder/src/sharable_watch_interface.hh
@@ -26,6 +26,8 @@ namespace watch_holder {
 
 class ISharableWatch {
  public:
+  virtual ~ISharableWatch() = default;
+
   virtual void Resume() = 0;
   virtual void Pause() = 0;
   virtual Evas_Object* GetCurrentImage() const = 0;

diff --git a/watch-holder/src/watch.hh b/watch-holder/src/watch.hh
index 1c40fac..aeb6856 100644 (file)
--- a/watch-holder/src/watch.hh
+++ b/watch-holder/src/watch.hh
@@ -46,6 +46,7 @@ class EXPORT_API Watch : private screen_connector::RemoteSurfaceEvas,
     IEvent* listener);
   Watch(int rid, std::string id, std::string appid, Evas_Object* viewer_win,
     tizen_base::Bundle extra, Watch::IEvent* listener);
+  virtual ~Watch() = default;
   void Resume() override;
   void Pause() override;
 

diff --git a/watch-holder/src/watch_holder.hh b/watch-holder/src/watch_holder.hh
index 9107e7f..ce81d66 100644 (file)
--- a/watch-holder/src/watch_holder.hh
+++ b/watch-holder/src/watch_holder.hh
@@ -36,7 +36,7 @@ namespace watch_holder {
 class EXPORT_API WatchHolder : public Watch::IEvent, public AmbientListener {
  public:
   WatchHolder(Evas_Object* win);
-  virtual ~WatchHolder() = 0;
+  virtual ~WatchHolder();
   int Launch(std::string appid, bool background, bundle* extra);
   void EnableRendering();
   void DisableRendering(int timeout);

diff --git a/watch-holder/src/watch_mirror.hh b/watch-holder/src/watch_mirror.hh
index 3c7b44b..67872f1 100644 (file)
--- a/watch-holder/src/watch_mirror.hh
+++ b/watch-holder/src/watch_mirror.hh
@@ -36,7 +36,7 @@ namespace watch_holder {
 class EXPORT_API WatchMirror : public Watch::IEvent, public AmbientListener {
  public:
   WatchMirror(Evas_Object* win);
-  virtual ~WatchMirror() = 0;
+  virtual ~WatchMirror();
   int Listen();
   std::shared_ptr<ISharableWatch> GetCurrent() const;
   virtual void OnChanged(const ISharableWatch& watch);