diff options
Diffstat (limited to 'src/control')
-rw-r--r-- | src/control/control.cpp | 4 | ||||
-rw-r--r-- | src/control/controlbehavior.cpp | 14 | ||||
-rw-r--r-- | src/control/controleffectknob.cpp | 2 | ||||
-rw-r--r-- | src/control/controlobject.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/control/control.cpp b/src/control/control.cpp index 5ea6a51dad..22a79b6dce 100644 --- a/src/control/control.cpp +++ b/src/control/control.cpp @@ -67,7 +67,7 @@ ControlDoublePrivate::~ControlDoublePrivate() { if (m_bPersistInConfiguration) { UserSettingsPointer pConfig = ControlDoublePrivate::s_pUserConfig; - if (pConfig != NULL) { + if (pConfig != nullptr) { pConfig->set(m_key, QString::number(get())); } } @@ -194,7 +194,7 @@ void ControlDoublePrivate::reset() { // NOTE: pSender = NULL is important. The originator of this action does // not know the resulting value so it makes sense that we should emit a // general valueChanged() signal even though we know the originator. - set(defaultValue, NULL); + set(defaultValue, nullptr); } void ControlDoublePrivate::set(double value, QObject* pSender) { diff --git a/src/control/controlbehavior.cpp b/src/control/controlbehavior.cpp index f6de005a90..406b1eeb58 100644 --- a/src/control/controlbehavior.cpp +++ b/src/control/controlbehavior.cpp @@ -28,7 +28,7 @@ void ControlNumericBehavior::setValueFromMidi( MidiOpCode o, double dParam, ControlDoublePrivate* pControl) { Q_UNUSED(o); double dNorm = midiToParameter(dParam); - pControl->set(parameterToValue(dNorm), NULL); + pControl->set(parameterToValue(dNorm), nullptr); } double ControlEncoderBehavior::midiToParameter(double midiValue) { @@ -269,7 +269,7 @@ void ControlAudioTaperPotBehavior::setValueFromMidi( MidiOpCode o, double dMidiParam, ControlDoublePrivate* pControl) { Q_UNUSED(o); double dParam = midiToParameter(dMidiParam); - pControl->set(parameterToValue(dParam), NULL); + pControl->set(parameterToValue(dParam), nullptr); } double ControlTTRotaryBehavior::valueToParameter(double dValue) { @@ -322,7 +322,7 @@ void ControlPushButtonBehavior::setValueFromMidi( timer->start(kPowerWindowTimeMillis); } else if (!timer->isActive()) { // Disable after releasing a long press - pControl->set(0., NULL); + pControl->set(0., nullptr); } } else if (m_buttonMode == TOGGLE || m_buttonMode == LONGPRESSLATCHING) { // This block makes push-buttons act as toggle buttons. @@ -334,7 +334,7 @@ void ControlPushButtonBehavior::setValueFromMidi( // the same control from different devices. double value = pControl->get(); value = (int)(value + 1.) % m_iNumStates; - pControl->set(value, NULL); + pControl->set(value, nullptr); if (m_buttonMode == LONGPRESSLATCHING) { auto* timer = getTimer(); timer->setSingleShot(true); @@ -346,15 +346,15 @@ void ControlPushButtonBehavior::setValueFromMidi( getTimer()->isActive() && value >= 1.) { // revert toggle if button is released too early value = (int)(value - 1.) % m_iNumStates; - pControl->set(value, NULL); + pControl->set(value, nullptr); } } } } else { // Not a toggle button (trigger only when button pushed) if (pressed) { - pControl->set(1., NULL); + pControl->set(1., nullptr); } else { - pControl->set(0., NULL); + pControl->set(0., nullptr); } } } diff --git a/src/control/controleffectknob.cpp b/src/control/controleffectknob.cpp index 1dfd28d592..d2f14bf159 100644 --- a/src/control/controleffectknob.cpp +++ b/src/control/controleffectknob.cpp @@ -10,7 +10,7 @@ ControlEffectKnob::ControlEffectKnob(const ConfigKey& key, double dMinValue, dou void ControlEffectKnob::setBehaviour(EffectManifestParameter::ControlHint type, double dMinValue, double dMaxValue) { - if (m_pControl == NULL) { + if (m_pControl == nullptr) { return; } diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp index df8983a4e9..aad0556418 100644 --- a/src/control/controlobject.cpp +++ b/src/control/controlobject.cpp @@ -63,7 +63,7 @@ ControlObject* ControlObject::getControl(const ConfigKey& key, ControlFlags flag if (pCDP) { return pCDP->getCreatorCO(); } - return NULL; + return nullptr; } void ControlObject::setValueFromMidi(MidiOpCode o, double v) { @@ -110,7 +110,7 @@ void ControlObject::setParameterFrom(double v, QObject* pSender) { void ControlObject::set(const ConfigKey& key, const double& value) { QSharedPointer<ControlDoublePrivate> pCop = ControlDoublePrivate::getControl(key); if (pCop) { - pCop->set(value, NULL); + pCop->set(value, nullptr); } } |