Revert "KeyEvent class pimpling"

This reverts commit f5fb3b059e770f974b2b128c0b84fa526fcc66b2.

diff --git a/dali-extension/internal/evas-plugin/evas-event-handler.cpp b/dali-extension/internal/evas-plugin/evas-event-handler.cpp
index f099db4..517cbd5 100644 (file)
--- a/dali-extension/internal/evas-plugin/evas-event-handler.cpp
+++ b/dali-extension/internal/evas-plugin/evas-event-handler.cpp
@@ -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( Dali::KeyEvent( "", "", 0, 0, 100, KeyEvent::Down ) );
 
         evasPlugin.OnEvasObjectKeyEvent( fakeKeyEvent );
       }

diff --git a/dali-extension/key/key-extension.cpp b/dali-extension/key/key-extension.cpp
index 94d65b9..fbf64a2 100644 (file)
--- a/dali-extension/key/key-extension.cpp
+++ b/dali-extension/key/key-extension.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ bool IsExtensionKey( const Dali::KeyEvent& keyEvent, Dali::EXTENSION_KEY daliKey
 
   for( size_t i = 0 ; i < sizeof(mKeyLookupTable) / sizeof(KeyExtensionPlugin::KeyLookup) ; i++ )
   {
-    if( !keyEvent.GetKeyName().compare( mKeyLookupTable[i].keyName ) )
+    if( !keyEvent.keyPressedName.compare( mKeyLookupTable[i].keyName ) )
     {
       key = mKeyLookupTable[i].daliKeyCode;
       break;

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..31a12a3 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -371,15 +371,15 @@ public:
     return false;
   }
 
-  bool SendKeyEvent( const Dali::KeyEvent& keyEvent )
+  bool SendKeyEvent( const KeyEvent& keyEvent )
   {
     void* evasKeyEvent = 0;
-    if( keyEvent.GetState() == Dali::KeyEvent::Down )
+    if( keyEvent.state == KeyEvent::Down )
     {
       Evas_Event_Key_Down downEvent;
       memset( &downEvent, 0, sizeof(Evas_Event_Key_Down) );
-      downEvent.key = keyEvent.GetKeyName().c_str();
-      downEvent.string = keyEvent.GetKeyString().c_str();
+      downEvent.key = keyEvent.keyPressedName.c_str();
+      downEvent.string = keyEvent.keyPressed.c_str();
       evasKeyEvent = static_cast<void*>(&downEvent);
       ewk_view_send_key_event( mWebView, evasKeyEvent, true );
     }
@@ -387,8 +387,8 @@ public:
     {
       Evas_Event_Key_Up upEvent;
       memset(&upEvent, 0, sizeof(Evas_Event_Key_Up));
-      upEvent.key = keyEvent.GetKeyName().c_str();
-      upEvent.string = keyEvent.GetKeyString().c_str();
+      upEvent.key = keyEvent.keyPressedName.c_str();
+      upEvent.string = keyEvent.keyPressed.c_str();
       evasKeyEvent = static_cast<void*>(&upEvent);
       ewk_view_send_key_event( mWebView, evasKeyEvent, false );
      }

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..dd63972 100644 (file)
--- a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
+++ b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
@@ -783,20 +783,20 @@ void TizenWebEngineLWE::DispatchKeyUpEvent( LWE::KeyValue keyCode )
 bool TizenWebEngineLWE::SendKeyEvent( const Dali::KeyEvent& event )
 {
   LWE::KeyValue keyValue = LWE::KeyValue::UnidentifiedKey;
-  if( 32 < event.GetKeyString().c_str()[0] && 127 > event.GetKeyString().c_str()[0] )
+  if( 32 < event.keyPressed.c_str()[0] && 127 > event.keyPressed.c_str()[0] )
   {
-    keyValue = static_cast<LWE::KeyValue>( event.GetKeyString().c_str()[0] );
+    keyValue = static_cast<LWE::KeyValue>( event.keyPressed.c_str()[0] );
   }
   else
   {
-    keyValue = KeyStringToKeyValue( event.GetKeyName().c_str(), event.GetKeyModifier() & 1 );
+    keyValue = KeyStringToKeyValue( event.keyPressedName.c_str(), event.keyModifier & 1 );
   }
-  if( event.GetState() == Dali::KeyEvent::Down )
+  if( event.state == Dali::KeyEvent::Down )
   {
     DispatchKeyDownEvent( keyValue );
     DispatchKeyPressEvent( keyValue );
   }
-  else if( event.GetState() == Dali::KeyEvent::Up )
+  else if( event.state == Dali::KeyEvent::Up )
   {
     DispatchKeyUpEvent( keyValue );
   }