X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fanimation%2Fkey-frames.cpp;h=a700771a1b94873ec35397bb634c2d11230384f0;hb=adae31cf70bdeed19789edc694d4baaf2fc67f21;hp=f4ddb2b37a5faa6a820c35bad553b4bc92d3ce23;hpb=7c6f8ed43521c52d6cc46a7e3e3e40069514f818;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/animation/key-frames.cpp b/dali/public-api/animation/key-frames.cpp index f4ddb2b..a700771 100644 --- 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) 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,32 +19,35 @@ #include // INTERNAL INCLUDES -#include +#include +#include #include #include -#include namespace Dali { - KeyFrames KeyFrames::New() { Internal::KeyFrames* internal = Internal::KeyFrames::New(); return KeyFrames(internal); } -KeyFrames KeyFrames::DownCast( BaseHandle handle ) +KeyFrames KeyFrames::DownCast(BaseHandle handle) { - return KeyFrames( dynamic_cast(handle.GetObjectPtr()) ); + return KeyFrames(dynamic_cast(handle.GetObjectPtr())); } -KeyFrames::KeyFrames() -{ -} +KeyFrames::KeyFrames() = default; -KeyFrames::~KeyFrames() -{ -} +KeyFrames::~KeyFrames() = default; + +KeyFrames::KeyFrames(const KeyFrames& handle) = default; + +KeyFrames& KeyFrames::operator=(const KeyFrames& rhs) = default; + +KeyFrames::KeyFrames(KeyFrames&& rhs) noexcept = default; + +KeyFrames& KeyFrames::operator=(KeyFrames&& rhs) noexcept = default; Property::Type KeyFrames::GetType() const { @@ -53,7 +56,7 @@ Property::Type KeyFrames::GetType() const void KeyFrames::Add(float time, Property::Value value) { - Add(time, value, AlphaFunctions::Linear); + Add(time, std::move(value), AlphaFunction::DEFAULT); } void KeyFrames::Add(float time, Property::Value value, AlphaFunction alpha) @@ -62,10 +65,8 @@ void KeyFrames::Add(float time, Property::Value value, AlphaFunction alpha) } KeyFrames::KeyFrames(Internal::KeyFrames* internal) - : BaseHandle(internal) +: BaseHandle(internal) { } - - -} // Dali +} // namespace Dali