removed foreach macro

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

2 files changed, 16 insertions, 16 deletions

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