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/Engines/mplayer/mplayerengine.cpp | 9 ++++----- src/plugins/Engines/mplayer/mplayerenginefactory.cpp | 2 +- src/plugins/Engines/mplayer/mplayermetadatamodel.cpp | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/plugins/Engines') 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 MplayerMetaDataModel::extraProperties() const //mplayer std output parsing QRegExp rx_id("^(ID_.*)=(.*)"); QMap 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)); -- cgit v1.2.3-13-gbd6f