projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DALi signals refactor to remove V2 naming
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
focus-manager
/
keyinput-focus-manager-impl.cpp
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
(file)
--- 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.
control.GetImplementation().OnKeyInputFocusGained();
// Emit the signal to inform focus change to the application.
- if ( !mKeyInputFocusChangedSignal
V2
.Empty() )
+ if ( !mKeyInputFocusChangedSignal.Empty() )
{
{
- mKeyInputFocusChangedSignal
V2
.Emit( control, previousFocusControl );
+ mKeyInputFocusChangedSignal.Emit( control, previousFocusControl );
}
}
}
}
@@
-151,14
+151,14
@@
bool KeyInputFocusManager::IsKeyboardListener( Toolkit::Control control ) const
return result;
}
return result;
}
-Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignal
V2
& KeyInputFocusManager::KeyInputFocusChangedSignal()
+Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignal
Type
& KeyInputFocusManager::KeyInputFocusChangedSignal()
{
{
- return mKeyInputFocusChangedSignal
V2
;
+ return mKeyInputFocusChangedSignal;
}
}
-Toolkit::KeyInputFocusManager::UnhandledKeyEventSignal
V2
& KeyInputFocusManager::UnhandledKeyEventSignal()
+Toolkit::KeyInputFocusManager::UnhandledKeyEventSignal
Type
& KeyInputFocusManager::UnhandledKeyEventSignal()
{
{
- return mUnhandledKeyEventSignal
V2
;
+ return mUnhandledKeyEventSignal;
}
KeyInputFocusManager::FocusStackIterator KeyInputFocusManager::FindFocusControlInStack( Toolkit::Control control ) const
}
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( !consumed )
{
// Emit signal to inform that a key event is not consumed.
- if( !mUnhandledKeyEventSignal
V2
.Empty() )
+ if( !mUnhandledKeyEventSignal.Empty() )
{
{
- mUnhandledKeyEventSignal
V2
.Emit(event);
+ mUnhandledKeyEventSignal.Emit(event);
}
}
}
}
}
}