From 1e31fe896524513577911e382897b841e40a4814 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 7 Sep 2019 22:08:54 +0000 Subject: removed foreach macro git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9067 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/archive/decoder_archive.cpp | 4 ++-- src/plugins/Input/archive/decoderarchivefactory.cpp | 2 +- src/plugins/Input/cdaudio/decodercdaudiofactory.cpp | 2 +- src/plugins/Input/cdaudio/settingsdialog.cpp | 2 +- src/plugins/Input/cue/settingsdialog.cpp | 4 ++-- src/plugins/Input/mpeg/settingsdialog.cpp | 4 ++-- src/plugins/Input/wildmidi/wildmidihelper.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/plugins/Input') 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 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 DecoderArchiveFactory::createPlayList(const QString &path, Tr //is this file supported by qmmp? QList 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 DecoderCDAudioFactory::createPlayList(const QString &path, Tr QString device_path = path; device_path.remove("cdda://"); QList 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 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 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); -- cgit v1.2.3-13-gbd6f