X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Fevent%2Fevents%2Fkey-event-impl.cpp;h=8f0c84f956bcb5fe72445ee88fb2800c6cfd1de5;hb=refs%2Ftags%2Faccepted%2Ftizen%2F5.0%2Funified%2F20190315.061321;hp=d686b8327316998fabc3000d0adfbb414cac6fca;hpb=2197e10ece46faa84a2b64c94af78a2bf2546192;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/events/key-event-impl.cpp b/dali/internal/event/events/key-event-impl.cpp
old mode 100644
new mode 100755
index d686b83..8f0c84f
--- a/dali/internal/event/events/key-event-impl.cpp
+++ b/dali/internal/event/events/key-event-impl.cpp
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/devel-api/common/dali-vector-devel.h>
 
 namespace Dali
 {
@@ -45,9 +44,11 @@ namespace Internal
 {
 
 KeyEventImpl::KeyEventImpl( KeyEvent* keyEvent )
-: mDeviceName( "" ),
-  mDeviceClass( DevelDevice::Class::NONE ),
-  mDeviceSubclass( DevelDevice::Subclass::NONE )
+: mLogicalKey( "" ),
+  mCompose( "" ),
+  mDeviceName( "" ),
+  mDeviceClass( Device::Class::NONE ),
+  mDeviceSubclass( Device::Subclass::NONE )
 {
   gKeyEventToImplMapping.PushBack( { keyEvent, this } );
 }
@@ -68,6 +69,8 @@ KeyEventImpl& KeyEventImpl::operator=( const KeyEventImpl& rhs )
 {
   if( this != &rhs )
   {
+    mLogicalKey = rhs.mLogicalKey;
+    mCompose = rhs.mCompose;
     mDeviceName = rhs.mDeviceName;
     mDeviceClass = rhs.mDeviceClass;
     mDeviceSubclass = rhs.mDeviceSubclass;
@@ -76,6 +79,26 @@ KeyEventImpl& KeyEventImpl::operator=( const KeyEventImpl& rhs )
   return *this;
 }
 
+std::string KeyEventImpl::GetLogicalKey() const
+{
+  return mLogicalKey;
+}
+
+void KeyEventImpl::SetLogicalKey( const std::string& logicalKey )
+{
+  mLogicalKey = logicalKey;
+}
+
+std::string KeyEventImpl::GetCompose() const
+{
+  return mCompose;
+}
+
+void KeyEventImpl::SetCompose( const std::string& compose )
+{
+  mCompose = compose;
+}
+
 std::string KeyEventImpl::GetDeviceName() const
 {
   return mDeviceName;
@@ -86,22 +109,22 @@ void KeyEventImpl::SetDeviceName( const std::string& deviceName )
   mDeviceName = deviceName;
 }
 
-DevelDevice::Class::Type KeyEventImpl::GetDeviceClass() const
+Device::Class::Type KeyEventImpl::GetDeviceClass() const
 {
   return mDeviceClass;
 }
 
-void KeyEventImpl::SetDeviceClass( DevelDevice::Class::Type deviceClass )
+void KeyEventImpl::SetDeviceClass( Device::Class::Type deviceClass )
 {
   mDeviceClass = deviceClass;
 }
 
-DevelDevice::Subclass::Type KeyEventImpl::GetDeviceSubclass() const
+Device::Subclass::Type KeyEventImpl::GetDeviceSubclass() const
 {
   return mDeviceSubclass;
 }
 
-void KeyEventImpl::SetDeviceSubclass( DevelDevice::Subclass::Type deviceSubclass )
+void KeyEventImpl::SetDeviceSubclass( Device::Subclass::Type deviceSubclass )
 {
   mDeviceSubclass = deviceSubclass;
 }