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

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / common / timer-impl.h

diff --git a/dali/internal/system/common/timer-impl.h b/dali/internal/system/common/timer-impl.h
index 2689d35..f631585 100644 (file)
--- a/dali/internal/system/common/timer-impl.h
+++ b/dali/internal/system/common/timer-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TIMER_H__
-#define __DALI_INTERNAL_TIMER_H__
+#ifndef DALI_INTERNAL_TIMER_H
+#define DALI_INTERNAL_TIMER_H
 
 /*
- * Copyright (c) 2017 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.
@@ -19,10 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/dali-adaptor-common.h>
 #include <dali/internal/system/common/timer-interface.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 
@@ -62,27 +62,37 @@ public:
   /**
    * @copydoc Dali::Timer::Start()
    */
-  virtual void Start();
+  void Start() override;
 
   /**
    * @copydoc Dali::Timer::Stop()
    */
-  virtual void Stop();
+  void Stop() override;
+
+  /**
+   * @copydoc Dali::Timer::Pause()
+   */
+  void Pause() override;
+
+  /**
+   * @copydoc Dali::Timer::Resume()
+   */
+  void Resume() override;
 
   /**
    * @copydoc Dali::Timer::SetInterval()
    */
-  virtual void SetInterval( unsigned int interval );
+  void SetInterval( unsigned int interval, bool restart ) override;
 
   /**
    * @copydoc Dali::Timer::GetInterval()
    */
-  virtual unsigned int GetInterval() const;
+  unsigned int GetInterval() const override;
 
   /**
    * @copydoc Dali::Timer::IsRunning()
    */
-  virtual bool IsRunning() const;
+  bool IsRunning() const override;
 
   /**
    * Tick
@@ -137,4 +147,4 @@ inline const Timer& GetImplementation(const Dali::Timer& timer)
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TIMER_H__
+#endif // DALI_INTERNAL_TIMER_H