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

[platform/core/uifw/dali-adaptor.git] / dali / public-api / adaptor-framework / timer.cpp

diff --git a/dali/public-api/adaptor-framework/timer.cpp b/dali/public-api/adaptor-framework/timer.cpp
index ba98792..785b6f2 100644 (file)
--- a/dali/public-api/adaptor-framework/timer.cpp
+++ b/dali/public-api/adaptor-framework/timer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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,44 +19,36 @@
 #include <dali/public-api/adaptor-framework/timer.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/dali-adaptor-common.h>
 #include <dali/internal/system/common/timer-impl.h>
+#include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali
 {
-
 Timer::Timer()
 {
 }
 
-Timer Timer::New( unsigned int milliSec )
+Timer Timer::New(unsigned int milliSec)
 {
-  Internal::Adaptor::TimerPtr internal = Internal::Adaptor::Timer::New( milliSec );
+  Internal::Adaptor::TimerPtr internal = Internal::Adaptor::Timer::New(milliSec);
   return Timer(internal.Get());
 }
 
-Timer::Timer( const Timer& timer )
-: BaseHandle(timer)
-{
-}
+Timer::Timer(const Timer& copy) = default;
 
-Timer& Timer::operator=( const Timer& timer )
-{
-  // check self assignment
-  if( *this != timer )
-  {
-    BaseHandle::operator=(timer);
-  }
-  return *this;
-}
+Timer& Timer::operator=(const Timer& rhs) = default;
+
+Timer::Timer(Timer&& rhs) = default;
+
+Timer& Timer::operator=(Timer&& rhs) = default;
 
 Timer::~Timer()
 {
 }
 
-Timer Timer::DownCast( BaseHandle handle )
+Timer Timer::DownCast(BaseHandle handle)
 {
-  return Timer( dynamic_cast<Internal::Adaptor::Timer*>( handle.GetObjectPtr() ) );
+  return Timer(dynamic_cast<Internal::Adaptor::Timer*>(handle.GetObjectPtr()));
 }
 
 void Timer::Start()
@@ -79,14 +71,14 @@ void Timer::Resume()
   Internal::Adaptor::GetImplementation(*this).Resume();
 }
 
-void Timer::SetInterval( unsigned int interval )
+void Timer::SetInterval(unsigned int interval)
 {
-  Internal::Adaptor::GetImplementation(*this).SetInterval( interval, true );
+  Internal::Adaptor::GetImplementation(*this).SetInterval(interval, true);
 }
 
-void Timer::SetInterval( unsigned int interval, bool restart )
+void Timer::SetInterval(unsigned int interval, bool restart)
 {
-  Internal::Adaptor::GetImplementation(*this).SetInterval( interval, restart );
+  Internal::Adaptor::GetImplementation(*this).SetInterval(interval, restart);
 }
 
 unsigned int Timer::GetInterval() const
@@ -109,5 +101,4 @@ Timer::Timer(Internal::Adaptor::Timer* timer)
 {
 }
 
-
 } // namespace Dali