Fix various reported SVACE errors

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

diff --git a/dali/internal/event/events/pinch-gesture-detector-impl.cpp b/dali/internal/event/events/pinch-gesture-detector-impl.cpp
index 355f4e8..0324cb0 100644 (file)
--- a/dali/internal/event/events/pinch-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/pinch-gesture-detector-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/events/pinch-gesture-detector-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/events/pinch-gesture.h>
 #include <dali/public-api/object/type-registry.h>
@@ -32,6 +35,11 @@ namespace Internal
 
 namespace
 {
+
+// Signals
+
+const char* const SIGNAL_PINCH_DETECTED = "pinchDetected";
+
 BaseHandle Create()
 {
   return Dali::PinchGestureDetector::New();
@@ -39,7 +47,7 @@ BaseHandle Create()
 
 TypeRegistration mType( typeid(Dali::PinchGestureDetector), typeid(Dali::GestureDetector), Create );
 
-SignalConnectorType signalConnector1( mType, Dali::PinchGestureDetector::SIGNAL_PINCH_DETECTED, &PinchGestureDetector::DoConnectSignal );
+SignalConnectorType signalConnector1( mType, SIGNAL_PINCH_DETECTED, &PinchGestureDetector::DoConnectSignal );
 
 }
 
@@ -63,15 +71,16 @@ void PinchGestureDetector::EmitPinchGestureSignal(Dali::Actor actor, const Pinch
   // Guard against destruction during signal emission
   Dali::PinchGestureDetector handle( this );
 
-  mDetectedSignalV2.Emit( actor, pinch );
+  mDetectedSignal.Emit( actor, pinch );
 }
 
 bool PinchGestureDetector::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
 {
   bool connected( true );
   PinchGestureDetector* gesture = dynamic_cast<PinchGestureDetector*>(object);
+  DALI_ASSERT_DEBUG( gesture && "object is not the correct type" ); // TypeRegistry should guarantee that this is correct, but confirm with just a debug assert
 
-  if ( Dali::PinchGestureDetector::SIGNAL_PINCH_DETECTED == signalName )
+  if ( 0 == strcmp( signalName.c_str(), SIGNAL_PINCH_DETECTED ) )
   {
     gesture->DetectedSignal().Connect( tracker, functor );
   }