From dabfa49a4c6c1d289c03b283dd76bdbdf9f04a00 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 7 Sep 2020 14:39:06 +0900 Subject: [PATCH] Revert "Revert "Renamed KeyEvent enum values to comply with coding standards."" This reverts commit 70d9fd825bad24b44f246aa24f7a3d317715737b. --- automated-tests/src/dali-adaptor/utc-Dali-Key.cpp | 2 +- dali/internal/adaptor/android/framework-android.cpp | 4 ++-- .../input/tizen-wayland/input-method-context-impl-ecore-wl.cpp | 4 ++-- dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp | 4 ++-- dali/internal/input/windows/input-method-context-impl-win.cpp | 4 ++-- .../window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp | 4 ++-- .../window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp | 4 ++-- dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp | 4 ++-- dali/internal/window-system/windows/window-base-win.cpp | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp b/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp index 27e5fb6..4d79fa8 100644 --- a/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp +++ b/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp @@ -98,7 +98,7 @@ const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable))/ (sizeof(KeyLooku // Generate a KeyPressEvent to send to Core Dali::KeyEvent GenerateKeyPress( const std::string& keyName ) { - Dali::KeyEvent keyPress = DevelKeyEvent::New(keyName, "", "", -1, 0, 0lu, Dali::KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift + Dali::KeyEvent keyPress = DevelKeyEvent::New(keyName, "", "", -1, 0, 0lu, Dali::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift return keyPress; } diff --git a/dali/internal/adaptor/android/framework-android.cpp b/dali/internal/adaptor/android/framework-android.cpp index b129bcd..4d34aa0 100644 --- a/dali/internal/adaptor/android/framework-android.cpp +++ b/dali/internal/adaptor/android/framework-android.cpp @@ -422,13 +422,13 @@ struct Framework::Impl int32_t action = AKeyEvent_getAction( event ); int64_t timeStamp = AKeyEvent_getEventTime( event ); - Dali::KeyEvent::State state = Dali::KeyEvent::Down; + Dali::KeyEvent::State state = Dali::KeyEvent::DOWN; switch ( action ) { case AKEY_EVENT_ACTION_DOWN: break; case AKEY_EVENT_ACTION_UP: - state = Dali::KeyEvent::Up; + state = Dali::KeyEvent::UP; break; } 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 7482be6..aa1061a 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 @@ -1058,11 +1058,11 @@ bool InputMethodContextEcoreWl::FilterEventKey( const Dali::KeyEvent& keyEvent ) if ( ! KeyLookup::IsDeviceButton( keyEvent.GetKeyName().c_str() )) { //check whether it's key down or key up event - if ( keyEvent.GetState() == Dali::KeyEvent::Down ) + if ( keyEvent.GetState() == Dali::KeyEvent::DOWN ) { eventHandled = ProcessEventKeyDown( keyEvent ); } - else if ( keyEvent.GetState() == Dali::KeyEvent::Up ) + else if ( keyEvent.GetState() == Dali::KeyEvent::UP ) { eventHandled = ProcessEventKeyUp( keyEvent ); } 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 b375e31..91442ba 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 @@ -764,11 +764,11 @@ bool InputMethodContextX::FilterEventKey( const Dali::KeyEvent& keyEvent ) if ( ! KeyLookup::IsDeviceButton( keyEvent.GetKeyName().c_str() )) { //check whether it's key down or key up event - if ( keyEvent.GetState() == Dali::KeyEvent::Down ) + if ( keyEvent.GetState() == Dali::KeyEvent::DOWN ) { eventHandled = ProcessEventKeyDown( keyEvent ); } - else if ( keyEvent.GetState() == Dali::KeyEvent::Up ) + else if ( keyEvent.GetState() == Dali::KeyEvent::UP ) { eventHandled = ProcessEventKeyUp( keyEvent ); } diff --git a/dali/internal/input/windows/input-method-context-impl-win.cpp b/dali/internal/input/windows/input-method-context-impl-win.cpp index 4accb32..ebcf1f2 100755 --- a/dali/internal/input/windows/input-method-context-impl-win.cpp +++ b/dali/internal/input/windows/input-method-context-impl-win.cpp @@ -342,11 +342,11 @@ bool InputMethodContextWin::FilterEventKey( const Dali::KeyEvent& keyEvent ) if ( ! KeyLookup::IsDeviceButton( keyEvent.GetKeyName().c_str() )) { //check whether it's key down or key up event - if ( keyEvent.GetState() == Dali::KeyEvent::Down ) + if ( keyEvent.GetState() == Dali::KeyEvent::DOWN ) { eventHandled = ProcessEventKeyDown( keyEvent ); } - else if ( keyEvent.GetState() == Dali::KeyEvent::Up ) + else if ( keyEvent.GetState() == Dali::KeyEvent::UP ) { eventHandled = ProcessEventKeyUp( keyEvent ); } 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 520dce0..9157080 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 @@ -1012,7 +1012,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, logicalKey, 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 ); } @@ -1075,7 +1075,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, logicalKey, 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 ad452fa..3239f1f 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 @@ -1184,7 +1184,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, logicalKey, 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 ); } @@ -1255,7 +1255,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, logicalKey, 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 326d16f..829eaff 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 @@ -546,7 +546,7 @@ void WindowBaseEcoreX::OnKeyDown( void* data, int type, void* event ) keyString = keyEvent->string; } - Integration::KeyEvent keyEvent( keyName, logicalKey, 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 ); } @@ -586,7 +586,7 @@ void WindowBaseEcoreX::OnKeyUp( void* data, int type, void* event ) keyString = keyEvent->string; } - Integration::KeyEvent keyEvent( keyName, logicalKey, 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 ); } diff --git a/dali/internal/window-system/windows/window-base-win.cpp b/dali/internal/window-system/windows/window-base-win.cpp index c2924d0..706c262 100755 --- a/dali/internal/window-system/windows/window-base-win.cpp +++ b/dali/internal/window-system/windows/window-base-win.cpp @@ -215,7 +215,7 @@ void WindowBaseWin::OnKeyDown( int type, TWinEventInfo *event ) // Ensure key event string is not NULL as keys like SHIFT have a null string. keyString.push_back( event->wParam ); - Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); + Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::DOWN, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); mKeyEventSignal.Emit( keyEvent ); } @@ -238,7 +238,7 @@ void WindowBaseWin::OnKeyUp( int type, TWinEventInfo *event ) // Ensure key event string is not NULL as keys like SHIFT have a null string. keyString.push_back( event->wParam ); - Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); + Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::UP, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS ); mKeyEventSignal.Emit( keyEvent ); } -- 2.7.4