fixed possible regressions

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9068 90c681e8-e032-0410-971d-27865f9a5e38

32 files changed, 141 insertions, 106 deletions

diff --git a/src/plugins/Effect/ladspa/ladspahost.cpp b/src/plugins/Effect/ladspa/ladspahost.cpp
index 8688ab756..36f7081c6 100644
--- a/src/plugins/Effect/ladspa/ladspahost.cpp
+++ b/src/plugins/Effect/ladspa/ladspahost.cpp
@@ -158,7 +158,7 @@ void LADSPAHost::findModules(const QString &path)
     QDir dir (path);
     dir.setFilter(QDir::Files | QDir::Hidden);
     dir.setSorting(QDir::Name);
-    QFileInfoList files = dir.entryInfoList((QStringList() << "*.so"));
+    const QFileInfoList files = dir.entryInfoList((QStringList() << "*.so"));
 
     for(const QFileInfo &file : qAsConst(files))
     {
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp
index 90b69cfd5..97ecc71a6 100644
--- a/src/plugins/Engines/mplayer/mplayerengine.cpp
+++ b/src/plugins/Engines/mplayer/mplayerengine.cpp
@@ -65,7 +65,7 @@ TrackInfo *MplayerInfo::createTrackInfo(const QString &path)
     mplayer_process.kill();
     QString str = QString::fromLocal8Bit(mplayer_process.readAll()).trimmed();
     TrackInfo *info = new TrackInfo(path);
-    QStringList lines = str.split("\n");
+    const QStringList lines = str.split("\n");
     for(const QString &line : qAsConst(lines))
     {
         if(rx_id_length.indexIn(line) > -1)
@@ -122,7 +122,7 @@ bool MplayerEngine::play()
 
 bool MplayerEngine::enqueue(InputSource *source)
 {
-    QStringList filters = MplayerInfo::filters();
+    const QStringList filters = MplayerInfo::filters();
     bool supports = false;
     for(const QString &filter : qAsConst(filters))
     {
diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
index 33493dfa4..2acd493a7 100644
--- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
+++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
@@ -43,7 +43,7 @@ EngineProperties MplayerEngineFactory::properties() const
 
 bool MplayerEngineFactory::supports(const QString &source) const
 {
-    QStringList filters = MplayerInfo::filters();
+    const QStringList filters = MplayerInfo::filters();
     for(const QString &filter : qAsConst(filters))
     {
         QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard);
diff --git a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
index 1f9aaf823..bfe0f5611 100644
--- a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
+++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
@@ -52,7 +52,7 @@ QList<MetaDataItem> MplayerMetaDataModel::extraProperties() const
     mplayer_process.start("mplayer", args);
     mplayer_process.waitForFinished();
     QString str = QString::fromLocal8Bit(mplayer_process.readAll()).trimmed();
-    QStringList lines = str.split("\n");
+    const QStringList lines = str.split("\n");
     //mplayer std output parsing
     QRegExp rx_id("^(ID_.*)=(.*)");
     QMap<QString, QString> params;
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index 90de6aca1..f6e1fe6ee 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -36,7 +36,7 @@
 #include "preseteditor.h"
 #include "converterdialog.h"
 
-ConverterDialog::ConverterDialog(QList <PlayListTrack *> tracks,  QWidget *parent) : QDialog(parent)
+ConverterDialog::ConverterDialog(const QList <PlayListTrack *> &tracks,  QWidget *parent) : QDialog(parent)
 {
     m_ui.setupUi(this);
     m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3);
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index e1d7dd2c1..89eeaa0e8 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -37,7 +37,7 @@ class ConverterDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit ConverterDialog(QList <PlayListTrack *> items,  QWidget *parent = nullptr);
+    explicit ConverterDialog(const QList<PlayListTrack *> &items,  QWidget *parent = nullptr);
     virtual ~ConverterDialog();
 
 public slots:
diff --git a/src/plugins/General/copypaste/copypaste.cpp b/src/plugins/General/copypaste/copypaste.cpp
index c2ef73565..183c5be5a 100644
--- a/src/plugins/General/copypaste/copypaste.cpp
+++ b/src/plugins/General/copypaste/copypaste.cpp
@@ -86,7 +86,7 @@ void CopyPaste::copy()
 void CopyPaste::paste()
 {
     qDebug("%s", Q_FUNC_INFO);
-    for(const PlayListTrack *track : qAsConst( m_buffer))
+    for(const PlayListTrack *track : qAsConst(m_buffer))
     {
         m_pl_manager->selectedPlayList()->add(new PlayListTrack(*track));
     }
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index a6478438b..5789bd906 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -82,7 +82,7 @@ void FileOps::execAction(int n)
     QString destination = m_destinations.at(n);
 
     PlayListModel *model = MediaPlayer::instance()->playListManager()->selectedPlayList();
-    QList<PlayListTrack*> tracks = model->selectedTracks();
+    const QList<PlayListTrack*> tracks = model->selectedTracks();
 
     switch (type)
     {
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index ca1e0952a..092bd02fa 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -46,9 +46,9 @@ HalPlugin::HalPlugin(QObject *parent) : QObject(parent)
     m_addTracks = false; //do not load tracks on startup
     m_addFiles = false;
     //find existing devices
-    QStringList udis = m_manager->findDeviceByCapability("volume");
+    const QStringList udis = m_manager->findDeviceByCapability("volume");
     for(const QString &udi : qAsConst(udis))
-    addDevice(udi);
+        addDevice(udi);
     //load remaining settings
     m_addTracks = settings.value("add_tracks", false).toBool();
     m_removeTracks = settings.value("remove_tracks", false).toBool();
@@ -63,16 +63,21 @@ HalPlugin::~HalPlugin()
 
 void HalPlugin::removeDevice(const QString &udi)
 {
-    for(HalDevice *device : qAsConst(m_devices))
+    QList<HalDevice *>::iterator it = m_devices.begin();
+    while(it != m_devices.end())
     {
-        if (device->udi() == udi)
+        if((*it)->udi() == udi)
         {
-            m_devices.removeAll(device);
-            delete device;
+            delete *it;
+            it = m_devices.erase(it);
             qDebug("HalPlugin: device \"%s\" removed", qPrintable(udi));
             updateActions();
             break;
         }
+        else
+        {
+            ++it;
+        }
     }
 }
 
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index 510f2e6aa..0a8b114f4 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -297,7 +297,7 @@ void Scrobbler::submit()
     params.insert("method", "track.scrobble");
     params.insert("sk", m_session);
 
-    QStringList keys = params.keys();
+    const QStringList keys = params.keys();
     for(const QString &key : qAsConst(keys)) //removes empty keys
     {
         if(params.value(key).isEmpty() || params.value(key) == "0")
@@ -347,7 +347,8 @@ void Scrobbler::sendNotification(const SongInfo &info)
     params.insert("method", "track.updateNowPlaying");
     params.insert("sk", m_session);
 
-    for(const QString &key : qAsConst(params)) //removes empty keys
+    const QStringList keys = params.keys();
+    for(const QString &key : qAsConst(keys)) //removes empty keys
     {
         if(params.value(key).isEmpty())
             params.remove(key);
diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp
index d668068d4..fa90b8ec2 100644
--- a/src/plugins/General/streambrowser/streamwindow.cpp
+++ b/src/plugins/General/streambrowser/streamwindow.cpp
@@ -184,7 +184,7 @@ void StreamWindow::on_addPushButton_clicked()
     QList<PlayListTrack *> tracks;
     if(m_ui->tabWidget->currentIndex() == 0)
     {
-        QModelIndexList indexes = m_ui->favoritesTableView->selectionModel()->selectedRows(0);
+        const QModelIndexList indexes = m_ui->favoritesTableView->selectionModel()->selectedRows(0);
         for(const QModelIndex &index : qAsConst(indexes))
         {
             QModelIndex source_index = m_favoritesFilterModel->mapToSource(index);
@@ -197,7 +197,7 @@ void StreamWindow::on_addPushButton_clicked()
     }
     else
     {
-        QModelIndexList indexes = m_ui->icecastTableView->selectionModel()->selectedRows(0);
+        const QModelIndexList indexes = m_ui->icecastTableView->selectionModel()->selectedRows(0);
         for(const QModelIndex &index : qAsConst(indexes))
         {
             QModelIndex source_index = m_iceCastFilterModel->mapToSource(index);
@@ -234,7 +234,7 @@ void StreamWindow::execFavoritesMenu(const QPoint &pos)
 
 void StreamWindow::addToFavorites()
 {
-    QModelIndexList indexes = m_ui->icecastTableView->selectionModel()->selectedRows(0);
+    const QModelIndexList indexes = m_ui->icecastTableView->selectionModel()->selectedRows(0);
     for(const QModelIndex &index : qAsConst(indexes))
     {
         QModelIndex source_index = m_iceCastFilterModel->mapToSource(index);
@@ -307,7 +307,7 @@ void StreamWindow::removeFromFavorites()
 {
     if(m_ui->tabWidget->currentIndex() != 0)
         return;
-    QModelIndexList indexes = m_ui->favoritesTableView->selectionModel()->selectedRows(0);
+    const QModelIndexList indexes = m_ui->favoritesTableView->selectionModel()->selectedRows(0);
     QList<int> rows_to_remove;
     for(const QModelIndex &index : qAsConst(indexes))
     {
diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp
index e30ae16dd..52873c5e0 100644
--- a/src/plugins/General/udisks2/udisks2device.cpp
+++ b/src/plugins/General/udisks2/udisks2device.cpp
@@ -88,7 +88,7 @@ QStringList UDisks2Device::mountPoints() const
 
     QDBusMessage reply = QDBusConnection::systemBus().call(message);
 
-    QList<QVariant> args = reply.arguments();
+    const QList<QVariant> args = reply.arguments();
 
     for(const QVariant &arg : qAsConst(args))
     {
diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp
index d249c06b0..65ad8ea2f 100644
--- a/src/plugins/General/udisks2/udisks2plugin.cpp
+++ b/src/plugins/General/udisks2/udisks2plugin.cpp
@@ -48,7 +48,7 @@ UDisks2Plugin::UDisks2Plugin(QObject *parent) : QObject(parent)
     m_addTracks = false; //do not load tracks on startup
     m_addFiles = false;
     //find existing devices
-    QList<QDBusObjectPath> devs = m_manager->findAllDevices();
+    const QList<QDBusObjectPath> devs = m_manager->findAllDevices();
     for(const QDBusObjectPath &o : qAsConst(devs))
         addDevice(o);
     //load remaining settings
@@ -65,16 +65,21 @@ UDisks2Plugin::~UDisks2Plugin()
 
 void UDisks2Plugin::removeDevice(QDBusObjectPath o)
 {
-    for(UDisks2Device *device : qAsConst(m_devices))
+    QList<UDisks2Device *>::iterator it = m_devices.begin();
+    while(it != m_devices.end())
     {
-        if (device->objectPath() == o)
+        if((*it)->objectPath() == o)
         {
-            m_devices.removeAll(device);
-            delete device;
+            delete (*it);
+            it = m_devices.erase(it);
             qDebug("UDisks2Plugin: removed device: \"%s\"", qPrintable(o.path()));
             updateActions();
             break;
         }
+        else
+        {
+            ++it;
+        }
     }
 }
 
diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp
index 118cb49aa..1c0dff1f4 100644
--- a/src/plugins/Input/archive/decoder_archive.cpp
+++ b/src/plugins/Input/archive/decoder_archive.cpp
@@ -59,11 +59,11 @@ bool DecoderArchive::initialize()
     }
 
     //is this file supported by qmmp?
-    QList<DecoderFactory *> filtered = Decoder::findByFileExtension(filePath);
-    for(DecoderFactory *f : qAsConst(filtered))
+    QList<DecoderFactory *> filtered;
+    for(DecoderFactory *f : Decoder::findByFileExtension(filePath))
     {
-        if(f->properties().noInput)
-            filtered.removeAll(f); //remove all factories without streaming input
+        if(!f->properties().noInput)
+            filtered << f; //add all factories with streaming input
     }
 
     if(filtered.isEmpty())
diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp
index 4d569defd..e96bbf007 100644
--- a/src/plugins/Input/archive/decoderarchivefactory.cpp
+++ b/src/plugins/Input/archive/decoderarchivefactory.cpp
@@ -95,11 +95,11 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr
             }
 
             //is this file supported by qmmp?
-            QList<DecoderFactory *> filtered = Decoder::findByFileExtension(filePath);
-            for(DecoderFactory *f : qAsConst(filtered))
+            QList<DecoderFactory *> filtered;
+            for(DecoderFactory *f : Decoder::findByFileExtension(filePath))
             {
-                if(f->properties().noInput)
-                    filtered.removeAll(f); //remove all factories without streaming input
+                if(!f->properties().noInput)
+                    filtered << f; //add all factories with streaming input
             }
 
             if(!filtered.isEmpty())
diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp
index 5d31c4a25..0e428039e 100644
--- a/src/plugins/Input/cdaudio/settingsdialog.cpp
+++ b/src/plugins/Input/cdaudio/settingsdialog.cpp
@@ -77,7 +77,7 @@ void SettingsDialog::on_clearCacheButton_clicked()
 {
     QDir dir(Qmmp::configDir());
     dir.cd("cddbcache");
-    QStringList list = dir.entryList(QStringList() << "*", QDir::Files);
+    const QStringList list = dir.entryList(QStringList() << "*", QDir::Files);
     for(const QString &name : qAsConst(list))
         dir.remove(name);
 }
diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp
index e48ff7de9..186389b7d 100644
--- a/src/plugins/Input/wildmidi/wildmidihelper.cpp
+++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp
@@ -113,15 +113,14 @@ void WildMidiHelper::removePtr(void *t)
 
 QStringList WildMidiHelper::configFiles() const
 {
-    QStringList files = QStringList() << "/etc/timidity.cfg"
-                                      << "/etc/timidity/timidity.cfg"
-                                      << "/etc/wildmidi/wildmidi.cfg";
-    for(const QString &path : qAsConst(files))
+    const QStringList paths = { "/etc/timidity.cfg", "/etc/timidity/timidity.cfg", "/etc/wildmidi/wildmidi.cfg" };
+    QStringList filtered;
+    for(const QString &path : qAsConst(paths))
     {
-        if(!QFile::exists(path))
-            files.removeAll(path);
+        if(QFile::exists(path))
+            filtered << path;
     }
-    return files;
+    return filtered;
 }
 
 quint32 WildMidiHelper::sampleRate()
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp
index 8e8e0ca7c..795014bc6 100644
--- a/src/plugins/Ui/qsui/actionmanager.cpp
+++ b/src/plugins/Ui/qsui/actionmanager.cpp
@@ -272,9 +272,10 @@ void ActionManager::updateToolBar(QToolBar *toolBar, ActionManager::ToolBarInfo
 
 ActionManager::ToolBarInfo ActionManager::defaultToolBar() const
 {
-    QList <Type> idList;
-    idList << PL_ADD_FILE << PL_ADD_DIRECTORY << PREVIOUS << PLAY << PAUSE << STOP << NEXT << EJECT;
-    idList << UI_SEPARATOR << UI_POS_SLIDER << UI_SEPARATOR << UI_VOL_SLIDER << VOL_MUTE;
+    const QList<Type> idList = {
+        PL_ADD_FILE, PL_ADD_DIRECTORY, PREVIOUS, PLAY, PAUSE, STOP, NEXT, EJECT,
+        UI_SEPARATOR, UI_POS_SLIDER, UI_SEPARATOR, UI_VOL_SLIDER, VOL_MUTE
+    };
     QStringList names;
     for(const Type &id : qAsConst(idList))
     {
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 73891daf3..83563325b 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -688,7 +688,7 @@ void MainWindow::readSettings()
     m_titleFormatter.setPattern(settings.value("window_title_format","%if(%p,%p - %t,%t)").toString());
 
     //update toolbars
-    QList<ActionManager::ToolBarInfo> toolBarInfoList = ActionManager::instance()->readToolBarSettings();
+    const QList<ActionManager::ToolBarInfo> toolBarInfoList = ActionManager::instance()->readToolBarSettings();
     QList<QToolBar *> toolBars = findChildren<QToolBar*>();
 
     //clear toolbars to avoid conflicts
@@ -698,15 +698,17 @@ void MainWindow::readSettings()
     for(const ActionManager::ToolBarInfo &info : qAsConst(toolBarInfoList))
     {
         bool found = false;
-        for(QToolBar *toolBar : qAsConst(toolBars))
+        QList<QToolBar *>::iterator it = toolBars.begin();
+        while(it != toolBars.end())
         {
-            if(toolBar->property("uid").toString() == info.uid)
+            if((*it)->property("uid").toString() == info.uid)
             {
                 found = true;
-                toolBars.removeAll(toolBar);
-                ActionManager::instance()->updateToolBar(toolBar, info);
+                ActionManager::instance()->updateToolBar(*it, info);
+                toolBars.erase(it);
                 break;
             }
+            it++;
         }
 
         if(!found)
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 2cd1efc7e..96b559889 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -321,12 +321,17 @@ void EqWidget::savePreset()
         preset->setPreamp(m_preamp->value());
         for (int i = 0; i<10; ++i)
             preset->setGain(i, m_sliders.at (i)->value());
-        for(EQPreset *p : qAsConst(m_presets)) //remove preset with same name
+        QList<EQPreset *>::iterator it = m_presets.begin();
+        while(it != m_presets.end()) //remove preset with same name
         {
-            if (p->text() == text)
+            if ((*it)->text() == text)
             {
-                m_presets.removeAll(p);
-                delete p;
+                delete (*it);
+                it = m_presets.erase(it);
+            }
+            else
+            {
+                ++it;
             }
         }
         m_presets.append(preset);
diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index 4b96899c8..b5b68b179 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -797,10 +797,7 @@ QRegion Skin::createRegion(const QString &path, const QString &key)
     for(const QString &str : qAsConst(value))
     numbers << str.split(" ", QString::SkipEmptyParts);
 
-    QList <QRegion> regions;
-
-    QList<QString>::iterator n;
-    n = numbers.begin();
+    QList<QString>::iterator n = numbers.begin();
     int r = m_double_size ? 2 : 1;
     for (int i = 0; i < numPoints.size(); ++i)
     {
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index 141498aa0..a209b098f 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -117,8 +117,8 @@ void SkinnedSettings::on_resetFontsButton_clicked()
 
 void SkinnedSettings::on_skinInstallButton_clicked()
 {
-    QStringList files = FileDialog::getOpenFileNames(this,tr("Select Skin Files"), QDir::homePath(),
-                                                     tr("Skin files") + " (*.tar.gz *.tgz *.tar.bz2 *.zip *.wsz)");
+    const QStringList files = FileDialog::getOpenFileNames(this,tr("Select Skin Files"), QDir::homePath(),
+                                                           tr("Skin files") + " (*.tar.gz *.tgz *.tar.bz2 *.zip *.wsz)");
     for(const QString &path : qAsConst(files))
     {
         QFile file(path);
@@ -160,7 +160,7 @@ void SkinnedSettings::findSkins(const QString &path)
 {
     QDir dir(path);
     dir.setFilter (QDir::Dirs | QDir::NoDotAndDotDot);
-    QList <QFileInfo> fileList = dir.entryInfoList();
+    const QList <QFileInfo> fileList = dir.entryInfoList();
     if (fileList.count() == 0)
         return;
     for(const QFileInfo &fileInfo : qAsConst(fileList))
diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
index ae3faa305..cbfa099f9 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -125,7 +125,7 @@ void SkinReader::unpackSkin(const QString &path)
     //remove old skin
     QDir dir(Qmmp::configDir() + "/cache/skin");
     dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-    QFileInfoList f = dir.entryInfoList();
+    const QFileInfoList f = dir.entryInfoList();
     for(const QFileInfo &file : qAsConst(f))
         dir.remove(file.fileName());
     //unpack
@@ -156,7 +156,7 @@ void SkinReader::untar(const QString &from, const QString &to, bool preview)
     m_process->waitForFinished();
     array = m_process->readAllStandardOutput ();
     QString str = QString(array);
-    QStringList outputList = str.split("\n", QString::SkipEmptyParts);
+    const QStringList outputList = str.split("\n", QString::SkipEmptyParts);
     for(QString str : qAsConst(outputList))
     {
         str = str.trimmed();
@@ -193,7 +193,7 @@ void SkinReader::unzip(const QString &from, const QString &to, bool preview)
         QProcess::execute("unzip", args);
         QDir dir(to);
         dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-        QFileInfoList fileList = dir.entryInfoList();
+        const QFileInfoList fileList = dir.entryInfoList();
         for(const QFileInfo &thumbInfo : qAsConst(fileList))
         {
             if (thumbInfo.fileName().startsWith("main.", Qt::CaseInsensitive))
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
index 163846cf0..4afe030e2 100644
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -107,7 +107,7 @@ void ProjectMWidget::initializeGL()
         presetDir.setFilter(QDir::Files);
         QStringList filters;
         filters << "*.prjm" << "*.milk";
-        QFileInfoList l = presetDir.entryInfoList(filters);
+        const QFileInfoList l = presetDir.entryInfoList(filters);
 
         RatingList list;
         list.push_back(3);
diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp
index 3bc19a694..fbd93f85b 100644
--- a/src/qmmp/decoder.cpp
+++ b/src/qmmp/decoder.cpp
@@ -203,7 +203,7 @@ DecoderFactory *Decoder::findByFilePath(const QString &path, bool useContent)
         fact = nullptr;
     }
 
-    QList<DecoderFactory*> filtered = findByFileExtension(path);
+    const QList<DecoderFactory*> filtered = findByFileExtension(path);
 
     if(filtered.isEmpty())
         return nullptr;
diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp
index 3eae41250..8e291d1a7 100644
--- a/src/qmmp/metadatamanager.cpp
+++ b/src/qmmp/metadatamanager.cpp
@@ -245,7 +245,8 @@ QFileInfoList MetaDataManager::findCoverFiles(QDir dir, int depth) const
     dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     dir.setSorting(QDir::Name);
     QFileInfoList file_list = dir.entryInfoList(m_settings->coverNameFilters());
-    for(const QFileInfo &i : qAsConst(file_list))
+    const auto fileListCopy = file_list; //avoid container modification
+    for(const QFileInfo &i : qAsConst(fileListCopy))
     {
         for(const QString &pattern : m_settings->coverNameFilters(false))
         {
@@ -261,7 +262,7 @@ QFileInfoList MetaDataManager::findCoverFiles(QDir dir, int depth) const
     depth--;
     dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
     dir.setSorting(QDir::Name);
-    QFileInfoList dir_info_list = dir.entryInfoList();
+    const QFileInfoList dir_info_list = dir.entryInfoList();
     for(const QFileInfo &i : qAsConst(dir_info_list))
     {
         file_list << findCoverFiles(QDir(i.absoluteFilePath()), depth);
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index e4f557ac6..a03bb18c7 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -45,7 +45,7 @@ FileLoader::~FileLoader()
 QList<PlayListTrack *> FileLoader::processFile(const QString &path, QStringList *ignoredPaths)
 {
     QList<PlayListTrack *> tracks;
-    QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(path, m_parts, ignoredPaths);
+    const QList<TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(path, m_parts, ignoredPaths);
 
     for(TrackInfo *info : qAsConst(infoList))
     {
@@ -132,27 +132,25 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
             filters << QRegExp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
 
 
-        for(PlayListTrack *t : qAsConst(tracks))
+        QList<PlayListTrack *>::iterator it = tracks.begin();
+        while(it != tracks.end())
         {
-            if(t->path().contains("://"))
+            if((*it)->path().contains("://") && !protocols.contains((*it)->path().section("://", 0, 0)))
             {
-                if(!protocols.contains(t->path().section("://",0,0)))
-                {
-                    tracks.removeAll(t);
-                    delete t;
-                }
+                delete (*it);
+                it = tracks.erase(it);
             }
-            else if(!QFile::exists(t->path()))
+            else if(!QFile::exists((*it)->path()))
             {
-                tracks.removeAll(t);
-                delete t;
+                delete (*it);
+                it = tracks.erase(it);
             }
             else
             {
                 bool found = false;
                 for(const QRegExp &filter : qAsConst(filters))
                 {
-                    if(filter.exactMatch(t->path()))
+                    if(filter.exactMatch((*it)->path()))
                     {
                         found = true;
                         break;
@@ -160,8 +158,12 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
                 }
                 if(!found)
                 {
-                    tracks.removeAll(t);
-                    delete t;
+                    delete (*it);
+                    it = tracks.erase(it);
+                }
+                else
+                {
+                    ++it;
                 }
             }
         }
@@ -384,12 +386,17 @@ void FileLoader::removeIgnoredTracks(QList<PlayListTrack *> *tracks, const QStri
     if(ignoredPaths.isEmpty())
         return;
 
-    for(PlayListTrack *track : qAsConst(*tracks))
+    QList<PlayListTrack *>::iterator it = tracks->begin();
+    while(it != tracks->end())
     {
-        if(ignoredPaths.contains(track->path()))
+        if(ignoredPaths.contains((*it)->path()))
+        {
+            delete (*it);
+            it = tracks->erase(it);
+        }
+        else
         {
-            tracks->removeAll(track);
-            delete track;
+            ++it;
         }
     }
 }
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index 32e096221..f460c6309 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -268,20 +268,22 @@ PlayListTrack *GroupedContainer::findTrack(int number) const
 
 void GroupedContainer::removeTrack(PlayListTrack *track)
 {
-    for(PlayListGroup *group : qAsConst(m_groups))
+    QList<PlayListGroup *>::iterator it = m_groups.begin();
+    while(it != m_groups.end())
     {
-        if(group->contains(track))
+        if((*it)->contains(track))
         {
-            group->trackList.removeAll(track);
+            (*it)->trackList.removeAll(track);
             m_items.removeAll(track);
-            if(group->isEmpty())
+            if((*it)->isEmpty())
             {
-                m_groups.removeAll(group);
-                m_items.removeAll(group);
-                delete group;
+                m_groups.removeAll(*it);
+                m_items.removeAll(*it);
+                delete *it;
             }
             return;
         }
+        ++it;
     }
 }
 
@@ -320,7 +322,7 @@ bool GroupedContainer::move(QList<int> indexes, int from, int to)
     if(!group)
         return false;
 
-    for(const int &i : qAsConst(indexes))
+    for(int i : qAsConst(indexes))
     {
         if(i <= firstIndex || i > lastIndex)
             return false;
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index d04c6de15..dc6145480 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -349,7 +349,7 @@ void PlayListManager::writePlayLists()
         plFile.write(QString("playlist=%1\n").arg(model->name()).toUtf8());
         if(model->isEmpty())
             continue;
-        QList<PlayListItem *> items = model->items();
+        const QList<PlayListItem *> items = model->items();
         plFile.write(QString("current=%1\n").arg(model->indexOfTrack(model->currentIndex())).toUtf8());
         for(PlayListItem *m : qAsConst(items))
         {
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 876c42e84..4d3cb040d 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -815,7 +815,7 @@ QList<PlayListItem *> PlayListModel::items() const
 
 void PlayListModel::addToQueue()
 {
-    QList<PlayListTrack*> selected_tracks = selectedTracks();
+    const QList<PlayListTrack*> selected_tracks = selectedTracks();
     blockSignals(true);
     for(PlayListTrack *track : qAsConst(selected_tracks))
         setQueued(track);
@@ -976,12 +976,17 @@ void PlayListModel::onTaskFinished()
                 flags |= STOP_AFTER;
             }
 
-            for(PlayListTrack *t : qAsConst(m_queued_songs))
+            QList<PlayListTrack *>::iterator it = m_queued_songs.begin();
+            while(it != m_queued_songs.end())
             {
-                if(!m_container->contains(t))
+                if(!m_container->contains(*it))
                 {
                     flags |= QUEUE;
-                    m_queued_songs.removeAll(t);
+                    it = m_queued_songs.erase(it);
+                }
+                else
+                {
+                    ++it;
                 }
             }
 
diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp
index 656000245..da2e64eec 100644
--- a/src/qmmpui/playlistparser.cpp
+++ b/src/qmmpui/playlistparser.cpp
@@ -121,7 +121,7 @@ QList<PlayListTrack *> PlayListParser::loadPlaylist(const QString &f_name)
         return QList<PlayListTrack *>();
     }
 
-    QList <PlayListTrack*> tracks = prs->decode(file.readAll());
+    const QList<PlayListTrack*> tracks = prs->decode(file.readAll());
 
     if(tracks.isEmpty())
     {
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index ab40c9e76..d326536f6 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -475,13 +475,18 @@ void PlayListTask::run()
         }
         //remove dublicate URLs and ignored files
         //this code prevents re-addition of cue tracks
-        for(PlayListTrack *t : qAsConst(m_new_tracks))
+        QList<PlayListTrack *>::iterator it = m_new_tracks.begin();
+        while(it != m_new_tracks.end())
         {
-            if((t->path().contains("://") && urls.contains(t->path())) ||
-                    ignoredFiles.contains(t->path()))
+            if(((*it)->path().contains("://") && urls.contains((*it)->path())) ||
+                    ignoredFiles.contains((*it)->path()))
             {
-                m_new_tracks.removeAll(t);
-                delete t;
+                delete (*it);
+                it = m_new_tracks.erase(it);
+            }
+            else
+            {
+                ++it;
             }
         }
     }