From 73c750df852e7b6336154acd65bd39de975feadc Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 15 Dec 2020 01:43:38 +0100 Subject: Replace null pointer constants (e.g. NULL, 0) with nullptr --- src/analyzer/analyzergain.cpp | 4 +- src/analyzer/analyzerwaveform.cpp | 8 +-- src/control/control.cpp | 4 +- src/control/controlbehavior.cpp | 14 ++-- src/control/controleffectknob.cpp | 2 +- src/control/controlobject.cpp | 4 +- src/controllers/bulk/bulkcontroller.cpp | 14 ++-- src/controllers/bulk/bulkenumerator.cpp | 2 +- src/controllers/controller.cpp | 12 ++-- .../controllerinputmappingtablemodel.cpp | 24 +++---- src/controllers/controllermappingtablemodel.cpp | 4 +- .../controlleroutputmappingtablemodel.cpp | 20 +++--- src/controllers/controlpickermenu.cpp | 2 +- src/controllers/delegates/controldelegate.cpp | 6 +- src/controllers/delegates/midibytedelegate.cpp | 4 +- src/controllers/delegates/midichanneldelegate.cpp | 4 +- src/controllers/delegates/midiopcodedelegate.cpp | 4 +- src/controllers/delegates/midioptionsdelegate.cpp | 4 +- src/controllers/dlgcontrollerlearning.cpp | 6 +- src/controllers/dlgprefcontroller.cpp | 16 ++--- src/controllers/hid/hidcontroller.cpp | 10 +-- src/controllers/keyboard/keyboardeventfilter.cpp | 5 +- src/controllers/midi/midicontroller.cpp | 6 +- src/controllers/midi/portmidicontroller.cpp | 2 +- src/controllers/midi/portmidienumerator.cpp | 4 +- src/controllers/softtakeover.cpp | 10 +-- src/database/mixxxdb.cpp | 29 ++++---- src/effects/effect.cpp | 12 ++-- src/effects/effectbuttonparameterslot.cpp | 2 +- src/effects/effectchainslot.cpp | 4 +- src/effects/effectparameterslot.cpp | 8 +-- src/effects/effectparameterslotbase.cpp | 11 ++- src/effects/effectrack.cpp | 2 +- src/effects/effectsmanager.cpp | 4 +- src/effects/lv2/lv2manifest.cpp | 2 +- src/encoder/encodervorbis.cpp | 4 +- src/encoder/encoderwave.cpp | 4 +- src/engine/channels/engineaux.cpp | 6 +- src/engine/channels/enginedeck.cpp | 8 +-- src/engine/channels/enginemicrophone.cpp | 6 +- src/engine/controls/bpmcontrol.cpp | 29 ++++---- src/engine/controls/cuecontrol.cpp | 4 +- src/engine/controls/loopingcontrol.cpp | 6 +- src/engine/controls/ratecontrol.cpp | 4 +- src/engine/effects/engineeffect.cpp | 2 +- src/engine/effects/engineeffectsmanager.cpp | 2 +- src/engine/enginebuffer.cpp | 6 +- src/engine/enginemaster.cpp | 10 +-- src/engine/enginepregain.cpp | 14 ++-- src/engine/enginexfader.cpp | 2 +- src/engine/filters/enginefilter.cpp | 11 ++- src/engine/readaheadmanager.cpp | 14 ++-- src/engine/sync/basesyncablelistener.cpp | 8 +-- src/errordialoghandler.cpp | 4 +- src/library/autodj/autodjprocessor.cpp | 6 +- src/library/autodj/dlgautodj.cpp | 8 +-- src/library/banshee/bansheefeature.cpp | 8 +-- src/library/baseexternallibraryfeature.cpp | 7 +- src/library/baseplaylistfeature.cpp | 26 ++++---- src/library/bpmdelegate.cpp | 4 +- src/library/browse/browsetablemodel.cpp | 7 +- src/library/browse/browsethread.cpp | 2 +- src/library/browse/foldertreemodel.cpp | 6 +- src/library/coverartutils.cpp | 4 +- src/library/crate/cratefeature.cpp | 10 +-- src/library/dao/analysisdao.cpp | 2 +- src/library/dao/autodjcratesdao.cpp | 2 +- src/library/export/trackexportdlg.cpp | 8 ++- src/library/export/trackexportwizard.cpp | 2 +- src/library/itunes/itunesfeature.cpp | 20 +++--- src/library/library.cpp | 7 +- src/library/librarycontrol.cpp | 6 +- src/library/libraryfeature.cpp | 14 ++-- src/library/parsercsv.cpp | 10 +-- src/library/parserm3u.cpp | 15 +++-- src/library/parserpls.cpp | 5 +- src/library/proxytrackmodel.cpp | 8 +-- src/library/rhythmbox/rhythmboxfeature.cpp | 12 ++-- src/library/sidebarmodel.cpp | 4 +- src/library/stareditor.cpp | 4 +- src/library/traktor/traktorfeature.cpp | 14 ++-- src/mixer/basetrackplayer.cpp | 6 +- src/mixer/playermanager.cpp | 18 ++--- src/mixxx.cpp | 43 ++++++------ src/musicbrainz/chromaprinter.cpp | 4 +- src/preferences/dialog/dlgprefcrossfader.cpp | 4 +- src/preferences/dialog/dlgprefeq.cpp | 9 ++- src/preferences/dialog/dlgpreferences.cpp | 6 +- src/preferences/dialog/dlgprefinterface.cpp | 2 +- src/preferences/dialog/dlgprefsound.cpp | 2 +- src/skin/legacyskinparser.cpp | 36 +++++----- src/skin/skinloader.cpp | 2 +- src/soundio/sounddevicenetwork.cpp | 2 +- src/soundio/sounddeviceportaudio.cpp | 28 ++++---- src/soundio/soundmanager.cpp | 8 +-- src/sources/soundsourcemp3.cpp | 2 +- src/track/track.cpp | 8 +-- src/util/dnd.cpp | 2 +- src/util/sandbox.cpp | 41 ++++++------ src/util/valuetransformer.cpp | 2 +- src/util/version.cpp | 21 +++--- src/vinylcontrol/vinylcontrolmanager.cpp | 2 +- src/vinylcontrol/vinylcontrolprocessor.cpp | 6 +- src/vinylcontrol/vinylcontrolsignalwidget.cpp | 20 +++--- src/vinylcontrol/vinylcontrolxwax.cpp | 28 ++++---- src/waveform/renderers/glvsynctestrenderer.cpp | 2 +- .../renderers/glwaveformrendererfilteredsignal.cpp | 2 +- src/waveform/renderers/glwaveformrendererrgb.cpp | 2 +- .../renderers/glwaveformrenderersimplesignal.cpp | 4 +- src/waveform/renderers/qtvsynctestrenderer.cpp | 2 +- .../renderers/qtwaveformrendererfilteredsignal.cpp | 6 +- .../renderers/qtwaveformrenderersimplesignal.cpp | 4 +- .../renderers/waveformrendererfilteredsignal.cpp | 2 +- src/waveform/renderers/waveformrendererhsv.cpp | 4 +- src/waveform/renderers/waveformrendererrgb.cpp | 2 +- .../renderers/waveformrenderersignalbase.cpp | 78 +++++++++++----------- src/waveform/renderers/waveformrendermarkrange.cpp | 2 +- src/waveform/renderers/waveformwidgetrenderer.cpp | 8 +-- src/waveform/waveformwidgetfactory.cpp | 16 ++--- src/waveform/widgets/glrgbwaveformwidget.cpp | 2 +- src/waveform/widgets/glsimplewaveformwidget.cpp | 2 +- src/waveform/widgets/glslwaveformwidget.cpp | 2 +- src/waveform/widgets/glvsynctestwidget.cpp | 2 +- src/waveform/widgets/glwaveformwidget.cpp | 2 +- src/waveform/widgets/qthsvwaveformwidget.cpp | 2 +- src/waveform/widgets/qtrgbwaveformwidget.cpp | 2 +- src/waveform/widgets/qtsimplewaveformwidget.cpp | 2 +- src/waveform/widgets/qtvsynctestwidget.cpp | 2 +- src/waveform/widgets/qtwaveformwidget.cpp | 2 +- src/waveform/widgets/waveformwidgetabstract.cpp | 2 +- src/widget/wtracktableview.cpp | 2 +- 131 files changed, 558 insertions(+), 536 deletions(-) (limited to 'src') diff --git a/src/analyzer/analyzergain.cpp b/src/analyzer/analyzergain.cpp index 47b31bb255..56a95609d0 100644 --- a/src/analyzer/analyzergain.cpp +++ b/src/analyzer/analyzergain.cpp @@ -9,8 +9,8 @@ AnalyzerGain::AnalyzerGain(UserSettingsPointer pConfig) : m_rgSettings(pConfig), - m_pLeftTempBuffer(NULL), - m_pRightTempBuffer(NULL), + m_pLeftTempBuffer(nullptr), + m_pRightTempBuffer(nullptr), m_iBufferSize(0) { m_pReplayGain = new ReplayGain(); } diff --git a/src/analyzer/analyzerwaveform.cpp b/src/analyzer/analyzerwaveform.cpp index ec0a6a1b0f..f3ab634f86 100644 --- a/src/analyzer/analyzerwaveform.cpp +++ b/src/analyzer/analyzerwaveform.cpp @@ -23,9 +23,9 @@ AnalyzerWaveform::AnalyzerWaveform( m_stride(0, 0), m_currentStride(0), m_currentSummaryStride(0) { - m_filter[0] = 0; - m_filter[1] = 0; - m_filter[2] = 0; + m_filter[0] = nullptr; + m_filter[1] = nullptr; + m_filter[2] = nullptr; m_analysisDao.initialize(dbConnection); } @@ -162,7 +162,7 @@ void AnalyzerWaveform::destroyFilters() { for (int i = 0; i < FilterCount; ++i) { if (m_filter[i]) { delete m_filter[i]; - m_filter[i] = 0; + m_filter[i] = nullptr; } } } 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 pCop = ControlDoublePrivate::getControl(key); if (pCop) { - pCop->set(value, NULL); + pCop->set(value, nullptr); } } diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp index f8b91e4494..a087d5574d 100644 --- a/src/controllers/bulk/bulkcontroller.cpp +++ b/src/controllers/bulk/bulkcontroller.cpp @@ -86,7 +86,7 @@ BulkController::BulkController(UserSettingsPointer pConfig, setInputDevice(true); setOutputDevice(true); - m_pReader = NULL; + m_pReader = nullptr; } BulkController::~BulkController() { @@ -161,12 +161,12 @@ int BulkController::open() { } // XXX: we should enumerate devices and match vendor, product, and serial - if (m_phandle == NULL) { + if (m_phandle == nullptr) { m_phandle = libusb_open_device_with_vid_pid( m_context, vendor_id, product_id); } - if (m_phandle == NULL) { + if (m_phandle == nullptr) { qWarning() << "Unable to open USB Bulk device" << getName(); return -1; } @@ -174,7 +174,7 @@ int BulkController::open() { setOpen(true); startEngine(); - if (m_pReader != NULL) { + if (m_pReader != nullptr) { qWarning() << "BulkReader already present for" << getName(); } else { m_pReader = new BulkReader(m_phandle, in_epaddr); @@ -199,7 +199,7 @@ int BulkController::close() { qDebug() << "Shutting down USB Bulk device" << getName(); // Stop the reading thread - if (m_pReader == NULL) { + if (m_pReader == nullptr) { qWarning() << "BulkReader not present for" << getName() << "yet the device is open!"; } else { @@ -208,7 +208,7 @@ int BulkController::close() { controllerDebug(" Waiting on reader to finish"); m_pReader->wait(); delete m_pReader; - m_pReader = NULL; + m_pReader = nullptr; } // Stop controller engine here to ensure it's done before the device is @@ -218,7 +218,7 @@ int BulkController::close() { // Close device controllerDebug(" Closing device"); libusb_close(m_phandle); - m_phandle = NULL; + m_phandle = nullptr; setOpen(false); return 0; } diff --git a/src/controllers/bulk/bulkenumerator.cpp b/src/controllers/bulk/bulkenumerator.cpp index 3634b74bb2..93874bd9b2 100644 --- a/src/controllers/bulk/bulkenumerator.cpp +++ b/src/controllers/bulk/bulkenumerator.cpp @@ -42,7 +42,7 @@ QList BulkEnumerator::queryDevices() { libusb_get_device_descriptor(device, &desc); if (is_interesting(&desc)) { - struct libusb_device_handle *handle = NULL; + struct libusb_device_handle* handle = nullptr; err = libusb_open(device, &handle); if (err) { qWarning() << "Error opening a device"; diff --git a/src/controllers/controller.cpp b/src/controllers/controller.cpp index 876fcc673d..370d11aee7 100644 --- a/src/controllers/controller.cpp +++ b/src/controllers/controller.cpp @@ -10,7 +10,7 @@ Controller::Controller(UserSettingsPointer pConfig) : QObject(), - m_pEngine(NULL), + m_pEngine(nullptr), m_bIsOutputDevice(false), m_bIsInputDevice(false), m_bIsOpen(false), @@ -27,7 +27,7 @@ Controller::~Controller() { void Controller::startEngine() { controllerDebug(" Starting engine"); - if (m_pEngine != NULL) { + if (m_pEngine != nullptr) { qWarning() << "Controller: Engine already exists! Restarting:"; stopEngine(); } @@ -36,13 +36,13 @@ void Controller::startEngine() void Controller::stopEngine() { controllerDebug(" Shutting down engine"); - if (m_pEngine == NULL) { + if (m_pEngine == nullptr) { qWarning() << "Controller::stopEngine(): No engine exists!"; return; } m_pEngine->gracefulShutdown(); delete m_pEngine; - m_pEngine = NULL; + m_pEngine = nullptr; } bool Controller::applyPreset(bool initializeScripts) { @@ -51,7 +51,7 @@ bool Controller::applyPreset(bool initializeScripts) { const ControllerPreset* pPreset = preset(); // Load the script code into the engine - if (m_pEngine == NULL) { + if (m_pEngine == nullptr) { qWarning() << "Controller::applyPreset(): No engine exists!"; return false; } @@ -103,7 +103,7 @@ void Controller::triggerActivity() } } void Controller::receive(const QByteArray& data, mixxx::Duration timestamp) { - if (m_pEngine == NULL) { + if (m_pEngine == nullptr) { //qWarning() << "Controller::receive called with no active engine!"; // Don't complain, since this will always show after closing a device as // queued signals flush out diff --git a/src/controllers/controllerinputmappingtablemodel.cpp b/src/controllers/controllerinputmappingtablemodel.cpp index e2b629b97d..7dec69fdf2 100644 --- a/src/controllers/controllerinputmappingtablemodel.cpp +++ b/src/controllers/controllerinputmappingtablemodel.cpp @@ -17,7 +17,7 @@ ControllerInputMappingTableModel::~ControllerInputMappingTableModel() { } void ControllerInputMappingTableModel::apply() { - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { // Clear existing input mappings and insert all the input mappings in // the table into the preset. QMultiHash mappings; @@ -33,7 +33,7 @@ void ControllerInputMappingTableModel::apply() { void ControllerInputMappingTableModel::onPresetLoaded() { clear(); - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { // TODO(rryan): Tooltips setHeaderData(MIDI_COLUMN_CHANNEL, Qt::Horizontal, tr("Channel")); setHeaderData(MIDI_COLUMN_OPCODE, Qt::Horizontal, tr("Opcode")); @@ -51,7 +51,7 @@ void ControllerInputMappingTableModel::onPresetLoaded() { } void ControllerInputMappingTableModel::clear() { - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { if (!m_midiInputMappings.isEmpty()) { beginRemoveRows(QModelIndex(), 0, m_midiInputMappings.size() - 1); m_midiInputMappings.clear(); @@ -65,7 +65,7 @@ void ControllerInputMappingTableModel::addMappings(const MidiInputMappings& mapp return; } - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { // When we add mappings from controller learning, we first remove the // duplicates from the table. We allow multiple mappings per MIDI // message but MIDI learning over-writes duplicates instead of adding. @@ -93,7 +93,7 @@ void ControllerInputMappingTableModel::addMappings(const MidiInputMappings& mapp } void ControllerInputMappingTableModel::addEmptyMapping() { - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { beginInsertRows(QModelIndex(), m_midiInputMappings.size(), m_midiInputMappings.size()); m_midiInputMappings.append(MidiInputMapping()); @@ -125,8 +125,8 @@ void ControllerInputMappingTableModel::removeMappings(QModelIndexList indices) { QAbstractItemDelegate* ControllerInputMappingTableModel::delegateForColumn( int column, QWidget* pParent) { - if (m_pMidiPreset != NULL) { - ControlDelegate* pControlDelegate = NULL; + if (m_pMidiPreset != nullptr) { + ControlDelegate* pControlDelegate = nullptr; switch (column) { case MIDI_COLUMN_CHANNEL: return new MidiChannelDelegate(pParent); @@ -142,14 +142,14 @@ QAbstractItemDelegate* ControllerInputMappingTableModel::delegateForColumn( return pControlDelegate; } } - return NULL; + return nullptr; } int ControllerInputMappingTableModel::rowCount(const QModelIndex& parent) const { if (parent.isValid()) { return 0; } - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { return m_midiInputMappings.size(); } return 0; @@ -161,7 +161,7 @@ int ControllerInputMappingTableModel::columnCount(const QModelIndex& parent) con } // Control and description. const int kBaseColumns = 2; - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { // Channel, Opcode, Control, Options return kBaseColumns + 4; } @@ -180,7 +180,7 @@ QVariant ControllerInputMappingTableModel::data(const QModelIndex& index, int row = index.row(); int column = index.column(); - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { if (row < 0 || row >= m_midiInputMappings.size()) { return QVariant(); } @@ -224,7 +224,7 @@ bool ControllerInputMappingTableModel::setData(const QModelIndex& index, int row = index.row(); int column = index.column(); - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { if (row < 0 || row >= m_midiInputMappings.size()) { return false; } diff --git a/src/controllers/controllermappingtablemodel.cpp b/src/controllers/controllermappingtablemodel.cpp index bd014c1f2c..75bb15da65 100644 --- a/src/controllers/controllermappingtablemodel.cpp +++ b/src/controllers/controllermappingtablemodel.cpp @@ -4,8 +4,8 @@ ControllerMappingTableModel::ControllerMappingTableModel(QObject* pParent) : QAbstractTableModel(pParent), - m_pMidiPreset(NULL), - m_pHidPreset(NULL) { + m_pMidiPreset(nullptr), + m_pHidPreset(nullptr) { } ControllerMappingTableModel::~ControllerMappingTableModel() { diff --git a/src/controllers/controlleroutputmappingtablemodel.cpp b/src/controllers/controlleroutputmappingtablemodel.cpp index b724726677..025185db3f 100644 --- a/src/controllers/controlleroutputmappingtablemodel.cpp +++ b/src/controllers/controlleroutputmappingtablemodel.cpp @@ -16,7 +16,7 @@ ControllerOutputMappingTableModel::~ControllerOutputMappingTableModel() { } void ControllerOutputMappingTableModel::apply() { - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { // Clear existing output mappings and insert all the output mappings in // the table into the preset. QMultiHash mappings; @@ -32,7 +32,7 @@ void ControllerOutputMappingTableModel::apply() { void ControllerOutputMappingTableModel::onPresetLoaded() { clear(); - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { // TODO(rryan): Tooltips setHeaderData(MIDI_COLUMN_CHANNEL, Qt::Horizontal, tr("Channel")); setHeaderData(MIDI_COLUMN_OPCODE, Qt::Horizontal, tr("Opcode")); @@ -53,7 +53,7 @@ void ControllerOutputMappingTableModel::onPresetLoaded() { } void ControllerOutputMappingTableModel::clear() { - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { if (!m_midiOutputMappings.isEmpty()) { beginRemoveRows(QModelIndex(), 0, m_midiOutputMappings.size() - 1); m_midiOutputMappings.clear(); @@ -63,7 +63,7 @@ void ControllerOutputMappingTableModel::clear() { } void ControllerOutputMappingTableModel::addEmptyMapping() { - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { beginInsertRows(QModelIndex(), m_midiOutputMappings.size(), m_midiOutputMappings.size()); m_midiOutputMappings.append(MidiOutputMapping()); @@ -95,7 +95,7 @@ void ControllerOutputMappingTableModel::removeMappings(QModelIndexList indices) QAbstractItemDelegate* ControllerOutputMappingTableModel::delegateForColumn( int column, QWidget* pParent) { - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { switch (column) { case MIDI_COLUMN_CHANNEL: return new MidiChannelDelegate(pParent); @@ -109,14 +109,14 @@ QAbstractItemDelegate* ControllerOutputMappingTableModel::delegateForColumn( return new ControlDelegate(this); } } - return NULL; + return nullptr; } int ControllerOutputMappingTableModel::rowCount(const QModelIndex& parent) const { if (parent.isValid()) { return 0; } - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { return m_midiOutputMappings.size(); } return 0; @@ -128,7 +128,7 @@ int ControllerOutputMappingTableModel::columnCount(const QModelIndex& parent) co } // Control and description const int kBaseColumns = 2; - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { // Channel, Opcode, Control, On, Off, Min, Max return kBaseColumns + 7; } @@ -147,7 +147,7 @@ QVariant ControllerOutputMappingTableModel::data(const QModelIndex& index, int row = index.row(); int column = index.column(); - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { if (row < 0 || row >= m_midiOutputMappings.size()) { return QVariant(); } @@ -193,7 +193,7 @@ bool ControllerOutputMappingTableModel::setData(const QModelIndex& index, int row = index.row(); int column = index.column(); - if (m_pMidiPreset != NULL) { + if (m_pMidiPreset != nullptr) { if (row < 0 || row >= m_midiOutputMappings.size()) { return false; } diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp index e5887bf0a2..b8df99f45e 100644 --- a/src/controllers/controlpickermenu.cpp +++ b/src/controllers/controlpickermenu.cpp @@ -1380,7 +1380,7 @@ void ControlPickerMenu::addPreviewDeckControl(const QString& control, } QMenu* ControlPickerMenu::addSubmenu(QString title, QMenu* pParent) { - if (pParent == NULL) { + if (pParent == nullptr) { pParent = this; } auto subMenu = make_parented(title, pParent); diff --git a/src/controllers/delegates/controldelegate.cpp b/src/controllers/delegates/controldelegate.cpp index e22a7ec87a..16e09daf5f 100644 --- a/src/controllers/delegates/controldelegate.cpp +++ b/src/controllers/delegates/controldelegate.cpp @@ -9,7 +9,7 @@ ControlDelegate::ControlDelegate(QObject* pParent) : QStyledItemDelegate(pParent), - m_pPicker(new ControlPickerMenu(NULL)), + m_pPicker(new ControlPickerMenu(nullptr)), m_iMidiOptionsColumn(-1), m_bIsIndexScript(false) { } @@ -66,7 +66,7 @@ void ControlDelegate::setEditorData(QWidget* editor, ConfigKey key = index.data(Qt::EditRole).value(); QLineEdit* pLineEdit = qobject_cast(editor); - if (pLineEdit == NULL) { + if (pLineEdit == nullptr) { return; } @@ -81,7 +81,7 @@ void ControlDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const { QLineEdit* pLineEdit = qobject_cast(editor); - if (pLineEdit == NULL) { + if (pLineEdit == nullptr) { return; } diff --git a/src/controllers/delegates/midibytedelegate.cpp b/src/controllers/delegates/midibytedelegate.cpp index 8739c66029..23be28698b 100644 --- a/src/controllers/delegates/midibytedelegate.cpp +++ b/src/controllers/delegates/midibytedelegate.cpp @@ -31,7 +31,7 @@ void MidiByteDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const { int control = index.data(Qt::EditRole).toInt(); HexSpinBox* pSpinBox = qobject_cast(editor); - if (pSpinBox == NULL) { + if (pSpinBox == nullptr) { return; } pSpinBox->setValue(control); @@ -41,7 +41,7 @@ void MidiByteDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const { HexSpinBox* pSpinBox = qobject_cast(editor); - if (pSpinBox == NULL) { + if (pSpinBox == nullptr) { return; } model->setData(index, pSpinBox->value(), Qt::EditRole); diff --git a/src/controllers/delegates/midichanneldelegate.cpp b/src/controllers/delegates/midichanneldelegate.cpp index 831e336d26..9387b45888 100644 --- a/src/controllers/delegates/midichanneldelegate.cpp +++ b/src/controllers/delegates/midichanneldelegate.cpp @@ -35,7 +35,7 @@ void MidiChannelDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const { int channel = index.data(Qt::EditRole).toInt(); QSpinBox* pSpinBox = qobject_cast(editor); - if (pSpinBox == NULL) { + if (pSpinBox == nullptr) { return; } // It's common to display channels as 1-indexed instead of 0-indexed. @@ -46,7 +46,7 @@ void MidiChannelDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const { QSpinBox* pSpinBox = qobject_cast(editor); - if (pSpinBox == NULL) { + if (pSpinBox == nullptr) { return; } model->setData(index, pSpinBox->value() - 1, Qt::EditRole); diff --git a/src/controllers/delegates/midiopcodedelegate.cpp b/src/controllers/delegates/midiopcodedelegate.cpp index 21cd363966..f8eeff5e7b 100644 --- a/src/controllers/delegates/midiopcodedelegate.cpp +++ b/src/controllers/delegates/midiopcodedelegate.cpp @@ -41,7 +41,7 @@ void MidiOpCodeDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const { int opCode = index.data(Qt::EditRole).toInt(); QComboBox* pComboBox = qobject_cast(editor); - if (pComboBox == NULL) { + if (pComboBox == nullptr) { return; } for (int i = 0; i < pComboBox->count(); ++i) { @@ -56,7 +56,7 @@ void MidiOpCodeDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const { QComboBox* pComboBox = qobject_cast(editor); - if (pComboBox == NULL) { + if (pComboBox == nullptr) { return; } model->setData(index, pComboBox->itemData(pComboBox->currentIndex()), diff --git a/src/controllers/delegates/midioptionsdelegate.cpp b/src/controllers/delegates/midioptionsdelegate.cpp index 868f492b5b..30a53e0ec9 100644 --- a/src/controllers/delegates/midioptionsdelegate.cpp +++ b/src/controllers/delegates/midioptionsdelegate.cpp @@ -69,7 +69,7 @@ void MidiOptionsDelegate::setEditorData(QWidget* editor, MidiOptions options = index.data(Qt::EditRole).value(); QComboBox* pComboBox = qobject_cast(editor); - if (pComboBox == NULL) { + if (pComboBox == nullptr) { return; } for (int i = 0; i < pComboBox->count(); ++i) { @@ -85,7 +85,7 @@ void MidiOptionsDelegate::setModelData(QWidget* editor, const QModelIndex& index) const { MidiOptions options; QComboBox* pComboBox = qobject_cast(editor); - if (pComboBox == NULL) { + if (pComboBox == nullptr) { return; } options.all = pComboBox->itemData(pComboBox->currentIndex()).toInt(); diff --git a/src/controllers/dlgcontrollerlearning.cpp b/src/controllers/dlgcontrollerlearning.cpp index 4f16566006..92e95bc41a 100644 --- a/src/controllers/dlgcontrollerlearning.cpp +++ b/src/controllers/dlgcontrollerlearning.cpp @@ -15,11 +15,11 @@ bool namedControlComparator(const NamedControl& l1, const NamedControl& l2) { } } // namespace -DlgControllerLearning::DlgControllerLearning(QWidget * parent, - Controller* controller) +DlgControllerLearning::DlgControllerLearning(QWidget* parent, + Controller* controller) : QDialog(parent), m_pController(controller), - m_pMidiController(NULL), + m_pMidiController(nullptr), m_controlPickerMenu(this), m_messagesLearned(false) { qRegisterMetaType("MidiInputMappings"); diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index 64ba02bd85..016f193f6f 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -31,11 +31,11 @@ DlgPrefController::DlgPrefController(QWidget* parent, m_pUserDir(userPresetsPath(pConfig)), m_pControllerManager(controllerManager), m_pController(controller), - m_pDlgControllerLearning(NULL), - m_pInputTableModel(NULL), - m_pInputProxyModel(NULL), - m_pOutputTableModel(NULL), - m_pOutputProxyModel(NULL), + m_pDlgControllerLearning(nullptr), + m_pInputTableModel(nullptr), + m_pInputProxyModel(nullptr), + m_pOutputTableModel(nullptr), + m_pOutputProxyModel(nullptr), m_bDirty(false) { m_ui.setupUi(this); @@ -178,7 +178,7 @@ void DlgPrefController::midiInputMappingsLearned( const MidiInputMappings& mappings) { // This is just a shortcut since doing a round-trip from Learning -> // Controller -> slotPresetLoaded -> setPreset is too heavyweight. - if (m_pInputTableModel != NULL) { + if (m_pInputTableModel != nullptr) { m_pInputTableModel->addMappings(mappings); } } @@ -694,7 +694,7 @@ void DlgPrefController::slotShowPreset(ControllerPresetPointer preset) { for (int i = 0; i < pInputModel->columnCount(); ++i) { QAbstractItemDelegate* pDelegate = pInputModel->delegateForColumn( i, m_ui.m_pInputMappingTableView); - if (pDelegate != NULL) { + if (pDelegate != nullptr) { qDebug() << "Setting input delegate for column" << i << pDelegate; m_ui.m_pInputMappingTableView->setItemDelegateForColumn(i, pDelegate); } @@ -718,7 +718,7 @@ void DlgPrefController::slotShowPreset(ControllerPresetPointer preset) { for (int i = 0; i < pOutputModel->columnCount(); ++i) { QAbstractItemDelegate* pDelegate = pOutputModel->delegateForColumn( i, m_ui.m_pOutputMappingTableView); - if (pDelegate != NULL) { + if (pDelegate != nullptr) { qDebug() << "Setting output delegate for column" << i << pDelegate; m_ui.m_pOutputMappingTableView->setItemDelegateForColumn(i, pDelegate); } diff --git a/src/controllers/hid/hidcontroller.cpp b/src/controllers/hid/hidcontroller.cpp index b94eecc8cc..f78dd6ffd5 100644 --- a/src/controllers/hid/hidcontroller.cpp +++ b/src/controllers/hid/hidcontroller.cpp @@ -198,7 +198,7 @@ int HidController::open() { m_pHidDevice = hid_open_path(hid_path); // If that fails, try to open device with vendor/product/serial # - if (m_pHidDevice == NULL) { + if (m_pHidDevice == nullptr) { controllerDebug("Failed. Trying to open with make, model & serial no:" << hid_vendor_id << hid_product_id << hid_serial); m_pHidDevice = hid_open(hid_vendor_id, hid_product_id, hid_serial_raw); @@ -206,15 +206,15 @@ int HidController::open() { // If it does fail, try without serial number WARNING: This will only open // one of multiple identical devices - if (m_pHidDevice == NULL) { + if (m_pHidDevice == nullptr) { qWarning() << "Unable to open specific HID device" << getName() << "Trying now with just make and model." << "(This may only open the first of multiple identical devices.)"; - m_pHidDevice = hid_open(hid_vendor_id, hid_product_id, NULL); + m_pHidDevice = hid_open(hid_vendor_id, hid_product_id, nullptr); } // If that fails, we give up! - if (m_pHidDevice == NULL) { + if (m_pHidDevice == nullptr) { qWarning() << "Unable to open HID device" << getName(); return -1; } @@ -340,7 +340,7 @@ void HidController::send(QByteArray data, unsigned int reportID) { //static QString HidController::safeDecodeWideString(const wchar_t* pStr, size_t max_length) { - if (pStr == NULL) { + if (pStr == nullptr) { return QString(); } // find a terminating 0 or take all chars diff --git a/src/controllers/keyboard/keyboardeventfilter.cpp b/src/controllers/keyboard/keyboardeventfilter.cpp index 254e4700f1..c65c84267e 100644 --- a/src/controllers/keyboard/keyboardeventfilter.cpp +++ b/src/controllers/keyboard/keyboardeventfilter.cpp @@ -10,9 +10,10 @@ #include "util/cmdlineargs.h" KeyboardEventFilter::KeyboardEventFilter(ConfigObject* pKbdConfigObject, - QObject* parent, const char* name) + QObject* parent, + const char* name) : QObject(parent), - m_pKbdConfigObject(NULL) { + m_pKbdConfigObject(nullptr) { setObjectName(name); setKeyboardConfig(pKbdConfigObject); } diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp index 1aa4c75b97..a3a62a6686 100644 --- a/src/controllers/midi/midicontroller.cpp +++ b/src/controllers/midi/midicontroller.cpp @@ -240,7 +240,7 @@ void MidiController::processInputMapping(const MidiInputMapping& mapping, if (mapping.options.script) { ControllerEngine* pEngine = getEngine(); - if (pEngine == NULL) { + if (pEngine == nullptr) { return; } @@ -255,7 +255,7 @@ void MidiController::processInputMapping(const MidiInputMapping& mapping, // Only pass values on to valid ControlObjects. ControlObject* pCO = ControlObject::getControl(mapping.control); - if (pCO == NULL) { + if (pCO == nullptr) { return; } @@ -490,7 +490,7 @@ void MidiController::processInputMapping(const MidiInputMapping& mapping, // Custom script handler if (mapping.options.script) { ControllerEngine* pEngine = getEngine(); - if (pEngine == NULL) { + if (pEngine == nullptr) { return; } QScriptValue function = pEngine->wrapFunctionCode(mapping.control.item, 2); diff --git a/src/controllers/midi/portmidicontroller.cpp b/src/controllers/midi/portmidicontroller.cpp index 87488f4e76..5d22a3ee30 100644 --- a/src/controllers/midi/portmidicontroller.cpp +++ b/src/controllers/midi/portmidicontroller.cpp @@ -26,7 +26,7 @@ PortMidiController::PortMidiController(const PmDeviceInfo* inputDeviceInfo, inputDeviceInfo, inputDeviceIndex)); } if (outputDeviceInfo) { - if (inputDeviceInfo == NULL) { + if (inputDeviceInfo == nullptr) { setDeviceName(QString("%1").arg(outputDeviceInfo->name)); } setOutputDevice(outputDeviceInfo->output); diff --git a/src/controllers/midi/portmidienumerator.cpp b/src/controllers/midi/portmidienumerator.cpp index 21bf302416..31b648a477 100644 --- a/src/controllers/midi/portmidienumerator.cpp +++ b/src/controllers/midi/portmidienumerator.cpp @@ -203,8 +203,8 @@ QList PortMidiEnumerator::queryDevices() { m_devices.clear(); - const PmDeviceInfo* inputDeviceInfo = NULL; - const PmDeviceInfo* outputDeviceInfo = NULL; + const PmDeviceInfo* inputDeviceInfo = nullptr; + const PmDeviceInfo* outputDeviceInfo = nullptr; int inputDevIndex = -1; int outputDevIndex = -1; QMap unassignedOutputDevices; diff --git a/src/controllers/softtakeover.cpp b/src/controllers/softtakeover.cpp index e0211fde44..fcd4e9dee3 100644 --- a/src/controllers/softtakeover.cpp +++ b/src/controllers/softtakeover.cpp @@ -25,7 +25,7 @@ SoftTakeoverCtrl::~SoftTakeoverCtrl() { void SoftTakeoverCtrl::enable(ControlObject* control) { ControlPotmeter* cpo = qobject_cast(control); - if (cpo == NULL) { + if (cpo == nullptr) { // softtakecover works only for continuous ControlPotmeter based COs return; } @@ -37,7 +37,7 @@ void SoftTakeoverCtrl::enable(ControlObject* control) { } void SoftTakeoverCtrl::disable(ControlObject* control) { - if (control == NULL) { + if (control == nullptr) { return; } SoftTakeover* pSt = m_softTakeoverHash.take(control); @@ -47,7 +47,7 @@ void SoftTakeoverCtrl::disable(ControlObject* control) { } bool SoftTakeoverCtrl::ignore(ControlObject* control, double newParameter) { - if (control == NULL) { + if (control == nullptr) { return false; } bool ignore = false; @@ -59,12 +59,12 @@ bool SoftTakeoverCtrl::ignore(ControlObject* control, double newParameter) { } void SoftTakeoverCtrl::ignoreNext(ControlObject* control) { - if (control == NULL) { + if (control == nullptr) { return; } SoftTakeover* pSt = m_softTakeoverHash.value(control); - if (pSt == NULL) { + if (pSt == nullptr) { return; } diff --git a/src/database/mixxxdb.cpp b/src/database/mixxxdb.cpp index 0cee5949a1..c3f87d7a51 100644 --- a/src/database/mixxxdb.cpp +++ b/src/database/mixxxdb.cpp @@ -85,29 +85,30 @@ bool MixxxDb::initDatabaseSchema( case SchemaManager::Result::NewerVersionBackwardsCompatible: return true; // done case SchemaManager::Result::UpgradeFailed: - QMessageBox::warning( - 0, upgradeFailed, + QMessageBox::warning(nullptr, + upgradeFailed, upgradeToVersionFailed + "\n" + - tr("Your mixxxdb.sqlite file may be corrupt.") + "\n" + - tr("Try renaming it and restarting Mixxx.") + "\n" + - helpEmail + "\n\n" + okToExit, + tr("Your mixxxdb.sqlite file may be corrupt.") + + "\n" + tr("Try renaming it and restarting Mixxx.") + + "\n" + helpEmail + "\n\n" + okToExit, QMessageBox::Ok); return false; // abort case SchemaManager::Result::NewerVersionIncompatible: - QMessageBox::warning( - 0, upgradeFailed, + QMessageBox::warning(nullptr, + upgradeFailed, upgradeToVersionFailed + "\n" + - tr("Your mixxxdb.sqlite file was created by a newer " - "version of Mixxx and is incompatible.") + - "\n\n" + okToExit, + tr("Your mixxxdb.sqlite file was created by a " + "newer " + "version of Mixxx and is incompatible.") + + "\n\n" + okToExit, QMessageBox::Ok); return false; // abort case SchemaManager::Result::SchemaError: - QMessageBox::warning( - 0, upgradeFailed, + QMessageBox::warning(nullptr, + upgradeFailed, upgradeToVersionFailed + "\n" + - tr("The database schema file is invalid.") + "\n" + - helpEmail + "\n\n" + okToExit, + tr("The database schema file is invalid.") + "\n" + + helpEmail + "\n\n" + okToExit, QMessageBox::Ok); return false; // abort } diff --git a/src/effects/effect.cpp b/src/effects/effect.cpp index 7fbe2ab518..3642dee51d 100644 --- a/src/effects/effect.cpp +++ b/src/effects/effect.cpp @@ -11,13 +11,13 @@ #include "util/xml.h" Effect::Effect(EffectsManager* pEffectsManager, - EffectManifestPointer pManifest, - EffectInstantiatorPointer pInstantiator) + EffectManifestPointer pManifest, + EffectInstantiatorPointer pInstantiator) : QObject(), // no parent m_pEffectsManager(pEffectsManager), m_pManifest(pManifest), m_pInstantiator(pInstantiator), - m_pEngineEffect(NULL), + m_pEngineEffect(nullptr), m_bAddedToEngine(false), m_bEnabled(false) { for (const auto& pManifestParameter: m_pManifest->parameters()) { @@ -90,7 +90,7 @@ void Effect::removeFromEngine(EngineEffectChain* pChain, int iIndex) { request->RemoveEffectFromChain.pEffect = m_pEngineEffect; request->RemoveEffectFromChain.iIndex = iIndex; m_pEffectsManager->writeRequest(request); - m_pEngineEffect = NULL; + m_pEngineEffect = nullptr; m_bAddedToEngine = false; } @@ -160,7 +160,7 @@ unsigned int Effect::numButtonParameters() const { EffectParameter* Effect::getParameterById(const QString& id) const { EffectParameter* pParameter = m_parametersById.value(id, NULL); - if (pParameter == NULL) { + if (pParameter == nullptr) { qWarning() << debugString() << "getParameterById" << "WARNING: parameter for id does not exist:" << id; } @@ -191,7 +191,7 @@ EffectParameter* Effect::getFilteredParameterForSlot(ParameterFilterFnc filterFn ++num; } } - return NULL; + return nullptr; } EffectParameter* Effect::getKnobParameterForSlot(unsigned int slotNumber) { diff --git a/src/effects/effectbuttonparameterslot.cpp b/src/effects/effectbuttonparameterslot.cpp index 8b43148663..ea376864f7 100644 --- a/src/effects/effectbuttonparameterslot.cpp +++ b/src/effects/effectbuttonparameterslot.cpp @@ -95,7 +95,7 @@ void EffectButtonParameterSlot::clear() { //qDebug() << debugString() << "clear"; if (m_pEffectParameter) { m_pEffectParameter->disconnect(this); - m_pEffectParameter = NULL; + m_pEffectParameter = nullptr; } m_pEffect.clear(); diff --git a/src/effects/effectchainslot.cpp b/src/effects/effectchainslot.cpp index 0f66673029..4fa4cf6b81 100644 --- a/src/effects/effectchainslot.cpp +++ b/src/effects/effectchainslot.cpp @@ -179,7 +179,7 @@ void EffectChainSlot::slotChainMixModeChanged(EffectChainMixMode mixMode) { void EffectChainSlot::slotChainChannelStatusChanged(const QString& group, bool enabled) { ChannelInfo* pInfo = m_channelInfoByName.value(group, NULL); - if (pInfo != NULL && pInfo->pEnabled != NULL) { + if (pInfo != nullptr && pInfo->pEnabled != nullptr) { pInfo->pEnabled->set(enabled); emit updated(); } @@ -463,7 +463,7 @@ void EffectChainSlot::slotControlChainPrevPreset(double v) { void EffectChainSlot::slotChannelStatusChanged(const QString& group) { if (m_pEffectChain) { ChannelInfo* pChannelInfo = m_channelInfoByName.value(group, NULL); - if (pChannelInfo != NULL && pChannelInfo->pEnabled != NULL) { + if (pChannelInfo != nullptr && pChannelInfo->pEnabled != nullptr) { bool bEnable = pChannelInfo->pEnabled->toBool(); if (bEnable) { m_pEffectChain->enableForInputChannel(pChannelInfo->handle_group); diff --git a/src/effects/effectparameterslot.cpp b/src/effects/effectparameterslot.cpp index 653f691364..59c055990f 100644 --- a/src/effects/effectparameterslot.cpp +++ b/src/effects/effectparameterslot.cpp @@ -112,7 +112,7 @@ void EffectParameterSlot::clear() { //qDebug() << debugString() << "clear"; if (m_pEffectParameter) { m_pEffectParameter->disconnect(this); - m_pEffectParameter = NULL; + m_pEffectParameter = nullptr; } m_pControlLoaded->forceSet(0.0); @@ -165,7 +165,7 @@ void EffectParameterSlot::slotLinkInverseChanged(double v) { void EffectParameterSlot::onEffectMetaParameterChanged(double parameter, bool force) { m_dChainParameter = parameter; - if (m_pEffectParameter != NULL) { + if (m_pEffectParameter != nullptr) { // Intermediate cast to integer is needed for VC++. EffectManifestParameter::LinkType type = static_cast( @@ -240,11 +240,11 @@ void EffectParameterSlot::onEffectMetaParameterChanged(double parameter, bool fo //qDebug() << "onEffectMetaParameterChanged" << debugString() << parameter << "force?" << force; if (force) { - m_pControlValue->setParameterFrom(parameter, NULL); + m_pControlValue->setParameterFrom(parameter, nullptr); // This ensures that softtakover is in sync for following updates m_pSoftTakeover->ignore(m_pControlValue, parameter); } else if (!m_pSoftTakeover->ignore(m_pControlValue, parameter)) { - m_pControlValue->setParameterFrom(parameter, NULL); + m_pControlValue->setParameterFrom(parameter, nullptr); } } } diff --git a/src/effects/effectparameterslotbase.cpp b/src/effects/effectparameterslotbase.cpp index 3767462191..7bb03b14a7 100644 --- a/src/effects/effectparameterslotbase.cpp +++ b/src/effects/effectparameterslotbase.cpp @@ -8,18 +8,17 @@ #include "moc_effectparameterslotbase.cpp" EffectParameterSlotBase::EffectParameterSlotBase(const QString& group, - const unsigned int iParameterSlotNumber) + const unsigned int iParameterSlotNumber) : m_iParameterSlotNumber(iParameterSlotNumber), m_group(group), - m_pEffectParameter(NULL), - m_pControlLoaded(NULL), - m_pControlType(NULL), + m_pEffectParameter(nullptr), + m_pControlLoaded(nullptr), + m_pControlType(nullptr), m_dChainParameter(0.0) { - } EffectParameterSlotBase::~EffectParameterSlotBase() { - m_pEffectParameter = NULL; + m_pEffectParameter = nullptr; m_pEffect.clear(); delete m_pControlLoaded; delete m_pControlType; diff --git a/src/effects/effectrack.cpp b/src/effects/effectrack.cpp index 888abd5d42..e8cd536a0e 100644 --- a/src/effects/effectrack.cpp +++ b/src/effects/effectrack.cpp @@ -69,7 +69,7 @@ void EffectRack::removeFromEngine() { pRequest->RemoveEffectRack.signalProcessingStage = m_signalProcessingStage; pRequest->RemoveEffectRack.pRack = m_pEngineEffectRack; m_pEffectsManager->writeRequest(pRequest); - m_pEngineEffectRack = NULL; + m_pEngineEffectRack = nullptr; } void EffectRack::registerInputChannel(const ChannelHandleAndGroup& handle_group) { diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp index 925fced754..380a19b734 100644 --- a/src/effects/effectsmanager.cpp +++ b/src/effects/effectsmanager.cpp @@ -26,8 +26,8 @@ EffectsManager::EffectsManager(QObject* pParent, m_pChannelHandleFactory(pChannelHandleFactory), m_pEffectChainManager(new EffectChainManager(pConfig, this)), m_nextRequestId(0), - m_pLoEqFreq(NULL), - m_pHiEqFreq(NULL), + m_pLoEqFreq(nullptr), + m_pHiEqFreq(nullptr), m_underDestruction(false) { qRegisterMetaType("EffectChainMixMode"); QPair requestPipes = diff --git a/src/effects/lv2/lv2manifest.cpp b/src/effects/lv2/lv2manifest.cpp index cb6b6d2d66..7c601f598b 100644 --- a/src/effects/lv2/lv2manifest.cpp +++ b/src/effects/lv2/lv2manifest.cpp @@ -193,7 +193,7 @@ void LV2Manifest::buildEnumerationOptions(const LilvPort* port, static_cast(lilv_node_as_float(value)))); } - if (options != NULL) { + if (options != nullptr) { lilv_scale_points_free(options); } } diff --git a/src/encoder/encodervorbis.cpp b/src/encoder/encodervorbis.cpp index b2c4dad297..f80a86a587 100644 --- a/src/encoder/encodervorbis.cpp +++ b/src/encoder/encodervorbis.cpp @@ -107,7 +107,7 @@ void EncoderVorbis::writePage() { } while (vorbis_analysis_blockout(&m_vdsp, &m_vblock) == 1) { - vorbis_analysis(&m_vblock, 0); + vorbis_analysis(&m_vblock, nullptr); vorbis_bitrate_addblock(&m_vblock); while (vorbis_bitrate_flushpacket(&m_vdsp, &m_oggpacket)) { // weld packet into bitstream @@ -169,7 +169,7 @@ void EncoderVorbis::initStream() { vorbis_block_init(&m_vdsp, &m_vblock); // set up packet-to-stream encoder; attach a random serial number - srand(time(0)); + srand(time(nullptr)); ogg_stream_init(&m_oggs, getSerial()); // add comment diff --git a/src/encoder/encoderwave.cpp b/src/encoder/encoderwave.cpp index 28edcee841..132cb41a1e 100644 --- a/src/encoder/encoderwave.cpp +++ b/src/encoder/encoderwave.cpp @@ -155,12 +155,12 @@ void EncoderWave::updateMetaData(const QString& artist, const QString& title, co void EncoderWave::initStream() { // Tell the encoder to automatically convert float input range to the correct output range. - sf_command(m_pSndfile, SFC_SET_NORM_FLOAT, NULL, SF_TRUE); + sf_command(m_pSndfile, SFC_SET_NORM_FLOAT, nullptr, SF_TRUE); // Tell the encoder that, when converting to integer formats, clip // automatically the values that go outside of the allowed range. // Warning! Depending on how libsndfile is compiled autoclip may not work. // Ensure CPU_CLIPS_NEGATIVE and CPU_CLIPS_POSITIVE is setup properly in the build. - sf_command(m_pSndfile, SFC_SET_CLIPPING, NULL, SF_TRUE) ; + sf_command(m_pSndfile, SFC_SET_CLIPPING, nullptr, SF_TRUE); // Strings passed to and retrieved from sf_get_string/sf_set_string are assumed to be utf-8. // However, while formats like Ogg/Vorbis and FLAC fully support utf-8, others like WAV and diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp index 098d7eff2f..c4e74db339 100644 --- a/src/engine/channels/engineaux.cpp +++ b/src/engine/channels/engineaux.cpp @@ -49,7 +49,7 @@ void EngineAux::onInputConfigured(const AudioInput& input) { qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!"; return; } - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; m_pInputConfigured->forceSet(1.0); } @@ -59,7 +59,7 @@ void EngineAux::onInputUnconfigured(const AudioInput& input) { qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!"; return; } - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; m_pInputConfigured->forceSet(0.0); } @@ -82,7 +82,7 @@ void EngineAux::process(CSAMPLE* pOut, const int iBufferSize) { // TODO(jholthuis): Use mixxx::audio::SampleRate instead static_cast(m_pSampleRate->get())); } - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; } else { SampleUtil::clear(pOut, iBufferSize); } diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp index 670d3b46f6..5aa6577c8e 100644 --- a/src/engine/channels/enginedeck.cpp +++ b/src/engine/channels/enginedeck.cpp @@ -70,7 +70,7 @@ void EngineDeck::process(CSAMPLE* pOut, const int iBufferSize) { if (isPassthroughActive() && sampleBuffer) { SampleUtil::copy(pOut, sampleBuffer, iBufferSize); m_bPassthroughWasActive = true; - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; m_pPregain->setSpeedAndScratching(1, false); } else { // If passthrough is no longer enabled, zero out the buffer @@ -138,7 +138,7 @@ void EngineDeck::receiveBuffer( Q_UNUSED(nFrames); // Skip receiving audio input if passthrough is not active if (!m_bPassthroughIsActive) { - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; return; } else { m_sampleBuffer = pBuffer; @@ -152,7 +152,7 @@ void EngineDeck::onInputConfigured(const AudioInput& input) { return; } m_pInputConfigured->forceSet(1.0); - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; } void EngineDeck::onInputUnconfigured(const AudioInput& input) { @@ -162,7 +162,7 @@ void EngineDeck::onInputUnconfigured(const AudioInput& input) { return; } m_pInputConfigured->forceSet(0.0); - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; } bool EngineDeck::isPassthroughActive() const { diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp index a6732417b7..be02da2815 100644 --- a/src/engine/channels/enginemicrophone.cpp +++ b/src/engine/channels/enginemicrophone.cpp @@ -47,7 +47,7 @@ void EngineMicrophone::onInputConfigured(const AudioInput& input) { qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!"; return; } - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; m_pInputConfigured->forceSet(1.0); } @@ -57,7 +57,7 @@ void EngineMicrophone::onInputUnconfigured(const AudioInput& input) { qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!"; return; } - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; m_pInputConfigured->forceSet(0.0); } @@ -85,7 +85,7 @@ void EngineMicrophone::process(CSAMPLE* pOut, const int iBufferSize) { } else { SampleUtil::clear(pOut, iBufferSize); } - m_sampleBuffer = NULL; + m_sampleBuffer = nullptr; // Update VU meter m_vuMeter.process(pOut, iBufferSize); diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp index 91642192f6..9374bf4950 100644 --- a/src/engine/controls/bpmcontrol.cpp +++ b/src/engine/controls/bpmcontrol.cpp @@ -543,11 +543,11 @@ bool BpmControl::getBeatContext(const mixxx::BeatsPointer& pBeats, return false; } - if (dpPrevBeat != NULL) { + if (dpPrevBeat != nullptr) { *dpPrevBeat = dPrevBeat; } - if (dpNextBeat != NULL) { + if (dpNextBeat != nullptr) { *dpNextBeat = dNextBeat; } @@ -567,11 +567,11 @@ bool BpmControl::getBeatContextNoLookup( } double dBeatLength = dNextBeat - dPrevBeat; - if (dpBeatLength != NULL) { + if (dpBeatLength != nullptr) { *dpBeatLength = dBeatLength; } - if (dpBeatPercentage != NULL) { + if (dpBeatPercentage != nullptr) { *dpBeatPercentage = dBeatLength == 0.0 ? 0.0 : (dPosition - dPrevBeat) / dBeatLength; // Because findNext and findPrev have an epsilon built in, sometimes @@ -613,15 +613,20 @@ double BpmControl::getNearestPositionInPhase( } // This happens if dThisPosition is the target position of a requested // seek command - if (!getBeatContext(pBeats, dThisPosition, - &dThisPrevBeat, &dThisNextBeat, - &dThisBeatLength, NULL)) { + if (!getBeatContext(pBeats, + dThisPosition, + &dThisPrevBeat, + &dThisNextBeat, + &dThisBeatLength, + nullptr)) { return dThisPosition; } } else { if (!getBeatContextNoLookup(dThisPosition, - dThisPrevBeat, dThisNextBeat, - &dThisBeatLength, NULL)) { + dThisPrevBeat, + dThisNextBeat, + &dThisBeatLength, + nullptr)) { return dThisPosition; } } @@ -660,9 +665,9 @@ double BpmControl::getNearestPositionInPhase( if (!BpmControl::getBeatContext(otherBeats, dOtherPosition, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, &dOtherBeatFraction)) { return dThisPosition; } diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index 00c8bf6f56..fe1eb01982 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -367,14 +367,14 @@ void CueControl::detachCue(HotcueControl* pControl) { if (!pCue) { return; } - disconnect(pCue.get(), 0, this, 0); + disconnect(pCue.get(), nullptr, this, nullptr); pControl->resetCue(); } void CueControl::trackLoaded(TrackPointer pNewTrack) { QMutexLocker lock(&m_mutex); if (m_pLoadedTrack) { - disconnect(m_pLoadedTrack.get(), 0, this, 0); + disconnect(m_pLoadedTrack.get(), nullptr, this, nullptr); for (const auto& pControl : qAsConst(m_hotcueControls)) { detachCue(pControl); } diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp index d0c5af9407..83d0b9d981 100644 --- a/src/engine/controls/loopingcontrol.cpp +++ b/src/engine/controls/loopingcontrol.cpp @@ -48,8 +48,8 @@ LoopingControl::LoopingControl(const QString& group, m_oldLoopSamples = { kNoTrigger, kNoTrigger, false }; m_loopSamples.setValue(m_oldLoopSamples); m_currentSample.setValue(0.0); - m_pActiveBeatLoop = NULL; - m_pRateControl = NULL; + m_pActiveBeatLoop = nullptr; + m_pRateControl = nullptr; //Create loop-in, loop-out, loop-exit, and reloop/exit ControlObjects m_pLoopInButton = new ControlPushButton(ConfigKey(group, "loop_in")); connect(m_pLoopInButton, &ControlObject::valueChanged, @@ -1088,7 +1088,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable // If running reverse, move the loop one loop size to the left. // Thus, the loops end will be closest to the current position bool reverse = false; - if (m_pRateControl != NULL) { + if (m_pRateControl != nullptr) { reverse = m_pRateControl->isReverseButtonPressed(); } if (reverse) { diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp index e32580d30a..404f55eb8b 100644 --- a/src/engine/controls/ratecontrol.cpp +++ b/src/engine/controls/ratecontrol.cpp @@ -34,7 +34,7 @@ const double RateControl::kPausedJogMultiplier = 18.0; RateControl::RateControl(const QString& group, UserSettingsPointer pConfig) : EngineControl(group, pConfig), - m_pBpmControl(NULL), + m_pBpmControl(nullptr), m_bTempStarted(false), m_tempRateRatio(0.0), m_dRateTempRampChange(0.0) { @@ -465,7 +465,7 @@ double RateControl::calculateSpeed(double baserate, double speed, bool paused, // If master sync is on, respond to it -- but vinyl and scratch mode always override. if (getSyncMode() == SYNC_FOLLOWER && !paused &&