projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
events
/
rotation-gesture-detector.h
diff --git
a/dali/public-api/events/rotation-gesture-detector.h
b/dali/public-api/events/rotation-gesture-detector.h
index
eab0de2
..
185cb19
100644
(file)
--- a/
dali/public-api/events/rotation-gesture-detector.h
+++ b/
dali/public-api/events/rotation-gesture-detector.h
@@
-24,13
+24,12
@@
namespace Dali
{
namespace Dali
{
-
namespace Internal DALI_INTERNAL
{
class RotationGestureDetector;
}
namespace Internal DALI_INTERNAL
{
class RotationGestureDetector;
}
-
struct
RotationGesture;
+
class
RotationGesture;
/**
* @brief This class looks for a rotation gesture involving two touches.
/**
* @brief This class looks for a rotation gesture involving two touches.
@@
-57,14
+56,12
@@
struct RotationGesture;
class DALI_CORE_API RotationGestureDetector : public GestureDetector
{
public: // Typedefs
class DALI_CORE_API RotationGestureDetector : public GestureDetector
{
public: // Typedefs
-
/**
* @brief Signal type.
*/
/**
* @brief Signal type.
*/
-
typedef Signal< void ( Actor, const RotationGesture& ) > DetectedSignalType
;
+
using DetectedSignalType = Signal<void(Actor, const RotationGesture&)>
;
public: // Creation & Destruction
public: // Creation & Destruction
-
/**
* @brief Creates an uninitialized RotationGestureDetector; this can be initialized with RotationGestureDetector::New().
*
/**
* @brief Creates an uninitialized RotationGestureDetector; this can be initialized with RotationGestureDetector::New().
*
@@
-90,7
+87,7
@@
public: // Creation & Destruction
* @param[in] handle Handle to an object
* @return Handle to a RotationGestureDetector object or an uninitialized handle
*/
* @param[in] handle Handle to an object
* @return Handle to a RotationGestureDetector object or an uninitialized handle
*/
- static RotationGestureDetector DownCast(
BaseHandle handle
);
+ static RotationGestureDetector DownCast(
BaseHandle handle
);
/**
* @brief Destructor.
/**
* @brief Destructor.
@@
-118,7
+115,6
@@
public: // Creation & Destruction
RotationGestureDetector& operator=(const RotationGestureDetector& rhs);
public: // Signals
RotationGestureDetector& operator=(const RotationGestureDetector& rhs);
public: // Signals
-
/**
* @brief This signal is emitted when the rotation gesture is detected on the attached actor.
*
/**
* @brief This signal is emitted when the rotation gesture is detected on the attached actor.
*
@@
-133,7
+129,6
@@
public: // Signals
DetectedSignalType& DetectedSignal();
public: // Not intended for Application developers
DetectedSignalType& DetectedSignal();
public: // Not intended for Application developers
-
/// @cond internal
/**
* @brief This constructor is used by RotationGestureDetector::New() methods.
/// @cond internal
/**
* @brief This constructor is used by RotationGestureDetector::New() methods.
@@
-143,7
+138,6
@@
public: // Not intended for Application developers
*/
explicit DALI_INTERNAL RotationGestureDetector(Internal::RotationGestureDetector* internal);
/// @endcond
*/
explicit DALI_INTERNAL RotationGestureDetector(Internal::RotationGestureDetector* internal);
/// @endcond
-
};
} // namespace Dali
};
} // namespace Dali