diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp
index 847dd4573e8f..bc0ad721c7a5 100644
--- a/src/broadcast/broadcastmanager.cpp
+++ b/src/broadcast/broadcastmanager.cpp
@@ -42,8 +42,8 @@ BroadcastManager::BroadcastManager(SettingsManager* pSettingsManager,
     shout_init();
 
     // Initialize connections list from the current state of BroadcastSettings
-    QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
-    for (const BroadcastProfilePtr& profile : std::as_const(profiles)) {
+    const QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
+    for (const BroadcastProfilePtr& profile : profiles) {
         addConnection(profile);
     }
 
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 8e0620da431f..def7b1985078 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -237,10 +237,10 @@ void ControllerManager::slotSetUpDevices() {
     qDebug() << "ControllerManager: Setting up devices";
 
     updateControllerList();
-    QList<Controller*> deviceList = getControllerList(false, true);
+    const QList<Controller*> deviceList = getControllerList(false, true);
     QStringList mappingPaths(getMappingPaths(m_pConfig));
 
-    for (Controller* pController : std::as_const(deviceList)) {
+    for (Controller* pController : deviceList) {
         QString name = pController->getName();
 
         if (pController->isOpen()) {
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 7135564d58fc..d7d460ee6f74 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -479,11 +479,11 @@ MappingInfo DlgPrefController::enumerateMappingsFromEnumerator(
     // re-enumerate on the next open of the preferences.
     if (!pMappingEnumerator.isNull()) {
         // Get a list of mappings in alphabetical order
-        QList<MappingInfo> systemMappings =
+        const QList<MappingInfo> systemMappings =
                 pMappingEnumerator->getMappingsByExtension(
                         m_pController->mappingExtension());
 
-        for (const MappingInfo& mapping : std::as_const(systemMappings)) {
+        for (const MappingInfo& mapping : systemMappings) {
             m_ui.comboBoxMapping->addItem(
                     icon, mapping.getName(), mapping.getPath());
             if (m_pController->matchMapping(mapping)) {
diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index 7b6c7a5a63ed..f0e7fbba2015 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -310,8 +310,8 @@ void DlgReplaceCueColor::slotApply() {
     }
 
     // Flush cached tracks to database
-    QSet<TrackId> cachedTrackIds = GlobalTrackCacheLocker().getCachedTrackIds();
-    for (const TrackId& trackId : std::as_const(cachedTrackIds)) {
+    const QSet<TrackId> cachedTrackIds = GlobalTrackCacheLocker().getCachedTrackIds();
+    for (const TrackId& trackId : cachedTrackIds) {
         TrackPointer pTrack = GlobalTrackCacheLocker().lookupTrackById(trackId);
         if (pTrack) {
             m_pTrackCollectionManager->saveTrack(pTrack);
diff --git a/src/library/banshee/bansheefeature.cpp b/src/library/banshee/bansheefeature.cpp
index 967cca982b40..c18befe6f48f 100644
--- a/src/library/banshee/bansheefeature.cpp
+++ b/src/library/banshee/bansheefeature.cpp
@@ -90,8 +90,8 @@ void BansheeFeature::activate() {
         m_isActivated =  true;
 
         std::unique_ptr<TreeItem> pRootItem = TreeItem::newRoot(this);
-        QList<BansheeDbConnection::Playlist> playlists = m_connection.getPlaylists();
-        for (const BansheeDbConnection::Playlist& playlist : std::as_const(playlists)) {
+        const QList<BansheeDbConnection::Playlist> playlists = m_connection.getPlaylists();
+        for (const BansheeDbConnection::Playlist& playlist : playlists) {
             qDebug() << playlist.name;
             // append the playlist to the child model
             pRootItem->appendChild(playlist.name, playlist.playlistId);
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index 8609833c8e45..725e181596ef 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -124,7 +124,7 @@ void TrackDAO::finish() {
     // Do housekeeping on the LibraryHashes/track_locations tables.
     qDebug() << "Cleaning LibraryHashes/track_locations tables.";
     SqlTransaction transaction(m_database);
-    QStringList deletedHashDirs = m_libraryHashDao.getDeletedDirectories();
+    const QStringList deletedHashDirs = m_libraryHashDao.getDeletedDirectories();
 
     // Delete any LibraryHashes directories that have been marked as deleted.
     m_libraryHashDao.removeDeletedDirectoryHashes();
@@ -132,7 +132,7 @@ void TrackDAO::finish() {
     // And mark the corresponding tracks in track_locations in the deleted
     // directories as deleted.
     // TODO(XXX) This doesn't handle sub-directories of deleted directories.
-    for (const auto& dir : std::as_const(deletedHashDirs)) {
+    for (const auto& dir : deletedHashDirs) {
         markTrackLocationsAsDeleted(m_database, dir);
     }
     transaction.commit();
diff --git a/src/library/trackcollection.cpp b/src/library/trackcollection.cpp
index db39c08c0e66..7f9249be302b 100644
--- a/src/library/trackcollection.cpp
+++ b/src/library/trackcollection.cpp
@@ -391,10 +391,10 @@ bool TrackCollection::purgeAllTracks(
         const QDir& rootDir) {
     DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this);
 
-    QList<TrackRef> trackRefs = m_trackDao.getAllTrackRefs(rootDir);
+    const QList<TrackRef> trackRefs = m_trackDao.getAllTrackRefs(rootDir);
     QList<TrackId> trackIds;
     trackIds.reserve(trackRefs.size());
-    for (const auto& trackRef : std::as_const(trackRefs)) {
+    for (const auto& trackRef : trackRefs) {
         DEBUG_ASSERT(trackRef.hasId());
         trackIds.append(trackRef.getId());
     }
diff --git a/src/library/trackset/baseplaylistfeature.cpp b/src/library/trackset/baseplaylistfeature.cpp
index 2a155614e531..01f18ae15991 100644
--- a/src/library/trackset/baseplaylistfeature.cpp
+++ b/src/library/trackset/baseplaylistfeature.cpp
@@ -677,9 +677,9 @@ void BasePlaylistFeature::slotAnalyzePlaylist() {
     if (m_lastRightClickedIndex.isValid()) {
         int playlistId = playlistIdFromIndex(m_lastRightClickedIndex);
         if (playlistId >= 0) {
-            QList<TrackId> ids = m_playlistDao.getTrackIds(playlistId);
+            const QList<TrackId> ids = m_playlistDao.getTrackIds(playlistId);
             QList<AnalyzerScheduledTrack> tracks;
-            for (auto id : std::as_const(ids)) {
+            for (auto id : ids) {
                 tracks.append(id);
             }
             emit analyzeTracks(tracks);
diff --git a/src/library/trackset/crate/cratefeature.cpp b/src/library/trackset/crate/cratefeature.cpp
index c4c205fff884..dbe290a2e72b 100644
--- a/src/library/trackset/crate/cratefeature.cpp
+++ b/src/library/trackset/crate/cratefeature.cpp
@@ -693,7 +693,7 @@ void CrateFeature::slotImportPlaylistFile(const QString& playlistFile, CrateId c
 
 void CrateFeature::slotCreateImportCrate() {
     // Get file to read
-    QStringList playlistFiles = LibraryFeature::getPlaylistFiles();
+    const QStringList playlistFiles = LibraryFeature::getPlaylistFiles();
     if (playlistFiles.isEmpty()) {
         return;
     }
@@ -707,7 +707,7 @@ void CrateFeature::slotCreateImportCrate() {
     CrateId lastCrateId;
 
     // For each selected file create a new crate
-    for (const QString& playlistFile : std::as_const(playlistFiles)) {
+    for (const QString& playlistFile : playlistFiles) {
         const QFileInfo fileInfo(playlistFile);
 
         Crate crate;
diff --git a/src/preferences/broadcastsettings.cpp b/src/preferences/broadcastsettings.cpp
index f581530863d5..9470bcbec58f 100644
--- a/src/preferences/broadcastsettings.cpp
+++ b/src/preferences/broadcastsettings.cpp
@@ -31,7 +31,7 @@ void BroadcastSettings::loadProfiles() {
     }
 
     QStringList nameFilters("*.bcp.xml");
-    QFileInfoList files =
+    const QFileInfoList files =
             profilesFolder.entryInfoList(nameFilters, QDir::Files, QDir::Name);
 
     // If *.bcp.xml files exist in the profiles subfolder, those will be loaded
@@ -49,7 +49,7 @@ void BroadcastSettings::loadProfiles() {
         kLogger.info() << "Found" << files.size() << "profile(s)";
 
         // Load profiles from filesystem
-        for (const QFileInfo& fileInfo : std::as_const(files)) {
+        for (const QFileInfo& fileInfo : files) {
             BroadcastProfilePtr profile =
                     BroadcastProfile::loadFromFile(fileInfo.absoluteFilePath());
 
diff --git a/src/preferences/colorpaletteeditor.cpp b/src/preferences/colorpaletteeditor.cpp
index 0df5b140f97e..f850dae6b8ec 100644
--- a/src/preferences/colorpaletteeditor.cpp
+++ b/src/preferences/colorpaletteeditor.cpp
@@ -193,8 +193,8 @@ void ColorPaletteEditor::slotAddColor() {
 }
 
 void ColorPaletteEditor::slotRemoveColor() {
-    QModelIndexList selection = m_pTableView->selectionModel()->selectedRows();
-    for (const auto& index : std::as_const(selection)) {
+    const QModelIndexList selection = m_pTableView->selectionModel()->selectedRows();
+    for (const auto& index : selection) {
         //row selected
         int row = index.row();
         m_pModel->removeRow(row);
diff --git a/src/soundio/sounddevicenetwork.cpp b/src/soundio/sounddevicenetwork.cpp
index 755963206e48..56658747d84b 100644
--- a/src/soundio/sounddevicenetwork.cpp
+++ b/src/soundio/sounddevicenetwork.cpp
@@ -271,9 +271,9 @@ void SoundDeviceNetwork::writeProcess(SINT framesPerBuffer) {
     m_outputFifo->aquireReadRegions(readAvailable,
             &dataPtr1, &size1, &dataPtr2, &size2);
 
-    QVector<NetworkOutputStreamWorkerPtr> workers =
+    const QVector<NetworkOutputStreamWorkerPtr> workers =
             m_pNetworkStream->outputWorkers();
-    for (const auto& pWorker : std::as_const(workers)) {
+    for (const auto& pWorker : workers) {
         if (pWorker.isNull()) {
             continue;
         }
diff --git a/src/soundio/soundmanagerconfig.cpp b/src/soundio/soundmanagerconfig.cpp
index 89a7deaaf123..d1228bf54431 100644
--- a/src/soundio/soundmanagerconfig.cpp
+++ b/src/soundio/soundmanagerconfig.cpp
@@ -84,7 +84,8 @@ bool SoundManagerConfig::readFromDisk() {
     VERIFY_OR_DEBUG_ASSERT(m_pSoundManager != nullptr) {
         return false;
     }
-    QList<SoundDevicePointer> soundDevices = m_pSoundManager->getDeviceList(m_api, true, true);
+    const QList<SoundDevicePointer> soundDevices =
+            m_pSoundManager->getDeviceList(m_api, true, true);
 
     for (int i = 0; i < devElements.count(); ++i) {
         QDomElement devElement(devElements.at(i).toElement());
@@ -109,7 +110,7 @@ bool SoundManagerConfig::readFromDisk() {
         }
 
         int devicesMatchingByName = 0;
-        for (const auto& soundDevice : std::as_const(soundDevices)) {
+        for (const auto& soundDevice : soundDevices) {
             SoundDeviceId hardwareDeviceId = soundDevice->getDeviceId();
             if (hardwareDeviceId.name == deviceIdFromFile.name) {
                 devicesMatchingByName++;
@@ -127,7 +128,7 @@ bool SoundManagerConfig::readFromDisk() {
             // very reliable as persistent identifiers across restarts of Mixxx.
             // Set deviceIdFromFile's alsaHwDevice and portAudioIndex to match
             // the hardwareDeviceId so operator== works for SoundDeviceId.
-            for (const auto& soundDevice : std::as_const(soundDevices)) {
+            for (const auto& soundDevice : soundDevices) {
                 SoundDeviceId hardwareDeviceId = soundDevice->getDeviceId();
                 if (hardwareDeviceId.name == deviceIdFromFile.name) {
                     deviceIdFromFile.alsaHwDevice = hardwareDeviceId.alsaHwDevice;
@@ -146,7 +147,7 @@ bool SoundManagerConfig::readFromDisk() {
                 // multiple devices with the same name. This might be possible
                 // somehow with a udev rule matching device serial numbers, but
                 // I have not tested this.
-                for (const auto& soundDevice : std::as_const(soundDevices)) {
+                for (const auto& soundDevice : soundDevices) {
                     SoundDeviceId hardwareDeviceId = soundDevice->getDeviceId();
                     if (hardwareDeviceId.name == deviceIdFromFile.name
                             && hardwareDeviceId.alsaHwDevice == deviceIdFromFile.alsaHwDevice) {
@@ -156,7 +157,7 @@ bool SoundManagerConfig::readFromDisk() {
                 }
             } else {
                 // Check if the one of the matching devices has the configured in and output channels
-                for (const auto& soundDevice : std::as_const(soundDevices)) {
+                for (const auto& soundDevice : soundDevices) {
                     SoundDeviceId hardwareDeviceId = soundDevice->getDeviceId();
                     if (hardwareDeviceId.name == deviceIdFromFile.name &&
                             soundDevice->getNumOutputChannels() >=
@@ -513,9 +514,10 @@ void SoundManagerConfig::loadDefaults(SoundManager* soundManager, unsigned int f
     if (flags & SoundManagerConfig::DEVICES) {
         clearOutputs();
         clearInputs();
-        QList<SoundDevicePointer> outputDevices = soundManager->getDeviceList(m_api, true, false);
+        const QList<SoundDevicePointer> outputDevices =
+                soundManager->getDeviceList(m_api, true, false);
         if (!outputDevices.isEmpty()) {
-            for (const auto& pDevice : std::as_const(outputDevices)) {
+            for (const auto& pDevice : outputDevices) {
                 if (pDevice->getNumOutputChannels() < 2) {
                     continue;
                 }
diff --git a/src/test/seratobeatgridtest.cpp b/src/test/seratobeatgridtest.cpp
index e92d2bfd1ef1..8dd7d4ef1b08 100644
--- a/src/test/seratobeatgridtest.cpp
+++ b/src/test/seratobeatgridtest.cpp
@@ -51,9 +51,9 @@ class SeratoBeatGridTest : public testing::Test {
         dir.setFilter(QDir::Files);
         dir.setNameFilters(QStringList() << "*.octet-stream");
 
-        QFileInfoList fileList = dir.entryInfoList();
+        const QFileInfoList fileList = dir.entryInfoList();
         EXPECT_FALSE(fileList.isEmpty());
-        for (const QFileInfo& fileInfo : std::as_const(fileList)) {
+        for (const QFileInfo& fileInfo : fileList) {
             qDebug() << "--- File:" << fileInfo.fileName();
             QFile file(dir.filePath(fileInfo.fileName()));
             bool openOk = file.open(QIODevice::ReadOnly);
diff --git a/src/test/seratomarkers2test.cpp b/src/test/seratomarkers2test.cpp
index 5f507acdadb3..9884eb0af130 100644
--- a/src/test/seratomarkers2test.cpp
+++ b/src/test/seratomarkers2test.cpp
@@ -122,9 +122,9 @@ class SeratoMarkers2Test : public testing::Test {
         dir.setFilter(QDir::Files);
         dir.setNameFilters(QStringList() << "*.octet-stream");
 
-        QFileInfoList fileList = dir.entryInfoList();
+        const QFileInfoList fileList = dir.entryInfoList();
         EXPECT_FALSE(fileList.isEmpty());
-        for (const QFileInfo& fileInfo : std::as_const(fileList)) {
+        for (const QFileInfo& fileInfo : fileList) {
             qDebug() << "--- File:" << fileInfo.fileName();
             QFile file(dir.filePath(fileInfo.fileName()));
             bool openOk = file.open(QIODevice::ReadOnly);
diff --git a/src/test/seratomarkerstest.cpp b/src/test/seratomarkerstest.cpp
index 96c100818570..b1b25d1455c7 100644
--- a/src/test/seratomarkerstest.cpp
+++ b/src/test/seratomarkerstest.cpp
@@ -62,9 +62,9 @@ class SeratoMarkersTest : public testing::Test {
         dir.setFilter(QDir::Files);
         dir.setNameFilters(QStringList() << "*.octet-stream");
 
-        QFileInfoList fileList = dir.entryInfoList();
+        const QFileInfoList fileList = dir.entryInfoList();
         EXPECT_FALSE(fileList.isEmpty());
-        for (const QFileInfo& fileInfo : std::as_const(fileList)) {
+        for (const QFileInfo& fileInfo : fileList) {
             qDebug() << "--- File:" << fileInfo.fileName();
             QFile file(dir.filePath(fileInfo.fileName()));
             bool openOk = file.open(QIODevice::ReadOnly);
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index f9d0ab567c75..e6e5c79af379 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -16,18 +16,18 @@ namespace {
 constexpr float lineHoverPadding = 5.0;
 
 Qt::Alignment decodeAlignmentFlags(const QString& alignString, Qt::Alignment defaultFlags) {
-    QStringList stringFlags = alignString.toLower()
-                                      .split('|',
+    const QStringList stringFlags = alignString.toLower()
+                                            .split('|',
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-                                              Qt::SkipEmptyParts);
+                                                    Qt::SkipEmptyParts);
 #else
-                                              QString::SkipEmptyParts);
+                                                    QString::SkipEmptyParts);
 #endif
 
     Qt::Alignment hflags;
     Qt::Alignment vflags;
 
-    for (const auto& stringFlag : std::as_const(stringFlags)) {
+    for (const auto& stringFlag : stringFlags) {
         if (stringFlag == "center") {
             hflags |= Qt::AlignHCenter;
             vflags |= Qt::AlignVCenter;
diff --git a/src/waveform/renderers/waveformrendermarkbase.cpp b/src/waveform/renderers/waveformrendermarkbase.cpp
index 7d715a149141..f250b73acc18 100644
--- a/src/waveform/renderers/waveformrendermarkbase.cpp
+++ b/src/waveform/renderers/waveformrendermarkbase.cpp
@@ -57,8 +57,8 @@ void WaveformRenderMarkBase::updateMarksFromCues() {
     }
 
     const int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
-    QList<CuePointer> loadedCues = pTrackInfo->getCuePoints();
-    for (const CuePointer& pCue : std::as_const(loadedCues)) {
+    const QList<CuePointer> loadedCues = pTrackInfo->getCuePoints();
+    for (const CuePointer& pCue : loadedCues) {
         const int hotCue = pCue->getHotCue();
         if (hotCue == Cue::kNoHotCue) {
             continue;
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index aab088b9f84e..756f6856f832 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -537,8 +537,8 @@ void WOverview::mousePressEvent(QMouseEvent* e) {
             // WOverview in the future, another way to associate
             // WaveformMarks with Cues will need to be implemented.
             CuePointer pHoveredCue;
-            QList<CuePointer> cueList = m_pCurrentTrack->getCuePoints();
-            for (const auto& pCue : std::as_const(cueList)) {
+            const QList<CuePointer> cueList = m_pCurrentTrack->getCuePoints();
+            for (const auto& pCue : cueList) {
                 if (pCue->getHotCue() == m_pHoveredMark->getHotCue()) {
                     pHoveredCue = pCue;
                     break;
diff --git a/src/widget/wsplitter.cpp b/src/widget/wsplitter.cpp
index e004ab1264df..c2bcd0ab6eaf 100644
--- a/src/widget/wsplitter.cpp
+++ b/src/widget/wsplitter.cpp
@@ -54,10 +54,10 @@ void WSplitter::setup(const QDomNode& node, const SkinContext& context) {
 
     // found some value for splitsizes?
     if (!sizesJoined.isEmpty()) {
-        QStringList sizesSplit = sizesJoined.split(",");
+        const QStringList sizesSplit = sizesJoined.split(",");
         QList<int> sizesList;
         ok = false;
-        for (const QString& sizeStr : std::as_const(sizesSplit)) {
+        for (const QString& sizeStr : sizesSplit) {
             sizesList.push_back(sizeStr.toInt(&ok));
             if (!ok) {
                 break;
@@ -75,10 +75,10 @@ void WSplitter::setup(const QDomNode& node, const SkinContext& context) {
     // Which children can be collapsed?
     QString collapsibleJoined;
     if (context.hasNodeSelectString(node, "Collapsible", &collapsibleJoined)) {
-        QStringList collapsibleSplit = collapsibleJoined.split(",");
+        const QStringList collapsibleSplit = collapsibleJoined.split(",");
         QList<bool> collapsibleList;
         ok = false;
-        for (const QString& collapsibleStr : std::as_const(collapsibleSplit)) {
+        for (const QString& collapsibleStr : collapsibleSplit) {
             collapsibleList.push_back(collapsibleStr.toInt(&ok)>0);
             if (!ok) {
                 break;
diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp
index 058852098d2b..64503db224bf 100644
--- a/src/widget/wtrackmenu.cpp
+++ b/src/widget/wtrackmenu.cpp
@@ -1324,10 +1324,10 @@ void WTrackMenu::slotPopulatePlaylistMenu() {
     const PlaylistDAO& playlistDao = m_pLibrary->trackCollectionManager()
                                              ->internalCollection()
                                              ->getPlaylistDAO();
-    QList<QPair<int, QString>> playlists =
+    const QList<QPair<int, QString>> playlists =
             playlistDao.getPlaylists(PlaylistDAO::PLHT_NOT_HIDDEN);
 
-    for (const auto& [id, name] : std::as_const(playlists)) {
+    for (const auto& [id, name] : playlists) {
         // No leak because making the menu the parent means they will be
         // auto-deleted
         int plId = id;