From dd51b3d8ff466159e750b02dafa6f7ad7cb1d4af Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Tue, 19 Jun 2012 18:21:16 +0200 Subject: [PATCH] Renamed Keyboard::Back to Keyboard::BackSpace --- include/SFML/Window/Keyboard.hpp | 2 +- src/SFML/Window/Linux/InputImpl.cpp | 2 +- src/SFML/Window/Linux/WindowImplX11.cpp | 2 +- src/SFML/Window/OSX/HIDInputManager.mm | 2 +- src/SFML/Window/Win32/InputImpl.cpp | 2 +- src/SFML/Window/Win32/WindowImplWin32.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/SFML/Window/Keyboard.hpp b/include/SFML/Window/Keyboard.hpp index c7aa7ce0..9bd92575 100644 --- a/include/SFML/Window/Keyboard.hpp +++ b/include/SFML/Window/Keyboard.hpp @@ -106,7 +106,7 @@ public : Dash, ///< The - key Space, ///< The Space key Return, ///< The Return key - Back, ///< The Backspace key + BackSpace, ///< The Backspace key Tab, ///< The Tabulation key PageUp, ///< The Page up key PageDown, ///< The Page down key diff --git a/src/SFML/Window/Linux/InputImpl.cpp b/src/SFML/Window/Linux/InputImpl.cpp index 5925be53..26238704 100644 --- a/src/SFML/Window/Linux/InputImpl.cpp +++ b/src/SFML/Window/Linux/InputImpl.cpp @@ -125,7 +125,7 @@ bool InputImpl::isKeyPressed(Keyboard::Key key) case Keyboard::Dash: keysym = XK_minus; break; case Keyboard::Space: keysym = XK_space; break; case Keyboard::Return: keysym = XK_Return; break; - case Keyboard::Back: keysym = XK_BackSpace; break; + case Keyboard::BackSpace: keysym = XK_BackSpace; break; case Keyboard::Tab: keysym = XK_Tab; break; case Keyboard::PageUp: keysym = XK_Prior; break; case Keyboard::PageDown: keysym = XK_Next; break; diff --git a/src/SFML/Window/Linux/WindowImplX11.cpp b/src/SFML/Window/Linux/WindowImplX11.cpp index 26f2c229..abeecedb 100644 --- a/src/SFML/Window/Linux/WindowImplX11.cpp +++ b/src/SFML/Window/Linux/WindowImplX11.cpp @@ -859,7 +859,7 @@ Keyboard::Key WindowImplX11::keysymToSF(KeySym symbol) case XK_space : return Keyboard::Space; case XK_Return : return Keyboard::Return; case XK_KP_Enter : return Keyboard::Return; - case XK_BackSpace : return Keyboard::Back; + case XK_BackSpace : return Keyboard::BackSpace; case XK_Tab : return Keyboard::Tab; case XK_Prior : return Keyboard::PageUp; case XK_Next : return Keyboard::PageDown; diff --git a/src/SFML/Window/OSX/HIDInputManager.mm b/src/SFML/Window/OSX/HIDInputManager.mm index 43f70268..153365a2 100644 --- a/src/SFML/Window/OSX/HIDInputManager.mm +++ b/src/SFML/Window/OSX/HIDInputManager.mm @@ -934,7 +934,7 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode) case 0x31: return sf::Keyboard::Space; // case 0x4c: /* keypad */ return sf::Keyboard::Return; case 0x24: /* keyboard */ return sf::Keyboard::Return; - case 0x33: return sf::Keyboard::Back; + case 0x33: return sf::Keyboard::BackSpace; case 0x30: return sf::Keyboard::Tab; // Duplicates (see next ยง). diff --git a/src/SFML/Window/Win32/InputImpl.cpp b/src/SFML/Window/Win32/InputImpl.cpp index 3b348ed6..66cbc59e 100644 --- a/src/SFML/Window/Win32/InputImpl.cpp +++ b/src/SFML/Window/Win32/InputImpl.cpp @@ -108,7 +108,7 @@ bool InputImpl::isKeyPressed(Keyboard::Key key) case Keyboard::Dash: vkey = VK_OEM_MINUS; break; case Keyboard::Space: vkey = VK_SPACE; break; case Keyboard::Return: vkey = VK_RETURN; break; - case Keyboard::Back: vkey = VK_BACK; break; + case Keyboard::BackSpace: vkey = VK_BACK; break; case Keyboard::Tab: vkey = VK_TAB; break; case Keyboard::PageUp: vkey = VK_PRIOR; break; case Keyboard::PageDown: vkey = VK_NEXT; break; diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp index a01218c0..8440dc52 100644 --- a/src/SFML/Window/Win32/WindowImplWin32.cpp +++ b/src/SFML/Window/Win32/WindowImplWin32.cpp @@ -708,7 +708,7 @@ Keyboard::Key WindowImplWin32::virtualKeyCodeToSF(WPARAM key, LPARAM flags) case VK_ESCAPE : return Keyboard::Escape; case VK_SPACE : return Keyboard::Space; case VK_RETURN : return Keyboard::Return; - case VK_BACK : return Keyboard::Back; + case VK_BACK : return Keyboard::BackSpace; case VK_TAB : return Keyboard::Tab; case VK_PRIOR : return Keyboard::PageUp; case VK_NEXT : return Keyboard::PageDown;