X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fflex-container%2Fflex-container.cpp;h=35fb2c16a61b1b6381b4ba1f6447f3a09895ddcd;hb=a1d6238d1bb9d8ca13d9bca6a4d58b633b0eb906;hp=0c0227d880936991f59664736c1580325bcf2ed8;hpb=d886d0a7b8637b2ad52844096091b63991157ff3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.cpp b/dali-toolkit/public-api/controls/flex-container/flex-container.cpp index 0c0227d..35fb2c1 100644 --- a/dali-toolkit/public-api/controls/flex-container/flex-container.cpp +++ b/dali-toolkit/public-api/controls/flex-container/flex-container.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -23,10 +23,8 @@ namespace Dali { - namespace Toolkit { - FlexContainer FlexContainer::New() { return Internal::FlexContainer::New(); @@ -36,32 +34,32 @@ FlexContainer::FlexContainer() { } -FlexContainer::FlexContainer( const FlexContainer& handle ) = default; +FlexContainer::FlexContainer(const FlexContainer& handle) = default; -FlexContainer::FlexContainer( FlexContainer&& rhs ) = default; +FlexContainer::FlexContainer(FlexContainer&& rhs) = default; -FlexContainer& FlexContainer::operator=( const FlexContainer& handle ) = default; +FlexContainer& FlexContainer::operator=(const FlexContainer& handle) = default; -FlexContainer& FlexContainer::operator=( FlexContainer&& rhs ) = default; +FlexContainer& FlexContainer::operator=(FlexContainer&& rhs) = default; FlexContainer::~FlexContainer() { } -FlexContainer FlexContainer::DownCast( BaseHandle handle ) +FlexContainer FlexContainer::DownCast(BaseHandle handle) { return Control::DownCast(handle); } -FlexContainer::FlexContainer( Internal::FlexContainer& implementation ) +FlexContainer::FlexContainer(Internal::FlexContainer& implementation) : Control(implementation) { } -FlexContainer::FlexContainer( Dali::Internal::CustomActor* internal ) -: Control( internal ) +FlexContainer::FlexContainer(Dali::Internal::CustomActor* internal) +: Control(internal) { - VerifyCustomActorPointer( internal ); + VerifyCustomActorPointer(internal); } } // namespace Toolkit