X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fmodel3d-view%2Fmodel3d-view.cpp;h=d401b65329cc3b829dc5a5662491508b84aeecdc;hp=1ebdd2be89ce65d7b4db0ff269050d8f9f37af7d;hb=HEAD;hpb=dea624eb348a4926d8761c8a1364f03f9f71acf5 diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp b/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp index 1ebdd2b..d401b65 100644 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp @@ -26,20 +26,19 @@ namespace Dali { - namespace Toolkit { - Model3dView::Model3dView() -{} +{ +} -Model3dView::Model3dView( const Model3dView& model3dView ) = default; +Model3dView::Model3dView(const Model3dView& model3dView) = default; -Model3dView::Model3dView( Model3dView&& rhs ) = default; +Model3dView::Model3dView(Model3dView&& rhs) noexcept = default; -Model3dView& Model3dView::operator=( const Model3dView& model3dView ) = default; +Model3dView& Model3dView::operator=(const Model3dView& model3dView) = default; -Model3dView& Model3dView::operator=( Model3dView&& rhs ) = default; +Model3dView& Model3dView::operator=(Model3dView&& rhs) noexcept = default; Model3dView::~Model3dView() { @@ -50,30 +49,30 @@ Model3dView Model3dView::New() return Internal::Model3dView::New(); } -Model3dView Model3dView::New( const std::string& objUrl, const std::string& mtlUrl, const std::string& imagesUrl ) +Model3dView Model3dView::New(const std::string& objUrl, const std::string& mtlUrl, const std::string& imagesUrl) { Model3dView model3dView = Internal::Model3dView::New(); - model3dView.SetProperty( Model3dView::Property::GEOMETRY_URL, Dali::Property::Value( objUrl ) ); - model3dView.SetProperty( Model3dView::Property::MATERIAL_URL, Dali::Property::Value( mtlUrl ) ); - model3dView.SetProperty( Model3dView::Property::IMAGES_URL, Dali::Property::Value( imagesUrl ) ); + model3dView.SetProperty(Model3dView::Property::IMAGES_URL, Dali::Property::Value(imagesUrl)); + model3dView.SetProperty(Model3dView::Property::GEOMETRY_URL, Dali::Property::Value(objUrl)); + model3dView.SetProperty(Model3dView::Property::MATERIAL_URL, Dali::Property::Value(mtlUrl)); return model3dView; } -Model3dView Model3dView::DownCast( BaseHandle handle ) +Model3dView Model3dView::DownCast(BaseHandle handle) { return Control::DownCast(handle); } -Model3dView::Model3dView( Internal::Model3dView& implementation ) - : Control( implementation ) +Model3dView::Model3dView(Internal::Model3dView& implementation) +: Control(implementation) { } -Model3dView::Model3dView( Dali::Internal::CustomActor* internal ) - : Control( internal ) +Model3dView::Model3dView(Dali::Internal::CustomActor* internal) +: Control(internal) { - VerifyCustomActorPointer( internal ); + VerifyCustomActorPointer(internal); } } // namespace Toolkit