Switching to ECORE_DEVICE_CLASS

Signed-off-by: Slava Barinov <v.barinov@samsung.com>

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 466c8c2de1dd3e10b1d178d2601b3ebcd48f94ac..dd89ebf3a430c749b0512abc177574fabd7abd65 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -649,11 +649,11 @@ _e_comp_wl_device_cap_to_class(int cap)
 {
    switch(cap)
      {
-      case ECORE_DEVICE_POINTER:
+      case ECORE_DEVICE_CLASS_POINTER:
          return EVAS_DEVICE_CLASS_MOUSE;
-      case ECORE_DEVICE_KEYBOARD:
+      case ECORE_DEVICE_CLASS_KEYBOARD:
          return EVAS_DEVICE_CLASS_KEYBOARD;
-      case ECORE_DEVICE_TOUCH:
+      case ECORE_DEVICE_CLASS_TOUCH:
          return EVAS_DEVICE_CLASS_TOUCH;
       default:
          return EVAS_DEVICE_CLASS_NONE;
@@ -5029,7 +5029,7 @@ _e_comp_wl_send_event_device(struct wl_client *wc, uint32_t timestamp, const cha
         EINA_LIST_FOREACH(e_comp_wl->input_device_manager.device_list, l, input_dev)
           {
              if ((strcmp(input_dev->identifier, dev_name)) ||
-                 (input_dev->capability != ECORE_DEVICE_KEYBOARD))
+                 (input_dev->capability != ECORE_DEVICE_CLASS_KEYBOARD))
                continue;
              e_comp_wl->input_device_manager.last_device_cap = input_dev->capability;
              EINA_LIST_FOREACH(input_dev->resources, ll, dev_res)

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 47512b804c5e04d1a6761f44f92647325be1efb8..116caf3032df5f0e8128dd1ae2e50b3c8f82d23f 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -459,9 +459,9 @@ _e_info_client_proc_input_device_info(int argc, char **argv)
      {
         i++;
         printf("%3d %50s %20s         ", i, dev->name, dev->identifier);
-        if (dev->capability & ECORE_DEVICE_POINTER) printf("Pointer | ");
-        if (dev->capability & ECORE_DEVICE_KEYBOARD) printf("Keyboard | ");
-        if (dev->capability & ECORE_DEVICE_TOUCH) printf("Touch | ");
+        if (dev->capability & ECORE_DEVICE_CLASS_POINTER) printf("Pointer | ");
+        if (dev->capability & ECORE_DEVICE_CLASS_KEYBOARD) printf("Keyboard | ");
+        if (dev->capability & ECORE_DEVICE_CLASS_TOUCH) printf("Touch | ");
         printf("(0x%x)\n", dev->capability);
      }