X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fevents%2Fpinch-gesture-detector.h;h=0fbcadc40b166ac4be8d7d35811e56cbe4905e94;hb=c4750afbf79f15bf71e2aa8ef54f84750463aae2;hp=33b4e9f45d35374ea8dc6c0b3f799bd8f7c9988f;hpb=b371d834b097c58b8202b08baaf15ca9dc8d6324;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/events/pinch-gesture-detector.h b/dali/public-api/events/pinch-gesture-detector.h index 33b4e9f..0fbcadc 100644 --- a/dali/public-api/events/pinch-gesture-detector.h +++ b/dali/public-api/events/pinch-gesture-detector.h @@ -1,8 +1,8 @@ -#ifndef __DALI_PINCH_GESTURE_DETECTOR_H__ -#define __DALI_PINCH_GESTURE_DETECTOR_H__ +#ifndef DALI_PINCH_GESTURE_DETECTOR_H +#define DALI_PINCH_GESTURE_DETECTOR_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -34,7 +34,7 @@ namespace Internal DALI_INTERNAL class PinchGestureDetector; } -struct PinchGesture; +class PinchGesture; /** * @brief This class looks for pinching gestures involving two touches. @@ -58,18 +58,16 @@ struct PinchGesture; * |----------------|-----------------------| * | pinchDetected | @ref DetectedSignal() | */ -class DALI_IMPORT_API PinchGestureDetector : public GestureDetector +class DALI_CORE_API PinchGestureDetector : public GestureDetector { public: // Typedefs - /** * @brief Signal type. * @SINCE_1_0.0 */ - typedef Signal< void ( Actor, const PinchGesture& ) > DetectedSignalType; + using DetectedSignalType = Signal; public: // Creation & Destruction - /** * @brief Creates an uninitialized PinchGestureDetector; this can be initialized with PinchGestureDetector::New(). * @@ -95,7 +93,7 @@ public: // Creation & Destruction * @param[in] handle Handle to an object * @return Handle to a PinchGestureDetector object or an uninitialized handle */ - static PinchGestureDetector DownCast( BaseHandle handle ); + static PinchGestureDetector DownCast(BaseHandle handle); /** * @brief Destructor. @@ -122,8 +120,24 @@ public: // Creation & Destruction */ PinchGestureDetector& operator=(const PinchGestureDetector& rhs); -public: // Signals + /** + * @brief This move constructor is required for (smart) pointer semantics. + * + * @SINCE_2_2.4 + * @param[in] handle A reference to the moved handle + */ + PinchGestureDetector(PinchGestureDetector&& handle) noexcept; + + /** + * @brief This move assignment operator is required for (smart) pointer semantics. + * + * @SINCE_2_2.4 + * @param[in] rhs A reference to the moved handle + * @return A reference to this + */ + PinchGestureDetector& operator=(PinchGestureDetector&& rhs) noexcept; +public: // Signals /** * @brief This signal is emitted when the pinch gesture is detected on the attached actor. * @@ -138,7 +152,6 @@ public: // Signals DetectedSignalType& DetectedSignal(); public: // Not intended for Application developers - /// @cond internal /** * @brief This constructor is used by PinchGestureDetector::New() methods. @@ -148,7 +161,6 @@ public: // Not intended for Application developers */ explicit DALI_INTERNAL PinchGestureDetector(Internal::PinchGestureDetector* internal); /// @endcond - }; /** @@ -156,4 +168,4 @@ public: // Not intended for Application developers */ } // namespace Dali -#endif // __DALI_PINCH_GESTURE_DETECTOR_H__ +#endif // DALI_PINCH_GESTURE_DETECTOR_H