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.h;h=358fd9f737e74ef27e860fd4d566fab0dae5ad7f;hp=9ef0d46a4f4a3a4bd86d0c9fafe3108c8422ed94;hb=4593cc619ab0739fc8586c0c752209c555b0c8e3;hpb=3b5c91aa5c8ec803487ded2008d6b460530e96ad diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h index 9ef0d46..358fd9f 100755 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_MODEL3D_VIEW_H__ -#define __DALI_TOOLKIT_MODEL3D_VIEW_H__ +#ifndef DALI_TOOLKIT_MODEL3D_VIEW_H +#define DALI_TOOLKIT_MODEL3D_VIEW_H /* - * 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. @@ -45,7 +45,7 @@ class Model3dView; * * @SINCE_1_1.4 */ -class DALI_IMPORT_API Model3dView : public Control +class DALI_TOOLKIT_API Model3dView : public Control { public: @@ -142,6 +142,14 @@ public: Model3dView( const Model3dView& model3dView ); /** + * @brief Move constructor + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + */ + Model3dView( Model3dView&& rhs ); + + /** * @brief Assignment operator. * @SINCE_1_1.4 * @param[in] model3dView Handle to an object @@ -150,6 +158,15 @@ public: Model3dView& operator=( const Model3dView& model3dView ); /** + * @brief Move assignment + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + * @return A reference to this + */ + Model3dView& operator=( Model3dView&& rhs ); + + /** * @brief Downcasts an Object handle to Model3dView. * * If handle points to a Model3dView, the downcast produces valid handle. @@ -190,4 +207,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_MODEL3D_VIEW_H__ +#endif // DALI_TOOLKIT_MODEL3D_VIEW_H