X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fflex-container%2Fflex-container.h;h=c89ef8ef83fba257de7b845585f7e7bd0060fc62;hp=ac564b96293ef8d1454e53535d88f63ee0f170fe;hb=dea624eb348a4926d8761c8a1364f03f9f71acf5;hpb=e40f95b837ab8e9f1ce9094ebf4e6ac781e7bf6f 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 --- 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) 2018 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. @@ -241,6 +241,14 @@ public: 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 @@ -249,6 +257,15 @@ public: 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. @@ -307,4 +324,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_FLEX_CONTAINER_H__ +#endif // DALI_TOOLKIT_FLEX_CONTAINER_H