diff --git a/src/blackcore/inputmanager.cpp b/src/blackcore/inputmanager.cpp index 9dad48583..35d3bbc5e 100644 --- a/src/blackcore/inputmanager.cpp +++ b/src/blackcore/inputmanager.cpp @@ -29,8 +29,8 @@ namespace BlackCore m_keyboard(IKeyboard::create(this)), m_joystick(IJoystick::create(this)) { - connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged, this, &CInputManager::ps_processKeyCombinationChanged, Qt::QueuedConnection); - connect(m_joystick.get(), &IJoystick::buttonCombinationChanged, this, &CInputManager::ps_processButtonCombinationChanged, Qt::QueuedConnection); + connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged, this, &CInputManager::processKeyCombinationChanged, Qt::QueuedConnection); + connect(m_joystick.get(), &IJoystick::buttonCombinationChanged, this, &CInputManager::processButtonCombinationChanged, Qt::QueuedConnection); reloadHotkeySettings(); } @@ -83,7 +83,7 @@ namespace BlackCore } } - void CInputManager::ps_processKeyCombinationChanged(const CHotkeyCombination &combination) + void CInputManager::processKeyCombinationChanged(const CHotkeyCombination &combination) { // Merge in the joystick part CHotkeyCombination copy(combination); @@ -91,7 +91,7 @@ namespace BlackCore processCombination(copy); } - void CInputManager::ps_processButtonCombinationChanged(const CHotkeyCombination &combination) + void CInputManager::processButtonCombinationChanged(const CHotkeyCombination &combination) { // Merge in the keyboard keys CHotkeyCombination copy(combination); diff --git a/src/blackcore/inputmanager.h b/src/blackcore/inputmanager.h index 9d9813a6c..db126ac23 100644 --- a/src/blackcore/inputmanager.h +++ b/src/blackcore/inputmanager.h @@ -107,9 +107,7 @@ namespace BlackCore //! Constructor CInputManager(QObject *parent = nullptr); - private slots: - void ps_processKeyCombinationChanged(const BlackMisc::Input::CHotkeyCombination &combination); - void ps_processButtonCombinationChanged(const BlackMisc::Input::CHotkeyCombination &combination); + private: //! Handle to a bound action @@ -125,6 +123,9 @@ namespace BlackCore //! Reload hotkey settings void reloadHotkeySettings(); + void processKeyCombinationChanged(const BlackMisc::Input::CHotkeyCombination &combination); + void processButtonCombinationChanged(const BlackMisc::Input::CHotkeyCombination &combination); + //! Bind action int bindImpl(const QString &action, QObject *receiver, std::function function);