removed foreach macro

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

12 files changed, 33 insertions, 34 deletions

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