Renaming of enum values for coding standards compliance.

[platform/core/uifw/dali-core.git] / dali / public-api / animation / constraint.cpp

diff --git a/dali/public-api/animation/constraint.cpp b/dali/public-api/animation/constraint.cpp
index 9d80836..8c2648d 100644 (file)
--- a/dali/public-api/animation/constraint.cpp
+++ b/dali/public-api/animation/constraint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 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.
@@ -38,7 +38,7 @@ Internal::PropertyConstraint< P >* CreatePropertyConstraint( CallbackBase* func
 
 } // unnamed namespace
 
-const Constraint::RemoveAction Constraint::DEFAULT_REMOVE_ACTION  = Constraint::Bake;
+const Constraint::RemoveAction Constraint::DEFAULT_REMOVE_ACTION = Constraint::BAKE;
 
 Constraint::Constraint()
 {
@@ -53,16 +53,13 @@ Constraint::~Constraint()
 {
 }
 
-Constraint::Constraint( const Constraint& constraint )
-: BaseHandle( constraint )
-{
-}
+Constraint::Constraint( const Constraint& constraint ) = default;
 
-Constraint& Constraint::operator=( const Constraint& rhs )
-{
-  BaseHandle::operator=( rhs );
-  return *this;
-}
+Constraint& Constraint::operator=( const Constraint& rhs ) = default;
+
+Constraint::Constraint( Constraint&& rhs ) = default;
+
+Constraint& Constraint::operator=( Constraint&& rhs ) = default;
 
 Constraint Constraint::DownCast( BaseHandle baseHandle )
 {
@@ -104,12 +101,12 @@ Constraint::RemoveAction Constraint::GetRemoveAction() const
   return GetImplementation(*this).GetRemoveAction();
 }
 
-void Constraint::SetTag( const unsigned int tag )
+void Constraint::SetTag( const uint32_t tag )
 {
   GetImplementation(*this).SetTag( tag );
 }
 
-unsigned int Constraint::GetTag() const
+uint32_t Constraint::GetTag() const
 {
   return GetImplementation(*this).GetTag();
 }
@@ -228,7 +225,7 @@ Constraint Constraint::New( Handle handle, Property::Index targetIndex, Property
 
     default:
     {
-      DALI_ASSERT_ALWAYS( false && "Property type enumeration out of bounds" ); // should never come here
+      DALI_ABORT( "Property not constrainable" );
       break;
     }
   }