flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 01:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #937 Resolved clazy warnings: miscellaneous.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-04-17 00:16:12 +01:00
parent 2134b4e874
commit e3fe8ec39f
24 changed files with 89 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/blackinput/win/keyboardwindows.cpp
View File

@@ -14,51 +14,55 @@ using namespace BlackMisc::Input;
namespace BlackInput
{
static QHash<int, KeyCode> keyMapping
static const auto &keyMapping()
{
{ '0', Key_0 },
{ '1', Key_1 },
{ '2', Key_2 },
{ '3', Key_3 },
{ '4', Key_4 },
{ '5', Key_5 },
{ '6', Key_6 },
{ '7', Key_7 },
{ '8', Key_8 },
{ '9', Key_9 },
{ 'A', Key_A },
{ 'B', Key_B },
{ 'C', Key_C },
{ 'D', Key_D },
{ 'E', Key_E },
{ 'F', Key_F },
{ 'G', Key_G },
{ 'H', Key_H },
{ 'I', Key_I },
{ 'J', Key_J },
{ 'K', Key_K },
{ 'L', Key_L },
{ 'M', Key_M },
{ 'N', Key_N },
{ 'O', Key_O },
{ 'P', Key_P },
{ 'Q', Key_Q },
{ 'R', Key_R },
{ 'S', Key_S },
{ 'T', Key_T },
{ 'U', Key_U },
{ 'V', Key_V },
{ 'W', Key_W },
{ 'X', Key_X },
{ 'Y', Key_Y },
{ 'Z', Key_Z },
{ VK_LSHIFT, Key_ShiftLeft },
{ VK_RSHIFT, Key_ShiftRight },
{ VK_LCONTROL, Key_ControlLeft },
{ VK_RCONTROL, Key_ControlRight },
{ VK_LMENU, Key_AltLeft },
{ VK_RMENU, Key_AltRight },
};
static const QHash<int, KeyCode> hash
{
{ '0', Key_0 },
{ '1', Key_1 },
{ '2', Key_2 },
{ '3', Key_3 },
{ '4', Key_4 },
{ '5', Key_5 },
{ '6', Key_6 },
{ '7', Key_7 },
{ '8', Key_8 },
{ '9', Key_9 },
{ 'A', Key_A },
{ 'B', Key_B },
{ 'C', Key_C },
{ 'D', Key_D },
{ 'E', Key_E },
{ 'F', Key_F },
{ 'G', Key_G },
{ 'H', Key_H },
{ 'I', Key_I },
{ 'J', Key_J },
{ 'K', Key_K },
{ 'L', Key_L },
{ 'M', Key_M },
{ 'N', Key_N },
{ 'O', Key_O },
{ 'P', Key_P },
{ 'Q', Key_Q },
{ 'R', Key_R },
{ 'S', Key_S },
{ 'T', Key_T },
{ 'U', Key_U },
{ 'V', Key_V },
{ 'W', Key_W },
{ 'X', Key_X },
{ 'Y', Key_Y },
{ 'Z', Key_Z },
{ VK_LSHIFT, Key_ShiftLeft },
{ VK_RSHIFT, Key_ShiftRight },
{ VK_LCONTROL, Key_ControlLeft },
{ VK_RCONTROL, Key_ControlRight },
{ VK_LMENU, Key_AltLeft },
{ VK_RMENU, Key_AltRight },
};
return hash;
}
static CKeyboardWindows *g_keyboardWindows = nullptr;
@@ -87,13 +91,13 @@ namespace BlackInput
BlackMisc::Input::CHotkeyCombination oldCombination(m_keyCombination);
if ((event == WM_KEYDOWN) || (event == WM_SYSKEYDOWN))
{
auto key = keyMapping.value(vkcode);
auto key = keyMapping().value(vkcode);
if (key == Key_Unknown) { return; }
m_keyCombination.addKeyboardKey(CKeyboardKey(key));
}
else if ((event == WM_KEYUP) || (event == WM_SYSKEYUP) )
{
auto key = keyMapping.value(vkcode);
auto key = keyMapping().value(vkcode);
if (key == Key_Unknown) { return; }
m_keyCombination.removeKeyboardKey(CKeyboardKey(key));
}