Revert "Revert "Renamed KeyEvent enum values to comply with coding standards.""

This reverts commit f6d9158e3bd7f1140cb78043bee8b0a2c0d64a5a.

diff --git a/dali-extension/internal/evas-plugin/evas-event-handler.cpp b/dali-extension/internal/evas-plugin/evas-event-handler.cpp
index f099db4..caf8dd1 100644 (file)
--- a/dali-extension/internal/evas-plugin/evas-event-handler.cpp
+++ b/dali-extension/internal/evas-plugin/evas-event-handler.cpp
@@ -698,7 +698,7 @@ void EvasEventHandler::OnEvasObjectKeyDown( void *data, Evas* evas, Evas_Object*
   // Create KeyEvent
   Integration::KeyEvent integKeyEvent;
 
-  integKeyEvent.state = Integration::KeyEvent::Down;
+  integKeyEvent.state = Integration::KeyEvent::DOWN;
 
   FillIntegrationKeyEvent( keyEvent, integKeyEvent );
 
@@ -713,7 +713,7 @@ void EvasEventHandler::OnEvasObjectKeyUp( void *data, Evas* evas, Evas_Object* e
   // Create KeyEvent
   Integration::KeyEvent integKeyEvent;
 
-  integKeyEvent.state = Integration::KeyEvent::Up;
+  integKeyEvent.state = Integration::KeyEvent::UP;
 
   FillIntegrationKeyEvent( keyEvent, integKeyEvent );
 
@@ -897,7 +897,7 @@ void EvasEventHandler::OnEvasObjectSmartFocused( void *data, Evas_Object* evasOb
       if( elm_win_focus_highlight_enabled_get( topWidget ) == EINA_TRUE )
       {
         // To allow that KeyboardFocusManager can handle the keyboard focus
-        Dali::Integration::KeyEvent fakeKeyEvent( "", "", "", 0, 0, 100, Dali::Integration::KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE );
+        Dali::Integration::KeyEvent fakeKeyEvent( "", "", "", 0, 0, 100, Dali::Integration::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE );
 
         evasPlugin.OnEvasObjectKeyEvent( fakeKeyEvent );
       }

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
index 640dfff..060a242 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -374,7 +374,7 @@ public:
   bool SendKeyEvent( const Dali::KeyEvent& keyEvent )
   {
     void* evasKeyEvent = 0;
-    if( keyEvent.GetState() == Dali::KeyEvent::Down )
+    if( keyEvent.GetState() == Dali::KeyEvent::DOWN )
     {
       Evas_Event_Key_Down downEvent;
       memset( &downEvent, 0, sizeof(Evas_Event_Key_Down) );

diff --git a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
index e37b12e..351001b 100644 (file)
--- a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
+++ b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
@@ -791,12 +791,12 @@ bool TizenWebEngineLWE::SendKeyEvent( const Dali::KeyEvent& event )
   {
     keyValue = KeyStringToKeyValue( event.GetKeyName().c_str(), event.GetKeyModifier() & 1 );
   }
-  if( event.GetState() == Dali::KeyEvent::Down )
+  if( event.GetState() == Dali::KeyEvent::DOWN )
   {
     DispatchKeyDownEvent( keyValue );
     DispatchKeyPressEvent( keyValue );
   }
-  else if( event.GetState() == Dali::KeyEvent::Up )
+  else if( event.GetState() == Dali::KeyEvent::UP )
   {
     DispatchKeyUpEvent( keyValue );
   }