Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / tizen-wayland / tizen-wearable / watch-application-impl.h

diff --git a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h
index 5757bf7..2117e16 100644 (file)
--- a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h
+++ b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_WATCH_APPLICATION_H__
-#define __DALI_INTERNAL_WATCH_APPLICATION_H__
+#ifndef DALI_INTERNAL_WATCH_APPLICATION_H
+#define DALI_INTERNAL_WATCH_APPLICATION_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,22 +79,22 @@ public:
   /**
    * Called when the framework is initialised.
    */
-  virtual void OnInit();
+  void OnInit() override;
 
   /**
    * Called when the framework is terminated.
    */
-  virtual void OnTerminate();
+  void OnTerminate() override;
 
   /**
    * Called when the framework is paused.
    */
-  virtual void OnPause();
+  void OnPause() override;
 
   /**
    * Called when the framework resumes from a paused state.
    */
-  virtual void OnResume();
+  void OnResume() override;
 
   /**
    * Called every second
@@ -155,4 +155,4 @@ inline const WatchApplication& GetImplementation(const Dali::WatchApplication& w
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_WATCH_APPLICATION_H__
+#endif // DALI_INTERNAL_WATCH_APPLICATION_H