From: Agnelo Vaz Date: Thu, 27 Feb 2014 19:54:20 +0000 (+0000) Subject: (KeyEvents) Removing unused cursorOffset numberOfChars from KeyEvent X-Git-Tag: dali-2014-wk16-release~23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed98138d6600414bb5092a2fb5e8f542a4bacb0e;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git (KeyEvents) Removing unused cursorOffset numberOfChars from KeyEvent [Issue#] N/A [Problem] CAPI Freeze so cleaning up first [Cause] N/A [Solution] [Verification] Build Repo Change-Id: Ia82332ea9b86b998068b0617641f4a0e2441f115 --- diff --git a/adaptors/tizen/internal/common/events/event-handler.cpp b/adaptors/tizen/internal/common/events/event-handler.cpp index 00495fac8..96cd63dce 100644 --- a/adaptors/tizen/internal/common/events/event-handler.cpp +++ b/adaptors/tizen/internal/common/events/event-handler.cpp @@ -418,8 +418,6 @@ struct EventHandler::Impl std::string keyString( "" ); int keyCode = ecore_x_keysym_keycode_get(keyEvent->keyname); int modifier( keyEvent->modifiers ); - int cursorOffset( 0 ); - int numberOfChars( 0 ); unsigned long time = keyEvent->timestamp; // Ensure key event string is not NULL as keys like SHIFT have a null string. @@ -428,7 +426,7 @@ struct EventHandler::Impl keyString = keyEvent->string; } - KeyEvent keyEvent(keyName, keyString, keyCode, modifier, cursorOffset, numberOfChars, time, KeyEvent::Down); + KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Down); handler->SendEvent( keyEvent ); } } @@ -481,8 +479,6 @@ struct EventHandler::Impl std::string keyString( "" ); int keyCode = ecore_x_keysym_keycode_get(keyEvent->keyname); int modifier( keyEvent->modifiers ); - int cursorOffset( 0 ); - int numberOfChars( 0 ); unsigned long time( keyEvent->timestamp ); // Ensure key event string is not NULL as keys like SHIFT have a null string. @@ -491,7 +487,7 @@ struct EventHandler::Impl keyString = keyEvent->string; } - KeyEvent keyEvent(keyName, keyString, keyCode, modifier, cursorOffset, numberOfChars, time, KeyEvent::Up); + KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Up); handler->SendEvent( keyEvent ); } @@ -1152,7 +1148,7 @@ void EventHandler::SendEvent(KeyEvent& keyEvent) // Create KeyEvent and send to Core. Integration::KeyEvent event(keyEvent.keyPressedName, keyEvent.keyPressed, keyEvent.keyCode, - keyEvent.keyModifier, keyEvent.cursorOffset, keyEvent.numberOfChars, keyEvent.time, static_cast(keyEvent.state)); + keyEvent.keyModifier, keyEvent.time, static_cast(keyEvent.state)); mCoreEventInterface.QueueCoreEvent( event ); mCoreEventInterface.ProcessCoreEvents(); } diff --git a/adaptors/tizen/internal/evas-plugin-impl.cpp b/adaptors/tizen/internal/evas-plugin-impl.cpp index 0965154cb..1363b38c1 100644 --- a/adaptors/tizen/internal/evas-plugin-impl.cpp +++ b/adaptors/tizen/internal/evas-plugin-impl.cpp @@ -300,8 +300,6 @@ static void _evas_object_key_down_cb(void *data, Evas *e, Evas_Object *obj, void std::string keyString( "" ); int keyCode = ecore_x_keysym_keycode_get(keyEvent->keyname); int modifier( EvasModifierToEcoreModifier ( keyEvent->modifiers ) ); - int cursorOffset( 0 ); - int numberOfChars( 0 ); unsigned long time( keyEvent->timestamp ); // Ensure key event string is not NULL as keys like SHIFT have a null string. @@ -310,7 +308,7 @@ static void _evas_object_key_down_cb(void *data, Evas *e, Evas_Object *obj, void keyString = keyEvent->string; } - KeyEvent daliKeyEvent(keyName, keyString, keyCode, modifier, cursorOffset, numberOfChars, time, KeyEvent::Down); + KeyEvent daliKeyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Down); ep->OnKeyEvent( daliKeyEvent ); } } @@ -351,8 +349,6 @@ static void _evas_object_key_up_cb(void *data, Evas *e, Evas_Object *obj, void * std::string keyString( "" ); int keyCode = ecore_x_keysym_keycode_get(keyEvent->keyname); int modifier( EvasModifierToEcoreModifier ( keyEvent->modifiers ) ); - int cursorOffset( 0 ); - int numberOfChars( 0 ); unsigned long time( keyEvent->timestamp ); // Ensure key event string is not NULL as keys like SHIFT have a null string. @@ -361,7 +357,7 @@ static void _evas_object_key_up_cb(void *data, Evas *e, Evas_Object *obj, void * keyString = keyEvent->string; } - KeyEvent daliKeyEvent(keyName, keyString, keyCode, modifier, cursorOffset, numberOfChars, time, KeyEvent::Up); + KeyEvent daliKeyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Up); ep->OnKeyEvent( daliKeyEvent ); } } @@ -396,7 +392,7 @@ static void _elm_focus_object_focus_in_cb(void *data, Evas_Object *obj, void *ev if(elm_win_focus_highlight_enabled_get(win) == EINA_TRUE) { // To allow that KeyboardFocusManager can handle the keyboard focus - KeyEvent fakeKeyEvent("", "", 0, 0, 0, 0, 100 /* fake timestamp */, KeyEvent::Down); + KeyEvent fakeKeyEvent("", "", 0, 0, 100 /* fake timestamp */, KeyEvent::Down); ep->OnKeyEvent( fakeKeyEvent ); } }