Switch SetProperty order of Model3dView

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / model3d-view / model3d-view.cpp

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 e1dc94c..0850093 100644 (file)
--- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp
+++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -26,26 +26,19 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 Model3dView::Model3dView()
-{}
-
-Model3dView::Model3dView( const Model3dView& model3dView )
-: Control( model3dView )
 {
 }
 
-Model3dView& Model3dView::operator=( const Model3dView& model3dView )
-{
-  if( &model3dView != this )
-  {
-    Control::operator=( model3dView );
-  }
-  return *this;
-}
+Model3dView::Model3dView(const Model3dView& model3dView) = default;
+
+Model3dView::Model3dView(Model3dView&& rhs) = default;
+
+Model3dView& Model3dView::operator=(const Model3dView& model3dView) = default;
+
+Model3dView& Model3dView::operator=(Model3dView&& rhs) = default;
 
 Model3dView::~Model3dView()
 {
@@ -56,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<Model3dView, Internal::Model3dView>(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::Model3dView>( internal );
+  VerifyCustomActorPointer<Internal::Model3dView>(internal);
 }
 
 } // namespace Toolkit