From d593fa58e641aa90d7e1f0759299c59d2665cca6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 31 May 2014 13:41:23 +0300 Subject: Move keyeventtype into separate file. --- src/gui/gui.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/gui.cpp') diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 1fb4cb79f..17ad60ac0 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -439,7 +439,7 @@ bool Gui::handleKeyInput() // change focus. if (!eventConsumed && keyInput.getActionId() == static_cast(InputAction::GUI_TAB) - && keyInput.getType() == KeyInput::PRESSED) + && keyInput.getType() == KeyEventType::PRESSED) { if (inputManager.isActionActive(InputAction::GUI_MOD)) mFocusHandler->tabPrevious(); @@ -1252,17 +1252,17 @@ void Gui::distributeKeyEvent(KeyEvent &event) const std::list keyListeners = widget->getKeyListeners(); - const unsigned int eventType = event.getType(); + const KeyEventType::Type eventType = event.getType(); // Send the event to all key listeners of the source widget. FOR_EACH (std::list::const_iterator, it, keyListeners) { switch (eventType) { - case KeyEvent::PRESSED: + case KeyEventType::PRESSED: (*it)->keyPressed(event); break; - case KeyEvent::RELEASED: + case KeyEventType::RELEASED: (*it)->keyReleased(event); break; default: @@ -1285,15 +1285,15 @@ void Gui::distributeKeyEvent(KeyEvent &event) const void Gui::distributeKeyEventToGlobalKeyListeners(KeyEvent& event) { BLOCK_START("Gui::distributeKeyEventToGlobalKeyListeners") - const unsigned int eventType = event.getType(); + const KeyEventType::Type eventType = event.getType(); FOR_EACH (KeyListenerListIterator, it, mKeyListeners) { switch (eventType) { - case KeyEvent::PRESSED: + case KeyEventType::PRESSED: (*it)->keyPressed(event); break; - case KeyEvent::RELEASED: + case KeyEventType::RELEASED: (*it)->keyReleased(event); break; default: -- cgit v1.2.3-70-g09d2