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
Merge "Add a TextEditor property to limit input to maximum characters" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
flex-container
/
flex-container.h
diff --git
a/dali-toolkit/public-api/controls/flex-container/flex-container.h
b/dali-toolkit/public-api/controls/flex-container/flex-container.h
index
ac564b9
..
c89ef8e
100644
(file)
--- a/
dali-toolkit/public-api/controls/flex-container/flex-container.h
+++ b/
dali-toolkit/public-api/controls/flex-container/flex-container.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_FLEX_CONTAINER_H__
-#define
__DALI_TOOLKIT_FLEX_CONTAINER_H__
+#ifndef
DALI_TOOLKIT_FLEX_CONTAINER_H
+#define
DALI_TOOLKIT_FLEX_CONTAINER_H
/*
/*
- * Copyright (c) 20
18
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.
@@
-241,6
+241,14
@@
public:
FlexContainer( const FlexContainer& handle );
/**
FlexContainer( const FlexContainer& handle );
/**
+ * @brief Move constructor
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ */
+ FlexContainer( FlexContainer&& rhs );
+
+ /**
* @brief Assignment operator. Changes this handle to point to another real object.
* @SINCE_1_1.35
* @param[in] handle Handle to an object
* @brief Assignment operator. Changes this handle to point to another real object.
* @SINCE_1_1.35
* @param[in] handle Handle to an object
@@
-249,6
+257,15
@@
public:
FlexContainer& operator=( const FlexContainer& handle );
/**
FlexContainer& operator=( const FlexContainer& handle );
/**
+ * @brief Move assignment
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ * @return A reference to this
+ */
+ FlexContainer& operator=( FlexContainer&& rhs );
+
+ /**
* @brief Destructor.
*
* @details This is non-virtual since derived Handle types must not contain data or virtual methods.
* @brief Destructor.
*
* @details This is non-virtual since derived Handle types must not contain data or virtual methods.
@@
-307,4
+324,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_FLEX_CONTAINER_H__
+#endif //
DALI_TOOLKIT_FLEX_CONTAINER_H