Merge branch 'devel/master(1.1.1)' into tizen

[platform/core/uifw/dali-adaptor.git] / automated-tests / src / dali-adaptor / utc-Dali-Key.cpp

diff --git a/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp b/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp
index 0fa93f4..51d7bc0 100644 (file)
--- a/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-Key.cpp
@@ -38,15 +38,15 @@ void utc_dali_adaptor_key_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-// Copied from key-impl.cpp
+// Copied from key-impl.h
 struct KeyLookup
 {
-  const char* keyName;      ///< X string representation
-  const int   daliKeyCode;  ///< Dali Enum Representation
-  const bool  deviceButton; ///< Whether the key is from a button on the device
+  const char* keyName;          ///< XF86 key name
+  const Dali::KEY daliKeyCode;  ///< Dali key code
+  const bool  deviceButton;     ///< Whether the key is from a button on the device
 };
 
-// Taken from key-impl-x.cpp
+// Common keys for all platforms
 KeyLookup KeyLookupTable[]=
 {
   { "Escape",                DALI_KEY_ESCAPE,          false },  // item not defined in utilX
@@ -69,9 +69,6 @@ KeyLookup KeyLookupTable[]=
   { "XF86AudioMedia",        DALI_KEY_MEDIA,           false },
   { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,      false },
   { "XF86AudioMute",         DALI_KEY_MUTE,            false },
-  { "XF86Send",              DALI_KEY_SEND,            true  },
-  { "XF86Phone",             DALI_KEY_SELECT,          true  },
-  { "XF86Stop",              DALI_KEY_END,             true  },
   { "XF86Menu",              DALI_KEY_MENU,            true  },
   { "XF86Home",              DALI_KEY_HOME,            true  },
   { "XF86Back",              DALI_KEY_BACK,            true  },