From b354f7f7eef7c20657638c757d59b47c1805f3a8 Mon Sep 17 00:00:00 2001 From: kimci86 Date: Sun, 17 Apr 2022 11:05:31 +0200 Subject: [PATCH] Scancode renaming leftover --- include/SFML/Window/Keyboard.hpp | 2 +- src/SFML/Window/Android/InputImpl.cpp | 2 +- src/SFML/Window/Unix/KeyboardImpl.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/SFML/Window/Keyboard.hpp b/include/SFML/Window/Keyboard.hpp index 8ff2993f..cc5755b4 100644 --- a/include/SFML/Window/Keyboard.hpp +++ b/include/SFML/Window/Keyboard.hpp @@ -334,7 +334,7 @@ public: LaunchMail, //!< Keyboard Launch Mail key LaunchMediaSelect, //!< Keyboard Launch Media Select key - ScancodeCount //!< Keep last -- the total number of scancodes + ScancodeCount //!< Keep last -- the total number of scancodes }; }; diff --git a/src/SFML/Window/Android/InputImpl.cpp b/src/SFML/Window/Android/InputImpl.cpp index 33caa571..12d24305 100644 --- a/src/SFML/Window/Android/InputImpl.cpp +++ b/src/SFML/Window/Android/InputImpl.cpp @@ -58,7 +58,7 @@ Keyboard::Key InputImpl::localize(Keyboard::Scancode /* code */) Keyboard::Scancode InputImpl::delocalize(Keyboard::Key /* key */) { // Not applicable - return Keyboard::ScanUnknown; + return Keyboard::Scan::Unknown; } String InputImpl::getDescription(Keyboard::Scancode /* code */) diff --git a/src/SFML/Window/Unix/KeyboardImpl.cpp b/src/SFML/Window/Unix/KeyboardImpl.cpp index 5a431687..d30fd9d0 100644 --- a/src/SFML/Window/Unix/KeyboardImpl.cpp +++ b/src/SFML/Window/Unix/KeyboardImpl.cpp @@ -500,7 +500,7 @@ void ensureMapping() { scancode = translateKeyCode(display, static_cast(keycode)); - if (scancode != sf::Keyboard::ScanUnknown && scancodeToKeycode[scancode] == NullKeyCode) + if (scancode != sf::Keyboard::Scan::Unknown && scancodeToKeycode[scancode] == NullKeyCode) scancodeToKeycode[scancode] = static_cast(keycode); keycodeToScancode[keycode] = scancode; @@ -554,7 +554,7 @@ KeyCode keyToKeyCode(sf::Keyboard::Key key) // Fallback for when XKeysymToKeycode cannot tell the KeyCode for XK_Alt_R if (key == sf::Keyboard::RAlt) - return scancodeToKeycode[sf::Keyboard::ScanRAlt]; + return scancodeToKeycode[sf::Keyboard::Scan::RAlt]; return NullKeyCode; }