22 files changed, 106 insertions, 106 deletions

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);