Revert "[Tizen] Device Class set in ecore wayland"

This reverts commit 9c4f1f5be542ca765af40119774ae494105537d0.

Change-Id: I0a394699583b711be0b84efe40b7018760b69d6f

diff --git a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
index 21668a6..d45cf66 100644 (file)
--- a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
@@ -44,7 +44,6 @@
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/hover-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
-#include <dali/devel-api/events/key-event-devel.h>
 
 // INTERNAL INCLUDES
 #include <events/gesture-manager.h>
@@ -258,48 +257,6 @@ void GetDeviceName(  Ecore_Event_Key* keyEvent, std::string& result )
   }
 }
 
-/**
- * Get the device class from the provided ecore key event
- */
-void GetDeviceClass(  Ecore_Event_Key* keyEvent, DevelKeyEvent::DeviceClass::Type& deviceClass )
-{
-  Ecore_Device_Class ecoreDeviceClass = ecore_device_class_get( keyEvent->dev );
-
-  switch( ecoreDeviceClass )
-  {
-  case ECORE_DEVICE_CLASS_SEAT:
-    deviceClass = DevelKeyEvent::DeviceClass::SEAT;
-    break;
-
-  case ECORE_DEVICE_CLASS_KEYBOARD:
-    deviceClass = DevelKeyEvent::DeviceClass::KEYBOARD;
-    break;
-
-  case ECORE_DEVICE_CLASS_MOUSE:
-    deviceClass = DevelKeyEvent::DeviceClass::MOUSE;
-    break;
-
-  case ECORE_DEVICE_CLASS_TOUCH:
-    deviceClass = DevelKeyEvent::DeviceClass::TOUCH;
-    break;
-
-  case ECORE_DEVICE_CLASS_PEN:
-    deviceClass = DevelKeyEvent::DeviceClass::PEN;
-    break;
-
-  case ECORE_DEVICE_CLASS_POINTER:
-    deviceClass = DevelKeyEvent::DeviceClass::POINTER;
-    break;
-
-  case ECORE_DEVICE_CLASS_GAMEPAD:
-    deviceClass = DevelKeyEvent::DeviceClass::GAMEPAD;
-    break;
-
-  default:
-    deviceClass = DevelKeyEvent::DeviceClass::NONE;
-    break;
-  }
-}
 
 } // unnamed namespace
 
@@ -574,14 +531,11 @@ struct EventHandler::Impl
         }
 
         std::string deviceName;
-        DevelKeyEvent::DeviceClass::Type deviceClass;
-
         GetDeviceName( keyEvent, deviceName );
-        GetDeviceClass( keyEvent, deviceClass );
 
-        DALI_LOG_INFO( gImfLogging, Debug::Verbose, "EVENT EcoreEventKeyDown - >>EcoreEventKeyDown deviceName(%s) deviceClass(%d)\n", deviceName.c_str(), deviceClass );
+        DALI_LOG_INFO( gImfLogging, Debug::Verbose, "EVENT EcoreEventKeyDown - >>EcoreEventKeyDown deviceName(%s)\n", deviceName.c_str() );
 
-        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, deviceName, deviceClass );
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, deviceName );
         handler->SendEvent( keyEvent );
       }
     }
@@ -654,12 +608,9 @@ struct EventHandler::Impl
         }
 
         std::string deviceName;
-        DevelKeyEvent::DeviceClass::Type deviceClass;
-
         GetDeviceName( keyEvent, deviceName );
-        GetDeviceClass( keyEvent, deviceClass );
 
-        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, deviceName, deviceClass );
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, deviceName );
         handler->SendEvent( keyEvent );
       }
     }

diff --git a/adaptors/x11/ecore-x-event-handler.cpp b/adaptors/x11/ecore-x-event-handler.cpp
index 2d3ce7f..f16d5c1 100644 (file)
--- a/adaptors/x11/ecore-x-event-handler.cpp
+++ b/adaptors/x11/ecore-x-event-handler.cpp
@@ -49,7 +49,6 @@
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/hover-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
-#include <dali/devel-api/events/key-event-devel.h>
 
 // INTERNAL INCLUDES
 #include <events/gesture-manager.h>
@@ -86,8 +85,6 @@ namespace
 
 const char * DETENT_DEVICE_NAME = "tizen_detent";
 const std::string DEFAULT_DEVICE_NAME = "";
-const DevelKeyEvent::DeviceClass::Type DEFAULT_DEVICE_CLASS = DevelKeyEvent::DeviceClass::NONE;
-
 // DBUS accessibility
 #define A11Y_BUS "org.a11y.Bus"
 #define A11Y_INTERFACE "org.a11y.Bus"
@@ -710,7 +707,7 @@ struct EventHandler::Impl
           keyString = keyEvent->string;
         }
 
-        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS );
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME );
         handler->SendEvent( keyEvent );
       }
     }
@@ -777,7 +774,7 @@ struct EventHandler::Impl
           keyString = keyEvent->string;
         }
 
-        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS );
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME );
 
         handler->SendEvent( keyEvent );
       }