X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fevents%2Fkey-event-integ.cpp;h=db7e1bce26f101982f50fbeba1bf47682ec7be37;hb=refs%2Ftags%2Faccepted%2Ftizen%2F5.0%2Funified%2F20190315.061321;hp=f8c6f7f32b0d7f095b428a5d3cca525c47bbd4d8;hpb=411a14ad0cd03385c7a47f40294f72e1adfd824e;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/integration-api/events/key-event-integ.cpp b/dali/integration-api/events/key-event-integ.cpp index f8c6f7f..db7e1bc 100755 --- a/dali/integration-api/events/key-event-integ.cpp +++ b/dali/integration-api/events/key-event-integ.cpp @@ -30,7 +30,7 @@ namespace Integration KeyEvent::KeyEvent() : Event( Key ), keyName(), - key(), + logicalKey(), keyString(), keyCode( -1 ), keyModifier( 0 ), @@ -43,12 +43,12 @@ KeyEvent::KeyEvent() { } -KeyEvent::KeyEvent( const std::string& keyName, const std::string& key, const std::string& keyString, int keyCode, int keyModifier, +KeyEvent::KeyEvent( const std::string& keyName, const std::string& logicalKey, const std::string& keyString, int keyCode, int keyModifier, unsigned long timeStamp, const State& keyState, const std::string& compose, const std::string& deviceName, const Device::Class::Type deviceClass, const Device::Subclass::Type deviceSubclass ) : Event( Key ), keyName( keyName ), - key( key ), + logicalKey( logicalKey ), keyString( keyString ), keyCode( keyCode ), keyModifier( keyModifier ), @@ -64,7 +64,7 @@ KeyEvent::KeyEvent( const std::string& keyName, const std::string& key, const st KeyEvent::KeyEvent( const Dali::KeyEvent& event ) : Event( Key ), keyName( event.keyPressedName ), - key( "" ), + logicalKey( "" ), keyString( event.keyPressed ), keyCode( event.keyCode ), keyModifier( event.keyModifier ), @@ -76,7 +76,7 @@ KeyEvent::KeyEvent( const Dali::KeyEvent& event ) deviceSubclass( Device::Subclass::NONE ) { const Internal::KeyEventImpl* keyEventImpl = GetImplementation( &event ); - key = keyEventImpl->GetKey(); + logicalKey = keyEventImpl->GetLogicalKey(); compose = keyEventImpl->GetCompose(); deviceName = keyEventImpl->GetDeviceName(); deviceClass = keyEventImpl->GetDeviceClass();