diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-01-07 17:40:58 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-01-09 00:35:23 +0100 |
commit | 6c3dedf209245d96a1bbcccfa84450829413bfa3 (patch) | |
tree | ecc69139f59fba2e5c5d8f23e16faf3c34a9cbb6 /src/vinylcontrol | |
parent | 603afe8364442758615c08cbafd8640bb0f236db (diff) |
vinylcontrol/vinylcontrolmanager: Replace QSignalMapper with lambda expressions
Diffstat (limited to 'src/vinylcontrol')
-rw-r--r-- | src/vinylcontrol/vinylcontrolmanager.cpp | 8 | ||||
-rw-r--r-- | src/vinylcontrol/vinylcontrolmanager.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/vinylcontrol/vinylcontrolmanager.cpp b/src/vinylcontrol/vinylcontrolmanager.cpp index cbb337c8ab..d4f1b68e86 100644 --- a/src/vinylcontrol/vinylcontrolmanager.cpp +++ b/src/vinylcontrol/vinylcontrolmanager.cpp @@ -32,11 +32,6 @@ VinylControlManager::VinylControlManager(QObject* pParent, pSoundManager->registerInput( AudioInput(AudioInput::VINYLCONTROL, 0, 2, i), m_pProcessor); } - - connect(&m_vinylControlEnabledMapper, - QOverload<int>::of(&QSignalMapper::mapped), - this, - &VinylControlManager::slotVinylControlEnabledChanged); } VinylControlManager::~VinylControlManager() { @@ -91,8 +86,7 @@ void VinylControlManager::slotNumDecksChanged(double dNumDecks) { QString group = PlayerManager::groupForDeck(i); ControlProxy* pEnabled = new ControlProxy(group, "vinylcontrol_enabled", this); m_pVcEnabled.push_back(pEnabled); - pEnabled->connectValueChanged(&m_vinylControlEnabledMapper, QOverload<int>::of(&QSignalMapper::mapped)); - m_vinylControlEnabledMapper.setMapping(pEnabled, i); + pEnabled->connectValueChanged(this, [this, i] { slotVinylControlEnabledChanged(i); }); // Default cueing should be off. ControlObject::set(ConfigKey(group, "vinylcontrol_cueing"), diff --git a/src/vinylcontrol/vinylcontrolmanager.h b/src/vinylcontrol/vinylcontrolmanager.h index 6002330499..7d570a1dee 100644 --- a/src/vinylcontrol/vinylcontrolmanager.h +++ b/src/vinylcontrol/vinylcontrolmanager.h @@ -8,7 +8,6 @@ #define VINYLCONTROLMANAGER_H #include <QObject> -#include <QSignalMapper> #include <QString> #include <QTimerEvent> @@ -73,7 +72,6 @@ class VinylControlManager : public QObject { QList<ControlProxy*> m_pVcEnabled; ControlProxy* m_pNumDecks; int m_iNumConfiguredDecks; - QSignalMapper m_vinylControlEnabledMapper; }; #endif // VINYLCONTROLMANAGER_H |