removed foreach macro

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

113 files changed, 418 insertions, 415 deletions

diff --git a/qmmp.pri b/qmmp.pri
index 980e63ea9..96f2cccc0 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -12,7 +12,7 @@ RCC_DIR=./.build/rcc
 
 #Defines
 
-DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS
+DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS QT_NO_FOREACH
 unix:DEFINES += QMMP_WS_X11
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 QT_DEPRECATED_WARNINGS
 
diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp
index 86751f5df..5cbd90f66 100644
--- a/src/app/builtincommandlineoption.cpp
+++ b/src/app/builtincommandlineoption.cpp
@@ -101,7 +101,7 @@ QString BuiltinCommandLineOption::executeCommand(const QString &option_string, c
         if(args.isEmpty())
             return out;
         QStringList full_path_list, remote_pls_list;
-        foreach(QString s, args)
+        for(const QString &s : qAsConst(args))
         {
 #ifdef Q_OS_WIN
             s.replace("\\","/");
@@ -232,7 +232,7 @@ QHash <QString, QStringList> BuiltinCommandLineOption::splitArgs(const QStringLi
 {
     QHash <QString, QStringList> commands;
     QString lastCmd;
-    foreach(QString arg, args)
+    for(const QString &arg : qAsConst(args))
     {
         QString cmd = arg.trimmed();
         if(cmd.startsWith("-") || cmd.startsWith("--"))
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index 76967b34f..e3a8c8139 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -97,7 +97,7 @@ QMMPStarter::QMMPStarter() : QObject()
 
     if(!commands.isEmpty())
     {
-        foreach(QString key, commands.keys())
+        for(const QString &key : commands.keys())
         {
             CommandLineHandler::OptionFlags flags;
             if(!m_option_manager->identify(key) &&
@@ -368,7 +368,7 @@ QString QMMPStarter::processCommandArgs(const QStringList &slist, const QString&
     if(slist.isEmpty())
         return QString();
     QStringList paths;
-    foreach(QString arg, slist) //detect file/directory paths
+    for(const QString &arg : qAsConst(slist)) //detect file/directory paths
     {
         if(arg.startsWith("-"))
             break;
@@ -383,7 +383,7 @@ QString QMMPStarter::processCommandArgs(const QStringList &slist, const QString&
         return QString();
 
     QString out;
-    foreach(QString key, commands.keys())
+    for(const QString &key : commands.keys())
     {
         if(key == "--no-start" || key == "--ui")
             continue;
@@ -408,7 +408,7 @@ void QMMPStarter::printUsage()
     cout << qPrintable(tr("Usage: qmmp [options] [files]")) << endl;
     cout << qPrintable(tr("Options:")) << endl;
     cout << "--------" << endl;
-    foreach (QString line, m_option_manager->helpString())
+    for(const QString &line : m_option_manager->helpString())
         cout << qPrintable(CommandLineManager::formatHelpString(line) ) << endl;
     CommandLineManager::printUsage();
     QStringList extraHelp;
@@ -421,7 +421,7 @@ void QMMPStarter::printUsage()
     extraHelp << tr("Home page: %1").arg("http://qmmp.ylsoftware.com");
     extraHelp << tr("Development page: %1").arg("https://sourceforge.net/p/qmmp-dev");
     extraHelp << tr("Bug tracker: %1").arg("https://sourceforge.net/p/qmmp-dev/tickets");
-    foreach (QString line, extraHelp)
+    for(const QString &line : qAsConst(extraHelp))
         cout << qPrintable(CommandLineManager::formatHelpString(line)) << endl;
 #ifdef Q_OS_WIN
     string text = tmp_stream.str();
@@ -456,7 +456,7 @@ void QMMPStarter::printUserInterfaces()
     tmp_stream.copyfmt(cout);
     streambuf* old_stream = cout.rdbuf(tmp_stream.rdbuf());
 #endif
-    foreach (QString name, UiLoader::names())
+    for(const QString &name : UiLoader::names())
         cout << qPrintable(name) << endl;
 #ifdef Q_OS_WIN
     string text = tmp_stream.str();
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 4b5bba8eb..e3e891f59 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -79,7 +79,7 @@ QString PlayListOption::executeCommand(int id, const QStringList &args)
                 << helpString(PL_SHUFFLE_TOGGLE)
                 << helpString(PL_STATE);
 
-        foreach (QString line, list)
+        for(const QString &line : qAsConst(list))
             out += CommandLineManager::formatHelpString(line) + "\n";
     }
         break;
diff --git a/src/plugins/Effect/ladspa/ladspahost.cpp b/src/plugins/Effect/ladspa/ladspahost.cpp
index b962f3d81..8688ab756 100644
--- a/src/plugins/Effect/ladspa/ladspahost.cpp
+++ b/src/plugins/Effect/ladspa/ladspahost.cpp
@@ -56,7 +56,7 @@ LADSPAHost::LADSPAHost(QObject *parent) : QObject(parent)
         int id = settings.value("id").toInt();
 
         LADSPAPlugin *plugin = nullptr;
-        foreach(LADSPAPlugin *p, plugins())
+        for(LADSPAPlugin *p : plugins())
         {
             if(p->unique_id == id)
             {
@@ -68,7 +68,7 @@ LADSPAHost::LADSPAHost(QObject *parent) : QObject(parent)
             continue;
 
         LADSPAEffect *effect = createEffect(plugin);
-        foreach (LADSPAControl *c, effect->controls)
+        for(LADSPAControl *c : qAsConst(effect->controls))
             c->value = settings.value(QString("port%1").arg(c->port), c->value).toFloat();
 
         m_effects.append(effect);
@@ -92,7 +92,7 @@ LADSPAHost::~LADSPAHost()
 
         settings.setValue("id", (quint64)m_effects[i]->plugin->desc->UniqueID);
 
-        foreach (LADSPAControl *c, m_effects[i]->controls)
+        for(const LADSPAControl *c : qAsConst(m_effects[i]->controls))
             settings.setValue(QString("port%1").arg(c->port), c->value);
 
         settings.endGroup();
@@ -105,7 +105,7 @@ void LADSPAHost::configure(quint32 freq, int chan)
     m_chan = chan;
     m_freq = freq;
 
-    foreach (LADSPAEffect *e, m_effects)
+    for(LADSPAEffect *e : qAsConst(m_effects))
     {
         //deactivate effect
         deactivateEffect(e);
@@ -149,7 +149,7 @@ void LADSPAHost::loadModules()
     }
     else
         directories = ladspa_path.split(':');
-    foreach(QString dir, directories)
+    for(const QString &dir : qAsConst(directories))
         findModules(dir);
 }
 
@@ -160,7 +160,7 @@ void LADSPAHost::findModules(const QString &path)
     dir.setSorting(QDir::Name);
     QFileInfoList files = dir.entryInfoList((QStringList() << "*.so"));
 
-    foreach(QFileInfo file, files)
+    for(const QFileInfo &file : qAsConst(files))
     {
         void *library = dlopen(qPrintable(file.absoluteFilePath ()), RTLD_LAZY);
         if (!library)
@@ -359,15 +359,15 @@ void LADSPAHost::activateEffect(LADSPAEffect *e)
     {
         LADSPA_Handle handle = desc->instantiate(desc, m_freq);
 
-        foreach (LADSPAControl *c, e->controls)
+        for(LADSPAControl *c : qAsConst(e->controls))
         {
             desc->connect_port(handle, c->port, &c->value);
         }
-        foreach (int port, e->in_ports)
+        for(int port : qAsConst(e->in_ports))
         {
             desc->connect_port(handle, port, m_buf[in_at++]);
         }
-        foreach (int port, e->out_ports)
+        for(int port : qAsConst(e->out_ports))
         {
             desc->connect_port(handle, port, m_buf[out_at++]);
         }
@@ -381,7 +381,7 @@ void LADSPAHost::activateEffect(LADSPAEffect *e)
 void LADSPAHost::deactivateEffect(LADSPAEffect *e)
 {
     const LADSPA_Descriptor *desc = e->plugin->desc;
-    foreach (LADSPA_Handle handle, e->handles)
+    for(const LADSPA_Handle &handle : qAsConst(e->handles))
     {
         if(desc->deactivate)
             desc->deactivate(handle);
diff --git a/src/plugins/Effect/ladspa/settingsdialog.cpp b/src/plugins/Effect/ladspa/settingsdialog.cpp
index ab52723a3..877b3098e 100644
--- a/src/plugins/Effect/ladspa/settingsdialog.cpp
+++ b/src/plugins/Effect/ladspa/settingsdialog.cpp
@@ -106,7 +106,7 @@ void SettingsDialog::on_configureButton_clicked()
     LADSPASlider *slider = nullptr;
     QLabel *label = nullptr;
 
-    foreach(LADSPAControl *c, effect->controls)
+    for(LADSPAControl *c : qAsConst(effect->controls))
     {
         switch ((int) c->type)
         {
@@ -146,6 +146,6 @@ void SettingsDialog::accept()
 void SettingsDialog::updateRunningPlugins()
 {
     m_ui->runningListWidget->clear();
-    foreach(LADSPAEffect *e, LADSPAHost::instance()->effects())
+    for(LADSPAEffect *e : LADSPAHost::instance()->effects())
         m_ui->runningListWidget->addItem(e->plugin->desc->Name);
 }
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp
index 70c2097b5..90b69cfd5 100644
--- a/src/plugins/Engines/mplayer/mplayerengine.cpp
+++ b/src/plugins/Engines/mplayer/mplayerengine.cpp
@@ -66,7 +66,7 @@ TrackInfo *MplayerInfo::createTrackInfo(const QString &path)
     QString str = QString::fromLocal8Bit(mplayer_process.readAll()).trimmed();
     TrackInfo *info = new TrackInfo(path);
     QStringList lines = str.split("\n");
-    foreach(QString line, lines)
+    for(const QString &line : qAsConst(lines))
     {
         if(rx_id_length.indexIn(line) > -1)
             info->setDuration((qint64) rx_id_length.cap(1).toDouble() * 1000);
@@ -124,7 +124,7 @@ bool MplayerEngine::enqueue(InputSource *source)
 {
     QStringList filters = MplayerInfo::filters();
     bool supports = false;
-    foreach(QString filter, filters)
+    for(const QString &filter : qAsConst(filters))
     {
         QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard);
         supports = regexp.exactMatch(source->path());
@@ -203,9 +203,8 @@ void MplayerEngine::setMuted(bool muted)
 
 void MplayerEngine::readStdOut()
 {
-    QString line = QString::fromLocal8Bit(m_process->readAll ()).trimmed();
-    QStringList lines = line.split("\n");
-    foreach(line, lines)
+    const QStringList lines = QString::fromLocal8Bit(m_process->readAll()).trimmed().split("\n");
+    for(const QString &line : lines)
     {
         if (rx_av.indexIn(line) > -1)
         {
diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
index ec20eb867..33493dfa4 100644
--- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
+++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
@@ -44,7 +44,7 @@ EngineProperties MplayerEngineFactory::properties() const
 bool MplayerEngineFactory::supports(const QString &source) const
 {
     QStringList filters = MplayerInfo::filters();
-    foreach(QString filter, filters)
+    for(const QString &filter : qAsConst(filters))
     {
         QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard);
         if (regexp.exactMatch(source))
diff --git a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
index e1592a3ab..1f9aaf823 100644
--- a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
+++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
@@ -56,7 +56,7 @@ QList<MetaDataItem> MplayerMetaDataModel::extraProperties() const
     //mplayer std output parsing
     QRegExp rx_id("^(ID_.*)=(.*)");
     QMap<QString, QString> params;
-    foreach(QString line, lines)
+    for(const QString &line : qAsConst(lines))
     {
         if(rx_id.indexIn(line.trimmed()) > -1)
             params.insert(rx_id.cap(1), rx_id.cap(2));
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
index a433ded9e..6e4cd08d9 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
@@ -116,9 +116,9 @@ QStringList QmmpFileDialogImpl::selectedFiles ()
     }
     else
     {
-        QModelIndexList ml = fileListView->selectionModel()->selectedIndexes();
-        foreach(QModelIndex i,ml)
-        l << m_model->filePath(i);
+        const QModelIndexList ml = fileListView->selectionModel()->selectedIndexes();
+        for(const QModelIndex &i : ml)
+            l << m_model->filePath(i);
     }
     return l;
 }
@@ -233,7 +233,7 @@ void QmmpFileDialogImpl::on_addPushButton_clicked()
             ml = fileListView->selectionModel()->selectedIndexes();
         else
             ml = treeView->selectionModel()->selectedIndexes();
-        foreach(QModelIndex i,ml)
+       for(const QModelIndex &i : qAsConst(ml))
         {
             if (!l.contains(m_model->filePath(i)))
                 l << m_model->filePath(i);
@@ -315,7 +315,7 @@ void QmmpFileDialogImpl::setModeAndMask(const QString& d,FileDialog::Mode m, con
 void QmmpFileDialogImpl::loadMountedVolumes()
 {
     mountPointsListWidget->clear();
-    foreach (QStorageInfo i, QStorageInfo::mountedVolumes())
+    for(const QStorageInfo &i : QStorageInfo::mountedVolumes())
     {
         if(i.fileSystemType() == "tmpfs")
             continue;
@@ -369,7 +369,7 @@ void QmmpFileDialogImpl::updateSelection ()
         ml = treeView->selectionModel()->selectedIndexes();
     QStringList l;
     QStringList files;
-    foreach(QModelIndex i,ml)
+    for(const QModelIndex &i : qAsConst(ml))
     {
         if (!l.contains(m_model->filePath(i).section("/", -1)))
         {
@@ -394,9 +394,9 @@ void QmmpFileDialogImpl::updateSelection ()
         if (m_mode == FileDialog::AddFiles || m_mode == FileDialog::AddFile/* || FileDialog::SaveFile*/)
         {
             addPushButton->setEnabled(true);
-            foreach(str, files)
+            for(const QString &file : qAsConst(files))
             {
-                if (QFileInfo(str).isDir())
+                if (QFileInfo(file).isDir())
                 {
                     addPushButton->setEnabled(false);
                     break;
@@ -445,7 +445,7 @@ void QmmpFileDialogImpl::addFiles(const QStringList &list)
         //check file extension
         QString f_name = fileNameLineEdit->text();
         bool contains = false;
-        foreach(QString str, qt_clean_filter_list(fileTypeComboBox->currentText()))
+        for(const QString &str : qt_clean_filter_list(fileTypeComboBox->currentText()))
         {
             QRegExp regExp(str);
             regExp.setPatternSyntax(QRegExp::Wildcard);
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp
index 8ae32f3ac..9acb4a43b 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp
@@ -105,7 +105,7 @@ QStringList TwoPanelFileDialogImpl::selectedFiles() const
     }
     else if(m_mode == FileDialog::AddDir || m_mode == FileDialog::AddDirs)
     {
-        foreach (QModelIndex index, m_ui.dirListView->selectionModel()->selectedRows(0))
+        for(const QModelIndex &index : m_ui.dirListView->selectionModel()->selectedRows(0))
         {
             if(index.isValid() && (m_dirModel->fileName(index) != ".."))
             {
@@ -115,7 +115,7 @@ QStringList TwoPanelFileDialogImpl::selectedFiles() const
     }
     else
     {
-        foreach (QListWidgetItem *item, m_ui.fileListWidget->selectedItems())
+        for(const QListWidgetItem *item : m_ui.fileListWidget->selectedItems())
         {
             l << item->data(Qt::UserRole).toString();
         }
@@ -156,7 +156,7 @@ void TwoPanelFileDialogImpl::updateFileSelection ()
 
     QStringList names;
 
-    foreach(QString path, paths)
+    for(const QString &path : qAsConst(paths))
     {
         QString name = QFileInfo(path).fileName();
         if (!names.contains(name))
@@ -182,9 +182,9 @@ void TwoPanelFileDialogImpl::updateFileSelection ()
     if(m_mode == FileDialog::AddFiles || m_mode == FileDialog::AddDirsFiles || m_mode == FileDialog::AddFile
             || m_mode == FileDialog::PlayDirsFiles)
     {
-        foreach(str, paths)
+        for(const QString &path : qAsConst(paths))
         {
-            if(QFileInfo(str).isFile())
+            if(QFileInfo(path).isFile())
             {
                 m_ui.playButton->setEnabled(true);
                 break;
@@ -382,7 +382,7 @@ void TwoPanelFileDialogImpl::updateFileList(const QString &path)
     dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     dir.setSorting(QDir::Name);
 
-    foreach (QFileInfo info, dir.entryInfoList(m_filters))
+    for(const QFileInfo &info : dir.entryInfoList(m_filters))
     {
         QListWidgetItem *item = new QListWidgetItem(info.fileName());
         item->setIcon(m_dirModel->iconProvider()->icon(info));
@@ -428,7 +428,7 @@ void TwoPanelFileDialogImpl::addFiles(const QStringList &list, bool play)
         //check file extension
         QString f_name = m_ui.fileNameLineEdit->text();
         bool contains = false;
-        foreach(QString str, qt_clean_filter_list(m_ui.fileTypeComboBox->currentText()))
+        for(const QString &str : qt_clean_filter_list(m_ui.fileTypeComboBox->currentText()))
         {
             QRegExp regExp(str);
             regExp.setPatternSyntax(QRegExp::Wildcard);
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index fc4916c7d..90de6aca1 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -44,7 +44,7 @@ ConverterDialog::ConverterDialog(QList <PlayListTrack *> tracks,  QWidget *paren
 
     QStringList paths;
     MetaDataFormatter formatter("%if(%p&%t,%p - %t,%f) - %l");
-    foreach(PlayListTrack *track, tracks)
+    for(const PlayListTrack *track : qAsConst(tracks))
     {
         //skip streams
         if(track->duration() == 0 || track->path().contains("://"))
@@ -148,7 +148,7 @@ void ConverterDialog::on_stopButton_clicked()
     if(m_converters.isEmpty())
         return;
 
-    foreach(Converter *c, m_converters)
+    for(Converter *c : qAsConst(m_converters))
         c->stop();
     QThreadPool::globalInstance()->waitForDone();
     qDeleteAll(m_converters);
@@ -287,7 +287,7 @@ void ConverterDialog::readPresets(const QString &path)
             dataList.last()[key] = value;
     }
 
-    foreach(QVariantMap data, dataList)
+    for(QVariantMap data : qAsConst(dataList))
     {
         data["read_only"] = path.startsWith(":/");
         QString title = data["name"].toString();
diff --git a/src/plugins/General/copypaste/copypaste.cpp b/src/plugins/General/copypaste/copypaste.cpp
index e3401d5aa..c2ef73565 100644
--- a/src/plugins/General/copypaste/copypaste.cpp
+++ b/src/plugins/General/copypaste/copypaste.cpp
@@ -65,7 +65,7 @@ void CopyPaste::cut()
     qDebug("%s", Q_FUNC_INFO);
     qDeleteAll(m_buffer);
     m_buffer.clear();
-    foreach(PlayListTrack *track,  m_pl_manager->selectedPlayList()->selectedTracks())
+    for(PlayListTrack *track : m_pl_manager->selectedPlayList()->selectedTracks())
     {
         m_buffer.append(new PlayListTrack(*track));
     }
@@ -77,7 +77,7 @@ void CopyPaste::copy()
     qDebug("%s", Q_FUNC_INFO);
     qDeleteAll(m_buffer);
     m_buffer.clear();
-    foreach(PlayListTrack *track,  m_pl_manager->selectedPlayList()->selectedTracks())
+    for(PlayListTrack *track : m_pl_manager->selectedPlayList()->selectedTracks())
     {
         m_buffer.append(new PlayListTrack(*track));
     }
@@ -86,7 +86,7 @@ void CopyPaste::copy()
 void CopyPaste::paste()
 {
     qDebug("%s", Q_FUNC_INFO);
-    foreach(PlayListTrack *track,  m_buffer)
+    for(const PlayListTrack *track : qAsConst( m_buffer))
     {
         m_pl_manager->selectedPlayList()->add(new PlayListTrack(*track));
     }
diff --git a/src/plugins/General/covermanager/coverwidget.cpp b/src/plugins/General/covermanager/coverwidget.cpp
index 87169b376..b41f70293 100644
--- a/src/plugins/General/covermanager/coverwidget.cpp
+++ b/src/plugins/General/covermanager/coverwidget.cpp
@@ -50,7 +50,7 @@ CoverWidget::CoverWidget(QWidget *parent)
     //settings
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_size = settings.value("CoverManager/size", 0).toInt();
-    foreach(QAction *a, sizeMenu->actions ())
+    for(QAction *a : sizeMenu->actions ())
     {
         a->setCheckable(true);
         if(a->data().toInt() == m_size)
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 16058fdc9..a6478438b 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -113,7 +113,7 @@ void FileOps::execAction(int n)
                                    QMessageBox::Yes | QMessageBox::No) !=  QMessageBox::Yes)
             break;
 
-        foreach(PlayListTrack *track, tracks)
+        for(PlayListTrack *track : qAsConst(tracks))
         {
             if (QFile::exists(track->path()) && QFile::remove(track->path()))
                 model->removeTrack(track);
@@ -151,7 +151,7 @@ void FileOps::copy(QList<PlayListTrack *> tracks, const QString &dest, MetaDataF
     progress.show();
     progress.setAutoClose (false);
     int i  = 0;
-    foreach(PlayListTrack *track, tracks)
+    for(const PlayListTrack *track : qAsConst(tracks))
     {
         if (!QFile::exists(track->path()))
             continue;
@@ -207,9 +207,9 @@ void FileOps::copy(QList<PlayListTrack *> tracks, const QString &dest, MetaDataF
     progress.close();
 }
 
-void FileOps::rename(QList<PlayListTrack *> tracks, MetaDataFormatter *formatter, PlayListModel *model)
+void FileOps::rename(const QList<PlayListTrack *> &tracks, MetaDataFormatter *formatter, PlayListModel *model)
 {
-    foreach(PlayListTrack *track, tracks)
+    for(PlayListTrack *track : qAsConst(tracks))
     {
         if (!QFile::exists(track->path())) //is it file?
             continue;
@@ -232,7 +232,7 @@ void FileOps::rename(QList<PlayListTrack *> tracks, MetaDataFormatter *formatter
     }
 }
 
-void FileOps::move(QList<PlayListTrack *> tracks, const QString &dest, MetaDataFormatter *formatter, PlayListModel *model)
+void FileOps::move(const QList<PlayListTrack *> &tracks, const QString &dest, MetaDataFormatter *formatter, PlayListModel *model)
 {
     QProgressDialog progress(qApp->activeWindow ());
     progress.setWindowModality(Qt::WindowModal);
@@ -241,7 +241,7 @@ void FileOps::move(QList<PlayListTrack *> tracks, const QString &dest, MetaDataF
     progress.show();
     progress.setAutoClose (false);
     int i  = 0;
-    foreach(PlayListTrack *track, tracks)
+    for(PlayListTrack *track : qAsConst(tracks))
     {
         if (!QFile::exists(track->path()))
             continue;
diff --git a/src/plugins/General/fileops/fileops.h b/src/plugins/General/fileops/fileops.h
index 0ad1fa27e..6fe500ab0 100644
--- a/src/plugins/General/fileops/fileops.h
+++ b/src/plugins/General/fileops/fileops.h
@@ -54,9 +54,9 @@ private slots:
 
 private:
     void copy(QList<PlayListTrack*> tracks, const QString &dest, MetaDataFormatter *formatter);
-    void rename(QList<PlayListTrack*> tracks, MetaDataFormatter *formatter,
+    void rename(const QList<PlayListTrack *> &tracks, MetaDataFormatter *formatter,
                 PlayListModel *model);
-    void move(QList<PlayListTrack*> tracks, const QString &dest, MetaDataFormatter *formatter,
+    void move(const QList<PlayListTrack*> &tracks, const QString &dest, MetaDataFormatter *formatter,
               PlayListModel *model);
 
     QList <int> m_types;
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 5b795d3d5..ca1e0952a 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -47,7 +47,7 @@ HalPlugin::HalPlugin(QObject *parent) : QObject(parent)
     m_addFiles = false;
     //find existing devices
     QStringList udis = m_manager->findDeviceByCapability("volume");
-    foreach(QString udi, udis)
+    for(const QString &udi : qAsConst(udis))
     addDevice(udi);
     //load remaining settings
     m_addTracks = settings.value("add_tracks", false).toBool();
@@ -63,7 +63,7 @@ HalPlugin::~HalPlugin()
 
 void HalPlugin::removeDevice(const QString &udi)
 {
-    foreach(HalDevice *device, m_devices)
+    for(HalDevice *device : qAsConst(m_devices))
     {
         if (device->udi() == udi)
         {
@@ -78,7 +78,7 @@ void HalPlugin::removeDevice(const QString &udi)
 
 void HalPlugin::addDevice(const QString &udi)
 {
-    foreach(HalDevice *device, m_devices) //is it already exists?
+    for(const HalDevice *device : qAsConst(m_devices)) //is it already exists?
     {
         if (device->udi() == udi)
             return;
@@ -141,7 +141,7 @@ void HalPlugin::addDevice(const QString &udi)
 void HalPlugin::updateActions()
 {
     // add action for cd audio or mounted volume
-    foreach(HalDevice *device, m_devices)
+    for(HalDevice *device : qAsConst(m_devices))
     {
         QStringList caps = device->property("info.capabilities").toStringList();
         QString dev_path;
@@ -184,7 +184,7 @@ void HalPlugin::updateActions()
         }
     }
     // remove action if device is unmounted/removed
-    foreach(QAction *action, m_actions->actions ())
+    for(QAction *action :m_actions->actions ())
     {
         if (!findDevice(action))
         {
@@ -205,7 +205,7 @@ void HalPlugin::processAction(QAction *action)
 
 QAction *HalPlugin::findAction(const QString &dev_path)
 {
-    foreach(QAction *action, m_actions->actions ())
+    for(QAction *action : m_actions->actions())
     {
         if (action->data().toString() == dev_path)
             return action;
@@ -215,7 +215,7 @@ QAction *HalPlugin::findAction(const QString &dev_path)
 
 HalDevice *HalPlugin::findDevice(QAction *action)
 {
-    foreach(HalDevice *device, m_devices)
+    for(HalDevice *device : qAsConst(m_devices))
     {
         QStringList caps = device->property("info.capabilities").toStringList();
         QString dev_path;
@@ -239,11 +239,11 @@ void HalPlugin::addPath(const QString &path)
 {
     PlayListModel *model = PlayListManager::instance()->selectedPlayList();
 
-    foreach(PlayListItem *item, model->items()) // Is it already exist?
+    for(const PlayListItem *item : model->items()) // Is it already exist?
     {
         if(item->isGroup())
             continue;
-        if (dynamic_cast<PlayListTrack *>(item)->path().startsWith(path))
+        if (dynamic_cast<const PlayListTrack *>(item)->path().startsWith(path))
             return;
     }
 
diff --git a/src/plugins/General/hotkey/hotkeydialog.cpp b/src/plugins/General/hotkey/hotkeydialog.cpp
index e522acc77..4d0c9ac00 100644
--- a/src/plugins/General/hotkey/hotkeydialog.cpp
+++ b/src/plugins/General/hotkey/hotkeydialog.cpp
@@ -38,7 +38,7 @@ void HotkeyDialog::keyPressEvent (QKeyEvent *event)
 {
     m_key = HotkeyManager::keycodeToKeysym(event->nativeScanCode ());
     m_modifiers = event->nativeModifiers ();
-    foreach(long mask_mod, HotkeyManager::ignModifiersList())
+    for(long mask_mod : HotkeyManager::ignModifiersList())
         m_modifiers &= ~mask_mod; //remove ignored modifiers (num lock, caps lock, etc)
 
     m_ui.keyLineEdit->setText(HotkeyManager::getKeyString(m_key, m_modifiers));
diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp
index aa0cdd6b5..950b57438 100644
--- a/src/plugins/General/hotkey/hotkeymanager_win.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp
@@ -226,7 +226,7 @@ bool HotkeyManager::nativeEventFilter(const QByteArray &eventType, void *message
     {

         SoundCore *core = SoundCore::instance();

         MediaPlayer *player = MediaPlayer::instance();

-        foreach(Hotkey *hotkey, m_grabbedKeys)

+        for(const Hotkey *hotkey : qAsConst(m_grabbedKeys))

         {

             if(hotkey->id != m->wParam)

                 continue;

diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp
index 26aac352b..6819523c6 100644
--- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp
@@ -95,7 +95,7 @@ HotkeyManager::HotkeyManager(QObject *parent) : QObject(parent)
 
         if (key)
         {
-            foreach(long mask_mod, ignModifiersList())
+            for(long mask_mod : ignModifiersList())
             {
                 Hotkey *hotkey = new Hotkey;
                 hotkey->action = i;
@@ -155,7 +155,7 @@ bool HotkeyManager::nativeEventFilter(const QByteArray &eventType, void *message
         quint32 mod = ke->state;
         SoundCore *core = SoundCore::instance();
         MediaPlayer *player = MediaPlayer::instance();
-        foreach(Hotkey *hotkey, m_grabbedKeys)
+        for(const Hotkey *hotkey : qAsConst(m_grabbedKeys))
         {
             if (hotkey->key != key || hotkey->mod != mod)
                 continue;
diff --git a/src/plugins/General/hotkey/settingsdialog.cpp b/src/plugins/General/hotkey/settingsdialog.cpp
index 7a5bd612d..1255790e2 100644
--- a/src/plugins/General/hotkey/settingsdialog.cpp
+++ b/src/plugins/General/hotkey/settingsdialog.cpp
@@ -75,7 +75,7 @@ void SettingsDialog::accept()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Hotkey");
-    foreach(Hotkey *k, m_hotkeys)
+    for(const Hotkey *k : qAsConst(m_hotkeys))
     {
         settings.setValue(QString("key_%1").arg(k->action), k->key);
         settings.setValue(QString("modifiers_%1").arg(k->action), k->mod);
@@ -86,16 +86,19 @@ void SettingsDialog::accept()
 
 void SettingsDialog::on_tableWidget_itemDoubleClicked (QTableWidgetItem *item)
 {
-    Hotkey *k = nullptr;
-    foreach(k, m_hotkeys)
+    Hotkey *key = nullptr;
+    for(Hotkey *k : m_hotkeys)
     {
         if (k->action == item->type())
+        {
+            key = k;
             break;
+        }
     }
-    if (!k)
+    if (!key)
         return;
 
-    HotkeyDialog *dialog = new HotkeyDialog(k->key, k->mod, this);
+    HotkeyDialog *dialog = new HotkeyDialog(key->key, key->mod, this);
     if (item->type() >= QTableWidgetItem::UserType &&
             dialog->exec() == QDialog::Accepted)
     {
@@ -104,8 +107,8 @@ void SettingsDialog::on_tableWidget_itemDoubleClicked (QTableWidgetItem *item)
         if(keyString.isEmpty() || items.isEmpty() || items.first() == item)
         {
             item->setText(keyString);
-            k->key = dialog->keySym ();
-            k->mod = dialog->nativeModifiers ();
+            key->key = dialog->keySym ();
+            key->mod = dialog->nativeModifiers ();
         }
         else
             QMessageBox::warning(this, tr("Warning"), tr("Key sequence '%1' is already used").arg(keyString));
diff --git a/src/plugins/General/listenbrainz/payloadcache.cpp b/src/plugins/General/listenbrainz/payloadcache.cpp
index f9e305c66..f142cbd7e 100644
--- a/src/plugins/General/listenbrainz/payloadcache.cpp
+++ b/src/plugins/General/listenbrainz/payloadcache.cpp
@@ -129,7 +129,7 @@ void PayloadCache::save(const QList<TrackMetaData> &songs)
         qWarning("PayloadCache: error %d: %s", file.error(), qPrintable(file.errorString()));
         return;
     }
-    foreach(TrackMetaData m, songs)
+    for(const TrackMetaData &m : qAsConst(songs))
     {
         file.write(QString("title=%1").arg(m.value(Qmmp::TITLE)).toUtf8() +"\n");
         file.write(QString("artist=%1").arg(m.value(Qmmp::ARTIST)).toUtf8() +"\n");
diff --git a/src/plugins/General/mpris/player2object.cpp b/src/plugins/General/mpris/player2object.cpp
index 7773d86ae..e1b511be5 100644
--- a/src/plugins/General/mpris/player2object.cpp
+++ b/src/plugins/General/mpris/player2object.cpp
@@ -313,7 +313,7 @@ void Player2Object::emitPropertiesChanged()
     syncProperties();
 
     QVariantMap map;
-    foreach(QByteArray name, changedProps)
+    for(const QByteArray &name : qAsConst(changedProps))
         map.insert(name, m_props.value(name));
 
     QDBusMessage msg = QDBusMessage::createSignal("/org/mpris/MediaPlayer2",
diff --git a/src/plugins/General/mpris/root2object.cpp b/src/plugins/General/mpris/root2object.cpp
index a7e9bdd50..dfc7b8edb 100644
--- a/src/plugins/General/mpris/root2object.cpp
+++ b/src/plugins/General/mpris/root2object.cpp
@@ -64,9 +64,9 @@ QString Root2Object::identity() const
 QStringList Root2Object::supportedMimeTypes() const
 {
     QStringList mimeTypes;
-    foreach(DecoderFactory *factory, Decoder::enabledFactories())
+    for(const DecoderFactory *factory : Decoder::enabledFactories())
         mimeTypes << factory->properties().contentTypes;
-    foreach(EngineFactory *factory, AbstractEngine::enabledFactories())
+    for(const EngineFactory *factory : AbstractEngine::enabledFactories())
         mimeTypes << factory->properties().contentTypes;
     mimeTypes.removeDuplicates();
     return mimeTypes;
diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp
index 1ad9e6a19..62b4b5641 100644
--- a/src/plugins/General/notifier/notifier.cpp
+++ b/src/plugins/General/notifier/notifier.cpp
@@ -138,7 +138,7 @@ void Notifier::showMetaData()
     data.append(m_core->metaData(Qmmp::TRACK).toUtf8()+"\n");
     data.append(QString("%1").arg(m_core->duration()/1000).toUtf8()+"\n");
 
-    foreach(QString path, m_psiTuneFiles)
+    for(const QString &path : qAsConst(m_psiTuneFiles))
     {
         QDir tuneDir = QFileInfo(path).absoluteDir();
         if(!tuneDir.exists())
@@ -170,7 +170,7 @@ void Notifier::removePsiTuneFiles()
 {
     if(m_psi) //clear psi notification
     {
-        foreach(QString path, m_psiTuneFiles)
+        for(const QString &path : qAsConst(m_psiTuneFiles))
             QFile::remove(path);
     }
 }
diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp
index af5fcaad3..22dd32334 100644
--- a/src/plugins/General/notifier/settingsdialog.cpp
+++ b/src/plugins/General/notifier/settingsdialog.cpp
@@ -73,7 +73,7 @@ void SettingsDialog::accept()
     settings.beginGroup("Notifier");
     settings.setValue ("message_delay", m_ui.messageDelaySpinBox->value());
     uint pos = PopupWidget::BOTTOMLEFT;
-    foreach (QPushButton *button, m_buttons.values())
+    for(QPushButton *button : m_buttons.values())
     {
         if(button->isChecked())
             pos = m_buttons.key(button);
diff --git a/src/plugins/General/rdetect/removablehelper.cpp b/src/plugins/General/rdetect/removablehelper.cpp
index ad4f37a7a..0e891f5ca 100644
--- a/src/plugins/General/rdetect/removablehelper.cpp
+++ b/src/plugins/General/rdetect/removablehelper.cpp
@@ -155,7 +155,7 @@ void RemovableHelper::updateActions()
         }

     }

     // remove action if device is unmounted/removed

-    foreach(QAction *action, m_actions->actions())

+    for(const QAction *action : m_actions->actions())

     {

         bool found = false;

 

@@ -188,7 +188,7 @@ void RemovableHelper::updateActions()
 

 QAction *RemovableHelper::findAction(const QString &dev_path)

 {

-    foreach(QAction *action, m_actions->actions())

+    for(const QAction *action : m_actions->actions())

     {

         if (action->data().toString() == dev_path)

             return action;

@@ -200,7 +200,7 @@ void RemovableHelper::addPath(const QString &path)
 {

     PlayListModel *model = PlayListManager::instance()->selectedPlayList();

 

-    foreach(PlayListItem *item, model->items()) // Is it already exist?

+    for(const PlayListItem *item : model->items()) // Is it already exist?

     {

         if(item->isGroup())

             continue;

diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp
index 78a5276d4..6faa1a225 100644
--- a/src/plugins/General/rgscan/rgscandialog.cpp
+++ b/src/plugins/General/rgscan/rgscandialog.cpp
@@ -58,7 +58,7 @@ RGScanDialog::RGScanDialog(QList <PlayListTrack *> tracks,  QWidget *parent) : Q
 
     QStringList paths;
     MetaDataFormatter formatter("%if(%p&%t,%p - %t,%f) - %l");
-    foreach(PlayListTrack *track, tracks)
+    for(const PlayListTrack *track : qAsConst(tracks))
     {
         //skip streams
         if(track->duration() == 0 || track->path().contains("://"))
@@ -163,7 +163,7 @@ void RGScanDialog::onScanFinished(QString url)
 
     bool stopped = true;
 
-    foreach (RGScanner *scanner, m_scanners)
+    for(const RGScanner *scanner : qAsConst(m_scanners))
     {
         if(scanner->isRunning() || scanner->isPending())
             stopped = false;
@@ -177,7 +177,7 @@ void RGScanDialog::onScanFinished(QString url)
         QMultiMap<QString, ReplayGainInfoItem*> itemGroupMap; //items grouped  by album
 
         //group by album name
-        foreach (RGScanner *scanner, m_scanners)
+        for(RGScanner *scanner : qAsConst(m_scanners))
         {
             if(!scanner->hasValues())
                 continue;
@@ -190,7 +190,7 @@ void RGScanDialog::onScanFinished(QString url)
             itemGroupMap.insert(album, item);
         }
         //calculate album peak and gain
-        foreach (QString album, itemGroupMap.keys())
+        for(const QString &album : itemGroupMap.keys())
         {
             QList<ReplayGainInfoItem*> items = itemGroupMap.values(album);
             GainHandle_t **a = (GainHandle_t **) malloc(items.count()*sizeof(GainHandle_t *));
@@ -202,7 +202,7 @@ void RGScanDialog::onScanFinished(QString url)
             }
             double album_gain = GetAlbumGain(a, items.count());
             free(a);
-            foreach (ReplayGainInfoItem *item, items)
+            for(ReplayGainInfoItem *item : qAsConst(items))
             {
                 item->info[Qmmp::REPLAYGAIN_ALBUM_PEAK] = album_peak;
                 item->info[Qmmp::REPLAYGAIN_ALBUM_GAIN] = album_gain;
@@ -220,7 +220,7 @@ void RGScanDialog::onScanFinished(QString url)
         {
             QString url = m_ui.tableWidget->item(i, 0)->data(Qt::UserRole).toString();
             bool found = false;
-            foreach (ReplayGainInfoItem *item, m_replayGainItemList)
+            for(const ReplayGainInfoItem *item : qAsConst(m_replayGainItemList))
             {
                 if(item->url == url)
                 {
@@ -256,7 +256,7 @@ void RGScanDialog::stop()
 {
     if(m_scanners.isEmpty())
         return;
-    foreach (RGScanner *scaner, m_scanners)
+    for(RGScanner *scaner : qAsConst(m_scanners))
     {
         scaner->stop();
     }
@@ -267,7 +267,7 @@ void RGScanDialog::stop()
 
 RGScanner *RGScanDialog::findScannerByUrl(const QString &url)
 {
-    foreach (RGScanner *scanner, m_scanners)
+    for(RGScanner *scanner : qAsConst(m_scanners))
     {
         if(scanner->url() == url)
             return scanner;
@@ -395,7 +395,7 @@ void RGScanDialog::on_writeButton_clicked()
 
     qDebug("RGScanDialog: writing ReplayGain values...");
 
-    foreach (ReplayGainInfoItem *item, m_replayGainItemList)
+    for(ReplayGainInfoItem *item : qAsConst(m_replayGainItemList))
     {
         QString ext = item->url.section(".", -1).toLower();
 
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index cc40e9c3f..510f2e6aa 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -298,7 +298,7 @@ void Scrobbler::submit()
     params.insert("sk", m_session);
 
     QStringList keys = params.keys();
-    foreach (QString key, keys) //removes empty keys
+    for(const QString &key : qAsConst(keys)) //removes empty keys
     {
         if(params.value(key).isEmpty() || params.value(key) == "0")
             params.remove(key);
@@ -309,7 +309,7 @@ void Scrobbler::submit()
 
     QUrlQuery body("");
     QByteArray data;
-    foreach (QString key, params.keys())
+    for(const QString &key : params.keys())
     {
         body.addQueryItem(key, params.value(key));
         data.append(key.toUtf8() + params.value(key).toUtf8());
@@ -347,7 +347,7 @@ void Scrobbler::sendNotification(const SongInfo &info)
     params.insert("method", "track.updateNowPlaying");
     params.insert("sk", m_session);
 
-    foreach (QString key, params) //removes empty keys
+    for(const QString &key : qAsConst(params)) //removes empty keys
     {
         if(params.value(key).isEmpty())
             params.remove(key);
@@ -358,7 +358,7 @@ void Scrobbler::sendNotification(const SongInfo &info)
 
     QUrlQuery body("");
     QByteArray data;
-    foreach (QString key, params.keys())
+    for(const QString &key : params.keys())
     {
         body.addQueryItem(key, params.value(key));
         data.append(key.toUtf8() + params.value(key).toUtf8());
@@ -469,7 +469,7 @@ void ScrobblerAuth::checkSession(const QString &session)
 
     QUrlQuery body("");
     QByteArray data;
-    foreach (QString key, params.keys())
+    for(const QString &key : params.keys())
     {
         body.addQueryItem(key, params.value(key));
         data.append(key.toUtf8() + params.value(key).toUtf8());
diff --git a/src/plugins/General/scrobbler/scrobblercache.cpp b/src/plugins/General/scrobbler/scrobblercache.cpp
index 05319e2a3..9ede37e67 100644
--- a/src/plugins/General/scrobbler/scrobblercache.cpp
+++ b/src/plugins/General/scrobbler/scrobblercache.cpp
@@ -129,7 +129,7 @@ void ListenCache::save(const QList<SongInfo> &songs)
         qWarning("ScrobblerCache: error %d: %s", file.error(), qPrintable(file.errorString()));
         return;
     }
-    foreach(SongInfo m, songs)
+    for(const SongInfo &m : qAsConst(songs))
     {
         file.write(QString("title=%1").arg(m.value(Qmmp::TITLE)).toUtf8() +"\n");
         file.write(QString("artist=%1").arg(m.value(Qmmp::ARTIST)).toUtf8() +"\n");
diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp
index 4c435c64d..50af945db 100644
--- a/src/plugins/General/statusicon/qmmptrayicon.cpp
+++ b/src/plugins/General/statusicon/qmmptrayicon.cpp
@@ -78,7 +78,7 @@ bool QmmpTrayIcon::hasToolTipEvent()
 {
     //checking for XEmbed system tray implementation
     //only this implementation is able to send QHelpEvent
-    foreach (QWindow *w, qApp->allWindows())
+    for(const QWindow *w : qApp->allWindows())
     {
         if(w->objectName() == "QSystemTrayIconSysWindow")
             return true;
diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp
index dc276e872..d668068d4 100644
--- a/src/plugins/General/streambrowser/streamwindow.cpp
+++ b/src/plugins/General/streambrowser/streamwindow.cpp
@@ -185,7 +185,7 @@ void StreamWindow::on_addPushButton_clicked()
     if(m_ui->tabWidget->currentIndex() == 0)
     {
         QModelIndexList indexes = m_ui->favoritesTableView->selectionModel()->selectedRows(0);
-        foreach(QModelIndex index, indexes)
+        for(const QModelIndex &index : qAsConst(indexes))
         {
             QModelIndex source_index = m_favoritesFilterModel->mapToSource(index);
             tracks << new PlayListTrack();
@@ -198,7 +198,7 @@ void StreamWindow::on_addPushButton_clicked()
     else
     {
         QModelIndexList indexes = m_ui->icecastTableView->selectionModel()->selectedRows(0);
-        foreach(QModelIndex index, indexes)
+        for(const QModelIndex &index : qAsConst(indexes))
         {
             QModelIndex source_index = m_iceCastFilterModel->mapToSource(index);
             tracks << new PlayListTrack();
@@ -235,7 +235,7 @@ void StreamWindow::execFavoritesMenu(const QPoint &pos)
 void StreamWindow::addToFavorites()
 {
     QModelIndexList indexes = m_ui->icecastTableView->selectionModel()->selectedRows(0);
-    foreach(QModelIndex index, indexes)
+    for(const QModelIndex &index : qAsConst(indexes))
     {
         QModelIndex source_index = m_iceCastFilterModel->mapToSource(index);
         int row = source_index.row();
@@ -309,7 +309,7 @@ void StreamWindow::removeFromFavorites()
         return;
     QModelIndexList indexes = m_ui->favoritesTableView->selectionModel()->selectedRows(0);
     QList<int> rows_to_remove;
-    foreach(QModelIndex index, indexes)
+    for(const QModelIndex &index : qAsConst(indexes))
     {
         rows_to_remove.append(m_favoritesFilterModel->mapToSource(index).row());
     }
diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp
index db0e88f85..e30ae16dd 100644
--- a/src/plugins/General/udisks2/udisks2device.cpp
+++ b/src/plugins/General/udisks2/udisks2device.cpp
@@ -90,7 +90,7 @@ QStringList UDisks2Device::mountPoints() const
 
     QList<QVariant> args = reply.arguments();
 
-    foreach (QVariant arg, args)
+    for(const QVariant &arg : qAsConst(args))
     {
         QByteArrayList list;
         QDBusArgument a = arg.value<QDBusVariant>().variant().value<QDBusArgument>();
@@ -98,7 +98,7 @@ QStringList UDisks2Device::mountPoints() const
             continue;
         a >> list;
 
-        foreach (QByteArray p, list)
+        for(const QByteArray &p : qAsConst(list))
             points.append(p);
     }
     return points;
diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp
index be73686b3..d249c06b0 100644
--- a/src/plugins/General/udisks2/udisks2plugin.cpp
+++ b/src/plugins/General/udisks2/udisks2plugin.cpp
@@ -49,7 +49,7 @@ UDisks2Plugin::UDisks2Plugin(QObject *parent) : QObject(parent)
     m_addFiles = false;
     //find existing devices
     QList<QDBusObjectPath> devs = m_manager->findAllDevices();
-    foreach(QDBusObjectPath o, devs)
+    for(const QDBusObjectPath &o : qAsConst(devs))
         addDevice(o);
     //load remaining settings
     m_addTracks = settings.value("add_tracks", false).toBool();
@@ -65,7 +65,7 @@ UDisks2Plugin::~UDisks2Plugin()
 
 void UDisks2Plugin::removeDevice(QDBusObjectPath o)
 {
-    foreach(UDisks2Device *device, m_devices)
+    for(UDisks2Device *device : qAsConst(m_devices))
     {
         if (device->objectPath() == o)
         {
@@ -80,7 +80,7 @@ void UDisks2Plugin::removeDevice(QDBusObjectPath o)
 
 void UDisks2Plugin::addDevice(QDBusObjectPath o)
 {
-    foreach(UDisks2Device *device, m_devices) //is it already exists?
+    for(const UDisks2Device *device : qAsConst(m_devices)) //is it already exists?
     {
         if (device->objectPath() == o)
             return;
@@ -101,7 +101,7 @@ void UDisks2Plugin::addDevice(QDBusObjectPath o)
 void UDisks2Plugin::updateActions()
 {
     // add action for cd audio or mounted volume
-    foreach(UDisks2Device *device, m_devices)
+    for(const UDisks2Device *device : qAsConst(m_devices))
     {
         QString dev_path;
         if (m_detectCDA && device->isAudio()) //cd audio
@@ -157,7 +157,7 @@ void UDisks2Plugin::updateActions()
         }
     }
     // remove action if device is unmounted/removed
-    foreach(QAction *action, m_actions->actions ())
+    for(QAction *action : m_actions->actions())
     {
         if (!findDevice(action))
         {
@@ -179,7 +179,7 @@ void UDisks2Plugin::processAction(QAction *action)
 
 QAction *UDisks2Plugin::findAction(const QString &dev_path)
 {
-    foreach(QAction *action, m_actions->actions ())
+    for(QAction *action : m_actions->actions())
     {
         if (action->data().toString() == dev_path)
             return action;
@@ -189,7 +189,7 @@ QAction *UDisks2Plugin::findAction(const QString &dev_path)
 
 UDisks2Device *UDisks2Plugin::findDevice(QAction *action)
 {
-    foreach(UDisks2Device *device, m_devices)
+    for(UDisks2Device *device : qAsConst(m_devices))
     {
         QString dev_path;
         if (device->isAudio())
@@ -212,7 +212,7 @@ void UDisks2Plugin::addPath(const QString &path)
 {
     PlayListModel *model = PlayListManager::instance()->selectedPlayList();
 
-    foreach(PlayListItem *item, model->items()) // Is it already exist?
+    for(PlayListItem *item : model->items()) // Is it already exist?
     {
         if(item->isGroup())
             continue;
diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp
index 4ebdea9c6..118cb49aa 100644
--- a/src/plugins/Input/archive/decoder_archive.cpp
+++ b/src/plugins/Input/archive/decoder_archive.cpp
@@ -60,7 +60,7 @@ bool DecoderArchive::initialize()
 
     //is this file supported by qmmp?
     QList<DecoderFactory *> filtered = Decoder::findByFileExtension(filePath);
-    foreach (DecoderFactory *f, filtered)
+    for(DecoderFactory *f : qAsConst(filtered))
     {
         if(f->properties().noInput)
             filtered.removeAll(f); //remove all factories without streaming input
@@ -86,7 +86,7 @@ bool DecoderArchive::initialize()
     else
     {
         //multiple factories, so trying to determine by content
-        foreach (DecoderFactory *fact, filtered)
+        for(DecoderFactory *fact : qAsConst(filtered))
         {
             if(fact->canDecode(m_input))
             {
diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp
index 119e30d83..4d569defd 100644
--- a/src/plugins/Input/archive/decoderarchivefactory.cpp
+++ b/src/plugins/Input/archive/decoderarchivefactory.cpp
@@ -96,7 +96,7 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr
 
             //is this file supported by qmmp?
             QList<DecoderFactory *> filtered = Decoder::findByFileExtension(filePath);
-            foreach (DecoderFactory *f, filtered)
+            for(DecoderFactory *f : qAsConst(filtered))
             {
                 if(f->properties().noInput)
                     filtered.removeAll(f); //remove all factories without streaming input
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index f861b8d22..f9e28d413 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -61,7 +61,7 @@ QList<TrackInfo *> DecoderCDAudioFactory::createPlayList(const QString &path, Tr
     QString device_path = path;
     device_path.remove("cdda://");
     QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(device_path, parts);
-    foreach(CDATrack t, tracks)
+    for(const CDATrack &t : qAsConst(tracks))
     {
         list << new TrackInfo(t.info);
     }
diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp
index f63147214..5d31c4a25 100644
--- a/src/plugins/Input/cdaudio/settingsdialog.cpp
+++ b/src/plugins/Input/cdaudio/settingsdialog.cpp
@@ -78,6 +78,6 @@ void SettingsDialog::on_clearCacheButton_clicked()
     QDir dir(Qmmp::configDir());
     dir.cd("cddbcache");
     QStringList list = dir.entryList(QStringList() << "*", QDir::Files);
-    foreach(QString name, list)
+    for(const QString &name : qAsConst(list))
         dir.remove(name);
 }
diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp
index c43c59b68..5f6a936b4 100644
--- a/src/plugins/Input/cue/settingsdialog.cpp
+++ b/src/plugins/Input/cue/settingsdialog.cpp
@@ -33,7 +33,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
     findCodecs();
-    foreach (QTextCodec *codec, codecs)
+    for(const QTextCodec *codec : qAsConst(codecs))
         ui.cueEncComboBox->addItem(codec->name());
 
 #ifdef WITH_ENCA
@@ -79,7 +79,7 @@ void SettingsDialog::findCodecs()
     QMap<QString, QTextCodec *> codecMap;
     QRegExp iso8859RegExp("ISO[- ]8859-([0-9]+).*");
 
-    foreach (int mib, QTextCodec::availableMibs())
+    for(int mib : QTextCodec::availableMibs())
     {
         QTextCodec *codec = QTextCodec::codecForMib(mib);
 
diff --git a/src/plugins/Input/mpeg/settingsdialog.cpp b/src/plugins/Input/mpeg/settingsdialog.cpp
index 75ef4f0e8..4b9589488 100644
--- a/src/plugins/Input/mpeg/settingsdialog.cpp
+++ b/src/plugins/Input/mpeg/settingsdialog.cpp
@@ -29,7 +29,7 @@ SettingsDialog::SettingsDialog(bool using_rusxmms, QWidget *parent)
     m_ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
     findCodecs();
-    foreach (QTextCodec *codec, codecs)
+    for(const QTextCodec *codec : qAsConst(codecs))
     {
         m_ui.id3v1EncComboBox->addItem(codec->name());
         m_ui.id3v2EncComboBox->addItem(codec->name());
@@ -92,7 +92,7 @@ void SettingsDialog::findCodecs()
     QMap<QString, QTextCodec *> codecMap;
     QRegExp iso8859RegExp("ISO[- ]8859-([0-9]+).*");
 
-    foreach (int mib, QTextCodec::availableMibs())
+    for(int mib : QTextCodec::availableMibs())
     {
         QTextCodec *codec = QTextCodec::codecForMib(mib);
 
diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp
index 812930561..e48ff7de9 100644
--- a/src/plugins/Input/wildmidi/wildmidihelper.cpp
+++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp
@@ -116,7 +116,7 @@ QStringList WildMidiHelper::configFiles() const
     QStringList files = QStringList() << "/etc/timidity.cfg"
                                       << "/etc/timidity/timidity.cfg"
                                       << "/etc/wildmidi/wildmidi.cfg";
-    foreach(QString path, files)
+    for(const QString &path : qAsConst(files))
     {
         if(!QFile::exists(path))
             files.removeAll(path);
diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp
index 9bd738e01..39ee1fafb 100644
--- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp
+++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp
@@ -86,7 +86,7 @@ bool OutputQtMultimedia::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFor
     if (!saved_device_name.isEmpty())
     {
         const QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
-        foreach (const QAudioDeviceInfo &info, devices)
+        for(const QAudioDeviceInfo &info : devices)
         {
             if (info.deviceName()==saved_device_name)
             {
diff --git a/src/plugins/Output/qtmultimedia/settingsdialog.cpp b/src/plugins/Output/qtmultimedia/settingsdialog.cpp
index 7b4fd0600..0a4a4532a 100644
--- a/src/plugins/Output/qtmultimedia/settingsdialog.cpp
+++ b/src/plugins/Output/qtmultimedia/settingsdialog.cpp
@@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog (QWidget *parent) : QDialog (parent)
 
     const QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
 	int index = 1;
-    foreach (const QAudioDeviceInfo &info, devices)
+    for(const QAudioDeviceInfo &info : devices)
 	{
     	const QString device_name = info.deviceName();
 		ui.deviceComboBox->addItem(device_name);
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
index f004f5099..46d48087d 100644
--- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
@@ -35,7 +35,7 @@ const PlayListFormatProperties M3UPlaylistFormat::properties() const
 QList<PlayListTrack *> M3UPlaylistFormat::decode(const QByteArray &contents)
 {
     QList<PlayListTrack*> out;
-    QStringList splitted = QString::fromUtf8(contents).split("\n");
+    const QStringList splitted = QString::fromUtf8(contents).split("\n");
     if(splitted.isEmpty())
         return out;
 
@@ -44,7 +44,7 @@ QList<PlayListTrack *> M3UPlaylistFormat::decode(const QByteArray &contents)
     QString artist, title;
     bool hasExtInf = false;
 
-    foreach(QString str, splitted)
+    for(QString str : qAsConst(splitted))
     {
         str = str.trimmed();
         if(str.startsWith("#EXTM3U") || str.isEmpty())
@@ -82,7 +82,7 @@ QByteArray M3UPlaylistFormat::encode(const QList<PlayListTrack*> &contents, cons
     MetaDataFormatter formatter("%if(%p,%p - %t,%t)%if(%p|%t,,%f)");
     QString m3uDir = QFileInfo(path).canonicalPath();
 
-    foreach(PlayListTrack* f, contents)
+    for(const PlayListTrack *f : qAsConst(contents))
     {
         QString info = "#EXTINF:" + QString::number(f->duration() / 1000) + "," + formatter.format(f);
         out.append(info);
diff --git a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
index d2682bad6..d4aced290 100644
--- a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
@@ -57,7 +57,7 @@ QList<PlayListTrack *> PLSPlaylistFormat::decode(const QByteArray &contents)
     int number = 0;
     bool error = false;
 
-    foreach (QString line, splitted)
+    for(const QString &line : qAsConst(splitted))
     {
         if(fileRegExp.indexIn(line) > -1)
         {
@@ -124,7 +124,7 @@ QByteArray PLSPlaylistFormat::encode(const QList<PlayListTrack *> &contents, con
     QStringList out;
     out << QString("[playlist]");
     int counter = 1;
-    foreach(PlayListTrack *f, contents)
+    for(const PlayListTrack *f : qAsConst(contents))
     {
         QString begin = "File" + QString::number(counter) + "=";
         out.append(begin + f->path());
diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
index 40ad3eaca..77c538186 100644
--- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
@@ -126,7 +126,7 @@ QByteArray XSPFPlaylistFormat::encode(const QList<PlayListTrack*> &files, const
     xml.writeStartElement("trackList");
 
     int counter = 1;
-    foreach(PlayListTrack* f, files)
+    for(PlayListTrack *f : qAsConst(files))
     {
         xml.writeStartElement("track");
 
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index bdf241ac0..1451f3b5b 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -503,8 +503,8 @@ void HttpStreamReader::parseICYMetaData(char *data, qint64 size)
     }
 #endif
     QString str = codec->toUnicode(data).trimmed();
-    QStringList list(str.split(";", QString::SkipEmptyParts));
-    foreach(QString line, list)
+    const QStringList list(str.split(";", QString::SkipEmptyParts));
+    for(QString line : qAsConst(list))
     {
         if (line.contains("StreamTitle="))
         {
@@ -536,7 +536,7 @@ void HttpStreamReader::parseICYMetaData(char *data, qint64 size)
 void HttpStreamReader::sendStreamInfo(QTextCodec *codec)
 {
     QHash<QString, QString> info;
-    foreach (QString key, m_stream.header.keys())
+    for(const QString &key : m_stream.header.keys())
     {
         info.insert(key, codec->toUnicode(m_stream.header.value(key)));
     }
diff --git a/src/plugins/Transports/http/settingsdialog.cpp b/src/plugins/Transports/http/settingsdialog.cpp
index 4bba7bcff..c8631af02 100644
--- a/src/plugins/Transports/http/settingsdialog.cpp
+++ b/src/plugins/Transports/http/settingsdialog.cpp
@@ -30,7 +30,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     m_ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
     findCodecs();
-    foreach (QTextCodec *codec, codecs)
+    for(const QTextCodec *codec : qAsConst(codecs))
         m_ui.icyEncodingComboBox->addItem(codec->name());
 #ifdef WITH_ENCA
     size_t n = 0;
@@ -80,7 +80,7 @@ void SettingsDialog::findCodecs()
     QMap<QString, QTextCodec *> codecMap;
     QRegExp iso8859RegExp("ISO[- ]8859-([0-9]+).*");
 
-    foreach (int mib, QTextCodec::availableMibs())
+    for(int mib : QTextCodec::availableMibs())
     {
         QTextCodec *codec = QTextCodec::codecForMib(mib);
 
diff --git a/src/plugins/Ui/qsui/aboutqsuidialog.cpp b/src/plugins/Ui/qsui/aboutqsuidialog.cpp
index e2a06be2e..595023d53 100644
--- a/src/plugins/Ui/qsui/aboutqsuidialog.cpp
+++ b/src/plugins/Ui/qsui/aboutqsuidialog.cpp
@@ -66,7 +66,7 @@ QString AboutQSUIDialog::getStringFromResource(const QString& res_file)
     paths << res_file + ".txt";
     paths << res_file;
 
-    foreach(QString path, paths)
+    for(const QString &path : qAsConst(paths))
     {
         QFile file(path);
         if (file.open(QIODevice::ReadOnly))
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp
index 52597aad8..8e8e0ca7c 100644
--- a/src/plugins/Ui/qsui/actionmanager.cpp
+++ b/src/plugins/Ui/qsui/actionmanager.cpp
@@ -198,7 +198,7 @@ void ActionManager::saveStates()
 void ActionManager::saveActions()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    foreach(QAction *action, m_actions.values())
+    for(const QAction *action : m_actions.values())
     {
         settings.setValue(QString("SimpleUiShortcuts/")+action->objectName(), action->shortcut());
     }
@@ -206,7 +206,7 @@ void ActionManager::saveActions()
 
 void ActionManager::resetShortcuts()
 {
-    foreach (QAction *action, m_actions.values())
+    for(QAction *action : m_actions.values())
     {
         action->setShortcut(action->property("defaultShortcut").toString());
     }
@@ -254,7 +254,7 @@ void ActionManager::updateToolBar(QToolBar *toolBar, ActionManager::ToolBarInfo
 {
     toolBar->clear();
     toolBar->setIconSize(info.iconSize);
-    foreach (QString name, info.actionNames)
+    for(const QString &name : qAsConst(info.actionNames))
     {
         if(name == "separator")
         {
@@ -276,7 +276,7 @@ ActionManager::ToolBarInfo ActionManager::defaultToolBar() const
     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;
     QStringList names;
-    foreach (Type id, idList)
+    for(const Type &id : qAsConst(idList))
     {
         if(id == UI_SEPARATOR)
         {
diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index cb32a202c..fe1e093d4 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -113,7 +113,7 @@ Equalizer::Equalizer(QWidget *parent) : QDialog(parent)
     m_layout->addItem(slidersLayout);
     m_layout->addItem(buttonsLayout);
     setMinimumHeight(300);
-    foreach(QSlider *slider, m_sliders)
+    for(const QSlider *slider : qAsConst(m_sliders))
     {
         connect(slider, SIGNAL(valueChanged(int)), SLOT(applySettings()));
     }
@@ -181,7 +181,7 @@ void Equalizer::applySettings()
 
 void Equalizer::resetSettings()
 {
-    foreach(QSlider *slider, m_sliders)
+    for(QSlider *slider : qAsConst(m_sliders))
     {
         slider->setValue(0);
     }
diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp
index 099b85e62..ae7a07da6 100644
--- a/src/plugins/Ui/qsui/filesystembrowser.cpp
+++ b/src/plugins/Ui/qsui/filesystembrowser.cpp
@@ -150,7 +150,7 @@ void FileSystemBrowser::onListViewActivated(const QModelIndex &index)
 
 void FileSystemBrowser::addToPlayList()
 {
-    foreach (QModelIndex index, m_listView->selectionModel()->selectedIndexes())
+    for(const QModelIndex &index : m_listView->selectionModel()->selectedIndexes())
     {
         if(!index.isValid())
             continue;
diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp
index 08b98d657..b78caa4c4 100644
--- a/src/plugins/Ui/qsui/logo.cpp
+++ b/src/plugins/Ui/qsui/logo.cpp
@@ -158,7 +158,7 @@ void Logo::processPreset2()
     QString str = QString("..0000..");//.arg(Qmmp::strVersion().left(5));
     int at = m_value % str.size();
 
-    foreach(QString line, m_source_lines)
+    for(QString line : qAsConst(m_source_lines))
     {
         while(line.contains("X"))
         {
@@ -178,7 +178,7 @@ void Logo::processPreset3()
     QString str = QString("...%1...").arg(Qmmp::strVersion().left(5));
     int at = m_value % str.size();
 
-    foreach(QString line, m_source_lines)
+    for(QString line : qAsConst(m_source_lines))
     {
         while(line.contains("X"))
         {
@@ -211,7 +211,7 @@ void Logo::processPreset4()
 
     int at = 0;
 
-    foreach(QString line, m_source_lines)
+    for(QString line : qAsConst(m_source_lines))
     {
         int count = line.count("X");
         int k = 0;
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index f7aa07a0a..73891daf3 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -91,7 +91,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     //keyboard manager
     m_key_manager = new KeyboardManager(this);
     //create tabs
-    foreach(PlayListModel *model, m_pl_manager->playLists())
+    for(PlayListModel *model : m_pl_manager->playLists())
     {
         if(m_pl_manager->currentPlayList() != model)
             m_tabWidget->addTab(model->name());
@@ -692,13 +692,13 @@ void MainWindow::readSettings()
     QList<QToolBar *> toolBars = findChildren<QToolBar*>();
 
     //clear toolbars to avoid conflicts
-    foreach (QToolBar *toolBar, toolBars)
+    for(QToolBar *toolBar : qAsConst(toolBars))
         toolBar->clear();
 
-    foreach (ActionManager::ToolBarInfo info, toolBarInfoList)
+    for(const ActionManager::ToolBarInfo &info : qAsConst(toolBarInfoList))
     {
         bool found = false;
-        foreach (QToolBar *toolBar, toolBars)
+        for(QToolBar *toolBar : qAsConst(toolBars))
         {
             if(toolBar->property("uid").toString() == info.uid)
             {
@@ -715,7 +715,7 @@ void MainWindow::readSettings()
         }
     }
 
-    foreach (QToolBar *toolBar, toolBars)
+    for(QToolBar *toolBar : qAsConst(toolBars))
         toolBar->deleteLater();
     toolBars.clear();
     setToolBarsBlocked(ACTION(ActionManager::UI_BLOCK_TOOLBARS)->isChecked());
@@ -925,7 +925,7 @@ void MainWindow::setTitleBarsVisible(bool visible)
 
 void MainWindow::setToolBarsBlocked(bool blocked)
 {
-    foreach (QToolBar *t, findChildren<QToolBar *>())
+    for(QToolBar *t : findChildren<QToolBar *>())
     {
         t->setMovable(!blocked);
     }
diff --git a/src/plugins/Ui/qsui/playlistbrowser.cpp b/src/plugins/Ui/qsui/playlistbrowser.cpp
index fbe370130..9d831e400 100644
--- a/src/plugins/Ui/qsui/playlistbrowser.cpp
+++ b/src/plugins/Ui/qsui/playlistbrowser.cpp
@@ -74,7 +74,7 @@ void PlayListBrowser::updateList()
 {
     m_listView->selectionModel()->blockSignals(true);
     m_listModel->clear();
-    foreach(PlayListModel *model, m_pl_manager->playLists())
+    for(PlayListModel *model : m_pl_manager->playLists())
     {
         QStandardItem *item = new QStandardItem(model->name());
         if(m_pl_manager->currentPlayList() == model)
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index d2b52caa7..2c4bdb9a9 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -79,7 +79,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) :
     m_alignmentMenu->addAction(tr("Center", "alignment"))->setData(ListWidgetRow::ALIGN_CENTER);
     connect(m_alignmentMenu, SIGNAL(triggered(QAction*)), SLOT(setAlignment(QAction*)));
     QActionGroup *alignmentGroup = new QActionGroup(this);
-    foreach (QAction *a, m_alignmentMenu->actions())
+    for(QAction *a : m_alignmentMenu->actions())
     {
         a->setCheckable(true);
         alignmentGroup->addAction(a);
@@ -275,7 +275,7 @@ int PlayListHeader::maxScrollValue() const
         return 0;
 
     int row_width = 0;
-    foreach (int size, sizes())
+    for(int size : sizes())
     {
         row_width += size;
     }
@@ -633,7 +633,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e)
         m_autoResizeAction->setChecked(m_model->data(m_pressed_column, AUTO_RESIZE).toBool());
 
         int alignment = m_model->data(m_pressed_column, ALIGNMENT).toInt();
-        foreach (QAction *action, m_alignmentMenu->actions())
+        for(QAction *action : m_alignmentMenu->actions())
         {
             if(action->data().toInt() == alignment)
             {
@@ -643,7 +643,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e)
         }
 
         //hide unused actions
-        foreach (QAction *action, m_menu->actions())
+        for(QAction *action : m_menu->actions())
         {
             if(m_menu->actions().at(0) == action)
                 action->setVisible(m_model->count() < MAX_COLUMNS);
@@ -656,7 +656,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e)
     }
     else
     {
-        foreach (QAction *action, m_menu->actions())
+        for(QAction *action : m_menu->actions())
         {
             if(action == m_menu->actions().first())
                 action->setVisible(m_model->count() < MAX_COLUMNS);
diff --git a/src/plugins/Ui/qsui/qsuianalyzer.cpp b/src/plugins/Ui/qsui/qsuianalyzer.cpp
index e86174d16..868a042c7 100644
--- a/src/plugins/Ui/qsui/qsuianalyzer.cpp
+++ b/src/plugins/Ui/qsui/qsuianalyzer.cpp
@@ -238,7 +238,7 @@ void QSUiAnalyzer::createMenu()
     m_fpsGroup->addAction(tr("25 fps"))->setData(25);
     m_fpsGroup->addAction(tr("10 fps"))->setData(10);
     m_fpsGroup->addAction(tr("5 fps"))->setData(5);
-    foreach(QAction *act, m_fpsGroup->actions ())
+    for(QAction *act : m_fpsGroup->actions ())
     {
         act->setCheckable(true);
         refreshRate->addAction(act);
@@ -252,7 +252,7 @@ void QSUiAnalyzer::createMenu()
     m_analyzerFalloffGroup->addAction(tr("Medium"))->setData(2.2);
     m_analyzerFalloffGroup->addAction(tr("Fast"))->setData(2.4);
     m_analyzerFalloffGroup->addAction(tr("Fastest"))->setData(2.8);
-    foreach(QAction *act, m_analyzerFalloffGroup->actions ())
+    for(QAction *act : m_analyzerFalloffGroup->actions ())
     {
         act->setCheckable(true);
         analyzerFalloff->addAction(act);
@@ -266,7 +266,7 @@ void QSUiAnalyzer::createMenu()
     m_peaksFalloffGroup->addAction(tr("Medium"))->setData(0.2);
     m_peaksFalloffGroup->addAction(tr("Fast"))->setData(0.4);
     m_peaksFalloffGroup->addAction(tr("Fastest"))->setData(0.8);
-    foreach(QAction *act, m_peaksFalloffGroup->actions ())
+    for(QAction *act : m_peaksFalloffGroup->actions ())
     {
         act->setCheckable(true);
         peaksFalloff->addAction(act);
@@ -317,17 +317,17 @@ void QSUiAnalyzer::readSettings()
         m_coverAction->setChecked(m_show_cover);
         m_peaksAction->setChecked(m_show_peaks);
 
-        foreach(QAction *act, m_fpsGroup->actions ())
+        for(QAction *act : m_fpsGroup->actions ())
         {
             if (m_timer->interval() == 1000 / act->data().toInt())
                 act->setChecked(true);
         }
-        foreach(QAction *act, m_peaksFalloffGroup->actions ())
+        for(QAction *act : m_peaksFalloffGroup->actions ())
         {
             if (m_peaks_falloff == act->data().toDouble())
                 act->setChecked(true);
         }
-        foreach(QAction *act, m_analyzerFalloffGroup->actions ())
+        for(QAction *act : m_analyzerFalloffGroup->actions ())
         {
             if (m_analyzer_falloff == act->data().toDouble())
                 act->setChecked(true);
diff --git a/src/plugins/Ui/qsui/shortcutdialog.cpp b/src/plugins/Ui/qsui/shortcutdialog.cpp
index 51b357e0f..5d67feaa8 100644
--- a/src/plugins/Ui/qsui/shortcutdialog.cpp
+++ b/src/plugins/Ui/qsui/shortcutdialog.cpp
@@ -28,7 +28,7 @@ ShortcutDialog::ShortcutDialog(const QString &key, QWidget *parent)
     m_ui.keyLineEdit->setText(key);
 
     //buttons should not catch keys
-    foreach(QAbstractButton *button, m_ui.buttonBox->buttons())
+    for(QAbstractButton *button : m_ui.buttonBox->buttons())
         button->setFocusPolicy(Qt::NoFocus);
 }
 
diff --git a/src/plugins/Ui/qsui/toolbareditor.cpp b/src/plugins/Ui/qsui/toolbareditor.cpp
index 4d54e7206..a0024e864 100644
--- a/src/plugins/Ui/qsui/toolbareditor.cpp
+++ b/src/plugins/Ui/qsui/toolbareditor.cpp
@@ -76,7 +76,7 @@ void ToolBarEditor::populateActionList(bool reset)
     }
 
     QStringList actionNames;
-    foreach (ActionManager::ToolBarInfo info, m_toolBarInfoList)
+    for(const ActionManager::ToolBarInfo &info : qAsConst(m_toolBarInfoList))
     {
         actionNames << info.actionNames;
         m_ui->toolbarNameComboBox->addItem(info.title);
@@ -191,7 +191,7 @@ void ToolBarEditor::on_toolbarNameComboBox_activated(int index)
         return;
     ActionManager::ToolBarInfo info = m_toolBarInfoList.at(index);
 
-    foreach (QString name, info.actionNames)
+    for(const QString &name : qAsConst(info.actionNames))
     {
         if(name == "separator")
         {
diff --git a/src/plugins/Ui/qsui/visualmenu.cpp b/src/plugins/Ui/qsui/visualmenu.cpp
index 0defc96fe..b8f56dc39 100644
--- a/src/plugins/Ui/qsui/visualmenu.cpp
+++ b/src/plugins/Ui/qsui/visualmenu.cpp
@@ -26,8 +26,7 @@
 
 VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent)
 {
-    VisualFactory *factory = nullptr;
-    foreach(factory, Visual::factories())
+    for(VisualFactory *factory : Visual::factories())
     {
         VisualAction *act = new VisualAction(factory, this);
         addAction(act);
diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp
index 8ee1fb667..7048ca58f 100644
--- a/src/plugins/Ui/skinned/actionmanager.cpp
+++ b/src/plugins/Ui/skinned/actionmanager.cpp
@@ -179,7 +179,7 @@ void ActionManager::saveStates()
 void ActionManager::saveActions()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    foreach(QAction *action, m_actions.values())
+    for(const QAction *action : m_actions.values())
     {
         settings.setValue(QString("SkinnedShortcuts/")+action->objectName(), action->shortcut());
     }
@@ -187,7 +187,7 @@ void ActionManager::saveActions()
 
 void ActionManager::resetShortcuts()
 {
-    foreach (QAction *action, m_actions.values())
+    for(QAction *action : m_actions.values())
     {
         action->setShortcut(action->property("defaultShortcut").toString());
     }
diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp
index 7f8c291f1..4da50d4c2 100644
--- a/src/plugins/Ui/skinned/dock.cpp
+++ b/src/plugins/Ui/skinned/dock.cpp
@@ -199,7 +199,7 @@ void Dock::move (QWidget* mv, QPoint npos)
 void Dock::calculateDistances()
 {
     m_delta_list.clear();
-    foreach (QWidget *w, m_widgetList)
+    for(const QWidget *w : qAsConst(m_widgetList))
     {
         if (w == m_mainWidget)
             m_delta_list.append(QPoint(0,0));
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 55ff6d797..2cd1efc7e 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -151,7 +151,7 @@ void EqWidget::readSettings()
     QPoint pos = settings.value("Skinned/eq_pos", QPoint(100, 216)).toPoint();
     int r = m_skin->ratio();
     //TODO QGuiApplication::screenAt
-    foreach(QScreen *screen, QGuiApplication::screens())
+    for(const QScreen *screen : QGuiApplication::screens())
     {
         if(screen->availableGeometry().contains(pos))
         {
@@ -321,7 +321,7 @@ void EqWidget::savePreset()
         preset->setPreamp(m_preamp->value());
         for (int i = 0; i<10; ++i)
             preset->setGain(i, m_sliders.at (i)->value());
-        foreach(EQPreset *p, m_presets) //remove preset with same name
+        for(EQPreset *p : qAsConst(m_presets)) //remove preset with same name
         {
             if (p->text() == text)
             {
@@ -391,7 +391,7 @@ void EqWidget::loadPreset(const QString &name)
 
 EQPreset *EqWidget::findPreset(const QString &name)
 {
-    foreach(EQPreset *preset, m_autoPresets)
+    for(EQPreset *preset : qAsConst(m_autoPresets))
     {
         if (preset->text() == name)
             return preset;
diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp
index 6f24a432f..e726866d9 100644
--- a/src/plugins/Ui/skinned/mainvisual.cpp
+++ b/src/plugins/Ui/skinned/mainvisual.cpp
@@ -132,7 +132,7 @@ void MainVisual::mousePressEvent (QMouseEvent *e)
             setVisual(nullptr);
 
         QString str = m_vis ? m_vis->name() : "Off";
-        foreach(QAction *act, m_visModeGroup->actions ())
+        for(QAction *act : m_visModeGroup->actions())
         {
             if (str == act->data().toString())
             {
@@ -216,7 +216,7 @@ void MainVisual::createMenu()
     m_visModeGroup->addAction(tr("Analyzer"))->setData("Analyzer");
     m_visModeGroup->addAction(tr("Scope"))->setData("Scope");
     m_visModeGroup->addAction(tr("Off"))->setData("Off");
-    foreach(QAction *act, m_visModeGroup->actions ())
+    for(QAction *act : m_visModeGroup->actions())
     {
         act->setCheckable(true);
         visMode->addAction(act);
@@ -230,13 +230,13 @@ void MainVisual::createMenu()
     m_analyzerModeGroup->addAction(tr("Vertical Lines"))->setData(2);
     m_analyzerTypeGroup->addAction(tr("Lines"))->setData(0);
     m_analyzerTypeGroup->addAction(tr("Bars"))->setData(1);
-    foreach(QAction *act, m_analyzerModeGroup->actions ())
+    for(QAction *act : m_analyzerModeGroup->actions())
     {
         act->setCheckable(true);
         analyzerMode->addAction(act);
     }
     analyzerMode->addSeparator ();
-    foreach(QAction *act, m_analyzerTypeGroup->actions ())
+    for(QAction *act : m_analyzerTypeGroup->actions())
     {
         act->setCheckable(true);
         analyzerMode->addAction(act);
@@ -253,7 +253,7 @@ void MainVisual::createMenu()
     m_fpsGroup->addAction(tr("25 fps"))->setData(25);
     m_fpsGroup->addAction(tr("10 fps"))->setData(10);
     m_fpsGroup->addAction(tr("5 fps"))->setData(5);
-    foreach(QAction *act, m_fpsGroup->actions ())
+    for(QAction *act : m_fpsGroup->actions())
     {
         act->setCheckable(true);
         refreshRate->addAction(act);
@@ -267,7 +267,7 @@ void MainVisual::createMenu()
     m_analyzerFalloffGroup->addAction(tr("Medium"))->setData(2.2);
     m_analyzerFalloffGroup->addAction(tr("Fast"))->setData(2.4);
     m_analyzerFalloffGroup->addAction(tr("Fastest"))->setData(2.8);
-    foreach(QAction *act, m_analyzerFalloffGroup->actions ())
+    for(QAction *act : m_analyzerFalloffGroup->actions())
     {
         act->setCheckable(true);
         analyzerFalloff->addAction(act);
@@ -281,7 +281,7 @@ void MainVisual::createMenu()
     m_peaksFalloffGroup->addAction(tr("Medium"))->setData(0.2);
     m_peaksFalloffGroup->addAction(tr("Fast"))->setData(0.4);
     m_peaksFalloffGroup->addAction(tr("Fastest"))->setData(0.8);
-    foreach(QAction *act, m_peaksFalloffGroup->actions ())
+    for(QAction *act : m_peaksFalloffGroup->actions())
     {
         act->setCheckable(true);
         peaksFalloff->addAction(act);
@@ -302,38 +302,38 @@ void MainVisual::readSettings()
     {
         m_update = true;
 
-        foreach(QAction *act, m_visModeGroup->actions ())
+        for(QAction *act : m_visModeGroup->actions())
         {
             if (vis_name == act->data().toString())
                 act->setChecked(true);
         }
         m_peaksAction->setChecked(settings.value("vis_show_peaks", true).toBool());
         int fps = settings.value("vis_rate", 25).toInt();
-        foreach(QAction *act, m_fpsGroup->actions ())
+        for(QAction *act : m_fpsGroup->actions())
         {
             if (fps == act->data().toInt())
                 act->setChecked(true);
         }
         int mode = settings.value("vis_analyzer_mode", 0).toInt();
-        foreach(QAction *act, m_analyzerModeGroup->actions ())
+        for(QAction *act : m_analyzerModeGroup->actions ())
         {
             if (mode == act->data().toInt())
                 act->setChecked(true);
         }
         int type = settings.value("vis_analyzer_type", 1).toInt();
-        foreach(QAction *act, m_analyzerTypeGroup->actions ())
+        for(QAction *act : m_analyzerTypeGroup->actions ())
         {
             if (type == act->data().toInt())
                 act->setChecked(true);
         }
         double speed = settings.value("vis_peaks_falloff", 0.2).toDouble();
-        foreach(QAction *act, m_peaksFalloffGroup->actions ())
+        for(QAction *act : m_peaksFalloffGroup->actions ())
         {
             if (speed == act->data().toDouble())
                 act->setChecked(true);
         }
         speed = settings.value("vis_analyzer_falloff", 2.2).toDouble();
-        foreach(QAction *act, m_analyzerFalloffGroup->actions ())
+        for(QAction *act : m_analyzerFalloffGroup->actions ())
         {
             if (speed == act->data().toDouble())
                 act->setChecked(true);
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 14e57f385..e2ca6b9c0 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -279,7 +279,7 @@ void MainWindow::readSettings()
         QRect availableGeometry = screen->availableGeometry();
         QPoint pos = settings.value("mw_pos", QPoint(100, 100)).toPoint();
         int r = m_skin->ratio();
-        foreach(QScreen *screen, QGuiApplication::screens())
+        for(const QScreen *screen : QGuiApplication::screens())
         {
             if(screen->availableGeometry().contains(pos))
             {
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 43f4fc7bf..334fa4bfb 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -473,7 +473,7 @@ void PlayList::readSettings()
         QPoint pos = settings.value ("Skinned/pl_pos", QPoint (100, 332)).toPoint();
         m_ratio = m_skin->ratio();
         //TODO QGuiApplication::screenAt
-        foreach(QScreen *screen, QGuiApplication::screens())
+        for(const QScreen *screen : QGuiApplication::screens())
         {
             if(screen->availableGeometry().contains(pos))
             {
@@ -611,7 +611,7 @@ void PlayList::generateCopySelectedMenu()
     action->setIcon(QIcon::fromTheme("document-new"));
     m_copySelectedMenu->addSeparator();
 
-    foreach(QString name, m_pl_manager->playListNames())
+    for(QString name : m_pl_manager->playListNames())
     {
         m_copySelectedMenu->addAction("&"+name.replace("&", "&&"));
     }
@@ -628,7 +628,7 @@ void PlayList::copySelectedMenuActionTriggered(QAction *action)
     else
     {
         actionText.remove(0,1).replace("&&", "&");
-        foreach(PlayListModel *model, m_pl_manager->playLists())
+        for(PlayListModel *model : m_pl_manager->playLists())
         {
             //if("&" + model->name().replace("&", "&&") == actionText)
             if(model->name() == actionText)
@@ -644,7 +644,7 @@ void PlayList::copySelectedMenuActionTriggered(QAction *action)
         return;
     }
     QList <PlayListTrack *> theCopy;
-    foreach(PlayListTrack *track, m_pl_manager->selectedPlayList()->selectedTracks())
+    for(PlayListTrack *track : m_pl_manager->selectedPlayList()->selectedTracks())
     {
         PlayListTrack *newItem = new PlayListTrack(*track);
         theCopy << newItem;
diff --git a/src/plugins/Ui/skinned/playlistbrowser.cpp b/src/plugins/Ui/skinned/playlistbrowser.cpp
index 56299ffd7..a4db5699f 100644
--- a/src/plugins/Ui/skinned/playlistbrowser.cpp
+++ b/src/plugins/Ui/skinned/playlistbrowser.cpp
@@ -69,7 +69,7 @@ void PlayListBrowser::updateList()
 {
     m_ui.listView->selectionModel()->blockSignals(true);
     m_listModel->clear();
-    foreach(PlayListModel *model, m_pl_manager->playLists())
+    for(PlayListModel *model : m_pl_manager->playLists())
     {
         QStandardItem *item = new QStandardItem(model->name());
         if(m_pl_manager->currentPlayList() == model)
@@ -129,11 +129,11 @@ void PlayListBrowser::rename()
 void PlayListBrowser::on_deleteButton_clicked()
 {
     QModelIndexList selectedIndexes;
-    foreach(QModelIndex index, m_ui.listView->selectionModel()->selectedIndexes())
+    for(const QModelIndex &index : m_ui.listView->selectionModel()->selectedIndexes())
     {
         selectedIndexes << m_proxyModel->mapToSource(index);
     }
-    foreach (QModelIndex index, selectedIndexes)
+    for(const QModelIndex &index : qAsConst(selectedIndexes))
     {
         m_pl_manager->removePlayList(index.row());
     }
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 0507f2f98..22ee0e023 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -100,7 +100,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) :
     m_alignmentMenu->addAction(tr("Center", "alignment"))->setData(ListWidgetRow::ALIGN_CENTER);
     connect(m_alignmentMenu, SIGNAL(triggered(QAction*)), SLOT(setAlignment(QAction*)));
     QActionGroup *alignmentGroup = new QActionGroup(this);
-    foreach (QAction *a, m_alignmentMenu->actions())
+    for(QAction *a : m_alignmentMenu->actions())
     {
         a->setCheckable(true);
         alignmentGroup->addAction(a);
@@ -276,7 +276,7 @@ int PlayListHeader::maxScrollValue() const
         return 0;
 
     int row_width = 0;
-    foreach (int size, sizes())
+    for(int size : sizes())
     {
         row_width += size;
     }
@@ -637,7 +637,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e)
         m_autoResizeAction->setChecked(m_model->data(m_pressed_column, AUTO_RESIZE).toBool());
 
         int alignment = m_model->data(m_pressed_column, ALIGNMENT).toInt();
-        foreach (QAction *action, m_alignmentMenu->actions())
+        for(QAction *action : m_alignmentMenu->actions())
         {
             if(action->data().toInt() == alignment)
             {
@@ -647,7 +647,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e)
         }
 
         //hide unused actions
-        foreach (QAction *action, m_menu->actions())
+        for(QAction *action : m_menu->actions())
         {
             if(m_menu->actions().at(0) == action)
                 action->setVisible(m_model->count() < MAX_COLUMNS);
@@ -660,7 +660,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e)
     }
     else
     {
-        foreach (QAction *action, m_menu->actions())
+        for(QAction *action : m_menu->actions())
         {
             if(action == m_menu->actions().first())
                 action->setVisible(m_model->count() < MAX_COLUMNS);
diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp
index d3f3006c9..562d95d7f 100644
--- a/src/plugins/Ui/skinned/playlistselector.cpp
+++ b/src/plugins/Ui/skinned/playlistselector.cpp
@@ -92,7 +92,7 @@ void PlayListSelector::updateTabs()
     m_rects.clear();
     m_extra_rects.clear();
     QRect rect;
-    foreach(QString text, m_pl_manager->playListNames())
+    for(const QString &text : m_pl_manager->playListNames())
     {
         if(m_rects.isEmpty())
             rect.setX(9);
diff --git a/src/plugins/Ui/skinned/preseteditor.cpp b/src/plugins/Ui/skinned/preseteditor.cpp
index 87e29f869..7d483601a 100644
--- a/src/plugins/Ui/skinned/preseteditor.cpp
+++ b/src/plugins/Ui/skinned/preseteditor.cpp
@@ -45,7 +45,7 @@ PresetEditor::~PresetEditor()
 
 void PresetEditor::addPresets(const QList<EQPreset*> &presets)
 {
-    foreach(QListWidgetItem *item, presets)
+    for(QListWidgetItem *item : qAsConst(presets))
     {
         ui.presetListWidget->addItem(item);
     }
@@ -53,7 +53,7 @@ void PresetEditor::addPresets(const QList<EQPreset*> &presets)
 
 void PresetEditor::addAutoPresets(const QList<EQPreset*> &presets)
 {
-    foreach(QListWidgetItem *item, presets)
+    for(QListWidgetItem *item : qAsConst(presets))
     {
         ui.autoPresetListWidget->addItem(item);
     }
diff --git a/src/plugins/Ui/skinned/shortcutdialog.cpp b/src/plugins/Ui/skinned/shortcutdialog.cpp
index 311e53c14..83243c220 100644
--- a/src/plugins/Ui/skinned/shortcutdialog.cpp
+++ b/src/plugins/Ui/skinned/shortcutdialog.cpp
@@ -28,7 +28,7 @@ ShortcutDialog::ShortcutDialog(const QString &key, QWidget *parent)
     m_ui.keyLineEdit->setText(key);
 
     //buttons should not catch keys
-    foreach(QAbstractButton *button, m_ui.buttonBox->buttons())
+    for(QAbstractButton *button : m_ui.buttonBox->buttons())
         button->setFocusPolicy(Qt::NoFocus);
 }
 
diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index f379955fb..4b96899c8 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -132,20 +132,19 @@ void Skin::setSkin (const QString& path)
     loadColors();
     if(m_double_size)
     {
-        uint key;
-        foreach(key, m_buttons.keys())
+        for(uint key : m_buttons.keys())
             m_buttons[key] = scalePixmap(m_buttons[key]);
-        foreach(key, m_titlebar.keys())
+        for(uint key : m_titlebar.keys())
             m_titlebar[key] = scalePixmap(m_titlebar[key]);
-        foreach(key, m_pl_parts.keys())
+        for(uint key : m_pl_parts.keys())
             m_pl_parts[key] = scalePixmap(m_pl_parts[key]);
-        foreach(key, m_eq_parts.keys())
+        for(uint key : m_eq_parts.keys())
             m_eq_parts[key] = scalePixmap(m_eq_parts[key]);
-        foreach(key, m_ms_parts.keys())
+        for(uint key : m_ms_parts.keys())
             m_ms_parts[key] = scalePixmap(m_ms_parts[key]);
-        foreach(key, m_parts.keys())
+        for(uint key : m_parts.keys())
             m_parts[key] = scalePixmap(m_parts[key]);
-        foreach(QChar c, m_letters.keys())
+        for(const QChar &c : m_letters.keys())
             m_letters[c] = scalePixmap(m_letters[c]);
         m_main = scalePixmap(m_main);
         posbar = scalePixmap(posbar);
@@ -400,7 +399,7 @@ void Skin::loadPlayList()
 QPixmap *Skin::getPixmap (const QString& name, const QString &fallback)
 {
     m_skin_dir.setFilter (QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-    foreach(QFileInfo info, m_skin_dir.entryInfoList(QStringList() << name + ".*"))
+    for(const QFileInfo &info : m_skin_dir.entryInfoList(QStringList() << name + ".*"))
     {
         if(info.suffix().toLower() != "cur" && info.suffix().toLower() != "txt")
             return new QPixmap (info.filePath());
@@ -408,7 +407,7 @@ QPixmap *Skin::getPixmap (const QString& name, const QString &fallback)
 
     if(!fallback.isEmpty())
     {
-        foreach(QFileInfo info, m_skin_dir.entryInfoList(QStringList() << fallback + ".*"))
+        for(const QFileInfo &info : m_skin_dir.entryInfoList(QStringList() << fallback + ".*"))
         {
             if(info.suffix().toLower() != "cur" && info.suffix().toLower() != "txt")
                 return new QPixmap (info.filePath());
@@ -795,7 +794,7 @@ QRegion Skin::createRegion(const QString &path, const QString &key)
     QStringList numPoints = settings.value(key+"/NumPoints").toStringList();
     QStringList value = settings.value(key+"/PointList").toStringList();
     QStringList numbers;
-    foreach(QString str, value)
+    for(const QString &str : qAsConst(value))
     numbers << str.split(" ", QString::SkipEmptyParts);
 
     QList <QRegion> regions;
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index 6bc10c20e..141498aa0 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -119,7 +119,7 @@ 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)");
-    foreach(QString path, files)
+    for(const QString &path : qAsConst(files))
     {
         QFile file(path);
         file.copy(Qmmp::configDir() + "/skins/" + QFileInfo(path).fileName());
@@ -163,7 +163,7 @@ void SkinnedSettings::findSkins(const QString &path)
     QList <QFileInfo> fileList = dir.entryInfoList();
     if (fileList.count() == 0)
         return;
-    foreach (QFileInfo fileInfo, fileList)
+    for(const QFileInfo &fileInfo : qAsConst(fileList))
     {
         QPixmap preview = Skin::getPixmap ("main", QDir(fileInfo.filePath ()));
         if (!preview.isNull())
@@ -203,7 +203,7 @@ void SkinnedSettings::loadSkins()
 #else
     findSkins(Qmmp::dataPath());
 #endif
-    foreach(QString path, m_reader->skins())
+    for(const QString &path : m_reader->skins())
     {
         QListWidgetItem *item = new QListWidgetItem (path.section('/', -1));
         item->setIcon (m_reader->getPreview(path));
diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
index 0494af7ea..ae3faa305 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -60,10 +60,10 @@ void SkinReader::generateThumbs()
     cache_dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     QFileInfoList d = cache_dir.entryInfoList();
     //clear removed skins from cache
-    foreach(QFileInfo thumbFile, d)
+    for(const QFileInfo &thumbFile : qAsConst(d))
     {
         bool del = true;
-        foreach(QFileInfo fileInfo, f)
+        for(const QFileInfo &fileInfo : qAsConst(f))
         {
             if (fileInfo.baseName () == thumbFile.baseName ())
             {
@@ -80,10 +80,10 @@ void SkinReader::generateThumbs()
         }
     }
     //add new skins to cache
-    foreach(QFileInfo fileInfo, f)
+    for(const QFileInfo &fileInfo : qAsConst(f))
     {
         bool create = true;
-        foreach(QFileInfo thumbInfo, d)
+        for(const QFileInfo &thumbInfo : qAsConst(d))
         {
             if (fileInfo.baseName () == thumbInfo.baseName ())
             {
@@ -106,9 +106,9 @@ void SkinReader::generateThumbs()
     //add thumbs to map
     cache_dir.refresh();
     d = cache_dir.entryInfoList();
-    foreach(QFileInfo fileInfo, f)
+    for(const QFileInfo &fileInfo : qAsConst(f))
     {
-         foreach(QFileInfo thumbInfo, d)
+         for(const QFileInfo &thumbInfo : qAsConst(d))
          {
             if (fileInfo.baseName () == thumbInfo.baseName ())
             {
@@ -126,7 +126,7 @@ void SkinReader::unpackSkin(const QString &path)
     QDir dir(Qmmp::configDir() + "/cache/skin");
     dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     QFileInfoList f = dir.entryInfoList();
-    foreach(QFileInfo file, f)
+    for(const QFileInfo &file : qAsConst(f))
         dir.remove(file.fileName());
     //unpack
     QString name = QFileInfo(path).fileName().toLower();
@@ -157,7 +157,7 @@ void SkinReader::untar(const QString &from, const QString &to, bool preview)
     array = m_process->readAllStandardOutput ();
     QString str = QString(array);
     QStringList outputList = str.split("\n", QString::SkipEmptyParts);
-    foreach(QString str, outputList)
+    for(QString str : qAsConst(outputList))
     {
         str = str.trimmed();
         args.clear();
@@ -194,7 +194,7 @@ void SkinReader::unzip(const QString &from, const QString &to, bool preview)
         QDir dir(to);
         dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
         QFileInfoList fileList = dir.entryInfoList();
-        foreach(QFileInfo thumbInfo, fileList)
+        for(const QFileInfo &thumbInfo : qAsConst(fileList))
         {
             if (thumbInfo.fileName().startsWith("main.", Qt::CaseInsensitive))
             {
diff --git a/src/plugins/Ui/skinned/visualmenu.cpp b/src/plugins/Ui/skinned/visualmenu.cpp
index cf99d361a..6135eda10 100644
--- a/src/plugins/Ui/skinned/visualmenu.cpp
+++ b/src/plugins/Ui/skinned/visualmenu.cpp
@@ -25,8 +25,7 @@
 
 VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent)
 {
-    VisualFactory *factory = nullptr;
-    foreach(factory, Visual::factories())
+    for(VisualFactory *factory : Visual::factories())
     {
         VisualAction *act = new VisualAction(factory, this);
         addAction(act);
diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp
index 2b10f84fe..b0a40c44f 100644
--- a/src/plugins/Visual/analyzer/analyzer.cpp
+++ b/src/plugins/Visual/analyzer/analyzer.cpp
@@ -117,17 +117,17 @@ void Analyzer::readSettings()
         m_update = true;
         m_peaksAction->setChecked(m_show_peaks);
 
-        foreach(QAction *act, m_fpsGroup->actions ())
+        for(QAction *act : m_fpsGroup->actions ())
         {
             if (m_timer->interval() == 1000 / act->data().toInt())
                 act->setChecked(true);
         }
-        foreach(QAction *act, m_peaksFalloffGroup->actions ())
+        for(QAction *act : m_peaksFalloffGroup->actions ())
         {
             if (m_peaks_falloff == act->data().toDouble())
                 act->setChecked(true);
         }
-        foreach(QAction *act, m_analyzerFalloffGroup->actions ())
+        for(QAction *act : m_analyzerFalloffGroup->actions ())
         {
             if (m_analyzer_falloff == act->data().toDouble())
                 act->setChecked(true);
@@ -339,7 +339,7 @@ void Analyzer::createMenu()
     m_fpsGroup->addAction(tr("25 fps"))->setData(25);
     m_fpsGroup->addAction(tr("10 fps"))->setData(10);
     m_fpsGroup->addAction(tr("5 fps"))->setData(5);
-    foreach(QAction *act, m_fpsGroup->actions ())
+    for(QAction *act : m_fpsGroup->actions ())
     {
         act->setCheckable(true);
         refreshRate->addAction(act);
@@ -353,7 +353,7 @@ void Analyzer::createMenu()
     m_analyzerFalloffGroup->addAction(tr("Medium"))->setData(2.2);
     m_analyzerFalloffGroup->addAction(tr("Fast"))->setData(2.4);
     m_analyzerFalloffGroup->addAction(tr("Fastest"))->setData(2.8);
-    foreach(QAction *act, m_analyzerFalloffGroup->actions ())
+    for(QAction *act : m_analyzerFalloffGroup->actions())
     {
         act->setCheckable(true);
         analyzerFalloff->addAction(act);
@@ -367,7 +367,7 @@ void Analyzer::createMenu()
     m_peaksFalloffGroup->addAction(tr("Medium"))->setData(0.2);
     m_peaksFalloffGroup->addAction(tr("Fast"))->setData(0.4);
     m_peaksFalloffGroup->addAction(tr("Fastest"))->setData(0.8);
-    foreach(QAction *act, m_peaksFalloffGroup->actions ())
+    for(QAction *act : m_peaksFalloffGroup->actions())
     {
         act->setCheckable(true);
         peaksFalloff->addAction(act);
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
index 1bc4d75c2..163846cf0 100644
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -112,7 +112,7 @@ void ProjectMWidget::initializeGL()
         RatingList list;
         list.push_back(3);
         list.push_back(3);
-        foreach (QFileInfo info, l)
+        for(const QFileInfo &info : qAsConst(l))
         {
             m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), list);
             m_listWidget->addItem(info.fileName());
diff --git a/src/qmmp/abstractengine.cpp b/src/qmmp/abstractengine.cpp
index 41989c308..df9d7573d 100644
--- a/src/qmmp/abstractengine.cpp
+++ b/src/qmmp/abstractengine.cpp
@@ -53,7 +53,7 @@ void AbstractEngine::loadPlugins()
 
     m_cache = new QList<QmmpPluginCache*>;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach (QString filePath, Qmmp::findPlugins("Engines"))
+    for(const QString &filePath : Qmmp::findPlugins("Engines"))
     {
         QmmpPluginCache *item = new QmmpPluginCache(filePath, &settings);
         if(item->hasError())
@@ -79,7 +79,7 @@ AbstractEngine *AbstractEngine::create(InputSource *s, QObject *parent)
 
 
     loadPlugins();
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -103,7 +103,7 @@ QList<EngineFactory *> AbstractEngine::factories()
 {
     loadPlugins();
     QList<EngineFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->engineFactory())
             list.append(item->engineFactory());
@@ -115,7 +115,7 @@ QList<EngineFactory *> AbstractEngine::enabledFactories()
 {
     loadPlugins();
     QList<EngineFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -128,7 +128,7 @@ QList<EngineFactory *> AbstractEngine::enabledFactories()
 EngineFactory *AbstractEngine::findByFilePath(const QString& source)
 {
     loadPlugins();
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -176,7 +176,7 @@ bool AbstractEngine::isEnabled(const AbstractEngine *engine)
 QString AbstractEngine::file(const EngineFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(const QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
@@ -189,7 +189,7 @@ QStringList AbstractEngine::protocols()
     loadPlugins();
     QStringList protocolsList;
 
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
diff --git a/src/qmmp/channelmap.cpp b/src/qmmp/channelmap.cpp
index 2414c8f0f..92b7f86b6 100644
--- a/src/qmmp/channelmap.cpp
+++ b/src/qmmp/channelmap.cpp
@@ -41,7 +41,7 @@ ChannelMap::ChannelMap(int channels)
 int ChannelMap::mask() const
 {
     int mask = 0;
-    foreach (Qmmp::ChannelPosition channel, *this)
+    for(const Qmmp::ChannelPosition channel : qAsConst(*this))
     {
         mask |= channel;
     }
@@ -79,7 +79,7 @@ const QString ChannelMap::toString() const
     names.insert(Qmmp::CHAN_SIDE_RIGHT, "SR");
 
 
-    foreach (Qmmp::ChannelPosition channel, *this)
+    for(const Qmmp::ChannelPosition channel : qAsConst(*this))
     {
        list << names.value(channel);
     }
diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp
index fc3941727..3bc19a694 100644
--- a/src/qmmp/decoder.cpp
+++ b/src/qmmp/decoder.cpp
@@ -102,7 +102,7 @@ void Decoder::setProperty(Qmmp::TrackProperty key, const QVariant &value)
 
 void Decoder::setProperties(const QMap<Qmmp::TrackProperty, QString> &properties)
 {
-    foreach(Qmmp::TrackProperty key, properties.keys())
+    for(const Qmmp::TrackProperty &key : properties.keys())
     {
         setProperty(key, properties.value(key));
     }
@@ -130,7 +130,7 @@ void Decoder::loadPlugins()
 
     m_cache = new QList<QmmpPluginCache*>;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach (QString filePath, Qmmp::findPlugins("Input"))
+    for(const QString &filePath : Qmmp::findPlugins("Input"))
     {
         QmmpPluginCache *item = new QmmpPluginCache(filePath, &settings);
         if(item->hasError())
@@ -148,7 +148,7 @@ void Decoder::loadPlugins()
 QString Decoder::file(const DecoderFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(const QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
@@ -161,7 +161,7 @@ QStringList Decoder::protocols()
     loadPlugins();
     QStringList protocolsList;
 
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -186,7 +186,7 @@ DecoderFactory *Decoder::findByFilePath(const QString &path, bool useContent)
             return nullptr;
         }
 
-        foreach(QmmpPluginCache *item, *m_cache)
+        for(QmmpPluginCache *item : qAsConst(*m_cache))
         {
             if(m_disabledNames.contains(item->shortName()))
                 continue;
@@ -220,7 +220,7 @@ DecoderFactory *Decoder::findByFilePath(const QString &path, bool useContent)
         return nullptr;
     }
 
-    foreach (fact, filtered)
+    for(DecoderFactory *fact : qAsConst(filtered))
     {
         if(fact->canDecode(&file))
             return fact;
@@ -237,7 +237,7 @@ DecoderFactory *Decoder::findByMime(const QString& type)
     if(type.isEmpty())
         return nullptr;
     loadPlugins();
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -251,7 +251,7 @@ DecoderFactory *Decoder::findByMime(const QString& type)
 DecoderFactory *Decoder::findByContent(QIODevice *input)
 {
     loadPlugins();
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -265,7 +265,7 @@ DecoderFactory *Decoder::findByContent(QIODevice *input)
 DecoderFactory *Decoder::findByProtocol(const QString &p)
 {
     loadPlugins();
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -280,7 +280,7 @@ QList<DecoderFactory *> Decoder::findByFileExtension(const QString &path)
 {
     QList<DecoderFactory*> filtered;
     DecoderFactory *fact = nullptr;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -288,7 +288,7 @@ QList<DecoderFactory *> Decoder::findByFileExtension(const QString &path)
         if(!(fact = item->decoderFactory()))
             continue;
 
-        foreach(QString filter, fact->properties().filters)
+        for(const QString &filter : fact->properties().filters)
         {
             QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard);
             if (regexp.exactMatch(path))
@@ -331,7 +331,7 @@ QList<DecoderFactory *> Decoder::factories()
 {
     loadPlugins();
     QList<DecoderFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->decoderFactory())
             list.append(item->decoderFactory());
@@ -343,7 +343,7 @@ QList<DecoderFactory *> Decoder::enabledFactories()
 {
     loadPlugins();
     QList<DecoderFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
diff --git a/src/qmmp/effect.cpp b/src/qmmp/effect.cpp
index 6557bf782..fbd927b20 100644
--- a/src/qmmp/effect.cpp
+++ b/src/qmmp/effect.cpp
@@ -85,7 +85,7 @@ void Effect::loadPlugins()
 
     m_cache = new QList<QmmpPluginCache *>;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach(QString filePath, Qmmp::findPlugins("Effect"))
+    for(const QString &filePath : Qmmp::findPlugins("Effect"))
     {
         QmmpPluginCache *item = new QmmpPluginCache(filePath, &settings);
         if(item->hasError())
@@ -112,7 +112,7 @@ QList<EffectFactory *> Effect::factories()
 {
     loadPlugins();
     QList<EffectFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->effectFactory())
             list.append(item->effectFactory());
@@ -124,7 +124,7 @@ QList<EffectFactory *> Effect::enabledFactories()
 {
     loadPlugins();
     QList<EffectFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_enabledNames.contains(item->shortName()) && item->effectFactory())
             list.append(item->effectFactory());
@@ -135,7 +135,7 @@ QList<EffectFactory *> Effect::enabledFactories()
 QString Effect::file(const EffectFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(const QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
@@ -180,7 +180,7 @@ bool Effect::isEnabled(const EffectFactory *factory)
 EffectFactory *Effect::findFactory(const QString &shortName)
 {
     loadPlugins();
-    foreach (EffectFactory *f, factories())
+    for(EffectFactory *f : factories())
     {
         if(shortName == f->properties().shortName)
             return f;
diff --git a/src/qmmp/inputsource.cpp b/src/qmmp/inputsource.cpp
index 174af9abc..b4bbee466 100644
--- a/src/qmmp/inputsource.cpp
+++ b/src/qmmp/inputsource.cpp
@@ -105,7 +105,7 @@ InputSource *InputSource::create(const QString &url, QObject *parent)
         qDebug("InputSource: using file transport");
         return new FileInputSource(url, parent);
     }
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -133,7 +133,7 @@ QList<InputSourceFactory *> InputSource::factories()
 {
     loadPlugins();
     QList<InputSourceFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->inputSourceFactory())
             list.append(item->inputSourceFactory());
@@ -145,7 +145,7 @@ QList<InputSourceFactory *> InputSource::enabledFactories()
 {
     loadPlugins();
     QList<InputSourceFactory *> list;
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -158,7 +158,7 @@ QList<InputSourceFactory *> InputSource::enabledFactories()
 QString InputSource::file(const InputSourceFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(const QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
@@ -171,7 +171,7 @@ QStringList InputSource::protocols()
     loadPlugins();
     QStringList protocolsList;
 
-    foreach (QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(m_disabledNames.contains(item->shortName()))
             continue;
@@ -214,7 +214,7 @@ void InputSource::loadPlugins()
 
     m_cache = new QList<QmmpPluginCache*>;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach (QString filePath, Qmmp::findPlugins("Transports"))
+    for(const QString &filePath : Qmmp::findPlugins("Transports"))
     {
         QmmpPluginCache *item = new QmmpPluginCache(filePath, &settings);
         if(item->hasError())
diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp
index 9080a25f6..3eae41250 100644
--- a/src/qmmp/metadatamanager.cpp
+++ b/src/qmmp/metadatamanager.cpp
@@ -70,10 +70,13 @@ QList<TrackInfo *> MetaDataManager::createPlayList(const QString &path, TrackInf
         }
         else
         {
-            foreach(fact, Decoder::factories())
+            for(DecoderFactory *f : Decoder::factories())
             {
-                if(fact->properties().protocols.contains(scheme) && Decoder::isEnabled(fact))
+                if(f->properties().protocols.contains(scheme) && Decoder::isEnabled(f))
+                {
+                    fact = f;
                     break;
+                }
             }
         }
     }
@@ -83,7 +86,7 @@ QList<TrackInfo *> MetaDataManager::createPlayList(const QString &path, TrackInf
     else if(efact)
         list = efact->createPlayList(path, parts, ignoredPaths);
 
-    foreach(TrackInfo *info, list)
+    for(TrackInfo *info : qAsConst(list))
     {
         if(info->value(Qmmp::DECODER).isEmpty() && (fact || efact))
             info->setValue(Qmmp::DECODER, fact ? fact->properties().shortName : efact->properties().shortName);
@@ -116,7 +119,7 @@ MetaDataModel* MetaDataManager::createMetaDataModel(const QString &path, bool re
         {
             return fact->createMetaDataModel(path, readOnly);
         }
-        foreach(efact, AbstractEngine::enabledFactories())
+        for(EngineFactory *efact : AbstractEngine::enabledFactories())
         {
             if(efact->properties().protocols.contains(scheme))
                 model = efact->createMetaDataModel(path, readOnly);
@@ -130,12 +133,12 @@ MetaDataModel* MetaDataManager::createMetaDataModel(const QString &path, bool re
 QStringList MetaDataManager::filters() const
 {
     QStringList filters;
-    foreach(DecoderFactory *fact, Decoder::enabledFactories())
+    for(const DecoderFactory *fact : Decoder::enabledFactories())
     {
         if (!fact->properties().filters.isEmpty())
             filters << fact->properties().description + " (" + fact->properties().filters.join(" ") + ")";
     }
-    foreach(EngineFactory *fact, AbstractEngine::enabledFactories())
+    for(const EngineFactory *fact : AbstractEngine::enabledFactories())
     {
         if (!fact->properties().filters.isEmpty())
             filters << fact->properties().description + " (" + fact->properties().filters.join(" ") + ")";
@@ -146,12 +149,12 @@ QStringList MetaDataManager::filters() const
 QStringList MetaDataManager::nameFilters() const
 {
     QStringList filters;
-    foreach(DecoderFactory *fact, Decoder::enabledFactories())
+    for(const DecoderFactory *fact : Decoder::enabledFactories())
     {
         if (Decoder::isEnabled(fact))
             filters << fact->properties().filters;
     }
-    foreach(EngineFactory *fact, AbstractEngine::enabledFactories())
+    for(const EngineFactory *fact : AbstractEngine::enabledFactories())
     {
         if (AbstractEngine::isEnabled(fact))
             filters << fact->properties().filters;
@@ -242,9 +245,9 @@ 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());
-    foreach(QFileInfo i, file_list)
+    for(const QFileInfo &i : qAsConst(file_list))
     {
-        foreach(QString pattern, m_settings->coverNameFilters(false))
+        for(const QString &pattern : m_settings->coverNameFilters(false))
         {
             if(QRegExp (pattern, Qt::CaseInsensitive, QRegExp::Wildcard).exactMatch(i.fileName()))
             {
@@ -259,7 +262,7 @@ QFileInfoList MetaDataManager::findCoverFiles(QDir dir, int depth) const
     dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
     dir.setSorting(QDir::Name);
     QFileInfoList dir_info_list = dir.entryInfoList();
-    foreach(QFileInfo i, dir_info_list)
+    for(const QFileInfo &i : qAsConst(dir_info_list))
     {
         file_list << findCoverFiles(QDir(i.absoluteFilePath()), depth);
     }
diff --git a/src/qmmp/output.cpp b/src/qmmp/output.cpp
index 1093d9dce..8dfdcdb9d 100644
--- a/src/qmmp/output.cpp
+++ b/src/qmmp/output.cpp
@@ -83,7 +83,7 @@ void Output::loadPlugins()
 
     m_cache = new QList<QmmpPluginCache *>;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach (QString filePath, Qmmp::findPlugins("Output"))
+    for(const QString &filePath : Qmmp::findPlugins("Output"))
     {
         QmmpPluginCache *item = new QmmpPluginCache(filePath, &settings);
         if(item->hasError())
@@ -114,7 +114,7 @@ QList<OutputFactory *> Output::factories()
 {
     loadPlugins();
     QList<OutputFactory *> list;
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->outputFactory())
             list.append(item->outputFactory());
@@ -125,7 +125,7 @@ QList<OutputFactory *> Output::factories()
 QString Output::file(const OutputFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(const QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
@@ -160,7 +160,7 @@ OutputFactory *Output::currentFactory()
     QString name = settings.value("Output/current_plugin", "oss4").toString();
 #endif
 #endif //QMMP_DEFAULT_OUTPUT
-    foreach(QmmpPluginCache *item, *m_cache)
+    for(QmmpPluginCache *item : qAsConst(*m_cache))
     {
         if (item->shortName() == name && item->outputFactory())
             return item->outputFactory();
diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp
index 289bdeb41..182be7ac6 100644
--- a/src/qmmp/outputwriter.cpp
+++ b/src/qmmp/outputwriter.cpp
@@ -181,7 +181,7 @@ bool OutputWriter::prepareConverters()
 
 void OutputWriter::startVisualization()
 {
-    foreach (Visual *visual, *Visual::visuals())
+    for(Visual *visual : *Visual::visuals())
     {
         QMetaObject::invokeMethod(visual, "start", Qt::QueuedConnection);
     }
@@ -190,7 +190,7 @@ void OutputWriter::startVisualization()
 void OutputWriter::stopVisualization()
 {
     Visual::clearBuffer();
-    foreach (Visual *visual, *Visual::visuals())
+    for(Visual *visual : *Visual::visuals())
     {
         QMetaObject::invokeMethod(visual, "stop", Qt::QueuedConnection);
     }
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index 337936bed..08ee560db 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -102,7 +102,7 @@ QStringList Qmmp::findPlugins(const QString &prefix)
 {
     QDir pluginDir(pluginPath() + "/" + prefix);
     QStringList paths;
-    foreach (QFileInfo info, pluginDir.entryInfoList(QStringList() << "*.dll" << "*.so", QDir::Files))
+    for(const QFileInfo &info : pluginDir.entryInfoList(QStringList() << "*.dll" << "*.so", QDir::Files))
         paths << info.canonicalFilePath();
     return paths;
 }
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 1bfddcf85..75a6153a7 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -168,7 +168,7 @@ bool QmmpAudioEngine::enqueue(InputSource *source)
 
 void QmmpAudioEngine::addEffect(EffectFactory *factory)
 {
-    foreach(Effect *effect, m_effects)
+    for(const Effect *effect : qAsConst(m_effects))
     {
         if(effect->factory() == factory)
         {
@@ -200,7 +200,7 @@ void QmmpAudioEngine::addEffect(EffectFactory *factory)
 void QmmpAudioEngine::removeEffect(EffectFactory *factory)
 {
     Effect *effect = nullptr;
-    foreach(Effect *e, m_effects)
+    for(Effect *e : qAsConst(m_effects))
     {
         if(e->factory() == factory)
         {
@@ -284,7 +284,7 @@ qint64 QmmpAudioEngine::produceSound(unsigned char *data, qint64 size, quint32 b
 
     b->samples = samples;
     b->rate = brate;
-    foreach(Effect* effect, m_effects)
+    for(Effect *effect : qAsConst(m_effects))
     {
         effect->applyEffect(b);
     }
@@ -637,7 +637,7 @@ void QmmpAudioEngine::prepareEffects(Decoder *d)
     m_converter->configure(m_ap.format());
     m_ap = AudioParameters(m_ap.sampleRate(), m_ap.channelMap(), Qmmp::PCM_FLOAT);
     //remove disabled and external effects
-    foreach(Effect *e, m_effects)
+    for(Effect *e : qAsConst(m_effects))
     {
         if(!e->factory() || !Effect::isEnabled(e->factory()))
         {
@@ -675,10 +675,10 @@ void QmmpAudioEngine::prepareEffects(Decoder *d)
         m_ap = m_effects.last()->audioParameters();
     }
 
-    foreach(EffectFactory *factory, Effect::enabledFactories())
+    for(EffectFactory *factory : Effect::enabledFactories())
     {
         Effect *effect = nullptr;
-        foreach(Effect *e, tmp_effects) //find effect
+        for(Effect *e : qAsConst(tmp_effects)) //find effect
         {
             if(e->factory() == factory)
                 effect = e;
diff --git a/src/qmmp/qmmpplugincache.cpp b/src/qmmp/qmmpplugincache.cpp
index 147c29f45..c6ab86f75 100644
--- a/src/qmmp/qmmpplugincache.cpp
+++ b/src/qmmp/qmmpplugincache.cpp
@@ -221,7 +221,7 @@ void QmmpPluginCache::cleanup(QSettings *settings)
 {
     settings->beginGroup("PluginCache");
 
-    foreach (QString key, settings->allKeys())
+    for(const QString &key : settings->allKeys())
     {
 #ifdef Q_OS_WIN
         if(!QFile::exists(key))
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index bb3fc8b40..f35087eba 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -133,7 +133,8 @@ void StateHandler::dispatch(const QHash<QString, QString> &info)
 {
     m_mutex.lock();
     QHash<QString, QString> tmp = info;
-    foreach(QString value, tmp.values()) //remove empty keys
+    const auto values = tmp.values();
+    for(const QString &value : values) //remove empty keys
     {
         if (value.isEmpty())
             tmp.remove(tmp.key(value));
diff --git a/src/qmmp/trackinfo.cpp b/src/qmmp/trackinfo.cpp
index e6887a76e..4bb7fcf4e 100644
--- a/src/qmmp/trackinfo.cpp
+++ b/src/qmmp/trackinfo.cpp
@@ -182,19 +182,19 @@ void TrackInfo::setValues(const QMap<Qmmp::ReplayGainKey, double> &replayGainInf
 
 void TrackInfo::updateValues(const QMap<Qmmp::MetaData, QString> &metaData)
 {
-    foreach (Qmmp::MetaData key, metaData.keys())
+    for(const Qmmp::MetaData &key : metaData.keys())
         setValue(key, metaData[key]);
 }
 
 void TrackInfo::updateValues(const QMap<Qmmp::TrackProperty, QString> &properties)
 {
-    foreach (Qmmp::TrackProperty key, properties.keys())
+    for(const Qmmp::TrackProperty &key : properties.keys())
         setValue(key, properties[key]);
 }
 
 void TrackInfo::updateValues(const QMap<Qmmp::ReplayGainKey, double> &replayGainInfo)
 {
-    foreach (Qmmp::ReplayGainKey key, replayGainInfo.keys())
+    for(const Qmmp::ReplayGainKey &key : replayGainInfo.keys())
         setValue(key, replayGainInfo[key]);
 }
 
diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp
index 44554d00e..5fb78a158 100644
--- a/src/qmmp/visual.cpp
+++ b/src/qmmp/visual.cpp
@@ -179,7 +179,7 @@ void Visual::initialize(QWidget *parent , QObject *receiver, const char *member)
     m_receiver = receiver;
     m_member = member;
     m_parentWidget = parent;
-    foreach(VisualFactory* factory, factories())
+    for(VisualFactory *factory : factories())
     {
         if (isEnabled(factory))
         {
@@ -249,7 +249,7 @@ void Visual::checkFactories()
         m_factories = new QList<VisualFactory *>;
         m_files = new QHash <const VisualFactory*, QString>;
 
-        foreach (QString filePath, Qmmp::findPlugins("Visual"))
+        for(const QString &filePath : Qmmp::findPlugins("Visual"))
         {
             QPluginLoader loader(filePath);
             QObject *plugin = loader.instance();
diff --git a/src/qmmpui/aboutdialog.cpp b/src/qmmpui/aboutdialog.cpp
index c21633f87..6cb92524c 100644
--- a/src/qmmpui/aboutdialog.cpp
+++ b/src/qmmpui/aboutdialog.cpp
@@ -75,7 +75,7 @@ QString AboutDialog::loadAbout()
 
     text.append("<h5>"+tr("Input plugins:")+"</h5>");
     text.append("<ul type=\"square\">");
-    foreach(DecoderFactory *fact, Decoder::factories())
+    for(const DecoderFactory *fact : Decoder::factories())
     {
         text.append("<li>");
         text.append(fact->properties().name);
@@ -84,7 +84,7 @@ QString AboutDialog::loadAbout()
     text.append("</ul>");
     text.append("<h5>"+tr("Output plugins:")+"</h5>");
     text.append("<ul type=\"square\">");
-    foreach(OutputFactory *fact, Output::factories())
+    for(const OutputFactory *fact : Output::factories())
     {
         text.append("<li>");
         text.append(fact->properties().name);
@@ -93,7 +93,7 @@ QString AboutDialog::loadAbout()
     text.append("</ul>");
     text.append("<h5>"+tr("Visual plugins:")+"</h5>");
     text.append("<ul type=\"square\">");
-    foreach(VisualFactory *fact, Visual::factories())
+    for(const VisualFactory *fact : Visual::factories())
     {
         text.append("<li>");
         text.append(fact->properties().name);
@@ -102,7 +102,7 @@ QString AboutDialog::loadAbout()
     text.append("</ul>");
     text.append("<h5>"+tr("Effect plugins:")+"</h5>");
     text.append("<ul type=\"square\">");
-    foreach(EffectFactory *fact, Effect::factories())
+    for(const EffectFactory *fact : Effect::factories())
     {
         text.append("<li>");
         text.append(fact->properties().name);
@@ -111,7 +111,7 @@ QString AboutDialog::loadAbout()
     text.append("</ul>");
     text.append("<h5>"+tr("General plugins:")+"</h5>");
     text.append("<ul type=\"square\">");
-    foreach(GeneralFactory *fact, General::factories())
+    for(const GeneralFactory *fact : General::factories())
     {
         text.append("<li>");
         text.append(fact->properties().name);
@@ -123,7 +123,7 @@ QString AboutDialog::loadAbout()
     return text;
 }
 
-QString AboutDialog::getStringFromResource(const QString& res_file)
+QString AboutDialog::getStringFromResource(const QString &res_file)
 {
     QString ret_string;
     QStringList paths;
@@ -135,7 +135,7 @@ QString AboutDialog::getStringFromResource(const QString& res_file)
     paths << res_file + ".txt";
     paths << res_file;
 
-    foreach(QString path, paths)
+    for(const QString &path : qAsConst(paths))
     {
         QFile file(path);
         if (file.open(QIODevice::ReadOnly))
diff --git a/src/qmmpui/commandlinehandler.cpp b/src/qmmpui/commandlinehandler.cpp
index 85263e16c..5c203901e 100644
--- a/src/qmmpui/commandlinehandler.cpp
+++ b/src/qmmpui/commandlinehandler.cpp
@@ -23,7 +23,7 @@
 QStringList CommandLineHandler::helpString() const
 {
     QStringList out;
-    foreach (const CommandLineOption &opt, m_options.values())
+    for(const CommandLineOption &opt : m_options.values())
     {
         if(opt.flags & HiddenFromHelp)
             continue;
@@ -45,7 +45,7 @@ QString CommandLineHandler::helpString(int id) const
 
 int CommandLineHandler::identify(const QString &name) const
 {
-    foreach (const CommandLineOption &opt, m_options.values())
+    for(const CommandLineOption &opt : m_options.values())
     {
         if(opt.names.contains(name))
             return m_options.key(opt);
diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp
index ed3c774a7..684231144 100644
--- a/src/qmmpui/commandlinemanager.cpp
+++ b/src/qmmpui/commandlinemanager.cpp
@@ -42,7 +42,7 @@ void CommandLineManager::checkOptions()
         m_options = new QList<CommandLineHandler *>;
         m_files = new QHash<CommandLineHandler*, QString>;
 
-        foreach (QString filePath, Qmmp::findPlugins("CommandLineOptions"))
+        for(const QString &filePath : Qmmp::findPlugins("CommandLineOptions"))
         {
             QPluginLoader loader(filePath);
             QObject *plugin = loader.instance();
@@ -76,7 +76,7 @@ QString CommandLineManager::executeCommand(const QString &name, const QStringLis
     checkOptions();
     bool started = UiHelper::instance() && SoundCore::instance() && MediaPlayer::instance();
 
-    foreach(CommandLineHandler *opt, *m_options)
+    for(CommandLineHandler *opt : qAsConst(*m_options))
     {
         int id = opt->identify(name);
         if(id < 0)
@@ -100,7 +100,7 @@ bool CommandLineManager::hasOption(const QString &opt_str, CommandLineHandler::O
     checkOptions();
     if(flags)
         *flags = nullptr;
-    foreach(CommandLineHandler *opt, *m_options)
+    for(const CommandLineHandler *opt : qAsConst(*m_options))
     {
         int id = opt->identify(opt_str);
         if(id >= 0)
@@ -116,9 +116,9 @@ bool CommandLineManager::hasOption(const QString &opt_str, CommandLineHandler::O
 void CommandLineManager::printUsage()
 {
     checkOptions();
-    foreach(CommandLineHandler *opt, *m_options)
+    for(const CommandLineHandler *opt : qAsConst(*m_options))
     {
-        foreach(QString line, opt->helpString())
+        for(const QString &line : opt->helpString())
         {
             QString str = formatHelpString(line);
             if(!str.isEmpty())
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index 47764e2dd..412d76599 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -194,7 +194,7 @@ void ConfigDialog::loadPluginsInfo()
      */
     QTreeWidgetItem *item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Transports"));
     item->setFirstColumnSpanned(true);
-    foreach(InputSourceFactory *factory, InputSource::factories())
+    for(InputSourceFactory *factory : InputSource::factories())
     {
         new PluginItem (item, factory,  InputSource::file(factory));
     }
@@ -205,7 +205,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Decoders"));
     item->setFirstColumnSpanned(true);
-    foreach(DecoderFactory *factory, Decoder::factories())
+    for(DecoderFactory *factory : Decoder::factories())
     {
         new PluginItem (item, factory,  Decoder::file(factory));
     }
@@ -216,7 +216,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Engines"));
     item->setFirstColumnSpanned(true);
-    foreach(EngineFactory *factory, AbstractEngine::factories())
+    for(EngineFactory *factory : AbstractEngine::factories())
     {
         new PluginItem (item, factory,  AbstractEngine::file(factory));
     }
@@ -227,7 +227,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Effects"));
     item->setFirstColumnSpanned(true);
-    foreach(EffectFactory *factory, Effect::factories())
+    for(EffectFactory *factory : Effect::factories())
     {
         new PluginItem (item, factory, Effect::file(factory));
     }
@@ -238,7 +238,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Visualization"));
     item->setFirstColumnSpanned(true);
-    foreach(VisualFactory *factory, Visual::factories())
+    for(VisualFactory *factory : Visual::factories())
     {
         new PluginItem (item, factory, Visual::file(factory));
     }
@@ -249,7 +249,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("General"));
     item->setFirstColumnSpanned(true);
-    foreach(GeneralFactory *factory, General::factories())
+    for(GeneralFactory *factory : General::factories())
     {
         new PluginItem (item, factory, General::file(factory));
     }
@@ -260,7 +260,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Output"));
     item->setFirstColumnSpanned(true);
-    foreach(OutputFactory *factory, Output::factories())
+    for(OutputFactory *factory : Output::factories())
     {
         new PluginItem (item, factory, Output::file(factory));
     }
@@ -271,7 +271,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("File Dialogs"));
     item->setFirstColumnSpanned(true);
-    foreach(FileDialogFactory *factory, FileDialog::factories())
+    for(FileDialogFactory *factory : FileDialog::factories())
     {
         new PluginItem (item, factory, FileDialog::file(factory));
     }
@@ -282,7 +282,7 @@ void ConfigDialog::loadPluginsInfo()
     */
     item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("User Interfaces"));
     item->setFirstColumnSpanned(true);
-    foreach(UiFactory *factory, UiLoader::factories())
+    for(UiFactory *factory : UiLoader::factories())
     {
         new PluginItem (item, factory, UiLoader::file(factory));
     }
@@ -359,7 +359,7 @@ void ConfigDialog::loadLanguages()
     l["sr_BA"] = tr("Serbian (Ijekavian)");
     l["sr_RS"] = tr("Serbian (Ekavian)");
 
-    foreach(QString code, l.keys())
+    for(const QString &code : l.keys())
     {
         QString title = code != "auto" ? l.value(code) + " (" + code + ")" : l.value(code);
         m_ui->langComboBox->addItem(title, code);
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index 0480d5077..06216a116 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -212,14 +212,14 @@ void DetailsDialog::updatePage()
 
     if(m_metaDataModel)
     {
-        foreach(TagModel *tagModel, m_metaDataModel->tags())
+        for(TagModel *tagModel : m_metaDataModel->tags())
         {
             TagEditor *editor = new TagEditor(tagModel, this);
             editor->setEnabled(!m_metaDataModel->isReadOnly());
             m_ui->tabWidget->addTab(editor, tagModel->name());
         }
 
-        foreach(MetaDataItem item, m_metaDataModel->descriptions())
+        for(const MetaDataItem &item : m_metaDataModel->descriptions())
         {
             QTextEdit *textEdit = new QTextEdit(this);
             textEdit->setReadOnly(true);
@@ -254,7 +254,7 @@ void DetailsDialog::printInfo()
     //stream information
     if(core->state() == Qmmp::Playing && core->path() == m_info.path())
     {
-        foreach(QString key, core->streamInfo().keys())
+        for(const QString &key : core->streamInfo().keys())
             streamInfoRows += formatRow(key, core->streamInfo().value(key));
     }
     streamInfoRows = streamInfoRows.trimmed();
@@ -276,7 +276,7 @@ void DetailsDialog::printInfo()
     }
     if(m_metaDataModel)
         items << m_metaDataModel->extraProperties();
-    foreach (MetaDataItem item, items)
+    for(const MetaDataItem &item : qAsConst(items))
         propertyRows += formatRow(item);
     propertyRows = propertyRows.trimmed();
     if(!propertyRows.isEmpty())
diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 510b281ad..d3bb5c6ea 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -43,7 +43,7 @@ void FileDialog::loadPlugins()
     m_cache->append(new QmmpUiPluginCache(new QtFileDialogFactory));
 
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach (QString filePath, Qmmp::findPlugins("FileDialogs"))
+    for(const QString &filePath : Qmmp::findPlugins("FileDialogs"))
     {
         QmmpUiPluginCache *item = new QmmpUiPluginCache(filePath, &settings);
         if(item->hasError())
@@ -59,7 +59,7 @@ QList<FileDialogFactory *> FileDialog::factories()
 {
     loadPlugins();
     QList<FileDialogFactory *> list;
-    foreach (QmmpUiPluginCache *item, *m_cache)
+    for(QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->fileDialogFactory())
             list.append(item->fileDialogFactory());
@@ -85,7 +85,7 @@ bool FileDialog::isEnabled(const FileDialogFactory *factory)
 QString FileDialog::file(const FileDialogFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpUiPluginCache *item, *m_cache)
+    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
@@ -167,7 +167,7 @@ FileDialog* FileDialog::instance()
 
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     QString name = settings.value("FileDialog", "qt_dialog").toString();
-    foreach(QmmpUiPluginCache *item, *m_cache)
+    for(QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == name)
         {
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index 49fcdabe6..e4f557ac6 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -47,7 +47,7 @@ QList<PlayListTrack *> FileLoader::processFile(const QString &path, QStringList
     QList<PlayListTrack *> tracks;
     QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(path, m_parts, ignoredPaths);
 
-    foreach (TrackInfo *info, infoList)
+    for(TrackInfo *info : qAsConst(infoList))
     {
         tracks.append(new PlayListTrack(info));
     }
@@ -128,11 +128,11 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
     {
         QStringList protocols = MetaDataManager::instance()->protocols();
         QList<QRegExp> filters;
-        foreach(const QString &pattern, MetaDataManager::instance()->nameFilters())
+        for(const QString &pattern : MetaDataManager::instance()->nameFilters())
             filters << QRegExp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
 
 
-        foreach(PlayListTrack *t, tracks)
+        for(PlayListTrack *t : qAsConst(tracks))
         {
             if(t->path().contains("://"))
             {
@@ -150,7 +150,7 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
             else
             {
                 bool found = false;
-                foreach(const QRegExp &filter, filters)
+                for(const QRegExp &filter : qAsConst(filters))
                 {
                     if(filter.exactMatch(t->path()))
                     {
@@ -185,7 +185,7 @@ void FileLoader::addDirectory(const QString& s, PlayListItem *before)
     dir.setSorting(QDir::Name);
     QFileInfoList l = dir.entryInfoList(m_filters);
 
-    foreach(QFileInfo info, l)
+    for(const QFileInfo &info : qAsConst(l))
     {
         if(checkRestrictFilters(info) && checkExcludeFilters(info))
         {
@@ -325,7 +325,7 @@ void FileLoader::insert(PlayListItem *before, const QString &path)
 void FileLoader::insert(PlayListItem *before, const QStringList &paths)
 {
     m_mutex.lock();
-    foreach (QString path, paths)
+    for(const QString &path : qAsConst(paths))
     {
         LoaderTask task;
         task.before = before;
@@ -356,7 +356,7 @@ bool FileLoader::checkRestrictFilters(const QFileInfo &info)
     if(m_settings->restrictFilters().isEmpty())
         return true;
 
-    foreach(QString filter, m_settings->restrictFilters())
+    for(const QString &filter : m_settings->restrictFilters())
     {
         QRegExp regexp (filter, Qt::CaseInsensitive, QRegExp::Wildcard);
         if(regexp.exactMatch(info.absoluteFilePath()))
@@ -370,7 +370,7 @@ bool FileLoader::checkExcludeFilters(const QFileInfo &info)
     if(m_settings->excludeFilters().isEmpty())
         return true;
 
-    foreach(QString filter, m_settings->excludeFilters())
+    for(const QString &filter : m_settings->excludeFilters())
     {
         QRegExp regexp (filter, Qt::CaseInsensitive, QRegExp::Wildcard);
         if(regexp.exactMatch(info.absoluteFilePath()))
@@ -384,7 +384,7 @@ void FileLoader::removeIgnoredTracks(QList<PlayListTrack *> *tracks, const QStri
     if(ignoredPaths.isEmpty())
         return;
 
-    foreach(PlayListTrack *track, *tracks)
+    for(PlayListTrack *track : qAsConst(*tracks))
     {
         if(ignoredPaths.contains(track->path()))
         {
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index a09a9cd72..0b540ba34 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -37,7 +37,7 @@ void General::loadPlugins()
 
     m_cache = new QList<QmmpUiPluginCache*>;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach (QString filePath, Qmmp::findPlugins("General"))
+    for(const QString &filePath : Qmmp::findPlugins("General"))
     {
         QmmpUiPluginCache *item = new QmmpUiPluginCache(filePath, &settings);
         if(item->hasError())
@@ -58,7 +58,7 @@ void General::create(QObject *parent)
     m_generals = new QHash <GeneralFactory*, QObject*>();
     m_parent = parent;
     loadPlugins();
-    foreach(QmmpUiPluginCache* item, *m_cache)
+    for(QmmpUiPluginCache* item : qAsConst(*m_cache))
     {
         if(!m_enabledNames.contains(item->shortName()))
             continue;
@@ -75,7 +75,7 @@ QList<GeneralFactory *> General::factories()
 {
     loadPlugins();
     QList<GeneralFactory *> list;
-    foreach (QmmpUiPluginCache *item, *m_cache)
+    for(QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->generalFactory())
             list.append(item->generalFactory());
@@ -87,7 +87,7 @@ QList<GeneralFactory *> General::enabledFactories()
 {
     loadPlugins();
     QList<GeneralFactory *> list;
-    foreach (QmmpUiPluginCache *item, *m_cache)
+    for(QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(!m_enabledNames.contains(item->shortName()))
             continue;
@@ -100,7 +100,7 @@ QList<GeneralFactory *> General::enabledFactories()
 QString General::file(const GeneralFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpUiPluginCache *item, *m_cache)
+    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index 27284c723..32e096221 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -125,7 +125,7 @@ void GroupedContainer::insertTrack(int index, PlayListTrack *track)
 
 void GroupedContainer::replaceTracks(QList<PlayListTrack *> tracks)
 {
-    foreach (PlayListGroup *g, m_groups)
+    for(PlayListGroup *g : qAsConst(m_groups))
     {
         g->trackList.clear();
     }
@@ -195,7 +195,7 @@ void GroupedContainer::setSelected(int index, bool selected)
 void GroupedContainer::clearSelection()
 {
     updateCache();
-    foreach (PlayListItem *item, m_items)
+    for(PlayListItem *item : qAsConst(m_items))
     {
         item->setSelected(false);
     }
@@ -255,7 +255,7 @@ int GroupedContainer::indexOfTrack(int index) const
 PlayListTrack *GroupedContainer::findTrack(int number) const
 {
     int firstNumber = 0;
-    foreach (PlayListGroup *group, m_groups)
+    for(const PlayListGroup *group : qAsConst(m_groups))
     {
         if(number >= firstNumber && number < firstNumber + group->count())
         {
@@ -268,7 +268,7 @@ PlayListTrack *GroupedContainer::findTrack(int number) const
 
 void GroupedContainer::removeTrack(PlayListTrack *track)
 {
-    foreach(PlayListGroup *group, m_groups)
+    for(PlayListGroup *group : qAsConst(m_groups))
     {
         if(group->contains(track))
         {
@@ -287,7 +287,7 @@ void GroupedContainer::removeTrack(PlayListTrack *track)
 
 void GroupedContainer::removeTracks(QList<PlayListTrack *> tracks)
 {
-    foreach(PlayListTrack *t, tracks)
+    for(PlayListTrack *t : qAsConst(tracks))
         removeTrack(t);
 }
 
@@ -320,7 +320,7 @@ bool GroupedContainer::move(QList<int> indexes, int from, int to)
     if(!group)
         return false;
 
-    foreach (int i, indexes)
+    for(const int &i : qAsConst(indexes))
     {
         if(i <= firstIndex || i > lastIndex)
             return false;
@@ -334,7 +334,7 @@ bool GroupedContainer::move(QList<int> indexes, int from, int to)
 
     if (from > to)
     {
-        foreach(int i, indexes)
+        for(const int &i : qAsConst(indexes))
         {
             if (i + to - from < 0)
                 break;
@@ -368,7 +368,7 @@ bool GroupedContainer::move(QList<int> indexes, int from, int to)
 QList<PlayListTrack *> GroupedContainer::takeAllTracks()
 {
     QList<PlayListTrack *> tracks;
-    foreach (PlayListGroup *g, m_groups)
+    for(PlayListGroup *g : qAsConst(m_groups))
     {
         tracks.append(g->trackList);
         g->trackList.clear();
@@ -426,7 +426,7 @@ void GroupedContainer::updateCache() const
     for(int i = 0; i < m_groups.count(); ++i)
     {
         m_items.append(m_groups.at(i));
-        foreach (PlayListTrack *track, m_groups.at(i)->trackList)
+        for(PlayListTrack *track : m_groups.at(i)->trackList)
         {
             track->setTrackIndex(t++);
             m_items.append(track);
diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp
index 9c0cb2b24..59218aa0b 100644
--- a/src/qmmpui/metadataformatter.cpp
+++ b/src/qmmpui/metadataformatter.cpp
@@ -97,7 +97,7 @@ void MetaDataFormatter::setPattern(const QString &pattern)
     m_nodes = compile(pattern);
 #ifdef DUMP_NODES
     qDebug("MetaDataFormatter: dump of nodes");
-    foreach (Node n, m_nodes)
+    for(const Node &n : qAsConst(m_nodes))
     {
         qDebug("=>%s", qPrintable(dumpNode(n)));
     }
@@ -575,7 +575,7 @@ QString MetaDataFormatter::dumpNode(MetaDataFormatter::Node node) const
     else if(node.command == Node::OR_OPERATOR)
         str += "OR_OPERATOR";
     str += "(";
-    foreach (Param p, node.params)
+    for(const Param &p : qAsConst(node.params))
     {
         if(p.type == Param::FIELD)
             params.append(QString("FIELD:%1").arg(p.field));
@@ -588,7 +588,7 @@ QString MetaDataFormatter::dumpNode(MetaDataFormatter::Node node) const
         else if(p.type == Param::NODES)
         {
             QStringList nodeStrList;
-            foreach (Node n, p.children)
+            for(const Node &n : qAsConst(p.children))
             {
                 nodeStrList.append(dumpNode(n));
             }
diff --git a/src/qmmpui/normalcontainer.cpp b/src/qmmpui/normalcontainer.cpp
index 96e3f4204..33b549736 100644
--- a/src/qmmpui/normalcontainer.cpp
+++ b/src/qmmpui/normalcontainer.cpp
@@ -35,7 +35,7 @@ NormalContainer::~NormalContainer()
 
 void NormalContainer::addTracks(QList<PlayListTrack *> tracks)
 {
-    foreach (PlayListTrack *track, tracks)
+    for(PlayListTrack *track : qAsConst(tracks))
     {
         m_items.append(track);
         track->setTrackIndex(m_items.count() - 1);
@@ -118,7 +118,7 @@ void NormalContainer::setSelected(int index, bool selected)
 
 void NormalContainer::clearSelection()
 {
-    foreach (PlayListItem *item, m_items)
+    for(PlayListItem *item : qAsConst(m_items))
     {
         item->setSelected(false);
     }
@@ -177,7 +177,7 @@ void NormalContainer::removeTrack(PlayListTrack *track)
 
 void NormalContainer::removeTracks(QList<PlayListTrack *> tracks)
 {
-    foreach(PlayListTrack *t, tracks)
+    for(PlayListTrack *t : qAsConst(tracks))
         m_items.removeAll(t);
 
     for(int i = 0; i < m_items.count(); ++i)
@@ -188,7 +188,7 @@ bool NormalContainer::move(QList<int> indexes, int from, int to)
 {
     if (from > to)
     {
-        foreach(int i, indexes)
+        for(const int &i : qAsConst(indexes))
         {
             if (i + to - from < 0)
                 break;
diff --git a/src/qmmpui/playlistheadermodel.cpp b/src/qmmpui/playlistheadermodel.cpp
index 55040aa52..ed7f7c904 100644
--- a/src/qmmpui/playlistheadermodel.cpp
+++ b/src/qmmpui/playlistheadermodel.cpp
@@ -240,7 +240,7 @@ void PlayListHeaderModel::updatePlayLists()
         patterns.append(m_columns[i].pattern);
     m_helper->setTitleFormats(patterns);
 
-    foreach(PlayListModel *model, PlayListManager::instance()->playLists())
+    for(PlayListModel *model : PlayListManager::instance()->playLists())
     {
          QMetaObject::invokeMethod(model, "listChanged", Q_ARG(int, PlayListModel::METADATA));
     }
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index f93858355..d04c6de15 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -105,7 +105,7 @@ QList <PlayListModel *> PlayListManager::playLists() const
 QStringList PlayListManager::playListNames() const
 {
     QStringList names;
-    foreach(PlayListModel *model, m_models)
+    for(const PlayListModel *model : qAsConst(m_models))
         names << model->name();
     return names;
 }
@@ -325,7 +325,7 @@ void PlayListManager::readPlayLists()
         pl = 0;
     m_selected = m_models.at(pl);
     m_current = m_models.at(pl);
-    foreach(PlayListModel *model, m_models)
+    for(const PlayListModel *model : qAsConst(m_models))
     {
         connect(model, SIGNAL(nameChanged(QString)), SIGNAL(playListsChanged()));
         connect(model, SIGNAL(listChanged(int)), SLOT(onListChanged(int)));
@@ -344,27 +344,27 @@ void PlayListManager::writePlayLists()
         return;
     }
     plFile.write(QString("current_playlist=%1\n").arg(m_models.indexOf(m_current)).toUtf8());
-    foreach(PlayListModel *model, m_models)
+    for(const PlayListModel *model : qAsConst(m_models))
     {
         plFile.write(QString("playlist=%1\n").arg(model->name()).toUtf8());
         if(model->isEmpty())
             continue;
         QList<PlayListItem *> items = model->items();
         plFile.write(QString("current=%1\n").arg(model->indexOfTrack(model->currentIndex())).toUtf8());
-        foreach(PlayListItem* m, items)
+        for(PlayListItem *m : qAsConst(items))
         {
             if(m->isGroup())
                 continue;
             PlayListTrack *t = dynamic_cast<PlayListTrack *>(m);
             plFile.write(QString("file=%1\n").arg(t->path()).toUtf8());
 
-            foreach(Qmmp::MetaData metaKey, m_metaKeys.values())
+            for(const Qmmp::MetaData &metaKey : m_metaKeys.values())
             {
                 if(!(value = t->value(metaKey)).isEmpty())
                     plFile.write(QString("%1=%2\n").arg(m_metaKeys.key(metaKey)).arg(value).toUtf8());
             }
 
-            foreach(Qmmp::TrackProperty propKey, m_propKeys.values())
+            for(const Qmmp::TrackProperty &propKey : m_propKeys.values())
             {
                 if(!(value = t->value(propKey)).isEmpty())
                     plFile.write(QString("%1=%2\n").arg(m_propKeys.key(propKey)).arg(value).toLatin1());
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 31add1f6f..876c42e84 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -131,7 +131,7 @@ void PlayListModel::add(QList<PlayListTrack *> tracks)
         m_current = m_container->indexOf(m_current_track);
     }
 
-    foreach(PlayListTrack *track, tracks)
+    for(PlayListTrack *track : qAsConst(tracks))
     {
         m_total_duration += track->duration();
         emit trackAdded(track);
@@ -189,7 +189,7 @@ void PlayListModel::insert(int index, QList<PlayListTrack *> tracks)
 
     int flags = 0;
 
-    foreach(PlayListTrack *track, tracks)
+    for(PlayListTrack *track : qAsConst(tracks))
     {
         m_container->insertTrack(index, track);
         m_total_duration += track->duration();
@@ -235,7 +235,7 @@ void PlayListModel::insert(int index, const QStringList &paths)
 void PlayListModel::insert(int index, const QList<QUrl> &urls)
 {
     QStringList paths;
-    foreach (QUrl url, urls)
+    for(const QUrl &url : qAsConst(urls))
     {
         if(url.scheme() == "file")
             paths.append(QFileInfo(url.toLocalFile()).canonicalFilePath());
@@ -452,14 +452,14 @@ void PlayListModel::setSelected(int index, bool selected)
 
 void PlayListModel::setSelected(QList<PlayListTrack *> tracks, bool selected)
 {
-    foreach(PlayListTrack *t, tracks)
+    for(PlayListTrack *t : qAsConst(tracks))
         t->setSelected(selected);
     emit listChanged(SELECTION);
 }
 
 void PlayListModel::setSelected(QList<PlayListItem *> items, bool selected)
 {
-    foreach(PlayListItem *i, items)
+    for(PlayListItem *i : qAsConst(items))
         i->setSelected(selected);
     emit listChanged(SELECTION);
 }
@@ -483,7 +483,7 @@ void PlayListModel::setSelected(int first, int last, bool selected)
 
 void PlayListModel::setSelected(QList<int> indexes, bool selected)
 {
-    foreach (int idx, indexes)
+    for(const int &idx : qAsConst(indexes))
         m_container->setSelected(idx, selected);
     emit listChanged(SELECTION);
 }
@@ -728,7 +728,7 @@ void PlayListModel::moveItems(int from, int to)
     if(selected_indexes.isEmpty())
         return;
 
-    foreach(int i, selected_indexes) //do no move groups
+    for(const int &i : qAsConst(selected_indexes)) //do no move groups
     {
         if(!isTrack(i))
             return;
@@ -800,7 +800,7 @@ QList<int> PlayListModel::selectedIndexes() const
 QList<PlayListTrack *> PlayListModel::selectedTracks() const
 {
     QList<PlayListTrack*> selected_tracks;
-    foreach(PlayListItem *item, m_container->items())
+    for(PlayListItem *item : m_container->items())
     {
         if(!item->isGroup() && item->isSelected())
             selected_tracks.append(dynamic_cast<PlayListTrack *>(item));
@@ -817,7 +817,7 @@ void PlayListModel::addToQueue()
 {
     QList<PlayListTrack*> selected_tracks = selectedTracks();
     blockSignals(true);
-    foreach(PlayListTrack* track, selected_tracks)
+    for(PlayListTrack *track : qAsConst(selected_tracks))
         setQueued(track);
     blockSignals(false);
     emit listChanged(QUEUE);
@@ -976,7 +976,7 @@ void PlayListModel::onTaskFinished()
                 flags |= STOP_AFTER;
             }
 
-            foreach (PlayListTrack *t, m_queued_songs)
+            for(PlayListTrack *t : qAsConst(m_queued_songs))
             {
                 if(!m_container->contains(t))
                 {
diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp
index 55b2499ae..656000245 100644
--- a/src/qmmpui/playlistparser.cpp
+++ b/src/qmmpui/playlistparser.cpp
@@ -39,7 +39,7 @@ QStringList PlayListParser::nameFilters()
 {
     loadFormats();
     QStringList filters;
-    foreach(PlayListFormat* format, *m_formats)
+    for(const PlayListFormat *format : qAsConst(*m_formats))
     {
         filters << format->properties().filters;
     }
@@ -48,7 +48,7 @@ QStringList PlayListParser::nameFilters()
 
 bool PlayListParser::isPlayList(const QString &url)
 {
-    foreach (QString filter, nameFilters())
+    for(const QString &filter : nameFilters())
     {
         QRegExp r(filter, Qt::CaseInsensitive, QRegExp::Wildcard);
         if(r.exactMatch(url))
@@ -60,7 +60,7 @@ bool PlayListParser::isPlayList(const QString &url)
 PlayListFormat *PlayListParser::findByMime(const QString &mime)
 {
     loadFormats();
-    foreach(PlayListFormat* format, *m_formats)
+    for(PlayListFormat *format : qAsConst(*m_formats))
     {
         if(format->properties().contentTypes.contains(mime))
             return format;
@@ -71,9 +71,9 @@ PlayListFormat *PlayListParser::findByMime(const QString &mime)
 PlayListFormat *PlayListParser::findByPath(const QString &filePath)
 {
     loadFormats();
-    foreach(PlayListFormat* format, *m_formats)
+    for(PlayListFormat *format : qAsConst(*m_formats))
     {
-        foreach(QString filter, format->properties().filters)
+        for(const QString &filter : format->properties().filters)
         {
             QRegExp r(filter, Qt::CaseInsensitive, QRegExp::Wildcard);
             if(r.exactMatch(filePath))
@@ -130,7 +130,7 @@ QList<PlayListTrack *> PlayListParser::loadPlaylist(const QString &f_name)
     }
 
     QString path;
-    foreach (PlayListTrack *t, tracks)
+    for(PlayListTrack *t : qAsConst(tracks))
     {
         path = t->path();
 
@@ -149,7 +149,7 @@ QList<PlayListTrack *> PlayListParser::loadPlaylist(const QString &f_name)
 
 QList<PlayListTrack *> PlayListParser::loadPlaylist(const QString &fmt, const QByteArray &content)
 {
-    foreach (PlayListFormat *p, *m_formats)
+    for(PlayListFormat *p : qAsConst(*m_formats))
     {
         if(p->properties().shortName == fmt)
             return p->decode(content);
@@ -163,7 +163,7 @@ void PlayListParser::loadFormats()
         return;
 
     m_formats = new QList<PlayListFormat*>();
-    foreach (QString filePath, Qmmp::findPlugins("PlayListFormats"))
+    for(const QString &filePath : Qmmp::findPlugins("PlayListFormats"))
     {
         QPluginLoader loader(filePath);
         QObject *plugin = loader.instance();
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index f3141781e..ab40c9e76 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -150,7 +150,7 @@ void PlayListTask::sort(QList<PlayListTrack *> tracks, PlayListModel::SortMode m
 
     m_align_groups = QmmpUiSettings::instance()->isGroupsEnabled() && (mode != PlayListModel::GROUP);
 
-    foreach (PlayListTrack *t, tracks)
+    for(PlayListTrack *t : qAsConst(tracks))
     {
         TrackField *f = new TrackField;
         f->track = t;
@@ -435,7 +435,7 @@ void PlayListTask::run()
         }
         //find all files
         QFileInfoList l;
-        foreach (QString p, dirs)
+        for(const QString &p : qAsConst(dirs))
         {
             QDir dir(p);
             dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
@@ -444,7 +444,7 @@ void PlayListTask::run()
         }
         //generate URLs for the current playlist
         QStringList urls;
-        foreach (TrackField *t, m_fields)
+        for(const TrackField *t : qAsConst(m_fields))
             urls.append(t->value);
 
         //find files that have already been added
@@ -464,10 +464,10 @@ void PlayListTask::run()
         //create new playlist tracks
         QStringList ignoredFiles;
         TrackInfo::Parts parts = QmmpUiSettings::instance()->useMetaData() ? TrackInfo::AllParts : TrackInfo::NoParts;
-        foreach(QFileInfo f, l)
+        for(const QFileInfo &f : qAsConst(l))
         {
             QStringList ignored;
-            foreach (TrackInfo *info, mm->createPlayList(f.canonicalFilePath(), parts, &ignored))
+            for(TrackInfo *info : mm->createPlayList(f.canonicalFilePath(), parts, &ignored))
             {
                 m_new_tracks << new PlayListTrack(info);
             }
@@ -475,7 +475,7 @@ void PlayListTask::run()
         }
         //remove dublicate URLs and ignored files
         //this code prevents re-addition of cue tracks
-        foreach(PlayListTrack *t, m_new_tracks)
+        for(PlayListTrack *t : qAsConst(m_new_tracks))
         {
             if((t->path().contains("://") && urls.contains(t->path())) ||
                     ignoredFiles.contains(t->path()))
@@ -505,7 +505,7 @@ QList<PlayListTrack *> PlayListTask::takeResults(PlayListTrack **current_track)
 {
     if(m_task == SORT || m_task == SORT_BY_COLUMN)
     {
-        foreach (TrackField *f, m_fields)
+        for(const TrackField *f : qAsConst(m_fields))
             m_tracks.append(f->track);
     }
     else if(m_task == SORT_SELECTION)
diff --git a/src/qmmpui/qmmpuiplugincache.cpp b/src/qmmpui/qmmpuiplugincache.cpp
index 2ced6521e..d10fecead 100644
--- a/src/qmmpui/qmmpuiplugincache.cpp
+++ b/src/qmmpui/qmmpuiplugincache.cpp
@@ -219,7 +219,7 @@ void QmmpUiPluginCache::cleanup(QSettings *settings)
 {
     settings->beginGroup("PluginCache");
 
-    foreach (QString key, settings->allKeys())
+    for(const QString &key : settings->allKeys())
     {
 #ifdef Q_OS_WIN
         if(!QFile::exists(key))
diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp
index dfb0d9c0d..215fdd1e6 100644
--- a/src/qmmpui/qmmpuisettings.cpp
+++ b/src/qmmpui/qmmpuisettings.cpp
@@ -133,7 +133,7 @@ void QmmpUiSettings::setGroupFormat(const QString &groupFormat)
     {
         m_group_format = groupFormat;
         m_helper->setGroupFormat(m_group_format);
-        foreach(PlayListModel *model, PlayListManager::instance()->playLists())
+        for(PlayListModel *model : PlayListManager::instance()->playLists())
         {
             model->rebuildGroups();
         }
diff --git a/src/qmmpui/tagupdater.cpp b/src/qmmpui/tagupdater.cpp
index bb0ca4bfa..1feb7cb21 100644
--- a/src/qmmpui/tagupdater.cpp
+++ b/src/qmmpui/tagupdater.cpp
@@ -23,7 +23,7 @@
 TagUpdater::TagUpdater(QObject* o, QList<PlayListTrack *> tracks) : m_observable(o)
 {
     m_tracks = tracks;
-    foreach(PlayListTrack *t, m_tracks)
+    for(PlayListTrack *t : qAsConst(m_tracks))
         t->beginUsage();
     connect(m_observable, SIGNAL(destroyed(QObject *)),SLOT(updateTags()));
     connect(m_observable, SIGNAL(destroyed(QObject *)),SLOT(deleteLater()));
@@ -31,7 +31,7 @@ TagUpdater::TagUpdater(QObject* o, QList<PlayListTrack *> tracks) : m_observable
 
 void TagUpdater::updateTags()
 {
-    foreach (PlayListTrack *t, m_tracks)
+    for(PlayListTrack *t : qAsConst(m_tracks))
     {
         t->endUsage();
         if (!t->isUsed() && t->isSheduledForDeletion())
diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp
index 0aadd0b24..b566fc98d 100644
--- a/src/qmmpui/uihelper.cpp
+++ b/src/qmmpui/uihelper.cpp
@@ -248,7 +248,7 @@ void UiHelper::exit()
 {
     //send non-spontaneous close event
     //for all windows
-    foreach (QWidget *widget, qApp->topLevelWidgets())
+    for(QWidget *widget : qApp->topLevelWidgets())
         widget->close();
 
     qApp->closeAllWindows();
diff --git a/src/qmmpui/uiloader.cpp b/src/qmmpui/uiloader.cpp
index cca8616a9..c1bb55de4 100644
--- a/src/qmmpui/uiloader.cpp
+++ b/src/qmmpui/uiloader.cpp
@@ -32,7 +32,7 @@ void UiLoader::loadPlugins()
 
     m_cache = new QList<QmmpUiPluginCache*>;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    foreach (QString filePath, Qmmp::findPlugins("Ui"))
+    for(const QString &filePath : Qmmp::findPlugins("Ui"))
     {
         QmmpUiPluginCache *item = new QmmpUiPluginCache(filePath, &settings);
         if(item->hasError())
@@ -48,7 +48,7 @@ QList<UiFactory *> UiLoader::factories()
 {
     loadPlugins();
     QList<UiFactory *> list;
-    foreach (QmmpUiPluginCache *item, *m_cache)
+    for(QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->uiFactory())
             list.append(item->uiFactory());
@@ -60,7 +60,7 @@ QStringList UiLoader::names()
 {
     QStringList out;
     loadPlugins();
-    foreach(QmmpUiPluginCache *item, *m_cache)
+    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         out << item->shortName();
     }
@@ -70,7 +70,7 @@ QStringList UiLoader::names()
 QString UiLoader::file(UiFactory *factory)
 {
     loadPlugins();
-    foreach(QmmpUiPluginCache *item, *m_cache)
+    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == factory->properties().shortName)
             return item->file();
@@ -86,7 +86,7 @@ void UiLoader::select(UiFactory* factory)
 void UiLoader::select(const QString &name)
 {
     loadPlugins();
-    foreach(QmmpUiPluginCache *item, *m_cache)
+    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == name)
         {
@@ -106,7 +106,7 @@ UiFactory *UiLoader::selected()
 #else
     QString name = settings.value("Ui/current_plugin", "skinned").toString();
 #endif
-    foreach(QmmpUiPluginCache *item, *m_cache)
+    for(QmmpUiPluginCache *item : qAsConst(*m_cache))
     {
         if(item->shortName() == name && item->uiFactory())
             return item->uiFactory();
diff --git a/src/qmmpui/winfileassocpage.cpp b/src/qmmpui/winfileassocpage.cpp
index 2d9aefa6d..9b1fef989 100644
--- a/src/qmmpui/winfileassocpage.cpp
+++ b/src/qmmpui/winfileassocpage.cpp
@@ -39,7 +39,7 @@ WinFileAssocPage::WinFileAssocPage(QWidget *parent): QWidget(parent)
         m_ui->selectNone->hide();
     }
 
-    foreach (QString ext, MetaDataManager::instance()->nameFilters())
+    for(QString ext : MetaDataManager::instance()->nameFilters())
     {
         ext.remove("*.");
         m_ui->listWidget->addItem(ext);