From: Seoyeon Kim Date: Mon, 11 Mar 2019 08:37:59 +0000 (+0900) Subject: [5.0] Change 'key' variable name to 'logicalKey' X-Git-Tag: accepted/tizen/5.0/unified/20190315.061317^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=3bb10d66e8ff6162c655da028605aef8b1fcab53 [5.0] Change 'key' variable name to 'logicalKey' - To clarify the meaning of the key symbol, changed the variable name to 'logicalKey' Change-Id: Ia892910ed1c8556aa0af39b00c0abb5f6c10e039 Signed-off-by: Seoyeon Kim --- diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp index 1405ba8..0a50e91 100755 --- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp +++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp @@ -947,7 +947,7 @@ bool InputMethodContextEcoreWl::ProcessEventKeyDown( const KeyEvent& keyEvent ) if ( mIMFContext ) { Integration::KeyEvent integKeyEvent( keyEvent ); - std::string key = integKeyEvent.key; + std::string key = integKeyEvent.logicalKey; std::string compose = keyEvent.GetCompose(); std::string deviceName = keyEvent.GetDeviceName(); @@ -1000,7 +1000,7 @@ bool InputMethodContextEcoreWl::ProcessEventKeyUp( const KeyEvent& keyEvent ) if( mIMFContext ) { Integration::KeyEvent integKeyEvent( keyEvent ); - std::string key = integKeyEvent.key; + std::string key = integKeyEvent.logicalKey; std::string compose = keyEvent.GetCompose(); std::string deviceName = keyEvent.GetDeviceName(); diff --git a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp index ccb9de5..7a2ab0e 100755 --- a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp +++ b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp @@ -754,7 +754,7 @@ bool InputMethodContextX::ProcessEventKeyDown( const KeyEvent& keyEvent ) if ( mIMFContext ) { Integration::KeyEvent integKeyEvent( keyEvent ); - std::string key = integKeyEvent.key; + std::string key = integKeyEvent.logicalKey; std::string compose = keyEvent.GetCompose(); @@ -808,7 +808,7 @@ bool InputMethodContextX::ProcessEventKeyUp( const KeyEvent& keyEvent ) if( mIMFContext ) { Integration::KeyEvent integKeyEvent( keyEvent ); - std::string key = integKeyEvent.key; + std::string key = integKeyEvent.logicalKey; std::string compose = keyEvent.GetCompose(); diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp index 571a3a6..bbfc2e4 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp @@ -998,7 +998,7 @@ void WindowBaseEcoreWl::OnKeyDown( void* data, int type, void* event ) DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" ); std::string keyName( keyEvent->keyname ); - std::string key( "" ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -1011,7 +1011,7 @@ void WindowBaseEcoreWl::OnKeyDown( void* data, int type, void* event ) // Ensure key symbol is not NULL as keys like SHIFT have a null string. if( keyEvent->key ) { - key = keyEvent->key; + logicalKey = keyEvent->key; } int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname ); @@ -1037,7 +1037,7 @@ void WindowBaseEcoreWl::OnKeyDown( void* data, int type, void* event ) GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass ); GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass ); - Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass ); mKeyEventSignal.Emit( keyEvent ); } @@ -1052,7 +1052,7 @@ void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event ) DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" ); std::string keyName( keyEvent->keyname ); - std::string key( "" ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -1065,7 +1065,7 @@ void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event ) // Ensure key symbol is not NULL as keys like SHIFT have a null string. if( keyEvent->key ) { - key = keyEvent->key; + logicalKey = keyEvent->key; } int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname ); @@ -1091,7 +1091,7 @@ void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event ) GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass ); GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass ); - Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass ); mKeyEventSignal.Emit( keyEvent ); } diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp index ff5562d..d59f0b1 100755 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp @@ -1008,7 +1008,7 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event ) DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" ); std::string keyName( keyEvent->keyname ); - std::string key( "" ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -1021,7 +1021,7 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event ) // Ensure key symbol is not NULL as keys like SHIFT have a null string. if( keyEvent->key ) { - key = keyEvent->key; + logicalKey = keyEvent->key; } int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname ); @@ -1047,7 +1047,7 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event ) GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass ); GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass ); - Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass ); mKeyEventSignal.Emit( keyEvent ); } @@ -1062,7 +1062,7 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event ) DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" ); std::string keyName( keyEvent->keyname ); - std::string key( "" ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -1075,7 +1075,7 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event ) // Ensure key symbol is not NULL as keys like SHIFT have a null string. if( keyEvent->key ) { - key = keyEvent->key; + logicalKey = keyEvent->key; } int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname ); @@ -1101,7 +1101,7 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event ) GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass ); GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass ); - Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass ); mKeyEventSignal.Emit( keyEvent ); } diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp index 6b0d9cc..c5fde3a 100755 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp @@ -519,7 +519,7 @@ void WindowBaseEcoreX::OnKeyDown( void* data, int type, void* event ) DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreX::OnKeyDown\n" ); std::string keyName( keyEvent->keyname ); - std::string key( "" ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -532,7 +532,7 @@ void WindowBaseEcoreX::OnKeyDown( void* data, int type, void* event ) // Ensure key symbol is not NULL as keys like SHIFT have a null string. if( keyEvent->key ) { - key = keyEvent->key; + logicalKey = keyEvent->key; } int keyCode = ecore_x_keysym_keycode_get( keyEvent->keyname ); @@ -545,7 +545,7 @@ void WindowBaseEcoreX::OnKeyDown( void* data, int type, void* event ) keyString = keyEvent->string; } - Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); mKeyEventSignal.Emit( keyEvent ); } @@ -560,7 +560,7 @@ void WindowBaseEcoreX::OnKeyUp( void* data, int type, void* event ) DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, " WindowBaseEcoreX::OnKeyUp\n" ); std::string keyName( keyEvent->keyname ); - std::string key( "" ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -572,7 +572,7 @@ void WindowBaseEcoreX::OnKeyUp( void* data, int type, void* event ) // Ensure key symbol is not NULL as keys like SHIFT have a null string. if( keyEvent->key ) { - key = keyEvent->key; + logicalKey = keyEvent->key; } int keyCode = ecore_x_keysym_keycode_get( keyEvent->keyname ); @@ -585,7 +585,7 @@ void WindowBaseEcoreX::OnKeyUp( void* data, int type, void* event ) keyString = keyEvent->string; } - Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); mKeyEventSignal.Emit( keyEvent ); }