X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Factors%2Fcustom-actor.cpp;h=99cf5369e24cdcf25f146ab90af0ffb6f1cec4f1;hb=refs%2Fchanges%2F62%2F289562%2F1;hp=3d265369a7171f5737bde1856b2dc0b38ac74953;hpb=b321cf7d4fe1e418f322ab5fd11709ad4767c83d;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/actors/custom-actor.cpp b/dali/public-api/actors/custom-actor.cpp index 3d26536..99cf536 100644 --- a/dali/public-api/actors/custom-actor.cpp +++ b/dali/public-api/actors/custom-actor.cpp @@ -24,10 +24,8 @@ namespace Dali { - namespace { - using namespace Dali; BaseHandle Create() @@ -36,37 +34,26 @@ BaseHandle Create() return BaseHandle(); } -TypeRegistration mType( typeid(Dali::CustomActor), typeid(Dali::Actor), Create ); +TypeRegistration mType(typeid(Dali::CustomActor), typeid(Dali::Actor), Create); -} +} // namespace -CustomActor::CustomActor() -{ -} +CustomActor::CustomActor() = default; -CustomActor CustomActor::DownCast( BaseHandle handle ) +CustomActor CustomActor::DownCast(BaseHandle handle) { - return CustomActor( dynamic_cast(handle.GetObjectPtr()) ); + return CustomActor(dynamic_cast(handle.GetObjectPtr())); } -CustomActor::~CustomActor() -{ -} +CustomActor::~CustomActor() = default; -CustomActor::CustomActor(const CustomActor& copy) -: Actor(copy) -{ -} +CustomActor::CustomActor(const CustomActor& copy) = default; -CustomActor& CustomActor::operator=(const CustomActor& rhs) -{ - BaseHandle::operator=(rhs); - return *this; -} +CustomActor& CustomActor::operator=(const CustomActor& rhs) = default; -CustomActor::CustomActor( CustomActor&& rhs ) = default; +CustomActor::CustomActor(CustomActor&& rhs) noexcept = default; -CustomActor& CustomActor::operator=( CustomActor&& rhs ) = default; +CustomActor& CustomActor::operator=(CustomActor&& rhs) noexcept = default; CustomActorImpl& CustomActor::GetImplementation() { @@ -98,7 +85,7 @@ CustomActor::CustomActor(Internal::CustomActor* internal) // Without this check, the actor will be deleted a second time, when the handle is disposed of // causing a crash. - if (internal) + if(internal) { DALI_ASSERT_ALWAYS(internal->ReferenceCount() != 1 && "Are you trying to use CustomActorImpl::Self() inside a CustomActorImpl destructor?"); }