Changed 'virtual' function override declarations to 'override' in automated-tests.
[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-WebView.cpp
index 781246e..adfa9f9 100644 (file)
@@ -75,7 +75,7 @@ static void OnEvaluateJavaScript( const std::string& result )
   gEvaluateJavaScriptCallbackCalled++;
 }
 
-static bool OnTouched( Actor actor, const Dali::TouchData& touch )
+static bool OnTouched( Actor actor, const Dali::TouchEvent& touch )
 {
   gTouched = true;
   return true;
@@ -225,7 +225,7 @@ int UtcDaliWebViewTouchAndKeys(void)
   application.Render();
 
   view.GetNaturalSize();
-  view.TouchSignal().Connect( &OnTouched );
+  view.TouchedSignal().Connect( &OnTouched );
 
   // Touch event
   Dali::Integration::TouchEvent event;
@@ -245,7 +245,7 @@ int UtcDaliWebViewTouchAndKeys(void)
 
   // Key event
   Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor( view );
-  application.ProcessEvent( Integration::KeyEvent( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent( Integration::KeyEvent( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE ) );
   application.SendNotification();
 
   DALI_TEST_CHECK( gTouched );