diff options
52 files changed, 116 insertions, 117 deletions
diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp index 71958f08c3..0831d806cf 100644 --- a/src/broadcast/broadcastmanager.cpp +++ b/src/broadcast/broadcastmanager.cpp @@ -43,7 +43,7 @@ BroadcastManager::BroadcastManager(SettingsManager* pSettingsManager, // Initialize connections list from the current state of BroadcastSettings QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles(); - for(BroadcastProfilePtr profile : profiles) { + for (const BroadcastProfilePtr& profile : profiles) { addConnection(profile); } @@ -99,7 +99,7 @@ void BroadcastManager::slotControlEnabled(double v) { if (v > 0.0) { bool atLeastOneEnabled = false; QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles(); - for(BroadcastProfilePtr profile : profiles) { + for (const BroadcastProfilePtr& profile : profiles) { if (profile->getEnabled()) { atLeastOneEnabled = true; break; @@ -138,7 +138,7 @@ void BroadcastManager::slotProfileRemoved(BroadcastProfilePtr profile) { void BroadcastManager::slotProfilesChanged() { QVector<NetworkOutputStreamWorkerPtr> workers = m_pNetworkStream->outputWorkers(); - for(NetworkOutputStreamWorkerPtr pWorker : workers) { + for (const NetworkOutputStreamWorkerPtr& pWorker : workers) { ShoutConnectionPtr connection = qSharedPointerCast<ShoutConnection>(pWorker); if (connection) { BroadcastProfilePtr profile = connection->profile(); @@ -197,7 +197,7 @@ bool BroadcastManager::removeConnection(BroadcastProfilePtr profile) { ShoutConnectionPtr BroadcastManager::findConnectionForProfile(BroadcastProfilePtr profile) { QVector<NetworkOutputStreamWorkerPtr> workers = m_pNetworkStream->outputWorkers(); - for(NetworkOutputStreamWorkerPtr pWorker : workers) { + for (const NetworkOutputStreamWorkerPtr& pWorker : workers) { ShoutConnectionPtr connection = qSharedPointerCast<ShoutConnection>(pWorker); if (connection.isNull()) continue; diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp index d95d0c0176..429a4d0230 100644 --- a/src/control/controlobjectscript.cpp +++ b/src/control/controlobjectscript.cpp @@ -22,7 +22,7 @@ bool ControlObjectScript::addScriptConnection(const ScriptConnection& conn) { Qt::QueuedConnection); } - for (const auto& priorConnection: m_scriptConnections) { + for (const auto& priorConnection : qAsConst(m_scriptConnections)) { if (conn == priorConnection) { qWarning() << "Connection " + conn.id.toString() + " already connected to (" + diff --git a/src/controllers/controllerinputmappingtablemodel.cpp b/src/controllers/controllerinputmappingtablemodel.cpp index cd143383aa..73db610044 100644 --- a/src/controllers/controllerinputmappingtablemodel.cpp +++ b/src/controllers/controllerinputmappingtablemodel.cpp @@ -19,7 +19,7 @@ void ControllerInputMappingTableModel::apply() { // Clear existing input mappings and insert all the input mappings in // the table into the preset. QMultiHash<uint16_t, MidiInputMapping> mappings; - for (const MidiInputMapping& mapping : m_midiInputMappings) { + for (const MidiInputMapping& mapping : qAsConst(m_midiInputMappings)) { // There can be multiple input mappings for the same input // MidiKey, so we need to use a QMultiHash here. mappings.insert(mapping.key.key, mapping); diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp index b6ab1f485e..61be6e31f6 100644 --- a/src/controllers/controllermanager.cpp +++ b/src/controllers/controllermanager.cpp @@ -352,7 +352,7 @@ void ControllerManager::pollDevices() { } mixxx::Duration start = mixxx::Time::elapsed(); - for (Controller* pDevice : m_controllers) { + for (Controller* pDevice : qAsConst(m_controllers)) { if (pDevice->isOpen() && pDevice->isPolling()) { pDevice->poll(); } diff --git a/src/controllers/controlleroutputmappingtablemodel.cpp b/src/controllers/controlleroutputmappingtablemodel.cpp index 1ae8b1dd73..676442cb1e 100644 --- a/src/controllers/controlleroutputmappingtablemodel.cpp +++ b/src/controllers/controlleroutputmappingtablemodel.cpp @@ -19,7 +19,7 @@ void ControllerOutputMappingTableModel::apply() { // Clear existing output mappings and insert all the output mappings in // the table into the preset. QMultiHash<ConfigKey, MidiOutputMapping> mappings; - for (const MidiOutputMapping& mapping : m_midiOutputMappings) { + for (const MidiOutputMapping& mapping : qAsConst(m_midiOutputMappings)) { // There can be multiple output mappings for the same output // control, so we need to use a QMultiHash here. mappings.insert(mapping.controlKey, mapping); diff --git a/src/controllers/controllerpresetinfoenumerator.cpp b/src/controllers/controllerpresetinfoenumerator.cpp index becbad20a4..517451fd33 100644 --- a/src/controllers/controllerpresetinfoenumerator.cpp +++ b/src/controllers/controllerpresetinfoenumerator.cpp @@ -56,7 +56,7 @@ void PresetInfoEnumerator::loadSupportedPresets() { m_hidPresets.clear(); m_bulkPresets.clear(); - for (const QString& dirPath : m_controllerDirPaths) { + for (const QString& dirPath : qAsConst(m_controllerDirPaths)) { QDirIterator it(dirPath); while (it.hasNext()) { it.next(); diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp index caf6ac2f81..2220524559 100644 --- a/src/dialog/dlgreplacecuecolor.cpp +++ b/src/dialog/dlgreplacecuecolor.cpp @@ -384,7 +384,7 @@ void DlgReplaceCueColor::slotApply() { bool canceled = false; QMultiMap<TrackPointer, int> cues; - for (const auto& row : rows) { + for (const auto& row : qAsConst(rows)) { QCoreApplication::processEvents(); if (progress.wasCanceled()) { canceled = true; diff --git a/src/effects/effect.cpp b/src/effects/effect.cpp index 1ca764d326..295565fa7d 100644 --- a/src/effects/effect.cpp +++ b/src/effects/effect.cpp @@ -181,7 +181,7 @@ EffectParameter* Effect::getFilteredParameterForSlot(ParameterFilterFnc filterFn // It's normal to ask for a parameter that doesn't exist. Callers must check // for NULL. unsigned int num = 0; - for (const auto& parameter: m_parameters) { + for (const auto& parameter : qAsConst(m_parameters)) { if (parameter->manifest()->showInParameterSlot() && filterFnc(parameter)) { if(num == slotNumber) { return parameter; diff --git a/src/effects/effectchainmanager.cpp b/src/effects/effectchainmanager.cpp index 595f5e010f..1d287f3b07 100644 --- a/src/effects/effectchainmanager.cpp +++ b/src/effects/effectchainmanager.cpp @@ -144,13 +144,13 @@ EffectChainPointer EffectChainManager::getPrevEffectChain(EffectChainPointer pEf } void EffectChainManager::refeshAllRacks() { - for (const auto& pRack: m_standardEffectRacks) { + for (const auto& pRack : qAsConst(m_standardEffectRacks)) { pRack->refresh(); } - for (const auto& pRack: m_equalizerEffectRacks) { + for (const auto& pRack : qAsConst(m_equalizerEffectRacks)) { pRack->refresh(); } - for (const auto& pRack: m_quickEffectRacks) { + for (const auto& pRack : qAsConst(m_quickEffectRacks)) { pRack->refresh(); } } @@ -166,7 +166,7 @@ bool EffectChainManager::saveEffectChains() { QDomElement rootNode = doc.documentElement(); - for (EffectRackPointer pRack : m_standardEffectRacks) { + for (const EffectRackPointer& pRack : qAsConst(m_standardEffectRacks)) { rootNode.appendChild(pRack->toXml(&doc)); } // TODO? Save QuickEffects in effects.xml too, or keep stored in ConfigObjects? diff --git a/src/effects/effectchainslot.cpp b/src/effects/effectchainslot.cpp index 857cc95d88..686cac6e83 100644 --- a/src/effects/effectchainslot.cpp +++ b/src/effects/effectchainslot.cpp @@ -240,7 +240,7 @@ void EffectChainSlot::updateRoutingSwitches() { VERIFY_OR_DEBUG_ASSERT(m_pEffectChain) { return; } - for (const ChannelInfo* pChannelInfo : m_channelInfoByName) { + for (const ChannelInfo* pChannelInfo : qAsConst(m_channelInfoByName)) { if (pChannelInfo->pEnabled->toBool()) { m_pEffectChain->enableForInputChannel(pChannelInfo->handle_group); } else { @@ -273,7 +273,7 @@ void EffectChainSlot::clear() { if (m_pEffectChain) { m_pEffectChain->removeFromEngine(m_pEffectRack->getEngineEffectRack(), m_iChainSlotNumber); - for (EffectSlotPointer pSlot : m_slots) { + for (EffectSlotPointer pSlot : qAsConst(m_slots)) { pSlot->clear(); } m_pEffectChain->disconnect(this); @@ -393,7 +393,7 @@ void EffectChainSlot::slotControlChainSuperParameter(double v, bool force) { v = math_clamp(v, 0.0, 1.0); m_pControlChainSuperParameter->set(v); } - for (const auto& pSlot : m_slots) { + for (const auto& pSlot : qAsConst(m_slots)) { pSlot->setMetaParameter(v, force); } } diff --git a/src/effects/effectrack.cpp b/src/effects/effectrack.cpp index 95dda5e90d..0ce72b950a 100644 --- a/src/effects/effectrack.cpp +++ b/src/effects/effectrack.cpp @@ -204,7 +204,7 @@ QDomElement EffectRack::toXml(QDomDocument* doc) const { rackElement.appendChild(groupElement); QDomElement chainsElement = doc->createElement("Chains"); - for (EffectChainSlotPointer pChainSlot : m_effectChainSlots) { + for (const EffectChainSlotPointer& pChainSlot : m_effectChainSlots) { QDomElement chain = pChainSlot->toXml(doc); chainsElement.appendChild(chain); } @@ -213,7 +213,7 @@ QDomElement EffectRack::toXml(QDomDocument* doc) const { } void EffectRack::refresh() { - for (const auto& pChainSlot: m_effectChainSlots) { + for (const auto& pChainSlot : qAsConst(m_effectChainSlots)) { EffectChainPointer pChain = pChainSlot->getOrCreateEffectChain(m_pEffectsManager); pChain->refreshAllEffects(); } diff --git a/src/effects/effectslot.cpp b/src/effects/effectslot.cpp index c91083558a..15ba19c74c 100644 --- a/src/effects/effectslot.cpp +++ b/src/effects/effectslot.cpp @@ -177,14 +177,13 @@ void EffectSlot::loadEffect(EffectPointer pEffect, bool adoptMetaknobPosition) { addEffectButtonParameterSlot(); } - for (const auto& pParameter : m_parameters) { + for (const auto& pParameter : qAsConst(m_parameters)) { pParameter->loadEffect(pEffect); } - for (const auto& pParameter : m_buttonParameters) { + for (const auto& pParameter : qAsConst(m_buttonParameters)) { pParameter->loadEffect(pEffect); } - if (adoptMetaknobPosition) { slotEffectMetaParameter(m_pControlMetaParameter->get(), true); } else { @@ -208,10 +207,10 @@ void EffectSlot::clear() { m_pControlLoaded->forceSet(0.0); m_pControlNumParameters->forceSet(0.0); m_pControlNumButtonParameters->forceSet(0.0); - for (const auto& pParameter : m_parameters) { + for (const auto& pParameter : qAsConst(m_parameters)) { pParameter->clear(); } - for (const auto& pParameter : m_buttonParameters) { + for (const auto& pParameter : qAsConst(m_buttonParameters)) { pParameter->clear(); } m_pEffect.clear(); @@ -245,7 +244,7 @@ void EffectSlot::slotClear(double v) { } void EffectSlot::syncSofttakeover() { - for (const auto& pParameterSlot : m_parameters) { + for (const auto& pParameterSlot : qAsConst(m_parameters)) { pParameterSlot->syncSofttakeover(); } } @@ -275,7 +274,7 @@ void EffectSlot::slotEffectMetaParameter(double v, bool force) { if (!m_pControlEnabled->toBool()) { force = true; } - for (const auto& pParameterSlot : m_parameters) { + for (const auto& pParameterSlot : qAsConst(m_parameters)) { pParameterSlot->onEffectMetaParameterChanged(v, force); } } @@ -358,13 +357,13 @@ void EffectSlot::loadEffectSlotFromXml(const QDomElement& effectElement) { } QMap<QString, EffectParameterSlotBasePointer> parametersById; - for (const auto& pParameter : m_parameters) { + for (const auto& pParameter : qAsConst(m_parameters)) { EffectManifestParameterPointer manifest = pParameter->getManifest(); if (manifest) { parametersById.insert(manifest->id(), pParameter); } } - for (const auto& pParameter : m_buttonParameters) { + for (const auto& pParameter : qAsConst(m_buttonParameters)) { EffectManifestParameterPointer manifest = pParameter->getManifest(); if (manifest) { parametersById.insert(manifest->id(), pParameter); diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp index 8858c46b4a..522982acd2 100644 --- a/src/effects/effectsmanager.cpp +++ b/src/effects/effectsmanager.cpp @@ -204,7 +204,7 @@ EffectPointer EffectsManager::instantiateEffect(const QString& effectId) { if (effectId.isEmpty()) { return EffectPointer(); } - for (const auto& pBackend: m_effectsBackends) { + for (const auto& pBackend : qAsConst(m_effectsBackends)) { if (pBackend->canInstantiateEffect(effectId)) { return pBackend->instantiateEffect(this, effectId); } diff --git a/src/encoder/encoderflacsettings.cpp b/src/encoder/encoderflacsettings.cpp index a8ec9809ac..8e31a429bd 100644 --- a/src/encoder/encoderflacsettings.cpp +++ b/src/encoder/encoderflacsettings.cpp @@ -80,7 +80,7 @@ QList<EncoderSettings::OptionsGroup> EncoderFlacSettings::getOptionGroups() cons // index 0 means disabled and 1 enabled. void EncoderFlacSettings::setGroupOption(QString groupCode, int optionIndex) { bool found=false; - for (const auto& group : m_radioList) { + for (const auto& group : qAsConst(m_radioList)) { if (groupCode == group.groupCode) { found=true; if (optionIndex < group.controlNames.size() || optionIndex == 1) { diff --git a/src/encoder/encodermp3settings.cpp b/src/encoder/encodermp3settings.cpp index 485be7de2e..6c4178d7b6 100644 --- a/src/encoder/encodermp3settings.cpp +++ b/src/encoder/encodermp3settings.cpp @@ -97,7 +97,7 @@ QList<EncoderSettings::OptionsGroup> EncoderMp3Settings::getOptionGroups() const void EncoderMp3Settings::setGroupOption(QString groupCode, int optionIndex) { bool found=false; - for (const auto& group : m_radioList) { + for (const auto& group : qAsConst(m_radioList)) { if (groupCode == group.groupCode) { found=true; if (optionIndex < group.controlNames.size() || optionIndex == 1) { diff --git a/src/encoder/encoderopussettings.cpp b/src/encoder/encoderopussettings.cpp index 586d72e995..31e6991c7e 100644 --- a/src/encoder/encoderopussettings.cpp +++ b/src/encoder/encoderopussettings.cpp @@ -92,7 +92,7 @@ QList<EncoderSettings::OptionsGroup> EncoderOpusSettings::getOptionGroups() cons void EncoderOpusSettings::setGroupOption(QString groupCode, int optionIndex) { bool found = false; - for (OptionsGroup group : qAsConst(m_radioList)) { + for (const OptionsGroup& group : qAsConst(m_radioList)) { if (groupCode == group.groupCode) { found = true; if (optionIndex < group.controlNames.size() || optionIndex == 1) { @@ -118,7 +118,7 @@ int EncoderOpusSettings::getSelectedOption(QString groupCode) const { ConfigKey(RECORDING_PREF_KEY, BITRATE_MODE_GROUP), 0); bool found = false; - for (OptionsGroup group : qAsConst(m_radioList)) { + for (const OptionsGroup& group : qAsConst(m_radioList)) { if (groupCode == group.groupCode) { found = true; if (value >= group.controlNames.size() && value > 1) { diff --git a/src/encoder/encoderwavesettings.cpp b/src/encoder/encoderwavesettings.cpp index 6a532464d3..fcc0e915cf 100644 --- a/src/encoder/encoderwavesettings.cpp +++ b/src/encoder/encoderwavesettings.cpp @@ -36,7 +36,7 @@ QList<EncoderSettings::OptionsGroup> EncoderWaveSettings::getOptionGroups() cons // index 0 means disabled and 1 enabled. void EncoderWaveSettings::setGroupOption(QString groupCode, int optionIndex) { bool found=false; - for (const auto& group : m_radioList) { + for (const auto& group : qAsConst(m_radioList)) { if (groupCode == group.groupCode) { found=true; if (optionIndex < group.controlNames.size() || optionIndex == 1) { diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index d8e48bd831..6b38a67325 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -344,7 +344,7 @@ void CueControl::trackLoaded(TrackPointer pNewTrack) { QMutexLocker lock(&m_mutex); if (m_pLoadedTrack) { disconnect(m_pLoadedTrack.get(), 0, this, 0); - for (const auto& pControl : m_hotcueControls) { + for (const auto& pControl : qAsConst(m_hotcueControls)) { detachCue(pControl); } @@ -905,7 +905,7 @@ void CueControl::hintReader(HintVector* pHintList) { // this is called from the engine thread // it is no locking required, because m_hotcueControl is filled during the // constructor and getPosition()->get() is a ControlObject - for (const auto& pControl: m_hotcueControls) { + for (const auto& pControl : qAsConst(m_hotcueControls)) { double position = pControl->getPosition(); if (position != Cue::kNoPosition) { cue_hint.frame = SampleUtil::floorPlayPosToFrame(position); diff --git a/src/engine/effects/engineeffectchain.cpp b/src/engine/effects/engineeffectchain.cpp index 2a8b5ac137..9fd5d8079a 100644 --- a/src/engine/effects/engineeffectchain.cpp +++ b/src/engine/effects/engineeffectchain.cpp @@ -212,7 +212,7 @@ void EngineEffectChain::deleteStatesForInputChannel(const ChannelHandle* inputCh for (auto&& outputChannelStatus : outputMap) { outputChannelStatus.enableState = EffectEnableState::Disabled; } - for (EngineEffect* pEffect : m_effects) { + for (EngineEffect* pEffect : qAsConst(m_effects)) { if (pEffect != nullptr) { pEffect->deleteStatesForInputChannel(inputChannel); } @@ -265,7 +265,7 @@ bool EngineEffectChain::process(const ChannelHandle& inputHandle, CSAMPLE* pIntermediateOutput; bool firstAddDryToWetEffectProcessed = false; - for (EngineEffect* pEffect: m_effects) { + for (EngineEffect* pEffect : qAsConst(m_effects)) { if (pEffect != nullptr) { // Select an unused intermediate buffer for the next output if (pIntermediateInput == m_buffer1.data()) { diff --git a/src/engine/effects/engineeffectrack.cpp b/src/engine/effects/engineeffectrack.cpp index f59ab97b52..7afe4ecb71 100644 --- a/src/engine/effects/engineeffectrack.cpp +++ b/src/engine/effects/engineeffectrack.cpp @@ -53,7 +53,7 @@ bool EngineEffectRack::process(const ChannelHandle& inputHandle, bool processingOccured = false; if (pIn == pOut) { // Effects are applied to the buffer in place - for (EngineEffectChain* pChain : m_chains) { + for (EngineEffectChain* pChain : qAsConst(m_chains)) { if (pChain != nullptr) { if (pChain->process(inputHandle, outputHandle, pIn, pOut, @@ -67,7 +67,7 @@ bool EngineEffectRack::process(const ChannelHandle& inputHandle, CSAMPLE* pIntermediateInput = pIn; CSAMPLE* pIntermediateOutput; - for (EngineEffectChain* pChain : m_chains) { + for (EngineEffectChain* pChain : qAsConst(m_chains)) { if (pChain != nullptr) { // Select an unused intermediate buffer for the next output if (pIntermediateInput == m_buffer1.data()) { diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp index a3d406ee46..ea0b6eb586 100644 --- a/src/engine/sidechain/enginenetworkstream.cpp +++ b/src/engine/sidechain/enginenetworkstream.cpp @@ -78,7 +78,7 @@ void EngineNetworkStream::startStream(double sampleRate) { m_inputStreamStartTimeUs = getNetworkTimeUs(); m_inputStreamFramesWritten = 0; - for(NetworkOutputStreamWorkerPtr worker : m_outputWorkers) { + for (NetworkOutputStreamWorkerPtr worker : qAsConst(m_outputWorkers)) { if (worker.isNull()) { continue; } @@ -90,7 +90,7 @@ void EngineNetworkStream::startStream(double sampleRate) { void EngineNetworkStream::stopStream() { m_inputStreamStartTimeUs = -1; - for(NetworkOutputStreamWorkerPtr worker : m_outputWorkers) { + for (NetworkOutputStreamWorkerPtr worker : qAsConst(m_outputWorkers)) { if (worker.isNull()) { continue; } diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp index 1691afb46b..62a7555abc 100644 --- a/src/engine/sync/enginesync.cpp +++ b/src/engine/sync/enginesync.cpp @@ -49,7 +49,7 @@ Syncable* EngineSync::pickMaster(Syncable* enabling_syncable) { int stopped_deck_count = 0; int playing_deck_count = 0; - for (const auto& pSyncable : m_syncables) { + for (const auto& pSyncable : qAsConst(m_syncables)) { if (pSyncable->getBaseBpm() <= 0.0) { continue; } @@ -477,7 +477,7 @@ Syncable* EngineSync::pickNonSyncSyncTarget(EngineChannel* pDontPick) const { bool EngineSync::otherSyncedPlaying(const QString& group) { bool othersInSync = false; - for (Syncable* theSyncable : m_syncables) { + for (Syncable* theSyncable : qAsConst(m_syncables)) { bool isSynchonized = theSyncable->isSynchronized(); if (theSyncable->getGroup() == group) { if (!isSynchonized) { < |