Use nested namespaces (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-09-15 21:44:54 +01:00
parent 3f2e5b0b69
commit 57d32da826
1345 changed files with 146075 additions and 150376 deletions

View File

@@ -9,108 +9,105 @@
#include "blackmisc/input/keyboardkeylist.h"
#include "blackmisc/input/keycodes.h"
namespace BlackMisc
namespace BlackMisc::Input
{
namespace Input
CKeyboardKeyList::CKeyboardKeyList() { }
CKeyboardKeyList::CKeyboardKeyList(const CSequence<CKeyboardKey> &baseClass) :
CSequence<CKeyboardKey>(baseClass)
{ }
QStringList CKeyboardKeyList::getKeyStrings() const
{
CKeyboardKeyList::CKeyboardKeyList() { }
CKeyboardKeyList::CKeyboardKeyList(const CSequence<CKeyboardKey> &baseClass) :
CSequence<CKeyboardKey>(baseClass)
{ }
QStringList CKeyboardKeyList::getKeyStrings() const
QStringList keys;
for (const CKeyboardKey &k : *this)
{
QStringList keys;
for (const CKeyboardKey &k : *this)
{
if (k.hasKey()) { keys.push_back(k.getKeyAsString()); }
}
return keys;
if (k.hasKey()) { keys.push_back(k.getKeyAsString()); }
}
return keys;
}
const CKeyboardKeyList &CKeyboardKeyList::allSupportedKeys()
const CKeyboardKeyList &CKeyboardKeyList::allSupportedKeys()
{
static const CKeyboardKeyList allKeys =
{
static const CKeyboardKeyList allKeys =
{
CKeyboardKey(Key_ControlLeft),
CKeyboardKey(Key_ControlRight),
CKeyboardKey(Key_AltLeft),
CKeyboardKey(Key_AltRight),
CKeyboardKey(Key_ShiftLeft),
CKeyboardKey(Key_ShiftRight),
CKeyboardKey(Key_Period),
CKeyboardKey(Key_Plus),
CKeyboardKey(Key_Minus),
CKeyboardKey(Key_Comma),
CKeyboardKey(Key_Multiply),
CKeyboardKey(Key_Divide),
CKeyboardKey(Key_Back),
CKeyboardKey(Key_Tab),
CKeyboardKey(Key_Esc),
CKeyboardKey(Key_Space),
CKeyboardKey(Key_Delete),
CKeyboardKey(Key_Insert),
CKeyboardKey(Key_DeadGrave),
CKeyboardKey(Key_A),
CKeyboardKey(Key_B),
CKeyboardKey(Key_C),
CKeyboardKey(Key_D),
CKeyboardKey(Key_E),
CKeyboardKey(Key_F),
CKeyboardKey(Key_G),
CKeyboardKey(Key_H),
CKeyboardKey(Key_I),
CKeyboardKey(Key_J),
CKeyboardKey(Key_K),
CKeyboardKey(Key_L),
CKeyboardKey(Key_M),
CKeyboardKey(Key_N),
CKeyboardKey(Key_O),
CKeyboardKey(Key_P),
CKeyboardKey(Key_Q),
CKeyboardKey(Key_R),
CKeyboardKey(Key_S),
CKeyboardKey(Key_T),
CKeyboardKey(Key_U),
CKeyboardKey(Key_V),
CKeyboardKey(Key_W),
CKeyboardKey(Key_X),
CKeyboardKey(Key_Y),
CKeyboardKey(Key_Z),
CKeyboardKey(Key_0),
CKeyboardKey(Key_1),
CKeyboardKey(Key_2),
CKeyboardKey(Key_3),
CKeyboardKey(Key_4),
CKeyboardKey(Key_5),
CKeyboardKey(Key_6),
CKeyboardKey(Key_7),
CKeyboardKey(Key_8),
CKeyboardKey(Key_9),
CKeyboardKey(Key_Numpad0),
CKeyboardKey(Key_Numpad1),
CKeyboardKey(Key_Numpad2),
CKeyboardKey(Key_Numpad3),
CKeyboardKey(Key_Numpad4),
CKeyboardKey(Key_Numpad5),
CKeyboardKey(Key_Numpad6),
CKeyboardKey(Key_Numpad7),
CKeyboardKey(Key_Numpad8),
CKeyboardKey(Key_Numpad9),
CKeyboardKey(Key_NumpadEqual),
CKeyboardKey(Key_OEM1),
CKeyboardKey(Key_OEM2),
CKeyboardKey(Key_OEM3),
CKeyboardKey(Key_OEM4),
CKeyboardKey(Key_OEM5),
CKeyboardKey(Key_OEM6),
CKeyboardKey(Key_OEM7),
CKeyboardKey(Key_OEM8),
CKeyboardKey(Key_OEM102)
};
CKeyboardKey(Key_ControlLeft),
CKeyboardKey(Key_ControlRight),
CKeyboardKey(Key_AltLeft),
CKeyboardKey(Key_AltRight),
CKeyboardKey(Key_ShiftLeft),
CKeyboardKey(Key_ShiftRight),
CKeyboardKey(Key_Period),
CKeyboardKey(Key_Plus),
CKeyboardKey(Key_Minus),
CKeyboardKey(Key_Comma),
CKeyboardKey(Key_Multiply),
CKeyboardKey(Key_Divide),
CKeyboardKey(Key_Back),
CKeyboardKey(Key_Tab),
CKeyboardKey(Key_Esc),
CKeyboardKey(Key_Space),
CKeyboardKey(Key_Delete),
CKeyboardKey(Key_Insert),
CKeyboardKey(Key_DeadGrave),
CKeyboardKey(Key_A),
CKeyboardKey(Key_B),
CKeyboardKey(Key_C),
CKeyboardKey(Key_D),
CKeyboardKey(Key_E),
CKeyboardKey(Key_F),
CKeyboardKey(Key_G),
CKeyboardKey(Key_H),
CKeyboardKey(Key_I),
CKeyboardKey(Key_J),
CKeyboardKey(Key_K),
CKeyboardKey(Key_L),
CKeyboardKey(Key_M),
CKeyboardKey(Key_N),
CKeyboardKey(Key_O),
CKeyboardKey(Key_P),
CKeyboardKey(Key_Q),
CKeyboardKey(Key_R),
CKeyboardKey(Key_S),
CKeyboardKey(Key_T),
CKeyboardKey(Key_U),
CKeyboardKey(Key_V),
CKeyboardKey(Key_W),
CKeyboardKey(Key_X),
CKeyboardKey(Key_Y),
CKeyboardKey(Key_Z),
CKeyboardKey(Key_0),
CKeyboardKey(Key_1),
CKeyboardKey(Key_2),
CKeyboardKey(Key_3),
CKeyboardKey(Key_4),
CKeyboardKey(Key_5),
CKeyboardKey(Key_6),
CKeyboardKey(Key_7),
CKeyboardKey(Key_8),
CKeyboardKey(Key_9),
CKeyboardKey(Key_Numpad0),
CKeyboardKey(Key_Numpad1),
CKeyboardKey(Key_Numpad2),
CKeyboardKey(Key_Numpad3),
CKeyboardKey(Key_Numpad4),
CKeyboardKey(Key_Numpad5),
CKeyboardKey(Key_Numpad6),
CKeyboardKey(Key_Numpad7),
CKeyboardKey(Key_Numpad8),
CKeyboardKey(Key_Numpad9),
CKeyboardKey(Key_NumpadEqual),
CKeyboardKey(Key_OEM1),
CKeyboardKey(Key_OEM2),
CKeyboardKey(Key_OEM3),
CKeyboardKey(Key_OEM4),
CKeyboardKey(Key_OEM5),
CKeyboardKey(Key_OEM6),
CKeyboardKey(Key_OEM7),
CKeyboardKey(Key_OEM8),
CKeyboardKey(Key_OEM102)
};
return allKeys;
}
} // ns
return allKeys;
}
} // ns