projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure BaseHandle class move noexcept (core public-api)
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
actors
/
custom-actor.h
diff --git
a/dali/public-api/actors/custom-actor.h
b/dali/public-api/actors/custom-actor.h
index
5e97a1a
..
329840e
100644
(file)
--- a/
dali/public-api/actors/custom-actor.h
+++ b/
dali/public-api/actors/custom-actor.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_CUSTOM_ACTOR_H__
-#define
__DALI_CUSTOM_ACTOR_H__
+#ifndef
DALI_CUSTOM_ACTOR_H
+#define
DALI_CUSTOM_ACTOR_H
/*
/*
- * Copyright (c) 20
14
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.
@@
-24,6
+24,10
@@
namespace Dali
{
namespace Dali
{
+/**
+ * @addtogroup dali_core_actors
+ * @{
+ */
namespace Internal DALI_INTERNAL
{
namespace Internal DALI_INTERNAL
{
@@
-34,83
+38,111
@@
class CustomActor;
* @brief CustomActor is a base class for custom UI controls.
*
* The implementation of the control must be supplied; see CustomActorImpl for more details.
* @brief CustomActor is a base class for custom UI controls.
*
* The implementation of the control must be supplied; see CustomActorImpl for more details.
+ * @SINCE_1_0.0
*/
*/
-class DALI_
IMPORT
_API CustomActor : public Actor
+class DALI_
CORE
_API CustomActor : public Actor
{
public:
{
public:
-
/**
/**
- * @brief Create an uninitialized CustomActor handle.
+ * @brief Create
s
an uninitialized CustomActor handle.
*
* Only derived versions can be instantiated.
*
* Only derived versions can be instantiated.
- * Calling member functions with an uninitialized Dali::Object is not allowed.
+ * Calling member functions with an uninitialized CustomActor handle is not allowed.
+ * @SINCE_1_0.0
*/
CustomActor();
/**
*/
CustomActor();
/**
- * @brief Downcast
an Object handle to CustomActor
.
+ * @brief Downcast
s a handle to CustomActor handle
.
*
*
- * If
handle points to a CustomActor the downcast produces valid
- *
handle. If not
the returned handle is left uninitialized.
+ * If
the handle points to a CustomActor, the downcast produces valid handle.
+ *
If not,
the returned handle is left uninitialized.
*
*
- * @param[in] handle to An object
- * @return handle to a CustomActor or an uninitialized handle
+ * @SINCE_1_0.0
+ * @param[in] handle Handle to an object
+ * @return Handle to a CustomActor or an uninitialized handle
*/
*/
- static CustomActor DownCast(
BaseHandle handle
);
+ static CustomActor DownCast(
BaseHandle handle
);
/**
/**
- * @brief Destructor
+ * @brief Destructor
.
*
* This is non-virtual since derived Handle types must not contain data or virtual methods.
*
* This is non-virtual since derived Handle types must not contain data or virtual methods.
+ * @SINCE_1_0.0
*/
~CustomActor();
/**
*/
~CustomActor();
/**
- * @brief Retrieve the custom actor implementation.
+ * @brief Retrieve
s
the custom actor implementation.
*
*
- * @return The implementation.
+ * @SINCE_1_0.0
+ * @return The implementation
*/
CustomActorImpl& GetImplementation();
/**
*/
CustomActorImpl& GetImplementation();
/**
- * @brief Retrieve the custom actor implementation.
+ * @brief Retrieve
s
the custom actor implementation.
*
*
- * @return The implementation.
+ * @SINCE_1_0.0
+ * @return The implementation
*/
const CustomActorImpl& GetImplementation() const;
/**
*/
const CustomActorImpl& GetImplementation() const;
/**
- * @brief Create
an initialis
ed CustomActor.
+ * @brief Create
s an initializ
ed CustomActor.
*
*
- * @
param[in] implementation The implementation for this custom actor.
- * @
return A handle to a newly allocated Dali resource.
+ * @
SINCE_1_0.0
+ * @
param[in] implementation The implementation for this custom actor
*/
CustomActor(CustomActorImpl& implementation);
/**
*/
CustomActor(CustomActorImpl& implementation);
/**
- * @brief Copy constructor
+ * @brief Copy constructor
.
*
*
- * @param [in] copy The actor to copy.
+ * @SINCE_1_0.0
+ * @param[in] copy The actor to copy
*/
CustomActor(const CustomActor& copy);
/**
*/
CustomActor(const CustomActor& copy);
/**
- * @brief Assignment operator
+ * @brief Assignment operator
.
*
*
- * @param [in] rhs The actor to copy.
+ * @SINCE_1_0.0
+ * @param[in] rhs The actor to copy
+ * @return A reference to this
*/
CustomActor& operator=(const CustomActor& rhs);
*/
CustomActor& operator=(const CustomActor& rhs);
-public: // Not intended for application developers
+ /**
+ * @brief Move constructor.
+ *
+ * @SINCE_1_9.22
+ * @param[in] rhs The actor to move
+ */
+ CustomActor(CustomActor&& rhs) noexcept;
/**
/**
+ * @brief Move assignment operator.
+ *
+ * @SINCE_1_9.22
+ * @param[in] rhs The actor to move
+ * @return A reference to this
+ */
+ CustomActor& operator=(CustomActor&& rhs) noexcept;
+
+public: // Not intended for application developers
+ /**
* @brief This constructor is used internally to create additional CustomActor handles.
*
* @brief This constructor is used internally to create additional CustomActor handles.
*
- * @param [in] actor A pointer to a newly allocated Dali resource
+ * @SINCE_1_0.0
+ * @param[in] actor A pointer to a newly allocated Dali resource
*/
CustomActor(Internal::CustomActor* actor);
};
*/
CustomActor(Internal::CustomActor* actor);
};
+/**
+ * @}
+ */
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_CUSTOM_ACTOR_H__
+#endif //
DALI_CUSTOM_ACTOR_H