From c98c07fc7da05df3c53fde98ff95b1fb959e1213 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 29 Dec 2016 17:00:54 +0300 Subject: Add constexpr into keyboardconfig. --- src/input/keyboardconfig.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/input/keyboardconfig.cpp') diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp index ecd563656..3405ad5c4 100644 --- a/src/input/keyboardconfig.cpp +++ b/src/input/keyboardconfig.cpp @@ -59,20 +59,6 @@ void KeyboardConfig::deinit() mActiveKeys2 = nullptr; } -int KeyboardConfig::getKeyValueFromEvent(const SDL_Event &event) -{ -#ifdef USE_SDL2 - return event.key.keysym.scancode; -#else // USE_SDL2 - - if (event.key.keysym.sym) - return CAST_S32(event.key.keysym.sym); - else if (event.key.keysym.scancode > 1) - return -event.key.keysym.scancode; - return 0; -#endif // USE_SDL2 -} - InputActionT KeyboardConfig::getKeyIndex(const SDL_Event &event, const int grp) { const int keyValue = getKeyValueFromEvent(event); @@ -149,16 +135,6 @@ std::string KeyboardConfig::getKeyShortString(const std::string &key) return key; } -SDLKey KeyboardConfig::getKeyFromEvent(const SDL_Event &event) -{ -#ifdef USE_SDL2 - return event.key.keysym.scancode; -#else // USE_SDL2 - - return event.key.keysym.sym; -#endif // USE_SDL2 -} - KeysVector *KeyboardConfig::getActionVector(const SDL_Event &event) { const int i = getKeyValueFromEvent(event); -- cgit v1.2.3-70-g09d2