projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.9.23] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
model3d-view
/
model3d-view.h
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
(executable)
--- 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) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* 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
*/
*
* @SINCE_1_1.4
*/
-class DALI_
IMPOR
T_API Model3dView : public Control
+class DALI_
TOOLKI
T_API Model3dView : public Control
{
public:
{
public:
@@
-142,6
+142,14
@@
public:
Model3dView( const Model3dView& model3dView );
/**
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
* @brief Assignment operator.
* @SINCE_1_1.4
* @param[in] model3dView Handle to an object
@@
-150,6
+158,15
@@
public:
Model3dView& operator=( const Model3dView& model3dView );
/**
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.
* @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
} // namespace Dali
-#endif //
__DALI_TOOLKIT_MODEL3D_VIEW_H__
+#endif //
DALI_TOOLKIT_MODEL3D_VIEW_H