Revert "Revert "KeyEvent class pimpling""

[platform/core/uifw/dali-adaptor.git] / dali / internal / input / common / key-impl.cpp

diff --git a/dali/internal/input/common/key-impl.cpp b/dali/internal/input/common/key-impl.cpp
index 30c6893..49dd765 100644 (file)
--- a/dali/internal/input/common/key-impl.cpp
+++ b/dali/internal/input/common/key-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -45,11 +45,7 @@ Debug::Filter* gKeyExtensionLogFilter = Debug::Filter::New(Debug::NoLogging, fal
 #endif
 
 // Path for loading extension keys
-#if _GLIBCXX_USE_CXX11_ABI
-const char* KEY_EXTENSION_PLUGIN_SO( "libdali-key-extension.so" );
-#else
-const char* KEY_EXTENSION_PLUGIN_SO( "libdali-key-extension-cxx03.so" );
-#endif
+const char* KEY_EXTENSION_PLUGIN_SO( "libdali2-key-extension.so" );
 
 class KeyMap
 {
@@ -213,7 +209,7 @@ class KeyMap
 
     if( mHandle == NULL )
     {
-      DALI_LOG_INFO( gKeyExtensionLogFilter, Debug::General, "Failed to get handle from libdali-key-extension.so\n" );
+      DALI_LOG_INFO( gKeyExtensionLogFilter, Debug::General, "Failed to get handle from libdali2-key-extension.so\n" );
       return;
     }
 
@@ -286,7 +282,7 @@ KeyMap globalKeyLookup;
 
 bool IsKey( const Dali::KeyEvent& keyEvent, Dali::KEY daliKey)
 {
-  int key = globalKeyLookup.GetDaliKeyEnum( keyEvent.keyPressedName.c_str() );
+  int key = globalKeyLookup.GetDaliKeyEnum( keyEvent.GetKeyName().c_str() );
   return daliKey == key;
 }