Merge "Combine Internal::ProxyObject & Internal::Object" into tizen

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

diff --git a/dali/internal/event/events/tap-gesture-detector-impl.cpp b/dali/internal/event/events/tap-gesture-detector-impl.cpp
index 1fa594f..2d84a8d 100644 (file)
--- a/dali/internal/event/events/tap-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/tap-gesture-detector-impl.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/internal/event/events/tap-gesture-detector-impl.h>
@@ -31,6 +32,10 @@ namespace Internal
 
 namespace
 {
+
+// Signals
+const char* const SIGNAL_TAP_DETECTED = "tap-detected";
+
 BaseHandle Create()
 {
   return Dali::TapGestureDetector::New();
@@ -38,7 +43,7 @@ BaseHandle Create()
 
 TypeRegistration mType( typeid(Dali::TapGestureDetector), typeid(Dali::GestureDetector), Create );
 
-SignalConnectorType signalConnector1( mType, Dali::TapGestureDetector::SIGNAL_TAP_DETECTED, &TapGestureDetector::DoConnectSignal );
+SignalConnectorType signalConnector1( mType, SIGNAL_TAP_DETECTED, &TapGestureDetector::DoConnectSignal );
 
 }
 
@@ -115,7 +120,7 @@ void TapGestureDetector::EmitTapGestureSignal(Dali::Actor tappedActor, const Tap
   // Guard against destruction during signal emission
   Dali::TapGestureDetector handle( this );
 
-  mDetectedSignalV2.Emit( tappedActor, tap );
+  mDetectedSignal.Emit( tappedActor, tap );
 }
 
 bool TapGestureDetector::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@ -123,7 +128,7 @@ bool TapGestureDetector::DoConnectSignal( BaseObject* object, ConnectionTrackerI
   bool connected( true );
   TapGestureDetector* gesture = dynamic_cast<TapGestureDetector*>(object);
 
-  if ( Dali::TapGestureDetector::SIGNAL_TAP_DETECTED  == signalName )
+  if ( 0 == strcmp( signalName.c_str(), SIGNAL_TAP_DETECTED ) )
   {
     gesture->DetectedSignal().Connect( tracker, functor );
   }