From e9c3fcbb64c2df147a176052fb219f0f8a7b89ec Mon Sep 17 00:00:00 2001 From: davc0n Date: Tue, 29 Apr 2025 19:51:07 +0200 Subject: devices: refactor class member vars (#10206) --- src/devices/Keyboard.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/devices/Keyboard.cpp') diff --git a/src/devices/Keyboard.cpp b/src/devices/Keyboard.cpp index 191cc6b2..70abe54d 100644 --- a/src/devices/Keyboard.cpp +++ b/src/devices/Keyboard.cpp @@ -6,7 +6,7 @@ SP CKeyboard::create(SP keeb) { SP pKeeb = SP(new CKeyboard(keeb)); - pKeeb->self = pKeeb; + pKeeb->m_self = pKeeb; return pKeeb; } @@ -16,22 +16,22 @@ bool CKeyboard::isVirtual() { } SP CKeyboard::aq() { - return keyboard.lock(); + return m_keyboard.lock(); } -CKeyboard::CKeyboard(SP keeb) : keyboard(keeb) { +CKeyboard::CKeyboard(SP keeb) : m_keyboard(keeb) { if (!keeb) return; - listeners.destroy = keeb->events.destroy.registerListener([this](std::any d) { - keyboard.reset(); - events.destroy.emit(); + m_listeners.destroy = keeb->events.destroy.registerListener([this](std::any d) { + m_keyboard.reset(); + m_events.destroy.emit(); }); - listeners.key = keeb->events.key.registerListener([this](std::any d) { + m_listeners.key = keeb->events.key.registerListener([this](std::any d) { auto E = std::any_cast(d); - keyboardEvents.key.emit(SKeyEvent{ + m_keyboardEvents.key.emit(SKeyEvent{ .timeMs = E.timeMs, .keycode = E.key, .state = E.pressed ? WL_KEYBOARD_KEY_STATE_PRESSED : WL_KEYBOARD_KEY_STATE_RELEASED, @@ -40,16 +40,16 @@ CKeyboard::CKeyboard(SP keeb) : keyboard(keeb) { updateXkbStateWithKey(E.key + 8, E.pressed); }); - listeners.modifiers = keeb->events.modifiers.registerListener([this](std::any d) { + m_listeners.modifiers = keeb->events.modifiers.registerListener([this](std::any d) { updateModifiersState(); - keyboardEvents.modifiers.emit(SModifiersEvent{ - .depressed = modifiersState.depressed, - .latched = modifiersState.latched, - .locked = modifiersState.locked, - .group = modifiersState.group, + m_keyboardEvents.modifiers.emit(SModifiersEvent{ + .depressed = m_modifiersState.depressed, + .latched = m_modifiersState.latched, + .locked = m_modifiersState.locked, + .group = m_modifiersState.group, }); }); - deviceName = keeb->getName(); + m_deviceName = keeb->getName(); } -- cgit v1.2.3