X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Ffocus-manager%2Fkeyinput-focus-manager-impl.cpp;h=dc8cefa1e594964049fa72c81e4c3ddf14c4925a;hp=65a9ec9cc3a29c7763a3a6fa3a5e33afdd13a387;hb=7e315a440bad7033d19fefa8f9952d625ee6f076;hpb=59987fa270fe64b7cb6d0007b24cb04b3f62e931

diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index 65a9ec9..dc8cefa 100644
--- a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -86,9 +86,9 @@ void KeyInputFocusManager::SetFocus( Toolkit::Control control )
   control.GetImplementation().OnKeyInputFocusGained();
 
   // Emit the signal to inform focus change to the application.
-  if ( !mKeyInputFocusChangedSignalV2.Empty() )
+  if ( !mKeyInputFocusChangedSignal.Empty() )
   {
-    mKeyInputFocusChangedSignalV2.Emit( control, previousFocusControl );
+    mKeyInputFocusChangedSignal.Emit( control, previousFocusControl );
   }
 }
 
@@ -151,14 +151,14 @@ bool KeyInputFocusManager::IsKeyboardListener( Toolkit::Control control ) const
   return result;
 }
 
-Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusManager::KeyInputFocusChangedSignal()
+Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusManager::KeyInputFocusChangedSignal()
 {
-  return mKeyInputFocusChangedSignalV2;
+  return mKeyInputFocusChangedSignal;
 }
 
-Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalV2& KeyInputFocusManager::UnhandledKeyEventSignal()
+Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType& KeyInputFocusManager::UnhandledKeyEventSignal()
 {
-  return mUnhandledKeyEventSignalV2;
+  return mUnhandledKeyEventSignal;
 }
 
 KeyInputFocusManager::FocusStackIterator KeyInputFocusManager::FindFocusControlInStack( Toolkit::Control control ) const
@@ -191,9 +191,9 @@ void KeyInputFocusManager::OnKeyEvent( const KeyEvent& event )
   if( !consumed )
   {
     // Emit signal to inform that a key event is not consumed.
-    if( !mUnhandledKeyEventSignalV2.Empty() )
+    if( !mUnhandledKeyEventSignal.Empty() )
     {
-      mUnhandledKeyEventSignalV2.Emit(event);
+      mUnhandledKeyEventSignal.Emit(event);
     }
   }
 }