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 "Remove unnecessary stream operators from radian and degree as well as unnecess...
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
events
/
long-press-gesture-detector.h
diff --git
a/dali/public-api/events/long-press-gesture-detector.h
b/dali/public-api/events/long-press-gesture-detector.h
index
cb8dab8
..
d148792
100644
(file)
--- a/
dali/public-api/events/long-press-gesture-detector.h
+++ b/
dali/public-api/events/long-press-gesture-detector.h
@@
-2,7
+2,7
@@
#define __DALI_LONG_PRESS_GESTURE_DETECTOR_H__
/*
#define __DALI_LONG_PRESS_GESTURE_DETECTOR_H__
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
@@
-20,7
+20,7
@@
// INTERNAL INCLUDES
#include <dali/public-api/events/gesture-detector.h>
// INTERNAL INCLUDES
#include <dali/public-api/events/gesture-detector.h>
-#include <dali/public-api/signals/dali-signal
-v2
.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
namespace Dali
{
@@
-48,15
+48,17
@@
struct LongPressGesture;
* @endcode
*
* @see LongPressGesture
* @endcode
*
* @see LongPressGesture
+ *
+ * Signals
+ * | %Signal Name | Method |
+ * |---------------------|-----------------------|
+ * | long-press-detected | @ref DetectedSignal() |
*/
class DALI_IMPORT_API LongPressGestureDetector : public GestureDetector
{
public: // Typedefs
*/
class DALI_IMPORT_API LongPressGestureDetector : public GestureDetector
{
public: // Typedefs
- typedef SignalV2< void ( Actor, const LongPressGesture& ) > DetectedSignalV2; ///< Gesture detected signal type
-
- //Signal Names
- static const char* const SIGNAL_LONG_PRESS_DETECTED; ///< name "long-press-detected"
+ typedef Signal< void ( Actor, const LongPressGesture& ) > DetectedSignalType; ///< Gesture detected signal type
public: // Creation & Destruction
public: // Creation & Destruction
@@
-186,7
+188,7
@@
public: // Signals
* @pre The gesture detector has been initialized.
* @return The signal to connect to.
*/
* @pre The gesture detector has been initialized.
* @return The signal to connect to.
*/
- DetectedSignal
V2
& DetectedSignal();
+ DetectedSignal
Type
& DetectedSignal();
public: // Not intended for Application developers
public: // Not intended for Application developers