[4.0] DALi version 1.2.82

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

diff --git a/dali/public-api/animation/key-frames.cpp b/dali/public-api/animation/key-frames.cpp
index 1edf54e..34148e9 100644 (file)
--- a/dali/public-api/animation/key-frames.cpp
+++ b/dali/public-api/animation/key-frames.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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,7 +19,7 @@
 #include <dali/public-api/animation/key-frames.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/animation/alpha-functions.h>
+#include <dali/public-api/animation/alpha-function.h>
 #include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/radian.h>
 #include <dali/internal/event/animation/key-frames-impl.h>
@@ -57,13 +57,6 @@ KeyFrames& KeyFrames::operator=(const KeyFrames& rhs)
   return *this;
 }
 
-KeyFrames& KeyFrames::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 Property::Type KeyFrames::GetType() const
 {
   return GetImplementation(*this).GetType();
@@ -71,7 +64,7 @@ Property::Type KeyFrames::GetType() const
 
 void KeyFrames::Add(float time, Property::Value value)
 {
-  Add(time, value, AlphaFunctions::Linear);
+  Add(time, value, AlphaFunction::DEFAULT);
 }
 
 void KeyFrames::Add(float time, Property::Value value, AlphaFunction alpha)