X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisual-factory%2Fvisual-base.cpp;h=7b20c60822a0164d2bd1caab916582e1c1a68ed0;hb=9df674d995218c964b7e498f83daed40da766464;hp=6a19c9bb96ebb3b000b8cdaea2fff37b361c5ca0;hpb=6c664b09beef66ee4e223cf30fb17ecdd6889bf7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.cpp b/dali-toolkit/devel-api/visual-factory/visual-base.cpp index 6a19c9b..7b20c60 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-base.cpp +++ b/dali-toolkit/devel-api/visual-factory/visual-base.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -56,12 +56,12 @@ void Visual::Base::SetName( const std::string& name ) GetImplementation( *this ).SetName( name ); } -const std::string& Visual::Base::GetName() +const std::string& Visual::Base::GetName() const { return GetImplementation( *this ).GetName(); } -void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize ) +void Visual::Base::SetTransformAndSize( const Dali::Property::Map& transform, Size controlSize ) { GetImplementation( *this ).SetTransformAndSize( transform, controlSize ); } @@ -81,17 +81,17 @@ void Visual::Base::GetNaturalSize(Vector2& naturalSize ) GetImplementation( *this ).GetNaturalSize( naturalSize ); } -void Visual::Base::SetDepthIndex( float index ) +void Visual::Base::SetDepthIndex( int index ) { GetImplementation( *this ).SetDepthIndex( index ); } -float Visual::Base::GetDepthIndex() const +int Visual::Base::GetDepthIndex() const { return GetImplementation( *this ).GetDepthIndex(); } -void Visual::Base::CreatePropertyMap( Property::Map& map ) const +void Visual::Base::CreatePropertyMap( Dali::Property::Map& map ) const { GetImplementation( *this ).CreatePropertyMap( map ); }