[dali_1.0.42] Merge branch 'tizen'

[platform/core/uifw/dali-core.git] / dali / internal / event / events / long-press-gesture-detector-impl.cpp

diff --git a/dali/internal/event/events/long-press-gesture-detector-impl.cpp b/dali/internal/event/events/long-press-gesture-detector-impl.cpp
index f779380..69ce40b 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/long-press-gesture-detector-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include "long-press-gesture-detector-impl.h"
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/events/long-press-gesture.h>
 #include <dali/public-api/object/type-registry.h>
@@ -31,6 +34,11 @@ namespace Internal
 
 namespace
 {
+
+// Signals
+
+const char* const SIGNAL_LONG_PRESS_DETECTED = "long-press-detected";
+
 BaseHandle Create()
 {
   return Dali::LongPressGestureDetector::New();
@@ -38,7 +46,7 @@ BaseHandle Create()
 
 TypeRegistration mType( typeid(Dali::LongPressGestureDetector), typeid(Dali::GestureDetector), Create );
 
-SignalConnectorType signalConnector1( mType, Dali::LongPressGestureDetector::SIGNAL_LONG_PRESS_DETECTED, &LongPressGestureDetector::DoConnectSignal );
+SignalConnectorType signalConnector1( mType, SIGNAL_LONG_PRESS_DETECTED, &LongPressGestureDetector::DoConnectSignal );
 
 }
 
@@ -129,7 +137,7 @@ void LongPressGestureDetector::EmitLongPressGestureSignal(Dali::Actor pressedAct
   // Guard against destruction during signal emission
   Dali::LongPressGestureDetector handle( this );
 
-  mDetectedSignalV2.Emit( pressedActor, longPress );
+  mDetectedSignal.Emit( pressedActor, longPress );
 }
 
 bool LongPressGestureDetector::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@ -137,7 +145,7 @@ bool LongPressGestureDetector::DoConnectSignal( BaseObject* object, ConnectionTr
   bool connected( true );
   LongPressGestureDetector* gesture = dynamic_cast<LongPressGestureDetector*>(object);
 
-  if ( Dali::LongPressGestureDetector::SIGNAL_LONG_PRESS_DETECTED == signalName )
+  if ( 0 == strcmp( signalName.c_str(), SIGNAL_LONG_PRESS_DETECTED ) )
   {
     gesture->DetectedSignal().Connect( tracker, functor );
   }