X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fcommon%2Fextents.h;h=922a955c96f7de9b8919e4fc9e584574e6d7902e;hb=0b501ba800a263b97d99adf224fc42d0c2aa8b37;hp=da62978df177d78dea426b72366d47899ffa9463;hpb=b9ddd411d5b10e716eb2d369a63bba5acb7ece77;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/common/extents.h b/dali/public-api/common/extents.h index da62978..922a955 100644 --- a/dali/public-api/common/extents.h +++ b/dali/public-api/common/extents.h @@ -2,7 +2,7 @@ #define DALI_EXTENTS_H /* - * Copyright (c) 2017 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. @@ -36,7 +36,7 @@ namespace Dali * @brief Structure describing the a collection of uint16_t. * @SINCE_1_2.62 */ -struct DALI_EXPORT_API Extents +struct DALI_CORE_API Extents { /** * @brief Default constructor which provides an initialized Dali::Extents( 0u, 0u, 0u, 0u ). @@ -49,7 +49,14 @@ struct DALI_EXPORT_API Extents * @SINCE_1_2.62 * @param[in] copy A reference to the copied Extents */ - Extents( const Extents& copy ) = default; + Extents(const Extents& copy) = default; + + /** + * @brief Move constructor. + * @SINCE_2_2.17 + * @param[in] move A reference to the moved Extents + */ + Extents(Extents&& move) = default; /** * @brief Constructor. @@ -60,7 +67,7 @@ struct DALI_EXPORT_API Extents * @param[in] top Top extent * @param[in] bottom Bottom extent */ - Extents( uint16_t start, uint16_t end, uint16_t top, uint16_t bottom ); + Extents(uint16_t start, uint16_t end, uint16_t top, uint16_t bottom); /** * @brief Copy Assignment operator. @@ -68,7 +75,15 @@ struct DALI_EXPORT_API Extents * @param[in] copy A reference to the copied Extents * @return Itself */ - Extents& operator=( const Extents& copy ) = default; + Extents& operator=(const Extents& copy) = default; + + /** + * @brief Move Assignment operator. + * @SINCE_2_2.17 + * @param[in] move A reference to the moved Extents + * @return Itself + */ + Extents& operator=(Extents&& move) = default; /** * @brief Assignment operator. @@ -77,7 +92,7 @@ struct DALI_EXPORT_API Extents * @param[in] array Array of uint16_t * @return Itself */ - Extents& operator=( const uint16_t* array ); + Extents& operator=(const uint16_t* array); /** * @brief Equality operator. @@ -86,7 +101,7 @@ struct DALI_EXPORT_API Extents * @param[in] rhs The Extents to test against * @return True if the extents are equal */ - bool operator==( const Extents &rhs ) const; + bool operator==(const Extents& rhs) const; /** * @brief Inequality operator. @@ -95,14 +110,13 @@ struct DALI_EXPORT_API Extents * @param[in] rhs The Extents to test against * @return True if the extents are not equal */ - bool operator!=( const Extents &rhs ) const; + bool operator!=(const Extents& rhs) const; public: - uint16_t start; ///< The start extent. @SINCE_1_2.62 - uint16_t end; ///< The end extent. @SINCE_1_2.62 - uint16_t top; ///< The top extent. @SINCE_1_2.62 - uint16_t bottom; ///< The bottom extent. @SINCE_1_2.62 - + uint16_t start; ///< The start extent. @SINCE_1_2.62 + uint16_t end; ///< The end extent. @SINCE_1_2.62 + uint16_t top; ///< The top extent. @SINCE_1_2.62 + uint16_t bottom; ///< The bottom extent. @SINCE_1_2.62 }; /** @@ -113,7 +127,7 @@ public: * @param[in] extents The Extents to output * @return The output stream operator */ -DALI_EXPORT_API std::ostream& operator<<( std::ostream& stream, const Extents& extents ); +DALI_CORE_API std::ostream& operator<<(std::ostream& stream, const Extents& extents); /** * @}