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
Add move semantics to common and base Toolkit classes
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control.h
diff --git
a/dali-toolkit/public-api/controls/control.h
b/dali-toolkit/public-api/controls/control.h
index
ed68e15
..
6ecfd8b
100644
(file)
--- a/
dali-toolkit/public-api/controls/control.h
+++ b/
dali-toolkit/public-api/controls/control.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_CONTROL_H
/*
#define DALI_TOOLKIT_CONTROL_H
/*
- * Copyright (c) 20
19
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.
@@
-26,7
+26,6
@@
#include <dali/public-api/events/pinch-gesture-detector.h>
#include <dali/public-api/events/tap-gesture-detector.h>
#include <dali/public-api/events/tap-gesture-detector.h>
#include <dali/public-api/events/pinch-gesture-detector.h>
#include <dali/public-api/events/tap-gesture-detector.h>
#include <dali/public-api/events/tap-gesture-detector.h>
-#include <dali/public-api/images/image.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/visual-properties.h>
@@
-107,9
+106,6
@@
public:
*/
STYLE_NAME = PROPERTY_START_INDEX,
*/
STYLE_NAME = PROPERTY_START_INDEX,
- RESERVED_PROPERTY_01, ///< Reserved index for a removed property.
- RESERVED_PROPERTY_02, ///< Reserved index for a removed property.
-
/**
* @brief Receives key events to the control.
* @details Name "keyInputFocus", type Property::BOOLEAN.
/**
* @brief Receives key events to the control.
* @details Name "keyInputFocus", type Property::BOOLEAN.
@@
-204,6
+200,14
@@
public: // Creation & Destruction
Control(const Control& uiControl);
/**
Control(const Control& uiControl);
/**
+ * @brief Move constructor.
+ *
+ * @SINCE_1_9.23
+ * @param[in] rhs Handle to move
+ */
+ Control( Control&& rhs );
+
+ /**
* @brief Dali::Control is intended as a base class.
*
* This is non-virtual since derived Handle types must not contain data or virtual methods.
* @brief Dali::Control is intended as a base class.
*
* This is non-virtual since derived Handle types must not contain data or virtual methods.
@@
-214,7
+218,7
@@
public: // Creation & Destruction
public: // operators
/**
public: // operators
/**
- * @brief
A
ssignment operator.
+ * @brief
Copy a
ssignment operator.
*
* Changes this handle to point to another real object.
* @SINCE_1_0.0
*
* Changes this handle to point to another real object.
* @SINCE_1_0.0
@@
-223,6
+227,15
@@
public: // operators
*/
Control& operator=( const Control& handle );
*/
Control& operator=( const Control& handle );
+ /**
+ * @brief Move assignment operator.
+ *
+ * @SINCE_1_9.23
+ * @param[in] rhs Object to assign this to
+ * @return Reference to this
+ */
+ Control& operator=( Control&& rhs );
+
public:
/**
public:
/**